diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java
index 7c1e84bcf..94449f091 100644
--- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java
+++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java
@@ -227,13 +227,13 @@ public class COverlimitUtil {
         int x, y;
         if (voltageLevel < DicDataEnum.KV6.getValue()) {
             x = 0;
-        } else if (voltageLevel>=DicDataEnum.KV6.getValue()&&voltageLevel<DicDataEnum.KV10.getValue()) {
+        } else if (voltageLevel<DicDataEnum.KV10.getValue()) {
             x = 1;
-        } else if (voltageLevel>=DicDataEnum.KV10.getValue()&& voltageLevel<DicDataEnum.KV35.getValue()) {
+        } else if (voltageLevel<DicDataEnum.KV35.getValue()) {
             x = 2;
-        } else if (voltageLevel>=DicDataEnum.KV35.getValue()&&voltageLevel<DicDataEnum.KV66.getValue()) {
+        } else if (voltageLevel<DicDataEnum.KV66.getValue()) {
             x = 3;
-        } else if (voltageLevel>=DicDataEnum.KV66.getValue()&&voltageLevel<DicDataEnum.KV110.getValue()) {
+        } else if (voltageLevel<DicDataEnum.KV110.getValue()) {
             x = 4;
         } else {
             x = 5;
@@ -270,28 +270,28 @@ public class COverlimitUtil {
      * 根据电压等级获取基准短路容量
      */
     public static float getDlCapByVoltageLevel(Float voltageLevel){
-        float capValue = 3.141592f;
+        float capValue;
         if(voltageLevel< DicDataEnum.KV06.getValue()){
             capValue = 10;
-        }else if(voltageLevel>=DicDataEnum.KV06.getValue() && voltageLevel<DicDataEnum.KV20.getValue()){
+        }else if(voltageLevel<DicDataEnum.KV20.getValue()){
             capValue = 100;
-        }else if(voltageLevel>=DicDataEnum.KV20.getValue() && voltageLevel<DicDataEnum.KV35.getValue()){
+        }else if(voltageLevel<DicDataEnum.KV35.getValue()){
             capValue = 200;
-        }else if(voltageLevel>=DicDataEnum.KV35.getValue() && voltageLevel<DicDataEnum.KV66.getValue()){
+        }else if(voltageLevel<DicDataEnum.KV66.getValue()){
             capValue = 250;
-        }else if(voltageLevel>=DicDataEnum.KV66.getValue() && voltageLevel<DicDataEnum.KV110.getValue()){
+        }else if(voltageLevel<DicDataEnum.KV110.getValue()){
             capValue = 500;
-        }else if(voltageLevel>=DicDataEnum.KV110.getValue() && voltageLevel<DicDataEnum.KV220.getValue()){
+        }else if(voltageLevel<DicDataEnum.KV220.getValue()){
             capValue = 750;
-        }else if(voltageLevel>=DicDataEnum.KV220.getValue() && voltageLevel<DicDataEnum.KV330.getValue()){
+        }else if(voltageLevel<DicDataEnum.KV330.getValue()){
             capValue = 2000;
-        }else if(voltageLevel>=DicDataEnum.KV330.getValue() && voltageLevel<DicDataEnum.KV500.getValue()){
+        }else if(voltageLevel<DicDataEnum.KV500.getValue()){
             capValue = 3000;
-        }else if(voltageLevel>=DicDataEnum.KV500.getValue() && voltageLevel<DicDataEnum.KV750.getValue()){
+        }else if(voltageLevel<DicDataEnum.KV750.getValue()){
             capValue = 4500;
-        }else if(voltageLevel>=DicDataEnum.KV750.getValue() && voltageLevel<DicDataEnum.KV1000.getValue()){
+        }else if(voltageLevel<DicDataEnum.KV1000.getValue()){
             capValue = 7000;
-        }else if(voltageLevel>=DicDataEnum.KV1000.getValue()){
+        }else {
             capValue = 9000;
         }
         return capValue;
@@ -347,21 +347,21 @@ public class COverlimitUtil {
         float value = 3.14159f;
         if(voltageLevel<DicDataEnum.KV6.getValue()){
             value = 0.4f;
-        }else if(voltageLevel>=DicDataEnum.KV6.getValue()&&voltageLevel<DicDataEnum.KV10.getValue()){
+        }else if(voltageLevel<DicDataEnum.KV10.getValue()){
             value = 6.3f;
-        }else if(voltageLevel>=DicDataEnum.KV10.getValue()&&voltageLevel<DicDataEnum.KV20.getValue()){
+        }else if(voltageLevel<DicDataEnum.KV20.getValue()){
             value = 10.5f;
-        }else if(voltageLevel>=DicDataEnum.KV20.getValue()&&voltageLevel<DicDataEnum.KV35.getValue()){
+        }else if(voltageLevel<DicDataEnum.KV35.getValue()){
             value = 21.0f;
-        }else if(voltageLevel>=DicDataEnum.KV35.getValue()&&voltageLevel<DicDataEnum.KV66.getValue()){
+        }else if(voltageLevel<DicDataEnum.KV66.getValue()){
             value = 36.5f;
-        }else if(voltageLevel>=DicDataEnum.KV66.getValue()&&voltageLevel<DicDataEnum.KV110.getValue()){
+        }else if(voltageLevel<DicDataEnum.KV110.getValue()){
             value = 69.0f;
-        }else if(voltageLevel>=DicDataEnum.KV110.getValue()&&voltageLevel<DicDataEnum.KV220.getValue()){
+        }else if(voltageLevel<DicDataEnum.KV220.getValue()){
             value = 115.5f;
-        }else if(voltageLevel>=DicDataEnum.KV220.getValue()&&voltageLevel<DicDataEnum.KV330.getValue()){
+        }else if(voltageLevel<DicDataEnum.KV330.getValue()){
             value = 230.0f;
-        }else if(voltageLevel>=DicDataEnum.KV330.getValue()){
+        }else {
             value = 345.0f;
         }
         return value;
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java
index 7c204de80..a3c37eaf5 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java
@@ -18,6 +18,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -74,9 +76,7 @@ public class RStatBusbarHarmonicServiceImpl extends ServiceImpl<RStatBusbarHarmo
             // 通过母线id查询变电站背景谐波年表
             List<RStatBusbarHarmonicYPO> info = rStatBusbarHarmonicMapper.getRStatBusbarHarmonic(param.getStartTime(), param.getEndTime(), dto.getGeneratrixIdList());
 
-
             for (GeneratrixAndPowerStationDTO generatrixAndPowerStationDTO : dtoS) {
-                boolean flag = false;
                 RStatBusbarHarmonicYVO vo = new RStatBusbarHarmonicYVO();
                 vo.setBusbarName(generatrixAndPowerStationDTO.getGeneratrixName());
                 vo.setSubId(generatrixAndPowerStationDTO.getPowerId());
@@ -87,22 +87,22 @@ public class RStatBusbarHarmonicServiceImpl extends ServiceImpl<RStatBusbarHarmo
                     if (generatrixAndPowerStationDTO.getGeneratrixId().equals(po.getBusbarId())){
                         vo.setBusbarId(po.getBusbarId());
                         vo.setDataDate(po.getDataDate());
-                        vo.setVEffectiveMax(po.getVEffectiveMax());
-                        vo.setVEffectiveMin(po.getVEffectiveMin());
-                        vo.setVEffectiveAvg(po.getVEffectiveAvg());
-                        vo.setVEffective95(po.getVEffective95());
-                        vo.setVThdMax(po.getVThdMax());
-                        vo.setVThdMin(po.getVThdMin());
-                        vo.setVThdAvg(po.getVThdAvg());
-                        vo.setVThd95(po.getVThd95());
-                        vo.setUnbalanceMax(po.getUnbalanceMax());
-                        vo.setUnbalanceMin(po.getUnbalanceMin());
-                        vo.setUnbalanceAvg(po.getUnbalanceAvg());
-                        vo.setUnbalance95(po.getUnbalance95());
-                        vo.setFlickerMax(po.getFlickerMax());
-                        vo.setFlickerMin(po.getFlickerMin());
-                        vo.setFlickerAvg(po.getFlickerAvg());
-                        vo.setFlicker95(po.getFlicker95());
+                        vo.setVEffectiveMax(po.getVEffectiveMax() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setVEffectiveMin(po.getVEffectiveMin() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setVEffectiveAvg(po.getVEffectiveAvg() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setVEffective95(po.getVEffective95() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setVThdMax(po.getVThdMax() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setVThdMin(po.getVThdMin() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setVThdAvg(po.getVThdAvg() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setVThd95(po.getVThd95() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setUnbalanceMax(po.getUnbalanceMax() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setUnbalanceMin(po.getUnbalanceMin() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setUnbalanceAvg(po.getUnbalanceAvg() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setUnbalance95(po.getUnbalance95() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setFlickerMax(po.getFlickerMax() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setFlickerMin(po.getFlickerMin() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setFlickerAvg(po.getFlickerAvg() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                        vo.setFlicker95(po.getFlicker95() ==3.14159 ? 3.14159: BigDecimal.valueOf(po.getVEffectiveMax()).setScale(2, RoundingMode.HALF_UP).doubleValue());
                         break;
                     }
                 }