diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLimitTargetVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLimitTargetVO.java
index 11bb7cfdc..a06259316 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLimitTargetVO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLimitTargetVO.java
@@ -73,4 +73,7 @@ public class RStatLimitTargetVO {
     @ApiModelProperty("所有指标越限天数")
     private Integer allOvertime = 0;
 
+    @ApiModelProperty("所有闪变越限天数")
+    private Integer flickerAllTime = 0;
+
 }
\ No newline at end of file
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml
index 627e7102b..fce807472 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml
@@ -423,7 +423,14 @@
                             THEN 1
                         ELSE 0
                         END
-            ) allOvertime
+            ) allOvertime,
+            SUM(
+                CASE
+                    WHEN A.flickerAllTime > 0
+                    THEN 1
+                    ELSE 0
+                END
+            ) flickerAllTime
         FROM
             (SELECT
                  time_id,
@@ -434,6 +441,7 @@
                  SUM(ubalance_overtime) AS ubalanceOvertime,
                  SUM(uaberrance_overtime) AS uaberranceOvertime,
                  SUM(i_neg_overtime) AS iNegOvertime,
+                 SUM(flicker_all_time) AS flickerAllTime,
                  SUM(
                      IF(
                          (
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 f6a95ccb9..9b9ae0761 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
@@ -527,7 +527,7 @@ public class GridServiceImpl implements IGridService {
                         detail9.setTargetName(DicDataEnum.INTERHARMONIC_VOLTAGE.getName());
                         if (CollUtil.isNotEmpty(list2)) {
                             //筛选出9项指标(电压偏差、频率偏差、电压总谐波畸变率、电压闪变、三相电压不平衡度、负序电流、谐波电流、间谐波电压、谐波电压)超标监测点
-                            long allNum = list2.stream().filter(o->o.getAllOvertime() > 0).count();
+                            long allNum = list2.stream().filter(o->o.getAllOvertime() > 0|| o.getFlickerAllTime()>0).count();
                             detail.setOverNum((int) allNum);
                             detail.setOverRatio(PubUtils.doubleRound(2,detail.getOverNum()*100.0/detail.getOnlineNum()));
                             //筛选出电压偏差超标监测点
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java
index 4258a97b3..ac9154ef8 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java
@@ -699,9 +699,8 @@ public class RStatLimitServiceImpl implements RStatLimitService {
         if (CollUtil.isNotEmpty(limitTarget)) {
             long count = limitTarget.stream()
                     .filter(x -> x.getAllTime() > 0 || x.getFlickerAllTime() > 0)
-                    .distinct()
-                    .map(RStatLimitTargetDPO::getLineId).count();
-            lineData.setOutOfStandardRate(NumberUtil.round(count * 100.0 / limitTarget.size(), 2).floatValue());
+                    .map(RStatLimitTargetDPO::getLineId).distinct().count();
+            lineData.setOutOfStandardRate(NumberUtil.round(count * 100.0 / lineIds.size(), 2).floatValue());
         } else {
             lineData.setOutOfStandardRate(0.0f);
         }
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 60adab4ae..4cdd775c2 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
@@ -261,6 +261,10 @@ public class HarmonicMetricServiceImpl extends MppServiceImpl<RStatAssesDMapper,
                     dealData(iMap,phasic,overLimit,flag,mpSurplusAbnormalCp95,mpSurplusAbnormalAvg,mpSurplusAbnormalMax,mpSurplusAbnormalMin,2,26,2,"iharm_","i_",all);
                     //间谐波电压
                     dealData(inMap,phasic,overLimit,flag,mpSurplusAbnormalCp95,mpSurplusAbnormalAvg,mpSurplusAbnormalMax,mpSurplusAbnormalMin,1,17,3,"inuharm_","v_",all);
+                    all.add(mpSurplusAbnormalCp95);
+                    all.add(mpSurplusAbnormalAvg);
+                    all.add(mpSurplusAbnormalMax);
+                    all.add(mpSurplusAbnormalMin);
                 }
             }
         }
@@ -309,10 +313,6 @@ public class HarmonicMetricServiceImpl extends MppServiceImpl<RStatAssesDMapper,
                 assPojo(moreValueMax, mpSurplusAbnormalMax, type);
                 assPojo(moreValueMin, mpSurplusAbnormalMin, type);
 
-                all.add(mpSurplusAbnormalCp95);
-                all.add(mpSurplusAbnormalAvg);
-                all.add(mpSurplusAbnormalMax);
-                all.add(mpSurplusAbnormalMin);
             }
         }
     }