diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/ResponsibilityAlgorithm.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/ResponsibilityAlgorithm.java
index 3ef037501..209d68414 100644
--- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/ResponsibilityAlgorithm.java
+++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/utils/ResponsibilityAlgorithm.java
@@ -505,7 +505,7 @@ public class ResponsibilityAlgorithm {
         }
 
         // 使用 LU 分解方法计算矩阵 invSXX
-        invSXX = A.invert().mult(I);
+        //invSXX = A.invert().mult(I);
 
         // 创建长度为 p_num 的向量 sXYMa_Eigen
         DMatrixRMaj sXYMa_Eigen = new DMatrixRMaj(p_num, 1);
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateServiceImpl.java
index a448dacdc..db339ab52 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateServiceImpl.java
@@ -669,76 +669,76 @@ public class LimitRateServiceImpl extends MppServiceImpl<LimitRatePOMapper, Limi
 
         if (!CollectionUtils.isEmpty (dataHarmRateVPOList)) {
             for (DataHarmRateV item : dataHarmRateVPOList) {
-                if (item.getV2 ( ) > overlimit.getUharm2 ( )) {
+                if (item.getV2 ( ) > overlimit.getUharm2 ( ) && item.getV2() >=0.0 && item.getV2() <=30.0) {
                     v2++;
                 }
-                if (item.getV3 ( ) > overlimit.getUharm3 ( )) {
+                if (item.getV3 ( ) > overlimit.getUharm3 ( ) && item.getV3() >=0.0 && item.getV3() <=30.0) {
                     v3++;
                 }
-                if (item.getV4 ( ) > overlimit.getUharm4 ( )) {
+                if (item.getV4 ( ) > overlimit.getUharm4 ( ) && item.getV4() >=0.0 && item.getV4() <=30.0) {
                     v4++;
                 }
-                if (item.getV5 ( ) > overlimit.getUharm5 ( )) {
+                if (item.getV5 ( ) > overlimit.getUharm5 ( ) && item.getV5() >=0.0 && item.getV5() <=30.0) {
                     v5++;
                 }
-                if (item.getV6 ( ) > overlimit.getUharm6 ( )) {
+                if (item.getV6 ( ) > overlimit.getUharm6 ( ) && item.getV6() >=0.0 && item.getV6() <=30.0) {
                     v6++;
                 }
-                if (item.getV7 ( ) > overlimit.getUharm7 ( )) {
+                if (item.getV7 ( ) > overlimit.getUharm7 ( ) && item.getV7() >=0.0 && item.getV7() <=30.0) {
                     v7++;
                 }
-                if (item.getV8 ( ) > overlimit.getUharm8 ( )) {
+                if (item.getV8 ( ) > overlimit.getUharm8 ( ) && item.getV8() >=0.0 && item.getV8() <=30.0) {
                     v8++;
                 }
-                if (item.getV9 ( ) > overlimit.getUharm9 ( )) {
+                if (item.getV9 ( ) > overlimit.getUharm9 ( ) && item.getV9() >=0.0 && item.getV9() <=30.0) {
                     v9++;
                 }
-                if (item.getV10 ( ) > overlimit.getUharm10 ( )) {
+                if (item.getV10 ( ) > overlimit.getUharm10 ( ) && item.getV10() >=0.0 && item.getV10() <=30.0) {
                     v10++;
                 }
-                if (item.getV11 ( ) > overlimit.getUharm11 ( )) {
+                if (item.getV11 ( ) > overlimit.getUharm11 ( ) && item.getV11() >=0.0 && item.getV11() <=30.0) {
                     v11++;
                 }
-                if (item.getV12 ( ) > overlimit.getUharm12 ( )) {
+                if (item.getV12 ( ) > overlimit.getUharm12 ( ) && item.getV12() >=0.0 && item.getV12() <=30.0) {
                     v12++;
                 }
-                if (item.getV13 ( ) > overlimit.getUharm13 ( )) {
+                if (item.getV13 ( ) > overlimit.getUharm13 ( ) && item.getV13() >=0.0 && item.getV13() <=30.0) {
                     v13++;
                 }
-                if (item.getV14 ( ) > overlimit.getUharm14 ( )) {
+                if (item.getV14 ( ) > overlimit.getUharm14 ( ) && item.getV14() >=0.0 && item.getV14() <=30.0) {
                     v14++;
                 }
-                if (item.getV15 ( ) > overlimit.getUharm15 ( )) {
+                if (item.getV15 ( ) > overlimit.getUharm15 ( ) && item.getV15() >=0.0 && item.getV15() <=30.0) {
                     v15++;
                 }
-                if (item.getV16 ( ) > overlimit.getUharm16 ( )) {
+                if (item.getV16 ( ) > overlimit.getUharm16 ( ) && item.getV16() >=0.0 && item.getV16() <=30.0) {
                     v16++;
                 }
-                if (item.getV17 ( ) > overlimit.getUharm17 ( )) {
+                if (item.getV17 ( ) > overlimit.getUharm17 ( ) && item.getV17() >=0.0 && item.getV17() <=30.0) {
                     v17++;
                 }
-                if (item.getV18 ( ) > overlimit.getUharm18 ( )) {
+                if (item.getV18 ( ) > overlimit.getUharm18 ( ) && item.getV18() >=0.0 && item.getV18() <=30.0) {
                     v18++;
                 }
-                if (item.getV19 ( ) > overlimit.getUharm19 ( )) {
+                if (item.getV19 ( ) > overlimit.getUharm19 ( ) && item.getV19() >=0.0 && item.getV19() <=30.0) {
                     v19++;
                 }
-                if (item.getV20 ( ) > overlimit.getUharm20 ( )) {
+                if (item.getV20 ( ) > overlimit.getUharm20 ( ) && item.getV20() >=0.0 && item.getV20() <=30.0) {
                     v20++;
                 }
-                if (item.getV21 ( ) > overlimit.getUharm21 ( )) {
+                if (item.getV21 ( ) > overlimit.getUharm21 ( ) && item.getV21() >=0.0 && item.getV21() <=30.0) {
                     v21++;
                 }
-                if (item.getV22 ( ) > overlimit.getUharm22 ( )) {
+                if (item.getV22 ( ) > overlimit.getUharm22 ( ) && item.getV22() >=0.0 && item.getV22() <=30.0) {
                     v22++;
                 }
-                if (item.getV23 ( ) > overlimit.getUharm23 ( )) {
+                if (item.getV23 ( ) > overlimit.getUharm23 ( ) && item.getV23() >=0.0 && item.getV23() <=30.0) {
                     v23++;
                 }
-                if (item.getV24 ( ) > overlimit.getUharm24 ( )) {
+                if (item.getV24 ( ) > overlimit.getUharm24 ( ) && item.getV24() >=0.0 && item.getV24() <=30.0) {
                     v24++;
                 }
-                if (item.getV25 ( ) > overlimit.getUharm25 ( )) {
+                if (item.getV25 ( ) > overlimit.getUharm25 ( ) && item.getV25() >=0.0 && item.getV25() <=30.0) {
                     v25++;
                 }
             }
@@ -746,76 +746,76 @@ public class LimitRateServiceImpl extends MppServiceImpl<LimitRatePOMapper, Limi
         //2-25次谐波电流
         if (!CollectionUtils.isEmpty (dataIPOList)) {
             for (DataI item : dataIPOList) {
-                if (item.getI2 ( ) > overlimit.getIharm2 ( )) {
+                if (item.getI2 ( ) > overlimit.getIharm2 ( ) && item.getI2() >=0.0 && item.getI2() <=30.0) {
                     i2++;
                 }
-                if (item.getI3 ( ) > overlimit.getIharm3 ( )) {
+                if (item.getI3 ( ) > overlimit.getIharm3 ( ) && item.getI3() >=0.0 && item.getI3() <=30.0) {
                     i3++;
                 }
-                if (item.getI4 ( ) > overlimit.getIharm4 ( )) {
+                if (item.getI4 ( ) > overlimit.getIharm4 ( ) && item.getI4() >=0.0 && item.getI4() <=30.0) {
                     i4++;
                 }
-                if (item.getI5 ( ) > overlimit.getIharm5 ( )) {
+                if (item.getI5 ( ) > overlimit.getIharm5 ( ) && item.getI5() >=0.0 && item.getI5() <=30.0) {
                     i5++;
                 }
-                if (item.getI6 ( ) > overlimit.getIharm6 ( )) {
+                if (item.getI6 ( ) > overlimit.getIharm6 ( ) && item.getI6() >=0.0 && item.getI6() <=30.0) {
                     i6++;
                 }
-                if (item.getI7 ( ) > overlimit.getIharm7 ( )) {
+                if (item.getI7 ( ) > overlimit.getIharm7 ( ) && item.getI7() >=0.0 && item.getI7() <=30.0) {
                     i7++;
                 }
-                if (item.getI8 ( ) > overlimit.getIharm8 ( )) {
+                if (item.getI8 ( ) > overlimit.getIharm8 ( ) && item.getI8() >=0.0 && item.getI8() <=30.0) {
                     i8++;
                 }
-                if (item.getI9 ( ) > overlimit.getIharm9 ( )) {
+                if (item.getI9 ( ) > overlimit.getIharm9 ( ) && item.getI9() >=0.0 && item.getI9() <=30.0) {
                     i9++;
                 }
-                if (item.getI10 ( ) > overlimit.getIharm10 ( )) {
+                if (item.getI10 ( ) > overlimit.getIharm10 ( ) && item.getI10() >=0.0 && item.getI10() <=30.0) {
                     i10++;
                 }
-                if (item.getI11 ( ) > overlimit.getIharm11 ( )) {
+                if (item.getI11 ( ) > overlimit.getIharm11 ( ) && item.getI11() >=0.0 && item.getI11() <=30.0) {
                     i11++;
                 }
-                if (item.getI12 ( ) > overlimit.getIharm12 ( )) {
+                if (item.getI12 ( ) > overlimit.getIharm12 ( ) && item.getI12() >=0.0 && item.getI12() <=30.0) {
                     i12++;
                 }
-                if (item.getI13 ( ) > overlimit.getIharm13 ( )) {
+                if (item.getI13 ( ) > overlimit.getIharm13 ( ) && item.getI13() >=0.0 && item.getI13() <=30.0) {
                     i13++;
                 }
-                if (item.getI14 ( ) > overlimit.getIharm14 ( )) {
+                if (item.getI14 ( ) > overlimit.getIharm14 ( ) && item.getI14() >=0.0 && item.getI14() <=30.0) {
                     i14++;
                 }
-                if (item.getI15 ( ) > overlimit.getIharm15 ( )) {
+                if (item.getI15 ( ) > overlimit.getIharm15 ( ) && item.getI15() >=0.0 && item.getI15() <=30.0) {
                     i15++;
                 }
-                if (item.getI16 ( ) > overlimit.getIharm16 ( )) {
+                if (item.getI16 ( ) > overlimit.getIharm16 ( ) && item.getI16() >=0.0 && item.getI16() <=30.0) {
                     i16++;
                 }
-                if (item.getI17 ( ) > overlimit.getIharm17 ( )) {
+                if (item.getI17 ( ) > overlimit.getIharm17 ( ) && item.getI17() >=0.0 && item.getI17() <=30.0) {
                     i17++;
                 }
-                if (item.getI18 ( ) > overlimit.getIharm18 ( )) {
+                if (item.getI18 ( ) > overlimit.getIharm18 ( ) && item.getI18() >=0.0 && item.getI18() <=30.0) {
                     i18++;
                 }
-                if (item.getI19 ( ) > overlimit.getIharm19 ( )) {
+                if (item.getI19 ( ) > overlimit.getIharm19 ( ) && item.getI19() >=0.0 && item.getI19() <=30.0) {
                     i19++;
                 }
-                if (item.getI20 ( ) > overlimit.getIharm20 ( )) {
+                if (item.getI20 ( ) > overlimit.getIharm20 ( ) && item.getI20() >=0.0 && item.getI20() <=30.0) {
                     i20++;
                 }
-                if (item.getI21 ( ) > overlimit.getIharm21 ( )) {
+                if (item.getI21 ( ) > overlimit.getIharm21 ( ) && item.getI21() >=0.0 && item.getI21() <=30.0) {
                     i21++;
                 }
-                if (item.getI22 ( ) > overlimit.getIharm22 ( )) {
+                if (item.getI22 ( ) > overlimit.getIharm22 ( ) && item.getI22() >=0.0 && item.getI22() <=30.0) {
                     i22++;
                 }
-                if (item.getI23 ( ) > overlimit.getIharm23 ( )) {
+                if (item.getI23 ( ) > overlimit.getIharm23 ( ) && item.getI23() >=0.0 && item.getI23() <=30.0) {
                     i23++;
                 }
-                if (item.getI24 ( ) > overlimit.getIharm24 ( )) {
+                if (item.getI24 ( ) > overlimit.getIharm24 ( ) && item.getI24() >=0.0 && item.getI24() <=30.0) {
                     i24++;
                 }
-                if (item.getI25 ( ) > overlimit.getIharm25 ( )) {
+                if (item.getI25 ( ) > overlimit.getIharm25 ( ) && item.getI25() >=0.0 && item.getI25() <=30.0) {
                     i25++;
                 }
             }
@@ -823,52 +823,52 @@ public class LimitRateServiceImpl extends MppServiceImpl<LimitRatePOMapper, Limi
         //0.5-15.5次间谐波电压含有率
         if (!CollectionUtils.isEmpty (dataInHarmVPOList)) {
             for (DataInHarmV item : dataInHarmVPOList) {
-                if (item.getV1 ( ) > overlimit.getInuharm1 ( )) {
+                if (item.getV1 ( ) > overlimit.getInuharm1 ( ) && item.getV1() >=0.0 && item.getV1() <=30.0) {
                     uHarm1++;
                 }
-                if (item.getV2 ( ) > overlimit.getInuharm2 ( )) {
+                if (item.getV2 ( ) > overlimit.getInuharm2 ( ) && item.getV2() >=0.0 && item.getV2() <=30.0) {
                     uHarm2++;
                 }
-                if (item.getV3 ( ) > overlimit.getInuharm3 ( )) {
+                if (item.getV3 ( ) > overlimit.getInuharm3 ( ) && item.getV3() >=0.0 && item.getV3() <=30.0) {
                     uHarm3++;
                 }
-                if (item.getV4 ( ) > overlimit.getInuharm4 ( )) {
+                if (item.getV4 ( ) > overlimit.getInuharm4 ( ) && item.getV4() >=0.0 && item.getV4() <=30.0) {
                     uHarm4++;
                 }
-                if (item.getV5 ( ) > overlimit.getInuharm5 ( )) {
+                if (item.getV5 ( ) > overlimit.getInuharm5 ( ) && item.getV5() >=0.0 && item.getV5() <=30.0) {
                     uHarm5++;
                 }
-                if (item.getV6 ( ) > overlimit.getInuharm6 ( )) {
+                if (item.getV6 ( ) > overlimit.getInuharm6 ( ) && item.getV6() >=0.0 && item.getV6() <=30.0) {
                     uHarm6++;
                 }
-                if (item.getV7 ( ) > overlimit.getInuharm7 ( )) {
+                if (item.getV7 ( ) > overlimit.getInuharm7 ( ) && item.getV7() >=0.0 && item.getV7() <=30.0) {
                     uHarm7++;
                 }
-                if (item.getV8 ( ) > overlimit.getInuharm8 ( )) {
+                if (item.getV8 ( ) > overlimit.getInuharm8 ( ) && item.getV8() >=0.0 && item.getV8() <=30.0) {
                     uHarm8++;
                 }
-                if (item.getV9 ( ) > overlimit.getInuharm9 ( )) {
+                if (item.getV9 ( ) > overlimit.getInuharm9 ( ) && item.getV9() >=0.0 && item.getV9() <=30.0) {
                     uHarm9++;
                 }
-                if (item.getV10 ( ) > overlimit.getInuharm10 ( )) {
+                if (item.getV10 ( ) > overlimit.getInuharm10 ( ) && item.getV10() >=0.0 && item.getV10() <=30.0) {
                     uHarm10++;
                 }
-                if (item.getV11 ( ) > overlimit.getInuharm11 ( )) {
+                if (item.getV11 ( ) > overlimit.getInuharm11 ( ) && item.getV11() >=0.0 && item.getV11() <=30.0) {
                     uHarm11++;
                 }
-                if (item.getV12 ( ) > overlimit.getInuharm12 ( )) {
+                if (item.getV12 ( ) > overlimit.getInuharm12 ( ) && item.getV12() >=0.0 && item.getV12() <=30.0) {
                     uHarm12++;
                 }
-                if (item.getV13 ( ) > overlimit.getInuharm13 ( )) {
+                if (item.getV13 ( ) > overlimit.getInuharm13 ( ) && item.getV13() >=0.0 && item.getV13() <=30.0) {
                     uHarm13++;
                 }
-                if (item.getV14 ( ) > overlimit.getInuharm14 ( )) {
+                if (item.getV14 ( ) > overlimit.getInuharm14 ( ) && item.getV14() >=0.0 && item.getV14() <=30.0) {
                     uHarm14++;
                 }
-                if (item.getV15 ( ) > overlimit.getInuharm15 ( )) {
+                if (item.getV15 ( ) > overlimit.getInuharm15 ( ) && item.getV15() >=0.0 && item.getV15() <=30.0) {
                     uHarm15++;
                 }
-                if (item.getV16 ( ) > overlimit.getInuharm16 ( )) {
+                if (item.getV16 ( ) > overlimit.getInuharm16 ( ) && item.getV16() >=0.0 && item.getV16() <=30.0) {
                     uHarm16++;
                 }
             }
@@ -876,7 +876,7 @@ public class LimitRateServiceImpl extends MppServiceImpl<LimitRatePOMapper, Limi
         //电压总谐波畸变率
         if (!CollectionUtils.isEmpty (dataVPOList)) {
             for (DataV item : dataVPOList) {
-                if (item.getVThd ( ) > overlimit.getUaberrance ( )) {
+                if (item.getVThd ( ) > overlimit.getUaberrance ( ) && item.getVThd() >=0.0 && item.getVThd() <=30.0) {
                     thd++;
                 }
             }
@@ -885,11 +885,11 @@ public class LimitRateServiceImpl extends MppServiceImpl<LimitRatePOMapper, Limi
         if (!CollectionUtils.isEmpty (dataVPODevList)) {
             for (DataV item : dataVPODevList) {
                 if (item.getVlDev() >= 0){
-                    if (item.getVlDev() > overlimit.getVoltageDev()){
+                    if (item.getVlDev() > overlimit.getVoltageDev() && item.getVlDev() >=0.0 && item.getVThd() <=20.0){
                         uDev++;
                     }
                 } else {
-                    if (Math.abs(item.getVuDev()) > Math.abs(overlimit.getUvoltageDev())){
+                    if (Math.abs(item.getVuDev()) > Math.abs(overlimit.getUvoltageDev()) && Math.abs(item.getVuDev()) <=20.0){
                         uDev++;
                     }
                 }
@@ -898,7 +898,7 @@ public class LimitRateServiceImpl extends MppServiceImpl<LimitRatePOMapper, Limi
         //长时间闪变
         if (!CollectionUtils.isEmpty (dataPltPOList)) {
             for (DataPlt item : dataPltPOList) {
-                if (item.getPlt ( ) > overlimit.getFlicker ( )) {
+                if (item.getPlt ( ) > overlimit.getFlicker ( ) && item.getPlt()>=0 && item.getPlt()<=20) {
                     flicker++;
                 }
             }
@@ -990,99 +990,99 @@ public class LimitRateServiceImpl extends MppServiceImpl<LimitRatePOMapper, Limi
         //2-25次谐波电压含有率
         for (Instant time:map1.keySet()) {
             List<DataHarmRateV> list = map1.get(time);
-            List<DataHarmRateV> l2 = list.stream().filter(s->s.getV2()>overlimit.getUharm2()).collect(Collectors.toList());
+            List<DataHarmRateV> l2 = list.stream().filter(s->s.getV2()>overlimit.getUharm2()&&s.getV2()>=0.0&&s.getV2()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l2)){
                 v2++;
             }
-            List<DataHarmRateV> l3 = list.stream().filter(s->s.getV3()>overlimit.getUharm3()).collect(Collectors.toList());
+            List<DataHarmRateV> l3 = list.stream().filter(s->s.getV3()>overlimit.getUharm3()&&s.getV3()>=0.0&&s.getV3()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l3)){
                 v3++;
             }
-            List<DataHarmRateV> l4 = list.stream().filter(s->s.getV4()>overlimit.getUharm4()).collect(Collectors.toList());
+            List<DataHarmRateV> l4 = list.stream().filter(s->s.getV4()>overlimit.getUharm4()&&s.getV4()>=0.0&&s.getV4()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l4)){
                 v4++;
             }
-            List<DataHarmRateV> l5 = list.stream().filter(s->s.getV5()>overlimit.getUharm5()).collect(Collectors.toList());
+            List<DataHarmRateV> l5 = list.stream().filter(s->s.getV5()>overlimit.getUharm5()&&s.getV5()>=0.0&&s.getV5()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l5)){
                 v5++;
             }
-            List<DataHarmRateV> l6 = list.stream().filter(s->s.getV6()>overlimit.getUharm6()).collect(Collectors.toList());
+            List<DataHarmRateV> l6 = list.stream().filter(s->s.getV6()>overlimit.getUharm6()&&s.getV6()>=0.0&&s.getV6()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l6)){
                 v6++;
             }
-            List<DataHarmRateV> l7 = list.stream().filter(s->s.getV7()>overlimit.getUharm7()).collect(Collectors.toList());
+            List<DataHarmRateV> l7 = list.stream().filter(s->s.getV7()>overlimit.getUharm7()&&s.getV7()>=0.0&&s.getV7()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l7)){
                 v7++;
             }
-            List<DataHarmRateV> l8 = list.stream().filter(s->s.getV8()>overlimit.getUharm8()).collect(Collectors.toList());
+            List<DataHarmRateV> l8 = list.stream().filter(s->s.getV8()>overlimit.getUharm8()&&s.getV8()>=0.0&&s.getV8()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l8)){
                 v8++;
             }
-            List<DataHarmRateV> l9 = list.stream().filter(s->s.getV9()>overlimit.getUharm9()).collect(Collectors.toList());
+            List<DataHarmRateV> l9 = list.stream().filter(s->s.getV9()>overlimit.getUharm9()&&s.getV9()>=0.0&&s.getV9()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l9)){
                 v9++;
             }
-            List<DataHarmRateV> l10 = list.stream().filter(s->s.getV10()>overlimit.getUharm10()).collect(Collectors.toList());
+            List<DataHarmRateV> l10 = list.stream().filter(s->s.getV10()>overlimit.getUharm10()&&s.getV10()>=0.0&&s.getV10()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l10)){
                 v10++;
             }
-            List<DataHarmRateV> l11 = list.stream().filter(s->s.getV11()>overlimit.getUharm11()).collect(Collectors.toList());
+            List<DataHarmRateV> l11 = list.stream().filter(s->s.getV11()>overlimit.getUharm11()&&s.getV11()>=0.0&&s.getV11()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l11)){
                 v11++;
             }
-            List<DataHarmRateV> l12 = list.stream().filter(s->s.getV12()>overlimit.getUharm12()).collect(Collectors.toList());
+            List<DataHarmRateV> l12 = list.stream().filter(s->s.getV12()>overlimit.getUharm12()&&s.getV12()>=0.0&&s.getV12()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l12)){
                 v12++;
             }
-            List<DataHarmRateV> l13 = list.stream().filter(s->s.getV13()>overlimit.getUharm13()).collect(Collectors.toList());
+            List<DataHarmRateV> l13 = list.stream().filter(s->s.getV13()>overlimit.getUharm13()&&s.getV13()>=0.0&&s.getV13()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l13)){
                 v13++;
             }
-            List<DataHarmRateV> l14 = list.stream().filter(s->s.getV14()>overlimit.getUharm14()).collect(Collectors.toList());
+            List<DataHarmRateV> l14 = list.stream().filter(s->s.getV14()>overlimit.getUharm14()&&s.getV14()>=0.0&&s.getV14()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l14)){
                 v14++;
             }
-            List<DataHarmRateV> l15 = list.stream().filter(s->s.getV15()>overlimit.getUharm15()).collect(Collectors.toList());
+            List<DataHarmRateV> l15 = list.stream().filter(s->s.getV15()>overlimit.getUharm15()&&s.getV15()>=0.0&&s.getV15()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l15)){
                 v15++;
             }
-            List<DataHarmRateV> l16 = list.stream().filter(s->s.getV16()>overlimit.getUharm16()).collect(Collectors.toList());
+            List<DataHarmRateV> l16 = list.stream().filter(s->s.getV16()>overlimit.getUharm16()&&s.getV16()>=0.0&&s.getV16()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l16)){
                 v16++;
             }
-            List<DataHarmRateV> l17 = list.stream().filter(s->s.getV17()>overlimit.getUharm17()).collect(Collectors.toList());
+            List<DataHarmRateV> l17 = list.stream().filter(s->s.getV17()>overlimit.getUharm17()&&s.getV17()>=0.0&&s.getV17()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l17)){
                 v17++;
             }
-            List<DataHarmRateV> l18 = list.stream().filter(s->s.getV18()>overlimit.getUharm18()).collect(Collectors.toList());
+            List<DataHarmRateV> l18 = list.stream().filter(s->s.getV18()>overlimit.getUharm18()&&s.getV18()>=0.0&&s.getV18()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l18)){
                 v18++;
             }
-            List<DataHarmRateV> l19 = list.stream().filter(s->s.getV19()>overlimit.getUharm19()).collect(Collectors.toList());
+            List<DataHarmRateV> l19 = list.stream().filter(s->s.getV19()>overlimit.getUharm19()&&s.getV19()>=0.0&&s.getV19()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l19)){
                 v19++;
             }
-            List<DataHarmRateV> l20 = list.stream().filter(s->s.getV20()>overlimit.getUharm20()).collect(Collectors.toList());
+            List<DataHarmRateV> l20 = list.stream().filter(s->s.getV20()>overlimit.getUharm20()&&s.getV20()>=0.0&&s.getV20()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l20)){
                 v20++;
             }
-            List<DataHarmRateV> l21 = list.stream().filter(s->s.getV21()>overlimit.getUharm21()).collect(Collectors.toList());
+            List<DataHarmRateV> l21 = list.stream().filter(s->s.getV21()>overlimit.getUharm21()&&s.getV21()>=0.0&&s.getV21()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l21)){
                 v21++;
             }
-            List<DataHarmRateV> l22 = list.stream().filter(s->s.getV22()>overlimit.getUharm22()).collect(Collectors.toList());
+            List<DataHarmRateV> l22 = list.stream().filter(s->s.getV22()>overlimit.getUharm22()&&s.getV22()>=0.0&&s.getV22()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l22)){
                 v22++;
             }
-            List<DataHarmRateV> l23 = list.stream().filter(s->s.getV23()>overlimit.getUharm23()).collect(Collectors.toList());
+            List<DataHarmRateV> l23 = list.stream().filter(s->s.getV23()>overlimit.getUharm23()&&s.getV23()>=0.0&&s.getV23()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l23)){
                 v23++;
             }
-            List<DataHarmRateV> l24 = list.stream().filter(s->s.getV24()>overlimit.getUharm24()).collect(Collectors.toList());
+            List<DataHarmRateV> l24 = list.stream().filter(s->s.getV24()>overlimit.getUharm24()&&s.getV24()>=0.0&&s.getV24()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l24)){
                 v24++;
             }
-            List<DataHarmRateV> l25 = list.stream().filter(s->s.getV25()>overlimit.getUharm25()).collect(Collectors.toList());
+            List<DataHarmRateV> l25 = list.stream().filter(s->s.getV25()>overlimit.getUharm25()&&s.getV25()>=0.0&&s.getV25()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l25)){
                 v25++;
             }
@@ -1090,99 +1090,99 @@ public class LimitRateServiceImpl extends MppServiceImpl<LimitRatePOMapper, Limi
         //2-25次谐波电流
         for (Instant time:map2.keySet()) {
             List<DataI> list = map2.get(time);
-            List<DataI> l2 = list.stream().filter(s->s.getI2()>overlimit.getIharm2()).collect(Collectors.toList());
+            List<DataI> l2 = list.stream().filter(s->s.getI2()>overlimit.getIharm2()&&s.getI2()>=0.0&&s.getI2()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l2)){
                 i2++;
             }
-            List<DataI> l3 = list.stream().filter(s->s.getI3()>overlimit.getIharm3()).collect(Collectors.toList());
+            List<DataI> l3 = list.stream().filter(s->s.getI3()>overlimit.getIharm3()&&s.getI3()>=0.0&&s.getI3()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l3)){
                 i3++;
             }
-            List<DataI> l4 = list.stream().filter(s->s.getI4()>overlimit.getIharm4()).collect(Collectors.toList());
+            List<DataI> l4 = list.stream().filter(s->s.getI4()>overlimit.getIharm4()&&s.getI4()>=0.0&&s.getI4()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l4)){
                 i4++;
             }
-            List<DataI> l5 = list.stream().filter(s->s.getI5()>overlimit.getIharm5()).collect(Collectors.toList());
+            List<DataI> l5 = list.stream().filter(s->s.getI5()>overlimit.getIharm5()&&s.getI5()>=0.0&&s.getI5()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l5)){
                 i5++;
             }
-            List<DataI> l6 = list.stream().filter(s->s.getI6()>overlimit.getIharm6()).collect(Collectors.toList());
+            List<DataI> l6 = list.stream().filter(s->s.getI6()>overlimit.getIharm6()&&s.getI6()>=0.0&&s.getI6()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l6)){
                 i6++;
             }
-            List<DataI> l7 = list.stream().filter(s->s.getI7()>overlimit.getIharm7()).collect(Collectors.toList());
+            List<DataI> l7 = list.stream().filter(s->s.getI7()>overlimit.getIharm7()&&s.getI7()>=0.0&&s.getI7()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l7)){
                 i7++;
             }
-            List<DataI> l8 = list.stream().filter(s->s.getI8()>overlimit.getIharm8()).collect(Collectors.toList());
+            List<DataI> l8 = list.stream().filter(s->s.getI8()>overlimit.getIharm8()&&s.getI8()>=0.0&&s.getI8()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l8)){
                 i8++;
             }
-            List<DataI> l9 = list.stream().filter(s->s.getI9()>overlimit.getIharm9()).collect(Collectors.toList());
+            List<DataI> l9 = list.stream().filter(s->s.getI9()>overlimit.getIharm9()&&s.getI9()>=0.0&&s.getI9()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l9)){
                 i9++;
             }
-            List<DataI> l10 = list.stream().filter(s->s.getI10()>overlimit.getIharm10()).collect(Collectors.toList());
+            List<DataI> l10 = list.stream().filter(s->s.getI10()>overlimit.getIharm10()&&s.getI10()>=0.0&&s.getI10()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l10)){
                 i10++;
             }
-            List<DataI> l11 = list.stream().filter(s->s.getI11()>overlimit.getIharm11()).collect(Collectors.toList());
+            List<DataI> l11 = list.stream().filter(s->s.getI11()>overlimit.getIharm11()&&s.getI11()>=0.0&&s.getI11()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l11)){
                 i11++;
             }
-            List<DataI> l12 = list.stream().filter(s->s.getI12()>overlimit.getIharm12()).collect(Collectors.toList());
+            List<DataI> l12 = list.stream().filter(s->s.getI12()>overlimit.getIharm12()&&s.getI12()>=0.0&&s.getI12()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l12)){
                 i12++;
             }
-            List<DataI> l13 = list.stream().filter(s->s.getI13()>overlimit.getIharm13()).collect(Collectors.toList());
+            List<DataI> l13 = list.stream().filter(s->s.getI13()>overlimit.getIharm13()&&s.getI13()>=0.0&&s.getI13()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l13)){
                 i13++;
             }
-            List<DataI> l14 = list.stream().filter(s->s.getI14()>overlimit.getIharm14()).collect(Collectors.toList());
+            List<DataI> l14 = list.stream().filter(s->s.getI14()>overlimit.getIharm14()&&s.getI14()>=0.0&&s.getI14()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l14)){
                 i14++;
             }
-            List<DataI> l15 = list.stream().filter(s->s.getI15()>overlimit.getIharm15()).collect(Collectors.toList());
+            List<DataI> l15 = list.stream().filter(s->s.getI15()>overlimit.getIharm15()&&s.getI15()>=0.0&&s.getI15()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l15)){
                 i15++;
             }
-            List<DataI> l16 = list.stream().filter(s->s.getI16()>overlimit.getIharm16()).collect(Collectors.toList());
+            List<DataI> l16 = list.stream().filter(s->s.getI16()>overlimit.getIharm16()&&s.getI16()>=0.0&&s.getI16()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l16)){
                 i16++;
             }
-            List<DataI> l17 = list.stream().filter(s->s.getI17()>overlimit.getIharm17()).collect(Collectors.toList());
+            List<DataI> l17 = list.stream().filter(s->s.getI17()>overlimit.getIharm17()&&s.getI17()>=0.0&&s.getI17()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l17)){
                 i17++;
             }
-            List<DataI> l18 = list.stream().filter(s->s.getI18()>overlimit.getIharm18()).collect(Collectors.toList());
+            List<DataI> l18 = list.stream().filter(s->s.getI18()>overlimit.getIharm18()&&s.getI18()>=0.0&&s.getI18()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l18)){
                 i18++;
             }
-            List<DataI> l19 = list.stream().filter(s->s.getI19()>overlimit.getIharm19()).collect(Collectors.toList());
+            List<DataI> l19 = list.stream().filter(s->s.getI19()>overlimit.getIharm19()&&s.getI19()>=0.0&&s.getI19()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l19)){
                 i19++;
             }
-            List<DataI> l20 = list.stream().filter(s->s.getI20()>overlimit.getIharm20()).collect(Collectors.toList());
+            List<DataI> l20 = list.stream().filter(s->s.getI20()>overlimit.getIharm20()&&s.getI20()>=0.0&&s.getI20()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l20)){
                 i20++;
             }
-            List<DataI> l21 = list.stream().filter(s->s.getI21()>overlimit.getIharm21()).collect(Collectors.toList());
+            List<DataI> l21 = list.stream().filter(s->s.getI21()>overlimit.getIharm21()&&s.getI21()>=0.0&&s.getI21()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l21)){
                 i21++;
             }
-            List<DataI> l22 = list.stream().filter(s->s.getI22()>overlimit.getIharm22()).collect(Collectors.toList());
+            List<DataI> l22 = list.stream().filter(s->s.getI22()>overlimit.getIharm22()&&s.getI22()>=0.0&&s.getI22()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l22)){
                 i22++;
             }
-            List<DataI> l23 = list.stream().filter(s->s.getI23()>overlimit.getIharm23()).collect(Collectors.toList());
+            List<DataI> l23 = list.stream().filter(s->s.getI23()>overlimit.getIharm23()&&s.getI23()>=0.0&&s.getI23()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l23)){
                 i23++;
             }
-            List<DataI> l24 = list.stream().filter(s->s.getI24()>overlimit.getIharm24()).collect(Collectors.toList());
+            List<DataI> l24 = list.stream().filter(s->s.getI24()>overlimit.getIharm24()&&s.getI24()>=0.0&&s.getI24()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l24)){
                 i24++;
             }
-            List<DataI> l25 = list.stream().filter(s->s.getI25()>overlimit.getIharm25()).collect(Collectors.toList());
+            List<DataI> l25 = list.stream().filter(s->s.getI25()>overlimit.getIharm25()&&s.getI25()>=0.0&&s.getI25()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l25)){
                 i25++;
             }
@@ -1190,67 +1190,67 @@ public class LimitRateServiceImpl extends MppServiceImpl<LimitRatePOMapper, Limi
         //0.5-15.5次间谐波电压含有率
         for (Instant time:map3.keySet()) {
             List<DataInHarmV> list3 = map3.get(time);
-            List<DataInHarmV> l2 = list3.stream().filter(s->s.getV1()>overlimit.getInuharm1()).collect(Collectors.toList());
+            List<DataInHarmV> l2 = list3.stream().filter(s->s.getV1()>overlimit.getInuharm1()&&s.getV1()>=0.0&&s.getV1()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l2)){
                 uHarm1++;
             }
-            List<DataInHarmV> l3 = list3.stream().filter(s->s.getV2()>overlimit.getInuharm2()).collect(Collectors.toList());
+            List<DataInHarmV> l3 = list3.stream().filter(s->s.getV2()>overlimit.getInuharm2()&&s.getV2()>=0.0&&s.getV2()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l3)){
                 uHarm2++;
             }
-            List<DataInHarmV> l4 = list3.stream().filter(s->s.getV3()>overlimit.getInuharm3()).collect(Collectors.toList());
+            List<DataInHarmV> l4 = list3.stream().filter(s->s.getV3()>overlimit.getInuharm3()&&s.getV3()>=0.0&&s.getV3()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l4)){
                 uHarm3++;
             }
-            List<DataInHarmV> l5 = list3.stream().filter(s->s.getV4()>overlimit.getInuharm4()).collect(Collectors.toList());
+            List<DataInHarmV> l5 = list3.stream().filter(s->s.getV4()>overlimit.getInuharm4()&&s.getV4()>=0.0&&s.getV4()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l5)){
                 uHarm4++;
             }
-            List<DataInHarmV> l6 = list3.stream().filter(s->s.getV5()>overlimit.getInuharm5()).collect(Collectors.toList());
+            List<DataInHarmV> l6 = list3.stream().filter(s->s.getV5()>overlimit.getInuharm5()&&s.getV5()>=0.0&&s.getV5()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l6)){
                 uHarm5++;
             }
-            List<DataInHarmV> l7 = list3.stream().filter(s->s.getV6()>overlimit.getInuharm6()).collect(Collectors.toList());
+            List<DataInHarmV> l7 = list3.stream().filter(s->s.getV6()>overlimit.getInuharm6()&&s.getV6()>=0.0&&s.getV6()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l7)){
                 uHarm6++;
             }
-            List<DataInHarmV> l8 = list3.stream().filter(s->s.getV7()>overlimit.getInuharm7()).collect(Collectors.toList());
+            List<DataInHarmV> l8 = list3.stream().filter(s->s.getV7()>overlimit.getInuharm7()&&s.getV7()>=0.0&&s.getV7()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l8)){
                 uHarm7++;
             }
-            List<DataInHarmV> l9 = list3.stream().filter(s->s.getV8()>overlimit.getInuharm8()).collect(Collectors.toList());
+            List<DataInHarmV> l9 = list3.stream().filter(s->s.getV8()>overlimit.getInuharm8()&&s.getV8()>=0.0&&s.getV8()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l9)){
                 uHarm8++;
             }
-            List<DataInHarmV> l10 = list3.stream().filter(s->s.getV9()>overlimit.getInuharm9()).collect(Collectors.toList());
+            List<DataInHarmV> l10 = list3.stream().filter(s->s.getV9()>overlimit.getInuharm9()&&s.getV9()>=0.0&&s.getV9()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l10)){
                 uHarm9++;
             }
-            List<DataInHarmV> l11 = list3.stream().filter(s->s.getV10()>overlimit.getInuharm10()).collect(Collectors.toList());
+            List<DataInHarmV> l11 = list3.stream().filter(s->s.getV10()>overlimit.getInuharm10()&&s.getV10()>=0.0&&s.getV10()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l11)){
                 uHarm10++;
             }
-            List<DataInHarmV> l12 = list3.stream().filter(s->s.getV11()>overlimit.getInuharm11()).collect(Collectors.toList());
+            List<DataInHarmV> l12 = list3.stream().filter(s->s.getV11()>overlimit.getInuharm11()&&s.getV11()>=0.0&&s.getV11()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l12)){
                 uHarm11++;
             }
-            List<DataInHarmV> l13 = list3.stream().filter(s->s.getV12()>overlimit.getInuharm12()).collect(Collectors.toList());
+            List<DataInHarmV> l13 = list3.stream().filter(s->s.getV12()>overlimit.getInuharm12()&&s.getV12()>=0.0&&s.getV12()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l13)){
                 uHarm12++;
             }
-            List<DataInHarmV> l14 = list3.stream().filter(s->s.getV13()>overlimit.getInuharm13()).collect(Collectors.toList());
+            List<DataInHarmV> l14 = list3.stream().filter(s->s.getV13()>overlimit.getInuharm13()&&s.getV13()>=0.0&&s.getV13()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l14)){
                 uHarm13++;
             }
-            List<DataInHarmV> l15 = list3.stream().filter(s->s.getV14()>overlimit.getInuharm14()).collect(Collectors.toList());
+            List<DataInHarmV> l15 = list3.stream().filter(s->s.getV14()>overlimit.getInuharm14()&&s.getV14()>=0.0&&s.getV14()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l15)){
                 uHarm14++;
             }
-            List<DataInHarmV> l16 = list3.stream().filter(s->s.getV15()>overlimit.getInuharm15()).collect(Collectors.toList());
+            List<DataInHarmV> l16 = list3.stream().filter(s->s.getV15()>overlimit.getInuharm15()&&s.getV15()>=0.0&&s.getV15()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l16)){
                 uHarm15++;
             }
-            List<DataInHarmV> l17 = list3.stream().filter(s->s.getV16()>overlimit.getInuharm16()).collect(Collectors.toList());
+            List<DataInHarmV> l17 = list3.stream().filter(s->s.getV16()>overlimit.getInuharm16()&&s.getV16()>=0.0&&s.getV16()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l17)){
                 uHarm16++;
             }
@@ -1258,7 +1258,7 @@ public class LimitRateServiceImpl extends MppServiceImpl<LimitRatePOMapper, Limi
         //电压总谐波畸变率
         for (Instant time:map4.keySet()) {
             List<DataV> list = map4.get(time);
-            List<DataV> l = list.stream().filter(s->s.getVThd()>overlimit.getUaberrance()).collect(Collectors.toList());
+            List<DataV> l = list.stream().filter(s->s.getVThd()>overlimit.getUaberrance()&&s.getVThd()>=0.0&&s.getVThd()<=30.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l)){
                 thd++;
             }
@@ -1266,7 +1266,7 @@ public class LimitRateServiceImpl extends MppServiceImpl<LimitRatePOMapper, Limi
         //三相电压不平衡度
         for (Instant time:map5.keySet()) {
             List<DataV> list = map5.get(time);
-            List<DataV> l = list.stream().filter(s->s.getVUnbalance()>overlimit.getUbalance()).collect(Collectors.toList());
+            List<DataV> l = list.stream().filter(s->s.getVUnbalance()>overlimit.getUbalance()&&s.getVUnbalance()>=0.0&&s.getVUnbalance()<=40.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l)){
                 uAberrance++;
             }
@@ -1282,7 +1282,7 @@ public class LimitRateServiceImpl extends MppServiceImpl<LimitRatePOMapper, Limi
         //频率偏差
         for (Instant time:map7.keySet()) {
             List<DataV> list = map7.get(time);
-            List<DataV> l = list.stream().filter(s->s.getFreqDev()>overlimit.getFreqDev()).collect(Collectors.toList());
+            List<DataV> l = list.stream().filter(s->s.getFreqDev()>overlimit.getFreqDev()&&Math.abs(s.getFreqDev())<=7.5).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l)){
                 freqDev++;
             }
@@ -1290,8 +1290,8 @@ public class LimitRateServiceImpl extends MppServiceImpl<LimitRatePOMapper, Limi
         //电压上偏差、电压下偏差
         for (Instant time:map8.keySet()) {
             List<DataV> list = map8.get(time);
-            List<DataV> l1 = list.stream().filter(s->s.getVlDev()>=0&&s.getVlDev()>overlimit.getVoltageDev()).collect(Collectors.toList());
-            List<DataV> l2 = list.stream().filter(s->s.getVlDev()<0&&Math.abs(s.getVuDev())>Math.abs(overlimit.getUvoltageDev())).collect(Collectors.toList());
+            List<DataV> l1 = list.stream().filter(s->s.getVlDev()>=0.0&&s.getVlDev()<=20.0&&s.getVlDev()>overlimit.getVoltageDev()).collect(Collectors.toList());
+            List<DataV> l2 = list.stream().filter(s->s.getVuDev()>=-20.0&&s.getVuDev()<=0.0&&Math.abs(s.getVuDev())>Math.abs(overlimit.getUvoltageDev())).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l1) || !CollectionUtils.isEmpty(l2)){
                 uDev++;
             }
@@ -1299,7 +1299,7 @@ public class LimitRateServiceImpl extends MppServiceImpl<LimitRatePOMapper, Limi
         //长时间闪变
         for (Instant time:map9.keySet()) {
             List<DataPlt> list = map9.get(time);
-            List<DataPlt> l = list.stream().filter(s->s.getPlt()>overlimit.getFlicker()).collect(Collectors.toList());
+            List<DataPlt> l = list.stream().filter(s->s.getPlt()>overlimit.getFlicker()&&s.getPlt()>=0.0&&s.getPlt()<=20.0).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(l)){
                 flicker++;
             }
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java
index f7b715013..580e04528 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java
@@ -27,6 +27,8 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -245,8 +247,32 @@ public class LimitTargetServiceImpl extends MppServiceImpl<RStatLimitTargetDMapp
     }
 
     private void chanelData(RStatLimitRateDPO limitRate, RStatLimitTargetDPO limitTarget){
-        limitTarget.setAllTime((limitRate.getAllTime()>1)?1:0);
-        limitTarget.setFlickerAllTime((limitRate.getFlickerAllTime()>1)?1:0);
+        //有一个指标超标，allTime则为1
+        int allTime = limitRate.getFreqDevOvertime() + limitRate.getVoltageDevOvertime() + limitRate.getUbalanceOvertime() + limitRate.getUaberranceOvertime() + limitRate.getINegOvertime();
+        try {
+            Class<?> clazz = limitRate.getClass();
+            for (int i = 2; i <= 25; i++) {
+                String methodName = "getUharm" + i + "Overtime";
+                String methodName2 = "getIharm" + i + "Overtime";
+                Method method = clazz.getMethod(methodName);
+                int overtime = (int) method.invoke(limitRate);
+                allTime += overtime;
+                Method method2 = clazz.getMethod(methodName2);
+                int overtime2 = (int) method2.invoke(limitRate);
+                allTime += overtime2;
+            }
+            for (int i = 1; i <= 16; i++) {
+                String methodName = "getInuharm" + i + "Overtime";
+                Method method = clazz.getMethod(methodName);
+                int overtime = (int) method.invoke(limitRate);
+                allTime += overtime;
+            }
+        } catch (Exception e) {
+            e.getMessage();
+        }
+        limitTarget.setAllTime((allTime>1)?1:0);
+        //闪变指标超标，flickerAllTime则为1
+        limitTarget.setFlickerAllTime((limitRate.getFlickerOvertime()>1)?1:0);
         limitTarget.setFreqDevOvertime((limitRate.getFreqDevOvertime()>1)?1:0);
         limitTarget.setVoltageDevOvertime((limitRate.getVoltageDevOvertime()>1)?1:0);
         limitTarget.setUbalanceOvertime((limitRate.getUbalanceOvertime()>1)?1:0);
@@ -254,7 +280,6 @@ public class LimitTargetServiceImpl extends MppServiceImpl<RStatLimitTargetDMapp
         limitTarget.setUaberranceOvertime((limitRate.getUaberranceOvertime()>1)?1:0);
         limitTarget.setINegOvertime((limitRate.getINegOvertime()>1)?1:0);
 
-        limitTarget.setUharm2Overtime((limitRate.getUharm2Overtime()>1)?1:0);
         limitTarget.setUharm2Overtime((limitRate.getUharm2Overtime()>1)?1:0);
         limitTarget.setUharm3Overtime((limitRate.getUharm3Overtime()>1)?1:0);
         limitTarget.setUharm4Overtime((limitRate.getUharm4Overtime()>1)?1:0);