diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java
index 4cdd775c2..3384ed718 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java
@@ -247,13 +247,28 @@ public class HarmonicMetricServiceImpl extends MppServiceImpl<RStatAssesDMapper,
                     if (dataPltMap.containsKey(phasic)) {
                         List<RStatDataPltDPO> mapList = dataPltMap.get(phasic);
                         Map<String, RStatDataPltDPO> pltMap = mapList.stream().collect(Collectors.toMap(RStatDataPltDPO::getValueType, Function.identity()));
-                        if (pltMap.get("MAX").getPlt() > (Double) overLimit.get("flicker")) {
-                            mpSurplusAbnormalCp95.setFlicker(pltMap.get("CP95").getPlt().floatValue());
-                            mpSurplusAbnormalAvg.setFlicker(pltMap.get("AVG").getPlt().floatValue());
-                            mpSurplusAbnormalMin.setFlicker(pltMap.get("MIN").getPlt().floatValue());
-                            mpSurplusAbnormalMax.setFlicker(pltMap.get("MAX").getPlt().floatValue());
+                        RStatDataPltDPO maxObj = pltMap.get("MAX");
+                        Double flickerLimit = (Double) overLimit.get("flicker");
+                        if (maxObj != null && flickerLimit != null && (maxObj).getPlt() > flickerLimit) {
+                            if (pltMap.get("CP95") != null) {
+                                mpSurplusAbnormalCp95.setFlicker(pltMap.get("CP95").getPlt().floatValue());
+                            }
+                            if (pltMap.get("AVG") != null) {
+                                mpSurplusAbnormalAvg.setFlicker(pltMap.get("AVG").getPlt().floatValue());
+                            }
+                            if (pltMap.get("MIN") != null) {
+                                mpSurplusAbnormalMin.setFlicker(pltMap.get("MIN").getPlt().floatValue());
+                            }
+                            mpSurplusAbnormalMax.setFlicker((maxObj).getPlt().floatValue());
                             flag = true;
                         }
+//                        if (pltMap.get("MAX").getPlt() > (Double) overLimit.get("flicker")) {
+//                            mpSurplusAbnormalCp95.setFlicker(pltMap.get("CP95").getPlt().floatValue());
+//                            mpSurplusAbnormalAvg.setFlicker(pltMap.get("AVG").getPlt().floatValue());
+//                            mpSurplusAbnormalMin.setFlicker(pltMap.get("MIN").getPlt().floatValue());
+//                            mpSurplusAbnormalMax.setFlicker(pltMap.get("MAX").getPlt().floatValue());
+//                            flag = true;
+//                        }
                     }
                     //谐波电压
                     dealData(tenMap,phasic,overLimit,flag,mpSurplusAbnormalCp95,mpSurplusAbnormalAvg,mpSurplusAbnormalMax,mpSurplusAbnormalMin,2,26,1,"uharm_","v_",all);