diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java
index 6702dbfe0..0670be376 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java
@@ -12,6 +12,7 @@ import com.njcn.device.pq.api.GeneralDeviceInfoClient;
 import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.pq.pojo.bo.BaseLineInfo;
 import com.njcn.device.pq.pojo.po.LineDetail;
+import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
 import com.njcn.harmonic.mapper.*;
 import com.njcn.harmonic.pojo.param.hebeinorth.AssessParam;
 import com.njcn.harmonic.pojo.po.PQSComAssesPO;
@@ -662,7 +663,7 @@ public class GridServiceImpl implements IGridService {
                 .distinct()
                 .collect(Collectors.toList());
         //获取基础台账信息
-        List<BaseLineInfo> baseLineInfos = generalDeviceInfoClient.getBaseLineInfo(lineList).getData();
+        List<AreaLineInfoVO> baseLineInfos = lineFeignClient.getBaseLineAreaInfo(lineList).getData();
         //获取越限详情
         List<RStatLimitRateDPO> overLimitList = rStatLimitRateDMapper.getAssessTargetRate(lineList, param.getStartTime(), param.getEndTime());
         Map<String, RStatLimitRateDPO> map = overLimitList.stream().collect(Collectors.toMap(RStatLimitRateDPO::getLineId, Function.identity()));
@@ -671,8 +672,8 @@ public class GridServiceImpl implements IGridService {
             qualifiedDetail.setAreaName(item.getGdName());
             qualifiedDetail.setLineName(item.getLineName());
             qualifiedDetail.setSubstationName(item.getSubName());
-            if (map.containsKey(item.getId())) {
-                RStatLimitRateDPO item2 = map.get(item.getId());
+            if (map.containsKey(item.getLineId())) {
+                RStatLimitRateDPO item2 = map.get(item.getLineId());
                 if (!Objects.isNull(item2) && item2.getAllTime() > 0) {
                     addQualifiedDetail(qualifiedDetail, item2);
                 }
diff --git a/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/service/impl/CustomReportTableServiceImpl.java b/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/service/impl/CustomReportTableServiceImpl.java
index 036f80350..a38376cbd 100644
--- a/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/service/impl/CustomReportTableServiceImpl.java
+++ b/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/service/impl/CustomReportTableServiceImpl.java
@@ -1471,7 +1471,7 @@ public class CustomReportTableServiceImpl implements CustomReportTableService {
                                     }
                                 }
                             } else if (v.charAt(0) == '%' && v.contains(STR_ONE)) {
-                                //指标合格情况
+                                //指标结论情况
                                 String str = "";
                                 List<ReportTemplateDTO> rDto = assMap.get(v.replace(STR_FOUR, "").toUpperCase());
                                 if (Objects.nonNull(rDto)) {
@@ -1481,7 +1481,7 @@ public class CustomReportTableServiceImpl implements CustomReportTableService {
                                         str = "/";
                                     }
                                     son.set(V, str);
-                                    if ("不合格".equals(str)) {
+                                    if (str.contains("不合格")) {
                                         son.set("fc", "#990000");
                                     }
                                 }
diff --git a/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/service/impl/MonitorHarmonicReportServiceImpl.java b/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/service/impl/MonitorHarmonicReportServiceImpl.java
index 8fedb8760..bf99f977a 100644
--- a/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/service/impl/MonitorHarmonicReportServiceImpl.java
+++ b/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/service/impl/MonitorHarmonicReportServiceImpl.java
@@ -244,7 +244,6 @@ public class MonitorHarmonicReportServiceImpl implements MonitorHarmonicReportSe
         // ======== 修复后的图片处理核心逻辑 ========
         Map<String, Object> header = handleImageData(file, picPathResource);
         reportmap.put("$image$", header);
-        reportmap.put("$image$", header);
 
         getVirtualData(param);
         // 电压幅值
@@ -469,7 +468,7 @@ public class MonitorHarmonicReportServiceImpl implements MonitorHarmonicReportSe
         reportmap.put("$TitleTime$", dayFormatter.format(currentTime));
         // 报告标题
         reportmap.put("$ReportTitle$",
-                String.format("对该地区%s电能质量在线监测数据进行分析， 以判断电能质量指标是否满足国标。", new String[]{strLineBaseName}));
+                String.format("    对该地区%s电能质量在线监测数据进行分析， 以判断电能质量指标是否满足国标。", new String[]{strLineBaseName}));
         // 报告分析时间段
         reportmap.put("$ReportTime$", strTime);
         // 运行数据分析