diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java
index 6edb150..799c664 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java
@@ -119,17 +119,17 @@
                 }
                 map.put(REPEAT_PREFIX + (i + 1), repMapList);
             }
+//            && (StringUtils.isNotEmpty(e.getTestValueOneDate())
+//                    || StringUtils.isNotEmpty(e.getTestValueTwoDate())
+//                    || StringUtils.isNotEmpty(e.getTestValueThreeDate())
+//                    || StringUtils.isNotEmpty(e.getTestValueFourDate())
+//                    || StringUtils.isNotEmpty(e.getTestValueFiveDate())
+//                    || StringUtils.isNotEmpty(e.getTestValueSixDate())
             //稳定性
             List<BizEquipmentStandardCheckDataDcPower> staList = request.getCheckDataDcPowerList()
                     .stream().filter(e -> points.equals(e.getCheckParam())
-                            && checkTypes[1].equals(e.getCheckType())
-                            && (StringUtils.isNotEmpty(e.getTestValueOneDate())
-                            || StringUtils.isNotEmpty(e.getTestValueTwoDate())
-                            || StringUtils.isNotEmpty(e.getTestValueThreeDate())
-                            || StringUtils.isNotEmpty(e.getTestValueFourDate())
-                            || StringUtils.isNotEmpty(e.getTestValueFiveDate())
-                            || StringUtils.isNotEmpty(e.getTestValueSixDate()))
-                    ).collect(Collectors.toList());
+                            && checkTypes[1].equals(e.getCheckType()))
+                    .collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(staList)) {
                 statisticalDate(staList, STA_PREFIX + (i + 1), map);
                 List<Map> repMapList = new ArrayList<>();

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java
index 6edb150..799c664 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java
@@ -119,17 +119,17 @@
                 }
                 map.put(REPEAT_PREFIX + (i + 1), repMapList);
             }
+//            && (StringUtils.isNotEmpty(e.getTestValueOneDate())
+//                    || StringUtils.isNotEmpty(e.getTestValueTwoDate())
+//                    || StringUtils.isNotEmpty(e.getTestValueThreeDate())
+//                    || StringUtils.isNotEmpty(e.getTestValueFourDate())
+//                    || StringUtils.isNotEmpty(e.getTestValueFiveDate())
+//                    || StringUtils.isNotEmpty(e.getTestValueSixDate())
             //稳定性
             List<BizEquipmentStandardCheckDataDcPower> staList = request.getCheckDataDcPowerList()
                     .stream().filter(e -> points.equals(e.getCheckParam())
-                            && checkTypes[1].equals(e.getCheckType())
-                            && (StringUtils.isNotEmpty(e.getTestValueOneDate())
-                            || StringUtils.isNotEmpty(e.getTestValueTwoDate())
-                            || StringUtils.isNotEmpty(e.getTestValueThreeDate())
-                            || StringUtils.isNotEmpty(e.getTestValueFourDate())
-                            || StringUtils.isNotEmpty(e.getTestValueFiveDate())
-                            || StringUtils.isNotEmpty(e.getTestValueSixDate()))
-                    ).collect(Collectors.toList());
+                            && checkTypes[1].equals(e.getCheckType()))
+                    .collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(staList)) {
                 statisticalDate(staList, STA_PREFIX + (i + 1), map);
                 List<Map> repMapList = new ArrayList<>();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java
index 50bd57d..0ee079c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java
@@ -242,6 +242,7 @@
             }
             map.put("equipmentList", equipmentList);
 
+            //封面自定义参数
             prepareCustomCoverParams(map, request.getMeasureDataElectricalSafetyList());
 
             List<BizBusinessDeviceMeasureDataElectricalSafety> electricalSafetyList = request.getMeasureDataElectricalSafetyList();
@@ -346,7 +347,7 @@
             }
             DictCodeUtils.convertDictCodeToName(request);
             Map<String, Object> map = BeanUtil.beanToMap(request);
-
+            mapReplace(map);
             BizBusinessDeviceMeasureEquipmentMapper equipmentMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureEquipmentMapper.class);
             List<MeasureEquipmentInfoDTO> equipmentList = equipmentMapper.selectEquipmentListByDataId(request.getDataId());
             if (CollectionUtils.isEmpty(equipmentList)) {
@@ -355,8 +356,6 @@
             }
             map.put("equipmentList", equipmentList);
 
-            prepareCustomCoverParams(map, request.getMeasureDataElectricalSafetyList());
-
             List<BizBusinessDeviceMeasureDataElectricalSafety> electricalSafetyList = request.getMeasureDataElectricalSafetyList();
             //填充参数
             prepareParams(electricalSafetyList, map);