diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
index e377fb5..fbc6f3c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
@@ -22,8 +22,13 @@
             lowFrequencySignal.setNominalValue(StringUtils.isNotBlank(lowFrequencySignal.getNominalValue()) ? lowFrequencySignal.getNominalValue() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setLowerIndex(StringUtils.isNotBlank(lowFrequencySignal.getLowerIndex()) ? lowFrequencySignal.getLowerIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setUpperIndex(StringUtils.isNotBlank(lowFrequencySignal.getUpperIndex()) ? lowFrequencySignal.getUpperIndex() + lowFrequencySignal.getUnit() : "");
-            lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + lowFrequencySignal.getMeasureValueUnit() : "");
+            if ("6".equals(lowFrequencySignal.getDataType())) {
+                lowFrequencySignal.setMeasureValue(lowFrequencySignal.getMeasureValue() + "%");
+            } else {
+                lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + lowFrequencySignal.getMeasureValueUnit() : "");
+            }
             lowFrequencySignal.setAcFrequency(StringUtils.isNotBlank(lowFrequencySignal.getAcFrequency()) ? lowFrequencySignal.getAcFrequency() + lowFrequencySignal.getAcFrequencyUnit() : "");
+            lowFrequencySignal.setFrequency(StringUtils.isNotBlank(lowFrequencySignal.getFrequency()) ? lowFrequencySignal.getFrequency() + lowFrequencySignal.getFrequencyUnit() : "");
             if (lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + "*" : lowFrequencySignal.getMeasureValue());
             }

diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
index e377fb5..fbc6f3c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
@@ -22,8 +22,13 @@
             lowFrequencySignal.setNominalValue(StringUtils.isNotBlank(lowFrequencySignal.getNominalValue()) ? lowFrequencySignal.getNominalValue() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setLowerIndex(StringUtils.isNotBlank(lowFrequencySignal.getLowerIndex()) ? lowFrequencySignal.getLowerIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setUpperIndex(StringUtils.isNotBlank(lowFrequencySignal.getUpperIndex()) ? lowFrequencySignal.getUpperIndex() + lowFrequencySignal.getUnit() : "");
-            lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + lowFrequencySignal.getMeasureValueUnit() : "");
+            if ("6".equals(lowFrequencySignal.getDataType())) {
+                lowFrequencySignal.setMeasureValue(lowFrequencySignal.getMeasureValue() + "%");
+            } else {
+                lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + lowFrequencySignal.getMeasureValueUnit() : "");
+            }
             lowFrequencySignal.setAcFrequency(StringUtils.isNotBlank(lowFrequencySignal.getAcFrequency()) ? lowFrequencySignal.getAcFrequency() + lowFrequencySignal.getAcFrequencyUnit() : "");
+            lowFrequencySignal.setFrequency(StringUtils.isNotBlank(lowFrequencySignal.getFrequency()) ? lowFrequencySignal.getFrequency() + lowFrequencySignal.getFrequencyUnit() : "");
             if (lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + "*" : lowFrequencySignal.getMeasureValue());
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java
index 5a7342a..7505cd6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java
@@ -379,39 +379,49 @@
     private void readyForMicrowaveCounter(Map<String, Object> map, List<BizBusinessDeviceMeasureDataCesiumAtom> atomList) {
         //晶振开机特性
         List<BizBusinessDeviceMeasureDataCesiumAtom> startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0);
-        map.put("gateTime1", cesiumAtom.getGateTime());
-        map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency());
-        map.put("groupNumber1", cesiumAtom.getSampleGroupNumber());
-        map.put("startupList", startupList);
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(startupList)){
+            BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0);
+            map.put("gateTime1", cesiumAtom.getGateTime());
+            map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency());
+            map.put("groupNumber1", cesiumAtom.getSampleGroupNumber());
+            map.put("startupList", startupList);
+        }
         //晶振1s频率稳定度
         List<BizBusinessDeviceMeasureDataCesiumAtom> stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0);
-        map.put("gateTime2", stability.getGateTime());
-        map.put("multiplyTimes2", stability.getMultiplyFrequency());
-        map.put("groupNumber2", stability.getSampleGroupNumber());
-        map.put("stabilityList", stabilityList);
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(stabilityList)){
+            BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0);
+            map.put("gateTime2", stability.getGateTime());
+            map.put("multiplyTimes2", stability.getMultiplyFrequency());
+            map.put("groupNumber2", stability.getSampleGroupNumber());
+            map.put("stabilityList", stabilityList);
+        }
         //晶振相对频率偏差
         List<BizBusinessDeviceMeasureDataCesiumAtom> deviationList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom deviation = deviationList.get(0);
-        map.put("gateTime3", deviation.getGateTime());
-        map.put("multiplyTimes3", deviation.getMultiplyFrequency());
-        map.put("deviationList", deviationList);
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(deviationList)){
+            BizBusinessDeviceMeasureDataCesiumAtom deviation = deviationList.get(0);
+            map.put("gateTime3", deviation.getGateTime());
+            map.put("multiplyTimes3", deviation.getMultiplyFrequency());
+            map.put("deviationList", deviationList);
+        }
         //晶振频率复现性
         List<BizBusinessDeviceMeasureDataCesiumAtom> reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0);
-        map.put("gateTime4", repro.getGateTime());
-        map.put("multiplyTimes4", repro.getMultiplyFrequency());
-        map.put("tOne", repro.getTOne());
-        map.put("tTwo", repro.getTTwo());
-        map.put("reproList", reproList);
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(reproList)){
+            BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0);
+            map.put("gateTime4", repro.getGateTime());
+            map.put("multiplyTimes4", repro.getMultiplyFrequency());
+            map.put("tOne", repro.getTOne());
+            map.put("tTwo", repro.getTTwo());
+            map.put("reproList", reproList);
+        }
         //晶振日老化率
         List<BizBusinessDeviceMeasureDataCesiumAtom> dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
-        map.put("gateTime5", daily.getGateTime());
-        map.put("multiplyTimes5", daily.getMultiplyFrequency());
-        map.put("groupNumber5", daily.getSampleGroupNumber());
-        map.put("dailyList", dailyList);
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(dailyList)){
+            BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
+            map.put("gateTime5", daily.getGateTime());
+            map.put("multiplyTimes5", daily.getMultiplyFrequency());
+            map.put("groupNumber5", daily.getSampleGroupNumber());
+            map.put("dailyList", dailyList);
+        }
         //频率测量范围、输入灵敏度及最大输入电平
         List<BizBusinessDeviceMeasureDataCesiumAtom> levelList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList());
         map.put("levelList", levelList);
@@ -423,35 +433,44 @@
     private void readyForUniversalCounter(Map<String, Object> map, List<BizBusinessDeviceMeasureDataCesiumAtom> atomList) {
         //晶振开机
         List<BizBusinessDeviceMeasureDataCesiumAtom> startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList());
-
-        BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0);
-        map.put("gateTime1", cesiumAtom.getGateTime());
-        map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency());
-        map.put("groupNumber1", cesiumAtom.getGroupNumber());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(startupList)){
+            BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0);
+            map.put("gateTime1", cesiumAtom.getGateTime());
+            map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency());
+            map.put("groupNumber1", cesiumAtom.getGroupNumber());
+        }
         //晶振1s频率稳定度
         List<BizBusinessDeviceMeasureDataCesiumAtom> stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0);
-        map.put("gateTime2", stability.getGateTime());
-        map.put("multiplyTimes2", stability.getMultiplyFrequency());
-        map.put("groupNumber2", stability.getGroupNumber());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(stabilityList)){
+            BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0);
+            map.put("gateTime2", stability.getGateTime());
+            map.put("multiplyTimes2", stability.getMultiplyFrequency());
+            map.put("groupNumber2", stability.getGroupNumber());
+        }
         //晶振相对频率偏差
         List<BizBusinessDeviceMeasureDataCesiumAtom> relativeList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0);
-        map.put("gateTime3", relative.getGateTime());
-        map.put("multiplyTimes3", relative.getMultiplyFrequency());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(relativeList)){
+            BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0);
+            map.put("gateTime3", relative.getGateTime());
+            map.put("multiplyTimes3", relative.getMultiplyFrequency());
+        }
         //晶振频率复现性
         List<BizBusinessDeviceMeasureDataCesiumAtom> reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0);
-        map.put("gateTime4", repro.getGateTime());
-        map.put("multiplyTimes4", repro.getMultiplyFrequency());
-        map.put("tOne", repro.getTOne());
-        map.put("tTwo", repro.getTTwo());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(reproList)){
+            BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0);
+            map.put("gateTime4", repro.getGateTime());
+            map.put("multiplyTimes4", repro.getMultiplyFrequency());
+            map.put("tOne", repro.getTOne());
+            map.put("tTwo", repro.getTTwo());
+        }
         //晶振日老化率
         List<BizBusinessDeviceMeasureDataCesiumAtom> dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
-        map.put("gateTime5", daily.getGateTime());
-        map.put("multiplyTimes5", daily.getMultiplyFrequency());
-        map.put("groupNumber5", daily.getGroupNumber());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(dailyList)){
+            BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
+            map.put("gateTime5", daily.getGateTime());
+            map.put("multiplyTimes5", daily.getMultiplyFrequency());
+            map.put("groupNumber5", daily.getGroupNumber());
+        }
         //频率测量范围、输入灵敏度
         List<BizBusinessDeviceMeasureDataCesiumAtom> freqList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList());
         //频率测量误差
@@ -486,11 +505,12 @@
         List<BizBusinessDeviceMeasureDataCesiumAtom> relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList());
         //频率复现性
         List<BizBusinessDeviceMeasureDataCesiumAtom> reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList());
-
-        BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = reproList.get(0);
-        map.put("tOne", cesiumAtom.getTOne());
-        map.put("tTwo", cesiumAtom.getTTwo());
-        map.put("tThree", cesiumAtom.getTThree());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(reproList)){
+            BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = reproList.get(0);
+            map.put("tOne", cesiumAtom.getTOne());
+            map.put("tTwo", cesiumAtom.getTTwo());
+            map.put("tThree", cesiumAtom.getTThree());
+        }
         //日频率漂移率
         List<BizBusinessDeviceMeasureDataCesiumAtom> dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList());
 
@@ -515,21 +535,24 @@
         List<BizBusinessDeviceMeasureDataCesiumAtom> reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList());
         //晶振日老化率
         List<BizBusinessDeviceMeasureDataCesiumAtom> dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList());
-
-        BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0);
-        map.put("relativeGateTime", relative.getGateTime());
-        map.put("relativeMultiplyTimes", relative.getMultiplyFrequency());
-
-        BizBusinessDeviceMeasureDataCesiumAtom rePro = reproList.get(0);
-        map.put("reproGateTime", rePro.getGateTime());
-        map.put("reproMultiplyTimes", rePro.getMultiplyFrequency());
-        map.put("tOne", rePro.getTOne());
-        map.put("tTwo", rePro.getTTwo());
-
-        BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
-        map.put("dailyGateTime", daily.getGateTime());
-        map.put("dailyMultiplyTimes", daily.getMultiplyFrequency());
-        map.put("dailySampleGroupNumber", daily.getSampleGroupNumber());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(relativeList)){
+            BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0);
+            map.put("relativeGateTime", relative.getGateTime());
+            map.put("relativeMultiplyTimes", relative.getMultiplyFrequency());
+        }
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(reproList)){
+            BizBusinessDeviceMeasureDataCesiumAtom rePro = reproList.get(0);
+            map.put("reproGateTime", rePro.getGateTime());
+            map.put("reproMultiplyTimes", rePro.getMultiplyFrequency());
+            map.put("tOne", rePro.getTOne());
+            map.put("tTwo", rePro.getTTwo());
+        }
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(dailyList)){
+            BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
+            map.put("dailyGateTime", daily.getGateTime());
+            map.put("dailyMultiplyTimes", daily.getMultiplyFrequency());
+            map.put("dailySampleGroupNumber", daily.getSampleGroupNumber());
+        }
 
         map.put("outputList", outputList);
         map.put("pulseList", pulseList);

diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
index e377fb5..fbc6f3c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
@@ -22,8 +22,13 @@
             lowFrequencySignal.setNominalValue(StringUtils.isNotBlank(lowFrequencySignal.getNominalValue()) ? lowFrequencySignal.getNominalValue() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setLowerIndex(StringUtils.isNotBlank(lowFrequencySignal.getLowerIndex()) ? lowFrequencySignal.getLowerIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setUpperIndex(StringUtils.isNotBlank(lowFrequencySignal.getUpperIndex()) ? lowFrequencySignal.getUpperIndex() + lowFrequencySignal.getUnit() : "");
-            lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + lowFrequencySignal.getMeasureValueUnit() : "");
+            if ("6".equals(lowFrequencySignal.getDataType())) {
+                lowFrequencySignal.setMeasureValue(lowFrequencySignal.getMeasureValue() + "%");
+            } else {
+                lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + lowFrequencySignal.getMeasureValueUnit() : "");
+            }
             lowFrequencySignal.setAcFrequency(StringUtils.isNotBlank(lowFrequencySignal.getAcFrequency()) ? lowFrequencySignal.getAcFrequency() + lowFrequencySignal.getAcFrequencyUnit() : "");
+            lowFrequencySignal.setFrequency(StringUtils.isNotBlank(lowFrequencySignal.getFrequency()) ? lowFrequencySignal.getFrequency() + lowFrequencySignal.getFrequencyUnit() : "");
             if (lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + "*" : lowFrequencySignal.getMeasureValue());
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java
index 5a7342a..7505cd6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java
@@ -379,39 +379,49 @@
     private void readyForMicrowaveCounter(Map<String, Object> map, List<BizBusinessDeviceMeasureDataCesiumAtom> atomList) {
         //晶振开机特性
         List<BizBusinessDeviceMeasureDataCesiumAtom> startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0);
-        map.put("gateTime1", cesiumAtom.getGateTime());
-        map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency());
-        map.put("groupNumber1", cesiumAtom.getSampleGroupNumber());
-        map.put("startupList", startupList);
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(startupList)){
+            BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0);
+            map.put("gateTime1", cesiumAtom.getGateTime());
+            map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency());
+            map.put("groupNumber1", cesiumAtom.getSampleGroupNumber());
+            map.put("startupList", startupList);
+        }
         //晶振1s频率稳定度
         List<BizBusinessDeviceMeasureDataCesiumAtom> stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0);
-        map.put("gateTime2", stability.getGateTime());
-        map.put("multiplyTimes2", stability.getMultiplyFrequency());
-        map.put("groupNumber2", stability.getSampleGroupNumber());
-        map.put("stabilityList", stabilityList);
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(stabilityList)){
+            BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0);
+            map.put("gateTime2", stability.getGateTime());
+            map.put("multiplyTimes2", stability.getMultiplyFrequency());
+            map.put("groupNumber2", stability.getSampleGroupNumber());
+            map.put("stabilityList", stabilityList);
+        }
         //晶振相对频率偏差
         List<BizBusinessDeviceMeasureDataCesiumAtom> deviationList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom deviation = deviationList.get(0);
-        map.put("gateTime3", deviation.getGateTime());
-        map.put("multiplyTimes3", deviation.getMultiplyFrequency());
-        map.put("deviationList", deviationList);
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(deviationList)){
+            BizBusinessDeviceMeasureDataCesiumAtom deviation = deviationList.get(0);
+            map.put("gateTime3", deviation.getGateTime());
+            map.put("multiplyTimes3", deviation.getMultiplyFrequency());
+            map.put("deviationList", deviationList);
+        }
         //晶振频率复现性
         List<BizBusinessDeviceMeasureDataCesiumAtom> reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0);
-        map.put("gateTime4", repro.getGateTime());
-        map.put("multiplyTimes4", repro.getMultiplyFrequency());
-        map.put("tOne", repro.getTOne());
-        map.put("tTwo", repro.getTTwo());
-        map.put("reproList", reproList);
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(reproList)){
+            BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0);
+            map.put("gateTime4", repro.getGateTime());
+            map.put("multiplyTimes4", repro.getMultiplyFrequency());
+            map.put("tOne", repro.getTOne());
+            map.put("tTwo", repro.getTTwo());
+            map.put("reproList", reproList);
+        }
         //晶振日老化率
         List<BizBusinessDeviceMeasureDataCesiumAtom> dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
-        map.put("gateTime5", daily.getGateTime());
-        map.put("multiplyTimes5", daily.getMultiplyFrequency());
-        map.put("groupNumber5", daily.getSampleGroupNumber());
-        map.put("dailyList", dailyList);
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(dailyList)){
+            BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
+            map.put("gateTime5", daily.getGateTime());
+            map.put("multiplyTimes5", daily.getMultiplyFrequency());
+            map.put("groupNumber5", daily.getSampleGroupNumber());
+            map.put("dailyList", dailyList);
+        }
         //频率测量范围、输入灵敏度及最大输入电平
         List<BizBusinessDeviceMeasureDataCesiumAtom> levelList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList());
         map.put("levelList", levelList);
@@ -423,35 +433,44 @@
     private void readyForUniversalCounter(Map<String, Object> map, List<BizBusinessDeviceMeasureDataCesiumAtom> atomList) {
         //晶振开机
         List<BizBusinessDeviceMeasureDataCesiumAtom> startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList());
-
-        BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0);
-        map.put("gateTime1", cesiumAtom.getGateTime());
-        map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency());
-        map.put("groupNumber1", cesiumAtom.getGroupNumber());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(startupList)){
+            BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0);
+            map.put("gateTime1", cesiumAtom.getGateTime());
+            map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency());
+            map.put("groupNumber1", cesiumAtom.getGroupNumber());
+        }
         //晶振1s频率稳定度
         List<BizBusinessDeviceMeasureDataCesiumAtom> stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0);
-        map.put("gateTime2", stability.getGateTime());
-        map.put("multiplyTimes2", stability.getMultiplyFrequency());
-        map.put("groupNumber2", stability.getGroupNumber());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(stabilityList)){
+            BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0);
+            map.put("gateTime2", stability.getGateTime());
+            map.put("multiplyTimes2", stability.getMultiplyFrequency());
+            map.put("groupNumber2", stability.getGroupNumber());
+        }
         //晶振相对频率偏差
         List<BizBusinessDeviceMeasureDataCesiumAtom> relativeList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0);
-        map.put("gateTime3", relative.getGateTime());
-        map.put("multiplyTimes3", relative.getMultiplyFrequency());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(relativeList)){
+            BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0);
+            map.put("gateTime3", relative.getGateTime());
+            map.put("multiplyTimes3", relative.getMultiplyFrequency());
+        }
         //晶振频率复现性
         List<BizBusinessDeviceMeasureDataCesiumAtom> reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0);
-        map.put("gateTime4", repro.getGateTime());
-        map.put("multiplyTimes4", repro.getMultiplyFrequency());
-        map.put("tOne", repro.getTOne());
-        map.put("tTwo", repro.getTTwo());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(reproList)){
+            BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0);
+            map.put("gateTime4", repro.getGateTime());
+            map.put("multiplyTimes4", repro.getMultiplyFrequency());
+            map.put("tOne", repro.getTOne());
+            map.put("tTwo", repro.getTTwo());
+        }
         //晶振日老化率
         List<BizBusinessDeviceMeasureDataCesiumAtom> dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
-        map.put("gateTime5", daily.getGateTime());
-        map.put("multiplyTimes5", daily.getMultiplyFrequency());
-        map.put("groupNumber5", daily.getGroupNumber());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(dailyList)){
+            BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
+            map.put("gateTime5", daily.getGateTime());
+            map.put("multiplyTimes5", daily.getMultiplyFrequency());
+            map.put("groupNumber5", daily.getGroupNumber());
+        }
         //频率测量范围、输入灵敏度
         List<BizBusinessDeviceMeasureDataCesiumAtom> freqList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList());
         //频率测量误差
@@ -486,11 +505,12 @@
         List<BizBusinessDeviceMeasureDataCesiumAtom> relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList());
         //频率复现性
         List<BizBusinessDeviceMeasureDataCesiumAtom> reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList());
-
-        BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = reproList.get(0);
-        map.put("tOne", cesiumAtom.getTOne());
-        map.put("tTwo", cesiumAtom.getTTwo());
-        map.put("tThree", cesiumAtom.getTThree());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(reproList)){
+            BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = reproList.get(0);
+            map.put("tOne", cesiumAtom.getTOne());
+            map.put("tTwo", cesiumAtom.getTTwo());
+            map.put("tThree", cesiumAtom.getTThree());
+        }
         //日频率漂移率
         List<BizBusinessDeviceMeasureDataCesiumAtom> dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList());
 
@@ -515,21 +535,24 @@
         List<BizBusinessDeviceMeasureDataCesiumAtom> reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList());
         //晶振日老化率
         List<BizBusinessDeviceMeasureDataCesiumAtom> dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList());
-
-        BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0);
-        map.put("relativeGateTime", relative.getGateTime());
-        map.put("relativeMultiplyTimes", relative.getMultiplyFrequency());
-
-        BizBusinessDeviceMeasureDataCesiumAtom rePro = reproList.get(0);
-        map.put("reproGateTime", rePro.getGateTime());
-        map.put("reproMultiplyTimes", rePro.getMultiplyFrequency());
-        map.put("tOne", rePro.getTOne());
-        map.put("tTwo", rePro.getTTwo());
-
-        BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
-        map.put("dailyGateTime", daily.getGateTime());
-        map.put("dailyMultiplyTimes", daily.getMultiplyFrequency());
-        map.put("dailySampleGroupNumber", daily.getSampleGroupNumber());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(relativeList)){
+            BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0);
+            map.put("relativeGateTime", relative.getGateTime());
+            map.put("relativeMultiplyTimes", relative.getMultiplyFrequency());
+        }
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(reproList)){
+            BizBusinessDeviceMeasureDataCesiumAtom rePro = reproList.get(0);
+            map.put("reproGateTime", rePro.getGateTime());
+            map.put("reproMultiplyTimes", rePro.getMultiplyFrequency());
+            map.put("tOne", rePro.getTOne());
+            map.put("tTwo", rePro.getTTwo());
+        }
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(dailyList)){
+            BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
+            map.put("dailyGateTime", daily.getGateTime());
+            map.put("dailyMultiplyTimes", daily.getMultiplyFrequency());
+            map.put("dailySampleGroupNumber", daily.getSampleGroupNumber());
+        }
 
         map.put("outputList", outputList);
         map.put("pulseList", pulseList);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java
index 7f344f1..8172cc9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java
@@ -72,7 +72,7 @@
             //除了选用的模板不一致，模板配置流程是一致的
             map.put("surveyor", "{{@surveyor}}");
             map.put("auditor", "{{@auditor}}");
-            List<ToBeRemoveDataItem> dataItems = removeCheckItem(request, 3, map);
+            List<ToBeRemoveDataItem> dataItems = removeCheckItem(request, 2, map);
             //核查模板在文件模板注册管理中配置了的
             String wordUrl = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE_CHECK_DATA, "数据打印", null,
                     RegisterCustomParameters.builder()

diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
index e377fb5..fbc6f3c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
@@ -22,8 +22,13 @@
             lowFrequencySignal.setNominalValue(StringUtils.isNotBlank(lowFrequencySignal.getNominalValue()) ? lowFrequencySignal.getNominalValue() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setLowerIndex(StringUtils.isNotBlank(lowFrequencySignal.getLowerIndex()) ? lowFrequencySignal.getLowerIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setUpperIndex(StringUtils.isNotBlank(lowFrequencySignal.getUpperIndex()) ? lowFrequencySignal.getUpperIndex() + lowFrequencySignal.getUnit() : "");
-            lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + lowFrequencySignal.getMeasureValueUnit() : "");
+            if ("6".equals(lowFrequencySignal.getDataType())) {
+                lowFrequencySignal.setMeasureValue(lowFrequencySignal.getMeasureValue() + "%");
+            } else {
+                lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + lowFrequencySignal.getMeasureValueUnit() : "");
+            }
             lowFrequencySignal.setAcFrequency(StringUtils.isNotBlank(lowFrequencySignal.getAcFrequency()) ? lowFrequencySignal.getAcFrequency() + lowFrequencySignal.getAcFrequencyUnit() : "");
+            lowFrequencySignal.setFrequency(StringUtils.isNotBlank(lowFrequencySignal.getFrequency()) ? lowFrequencySignal.getFrequency() + lowFrequencySignal.getFrequencyUnit() : "");
             if (lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + "*" : lowFrequencySignal.getMeasureValue());
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java
index 5a7342a..7505cd6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java
@@ -379,39 +379,49 @@
     private void readyForMicrowaveCounter(Map<String, Object> map, List<BizBusinessDeviceMeasureDataCesiumAtom> atomList) {
         //晶振开机特性
         List<BizBusinessDeviceMeasureDataCesiumAtom> startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0);
-        map.put("gateTime1", cesiumAtom.getGateTime());
-        map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency());
-        map.put("groupNumber1", cesiumAtom.getSampleGroupNumber());
-        map.put("startupList", startupList);
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(startupList)){
+            BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0);
+            map.put("gateTime1", cesiumAtom.getGateTime());
+            map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency());
+            map.put("groupNumber1", cesiumAtom.getSampleGroupNumber());
+            map.put("startupList", startupList);
+        }
         //晶振1s频率稳定度
         List<BizBusinessDeviceMeasureDataCesiumAtom> stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0);
-        map.put("gateTime2", stability.getGateTime());
-        map.put("multiplyTimes2", stability.getMultiplyFrequency());
-        map.put("groupNumber2", stability.getSampleGroupNumber());
-        map.put("stabilityList", stabilityList);
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(stabilityList)){
+            BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0);
+            map.put("gateTime2", stability.getGateTime());
+            map.put("multiplyTimes2", stability.getMultiplyFrequency());
+            map.put("groupNumber2", stability.getSampleGroupNumber());
+            map.put("stabilityList", stabilityList);
+        }
         //晶振相对频率偏差
         List<BizBusinessDeviceMeasureDataCesiumAtom> deviationList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom deviation = deviationList.get(0);
-        map.put("gateTime3", deviation.getGateTime());
-        map.put("multiplyTimes3", deviation.getMultiplyFrequency());
-        map.put("deviationList", deviationList);
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(deviationList)){
+            BizBusinessDeviceMeasureDataCesiumAtom deviation = deviationList.get(0);
+            map.put("gateTime3", deviation.getGateTime());
+            map.put("multiplyTimes3", deviation.getMultiplyFrequency());
+            map.put("deviationList", deviationList);
+        }
         //晶振频率复现性
         List<BizBusinessDeviceMeasureDataCesiumAtom> reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0);
-        map.put("gateTime4", repro.getGateTime());
-        map.put("multiplyTimes4", repro.getMultiplyFrequency());
-        map.put("tOne", repro.getTOne());
-        map.put("tTwo", repro.getTTwo());
-        map.put("reproList", reproList);
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(reproList)){
+            BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0);
+            map.put("gateTime4", repro.getGateTime());
+            map.put("multiplyTimes4", repro.getMultiplyFrequency());
+            map.put("tOne", repro.getTOne());
+            map.put("tTwo", repro.getTTwo());
+            map.put("reproList", reproList);
+        }
         //晶振日老化率
         List<BizBusinessDeviceMeasureDataCesiumAtom> dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
-        map.put("gateTime5", daily.getGateTime());
-        map.put("multiplyTimes5", daily.getMultiplyFrequency());
-        map.put("groupNumber5", daily.getSampleGroupNumber());
-        map.put("dailyList", dailyList);
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(dailyList)){
+            BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
+            map.put("gateTime5", daily.getGateTime());
+            map.put("multiplyTimes5", daily.getMultiplyFrequency());
+            map.put("groupNumber5", daily.getSampleGroupNumber());
+            map.put("dailyList", dailyList);
+        }
         //频率测量范围、输入灵敏度及最大输入电平
         List<BizBusinessDeviceMeasureDataCesiumAtom> levelList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList());
         map.put("levelList", levelList);
@@ -423,35 +433,44 @@
     private void readyForUniversalCounter(Map<String, Object> map, List<BizBusinessDeviceMeasureDataCesiumAtom> atomList) {
         //晶振开机
         List<BizBusinessDeviceMeasureDataCesiumAtom> startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList());
-
-        BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0);
-        map.put("gateTime1", cesiumAtom.getGateTime());
-        map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency());
-        map.put("groupNumber1", cesiumAtom.getGroupNumber());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(startupList)){
+            BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0);
+            map.put("gateTime1", cesiumAtom.getGateTime());
+            map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency());
+            map.put("groupNumber1", cesiumAtom.getGroupNumber());
+        }
         //晶振1s频率稳定度
         List<BizBusinessDeviceMeasureDataCesiumAtom> stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0);
-        map.put("gateTime2", stability.getGateTime());
-        map.put("multiplyTimes2", stability.getMultiplyFrequency());
-        map.put("groupNumber2", stability.getGroupNumber());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(stabilityList)){
+            BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0);
+            map.put("gateTime2", stability.getGateTime());
+            map.put("multiplyTimes2", stability.getMultiplyFrequency());
+            map.put("groupNumber2", stability.getGroupNumber());
+        }
         //晶振相对频率偏差
         List<BizBusinessDeviceMeasureDataCesiumAtom> relativeList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0);
-        map.put("gateTime3", relative.getGateTime());
-        map.put("multiplyTimes3", relative.getMultiplyFrequency());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(relativeList)){
+            BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0);
+            map.put("gateTime3", relative.getGateTime());
+            map.put("multiplyTimes3", relative.getMultiplyFrequency());
+        }
         //晶振频率复现性
         List<BizBusinessDeviceMeasureDataCesiumAtom> reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0);
-        map.put("gateTime4", repro.getGateTime());
-        map.put("multiplyTimes4", repro.getMultiplyFrequency());
-        map.put("tOne", repro.getTOne());
-        map.put("tTwo", repro.getTTwo());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(reproList)){
+            BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0);
+            map.put("gateTime4", repro.getGateTime());
+            map.put("multiplyTimes4", repro.getMultiplyFrequency());
+            map.put("tOne", repro.getTOne());
+            map.put("tTwo", repro.getTTwo());
+        }
         //晶振日老化率
         List<BizBusinessDeviceMeasureDataCesiumAtom> dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
-        map.put("gateTime5", daily.getGateTime());
-        map.put("multiplyTimes5", daily.getMultiplyFrequency());
-        map.put("groupNumber5", daily.getGroupNumber());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(dailyList)){
+            BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
+            map.put("gateTime5", daily.getGateTime());
+            map.put("multiplyTimes5", daily.getMultiplyFrequency());
+            map.put("groupNumber5", daily.getGroupNumber());
+        }
         //频率测量范围、输入灵敏度
         List<BizBusinessDeviceMeasureDataCesiumAtom> freqList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList());
         //频率测量误差
@@ -486,11 +505,12 @@
         List<BizBusinessDeviceMeasureDataCesiumAtom> relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList());
         //频率复现性
         List<BizBusinessDeviceMeasureDataCesiumAtom> reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList());
-
-        BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = reproList.get(0);
-        map.put("tOne", cesiumAtom.getTOne());
-        map.put("tTwo", cesiumAtom.getTTwo());
-        map.put("tThree", cesiumAtom.getTThree());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(reproList)){
+            BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = reproList.get(0);
+            map.put("tOne", cesiumAtom.getTOne());
+            map.put("tTwo", cesiumAtom.getTTwo());
+            map.put("tThree", cesiumAtom.getTThree());
+        }
         //日频率漂移率
         List<BizBusinessDeviceMeasureDataCesiumAtom> dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList());
 
@@ -515,21 +535,24 @@
         List<BizBusinessDeviceMeasureDataCesiumAtom> reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList());
         //晶振日老化率
         List<BizBusinessDeviceMeasureDataCesiumAtom> dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList());
-
-        BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0);
-        map.put("relativeGateTime", relative.getGateTime());
-        map.put("relativeMultiplyTimes", relative.getMultiplyFrequency());
-
-        BizBusinessDeviceMeasureDataCesiumAtom rePro = reproList.get(0);
-        map.put("reproGateTime", rePro.getGateTime());
-        map.put("reproMultiplyTimes", rePro.getMultiplyFrequency());
-        map.put("tOne", rePro.getTOne());
-        map.put("tTwo", rePro.getTTwo());
-
-        BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
-        map.put("dailyGateTime", daily.getGateTime());
-        map.put("dailyMultiplyTimes", daily.getMultiplyFrequency());
-        map.put("dailySampleGroupNumber", daily.getSampleGroupNumber());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(relativeList)){
+            BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0);
+            map.put("relativeGateTime", relative.getGateTime());
+            map.put("relativeMultiplyTimes", relative.getMultiplyFrequency());
+        }
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(reproList)){
+            BizBusinessDeviceMeasureDataCesiumAtom rePro = reproList.get(0);
+            map.put("reproGateTime", rePro.getGateTime());
+            map.put("reproMultiplyTimes", rePro.getMultiplyFrequency());
+            map.put("tOne", rePro.getTOne());
+            map.put("tTwo", rePro.getTTwo());
+        }
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(dailyList)){
+            BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
+            map.put("dailyGateTime", daily.getGateTime());
+            map.put("dailyMultiplyTimes", daily.getMultiplyFrequency());
+            map.put("dailySampleGroupNumber", daily.getSampleGroupNumber());
+        }
 
         map.put("outputList", outputList);
         map.put("pulseList", pulseList);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java
index 7f344f1..8172cc9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java
@@ -72,7 +72,7 @@
             //除了选用的模板不一致，模板配置流程是一致的
             map.put("surveyor", "{{@surveyor}}");
             map.put("auditor", "{{@auditor}}");
-            List<ToBeRemoveDataItem> dataItems = removeCheckItem(request, 3, map);
+            List<ToBeRemoveDataItem> dataItems = removeCheckItem(request, 2, map);
             //核查模板在文件模板注册管理中配置了的
             String wordUrl = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE_CHECK_DATA, "数据打印", null,
                     RegisterCustomParameters.builder()
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java
index 271acdd..4f2dd2e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java
@@ -90,7 +90,6 @@
                 .filter(att -> REPEATABILITY.equals(att.getCheckType()))
                 .peek(att -> {
                     att.setFrequency(StringUtils.isNotBlank(att.getFrequency()) ? att.getFrequency() + att.getFrequencyUnit() : att.getFrequency());
-                    att.setAttenuationAmount(StringUtils.isNotBlank(att.getAttenuationAmount()) ? att.getAttenuationAmount() + att.getAttenuationAmountUnit() : att.getAttenuationAmount());
                     att.setTestValueOne(StringUtils.isNotBlank(att.getTestValueOne()) ? att.getTestValueOne() + att.getAttenuationAmountUnit() : att.getTestValueOne());
                     att.setTestValueTwo(StringUtils.isNotBlank(att.getTestValueTwo()) ? att.getTestValueTwo() + att.getAttenuationAmountUnit() : att.getTestValueTwo());
                     att.setTestValueThree(StringUtils.isNotBlank(att.getTestValueThree()) ? att.getTestValueThree() + att.getAttenuationAmountUnit() : att.getTestValueThree());

diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
index e377fb5..fbc6f3c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/LowFrequencySignalStrategyType.java
@@ -22,8 +22,13 @@
             lowFrequencySignal.setNominalValue(StringUtils.isNotBlank(lowFrequencySignal.getNominalValue()) ? lowFrequencySignal.getNominalValue() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setLowerIndex(StringUtils.isNotBlank(lowFrequencySignal.getLowerIndex()) ? lowFrequencySignal.getLowerIndex() + lowFrequencySignal.getUnit() : "");
             lowFrequencySignal.setUpperIndex(StringUtils.isNotBlank(lowFrequencySignal.getUpperIndex()) ? lowFrequencySignal.getUpperIndex() + lowFrequencySignal.getUnit() : "");
-            lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + lowFrequencySignal.getMeasureValueUnit() : "");
+            if ("6".equals(lowFrequencySignal.getDataType())) {
+                lowFrequencySignal.setMeasureValue(lowFrequencySignal.getMeasureValue() + "%");
+            } else {
+                lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + lowFrequencySignal.getMeasureValueUnit() : "");
+            }
             lowFrequencySignal.setAcFrequency(StringUtils.isNotBlank(lowFrequencySignal.getAcFrequency()) ? lowFrequencySignal.getAcFrequency() + lowFrequencySignal.getAcFrequencyUnit() : "");
+            lowFrequencySignal.setFrequency(StringUtils.isNotBlank(lowFrequencySignal.getFrequency()) ? lowFrequencySignal.getFrequency() + lowFrequencySignal.getFrequencyUnit() : "");
             if (lowFrequencySignal.getExceedMark() == 1) {
                 lowFrequencySignal.setMeasureValue(StringUtils.isNotBlank(lowFrequencySignal.getMeasureValue()) ? lowFrequencySignal.getMeasureValue() + "*" : lowFrequencySignal.getMeasureValue());
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java
index 5a7342a..7505cd6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java
@@ -379,39 +379,49 @@
     private void readyForMicrowaveCounter(Map<String, Object> map, List<BizBusinessDeviceMeasureDataCesiumAtom> atomList) {
         //晶振开机特性
         List<BizBusinessDeviceMeasureDataCesiumAtom> startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0);
-        map.put("gateTime1", cesiumAtom.getGateTime());
-        map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency());
-        map.put("groupNumber1", cesiumAtom.getSampleGroupNumber());
-        map.put("startupList", startupList);
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(startupList)){
+            BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0);
+            map.put("gateTime1", cesiumAtom.getGateTime());
+            map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency());
+            map.put("groupNumber1", cesiumAtom.getSampleGroupNumber());
+            map.put("startupList", startupList);
+        }
         //晶振1s频率稳定度
         List<BizBusinessDeviceMeasureDataCesiumAtom> stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0);
-        map.put("gateTime2", stability.getGateTime());
-        map.put("multiplyTimes2", stability.getMultiplyFrequency());
-        map.put("groupNumber2", stability.getSampleGroupNumber());
-        map.put("stabilityList", stabilityList);
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(stabilityList)){
+            BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0);
+            map.put("gateTime2", stability.getGateTime());
+            map.put("multiplyTimes2", stability.getMultiplyFrequency());
+            map.put("groupNumber2", stability.getSampleGroupNumber());
+            map.put("stabilityList", stabilityList);
+        }
         //晶振相对频率偏差
         List<BizBusinessDeviceMeasureDataCesiumAtom> deviationList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom deviation = deviationList.get(0);
-        map.put("gateTime3", deviation.getGateTime());
-        map.put("multiplyTimes3", deviation.getMultiplyFrequency());
-        map.put("deviationList", deviationList);
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(deviationList)){
+            BizBusinessDeviceMeasureDataCesiumAtom deviation = deviationList.get(0);
+            map.put("gateTime3", deviation.getGateTime());
+            map.put("multiplyTimes3", deviation.getMultiplyFrequency());
+            map.put("deviationList", deviationList);
+        }
         //晶振频率复现性
         List<BizBusinessDeviceMeasureDataCesiumAtom> reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0);
-        map.put("gateTime4", repro.getGateTime());
-        map.put("multiplyTimes4", repro.getMultiplyFrequency());
-        map.put("tOne", repro.getTOne());
-        map.put("tTwo", repro.getTTwo());
-        map.put("reproList", reproList);
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(reproList)){
+            BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0);
+            map.put("gateTime4", repro.getGateTime());
+            map.put("multiplyTimes4", repro.getMultiplyFrequency());
+            map.put("tOne", repro.getTOne());
+            map.put("tTwo", repro.getTTwo());
+            map.put("reproList", reproList);
+        }
         //晶振日老化率
         List<BizBusinessDeviceMeasureDataCesiumAtom> dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
-        map.put("gateTime5", daily.getGateTime());
-        map.put("multiplyTimes5", daily.getMultiplyFrequency());
-        map.put("groupNumber5", daily.getSampleGroupNumber());
-        map.put("dailyList", dailyList);
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(dailyList)){
+            BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
+            map.put("gateTime5", daily.getGateTime());
+            map.put("multiplyTimes5", daily.getMultiplyFrequency());
+            map.put("groupNumber5", daily.getSampleGroupNumber());
+            map.put("dailyList", dailyList);
+        }
         //频率测量范围、输入灵敏度及最大输入电平
         List<BizBusinessDeviceMeasureDataCesiumAtom> levelList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList());
         map.put("levelList", levelList);
@@ -423,35 +433,44 @@
     private void readyForUniversalCounter(Map<String, Object> map, List<BizBusinessDeviceMeasureDataCesiumAtom> atomList) {
         //晶振开机
         List<BizBusinessDeviceMeasureDataCesiumAtom> startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList());
-
-        BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0);
-        map.put("gateTime1", cesiumAtom.getGateTime());
-        map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency());
-        map.put("groupNumber1", cesiumAtom.getGroupNumber());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(startupList)){
+            BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0);
+            map.put("gateTime1", cesiumAtom.getGateTime());
+            map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency());
+            map.put("groupNumber1", cesiumAtom.getGroupNumber());
+        }
         //晶振1s频率稳定度
         List<BizBusinessDeviceMeasureDataCesiumAtom> stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0);
-        map.put("gateTime2", stability.getGateTime());
-        map.put("multiplyTimes2", stability.getMultiplyFrequency());
-        map.put("groupNumber2", stability.getGroupNumber());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(stabilityList)){
+            BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0);
+            map.put("gateTime2", stability.getGateTime());
+            map.put("multiplyTimes2", stability.getMultiplyFrequency());
+            map.put("groupNumber2", stability.getGroupNumber());
+        }
         //晶振相对频率偏差
         List<BizBusinessDeviceMeasureDataCesiumAtom> relativeList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0);
-        map.put("gateTime3", relative.getGateTime());
-        map.put("multiplyTimes3", relative.getMultiplyFrequency());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(relativeList)){
+            BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0);
+            map.put("gateTime3", relative.getGateTime());
+            map.put("multiplyTimes3", relative.getMultiplyFrequency());
+        }
         //晶振频率复现性
         List<BizBusinessDeviceMeasureDataCesiumAtom> reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0);
-        map.put("gateTime4", repro.getGateTime());
-        map.put("multiplyTimes4", repro.getMultiplyFrequency());
-        map.put("tOne", repro.getTOne());
-        map.put("tTwo", repro.getTTwo());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(reproList)){
+            BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0);
+            map.put("gateTime4", repro.getGateTime());
+            map.put("multiplyTimes4", repro.getMultiplyFrequency());
+            map.put("tOne", repro.getTOne());
+            map.put("tTwo", repro.getTTwo());
+        }
         //晶振日老化率
         List<BizBusinessDeviceMeasureDataCesiumAtom> dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList());
-        BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
-        map.put("gateTime5", daily.getGateTime());
-        map.put("multiplyTimes5", daily.getMultiplyFrequency());
-        map.put("groupNumber5", daily.getGroupNumber());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(dailyList)){
+            BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
+            map.put("gateTime5", daily.getGateTime());
+            map.put("multiplyTimes5", daily.getMultiplyFrequency());
+            map.put("groupNumber5", daily.getGroupNumber());
+        }
         //频率测量范围、输入灵敏度
         List<BizBusinessDeviceMeasureDataCesiumAtom> freqList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList());
         //频率测量误差
@@ -486,11 +505,12 @@
         List<BizBusinessDeviceMeasureDataCesiumAtom> relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList());
         //频率复现性
         List<BizBusinessDeviceMeasureDataCesiumAtom> reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList());
-
-        BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = reproList.get(0);
-        map.put("tOne", cesiumAtom.getTOne());
-        map.put("tTwo", cesiumAtom.getTTwo());
-        map.put("tThree", cesiumAtom.getTThree());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(reproList)){
+            BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = reproList.get(0);
+            map.put("tOne", cesiumAtom.getTOne());
+            map.put("tTwo", cesiumAtom.getTTwo());
+            map.put("tThree", cesiumAtom.getTThree());
+        }
         //日频率漂移率
         List<BizBusinessDeviceMeasureDataCesiumAtom> dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList());
 
@@ -515,21 +535,24 @@
         List<BizBusinessDeviceMeasureDataCesiumAtom> reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList());
         //晶振日老化率
         List<BizBusinessDeviceMeasureDataCesiumAtom> dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList());
-
-        BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0);
-        map.put("relativeGateTime", relative.getGateTime());
-        map.put("relativeMultiplyTimes", relative.getMultiplyFrequency());
-
-        BizBusinessDeviceMeasureDataCesiumAtom rePro = reproList.get(0);
-        map.put("reproGateTime", rePro.getGateTime());
-        map.put("reproMultiplyTimes", rePro.getMultiplyFrequency());
-        map.put("tOne", rePro.getTOne());
-        map.put("tTwo", rePro.getTTwo());
-
-        BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
-        map.put("dailyGateTime", daily.getGateTime());
-        map.put("dailyMultiplyTimes", daily.getMultiplyFrequency());
-        map.put("dailySampleGroupNumber", daily.getSampleGroupNumber());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(relativeList)){
+            BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0);
+            map.put("relativeGateTime", relative.getGateTime());
+            map.put("relativeMultiplyTimes", relative.getMultiplyFrequency());
+        }
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(reproList)){
+            BizBusinessDeviceMeasureDataCesiumAtom rePro = reproList.get(0);
+            map.put("reproGateTime", rePro.getGateTime());
+            map.put("reproMultiplyTimes", rePro.getMultiplyFrequency());
+            map.put("tOne", rePro.getTOne());
+            map.put("tTwo", rePro.getTTwo());
+        }
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(dailyList)){
+            BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0);
+            map.put("dailyGateTime", daily.getGateTime());
+            map.put("dailyMultiplyTimes", daily.getMultiplyFrequency());
+            map.put("dailySampleGroupNumber", daily.getSampleGroupNumber());
+        }
 
         map.put("outputList", outputList);
         map.put("pulseList", pulseList);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java
index 7f344f1..8172cc9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java
@@ -72,7 +72,7 @@
             //除了选用的模板不一致，模板配置流程是一致的
             map.put("surveyor", "{{@surveyor}}");
             map.put("auditor", "{{@auditor}}");
-            List<ToBeRemoveDataItem> dataItems = removeCheckItem(request, 3, map);
+            List<ToBeRemoveDataItem> dataItems = removeCheckItem(request, 2, map);
             //核查模板在文件模板注册管理中配置了的
             String wordUrl = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE_CHECK_DATA, "数据打印", null,
                     RegisterCustomParameters.builder()
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java
index 271acdd..4f2dd2e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java
@@ -90,7 +90,6 @@
                 .filter(att -> REPEATABILITY.equals(att.getCheckType()))
                 .peek(att -> {
                     att.setFrequency(StringUtils.isNotBlank(att.getFrequency()) ? att.getFrequency() + att.getFrequencyUnit() : att.getFrequency());
-                    att.setAttenuationAmount(StringUtils.isNotBlank(att.getAttenuationAmount()) ? att.getAttenuationAmount() + att.getAttenuationAmountUnit() : att.getAttenuationAmount());
                     att.setTestValueOne(StringUtils.isNotBlank(att.getTestValueOne()) ? att.getTestValueOne() + att.getAttenuationAmountUnit() : att.getTestValueOne());
                     att.setTestValueTwo(StringUtils.isNotBlank(att.getTestValueTwo()) ? att.getTestValueTwo() + att.getAttenuationAmountUnit() : att.getTestValueTwo());
                     att.setTestValueThree(StringUtils.isNotBlank(att.getTestValueThree()) ? att.getTestValueThree() + att.getAttenuationAmountUnit() : att.getTestValueThree());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java
index 89c0a62..cc54a01 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java
@@ -607,20 +607,23 @@
      * @param map
      */
     private void assembleThermostaticBathCertificateParams(List<BizBusinessDeviceMeasureDataResistanceThermometer> thermometerList, Map<String, Object> map) {
-        List<String> pointList = thermometerList.stream()
+        String min = thermometerList.stream()
                 .map(BizBusinessDeviceMeasureDataResistanceThermometer::getUpperLowerPoint)
-                .sorted().distinct().collect(Collectors.toList());
-        map.put("lowerPoint", StringUtils.isNotBlank(pointList.get(0)) ? pointList.get(0) : "/");
-        map.put("upperPoint", StringUtils.isNotBlank(pointList.get(1)) ? pointList.get(1) : "/");
+                .min(String::compareTo).orElseThrow(() -> new BusinessException(2640, "恒温槽检定证书参数异常，上限点为null"));
+        String max = thermometerList.stream()
+                .map(BizBusinessDeviceMeasureDataResistanceThermometer::getUpperLowerPoint)
+                .max(String::compareTo).orElseThrow(() -> new BusinessException(2640, "恒温槽检定证书参数异常，下限点为null"));
+        map.put("lowerPoint", StringUtils.isNotBlank(min) ? min : "/");
+        map.put("upperPoint", StringUtils.isNotBlank(max) ? max : "/");
 
         List<String> lowerVolatility = thermometerList.stream()
-                .filter(t -> pointList.get(0).equals(t.getUpperLowerPoint()))
+                .filter(t -> min.equals(t.getUpperLowerPoint()))
                 .map(BizBusinessDeviceMeasureDataResistanceThermometer::getVolatility)
                 .sorted(Comparator.reverseOrder())
                 .collect(Collectors.toList());
 
         List<String> upperVolatility = thermometerList.stream()
-                .filter(t -> pointList.get(1).equals(t.getUpperLowerPoint()))
+                .filter(t -> max.equals(t.getUpperLowerPoint()))
                 .map(BizBusinessDeviceMeasureDataResistanceThermometer::getVolatility)
                 .sorted(Comparator.reverseOrder()).collect(Collectors.toList());
 
@@ -629,13 +632,13 @@
         map.put("upperVolatility", StringUtils.isNotBlank(upperVolatility.get(0)) ? upperVolatility.get(0) : "/");
 
         List<String> lowerMaxWork = thermometerList.stream()
-                .filter(t -> pointList.get(0).equals(t.getUpperLowerPoint()))
+                .filter(t -> min.equals(t.getUpperLowerPoint()))
                 .map(BizBusinessDeviceMeasureDataResistanceThermometer::getMaxWorkTemperatureDifferent)
                 .sorted(Comparator.reverseOrder())
                 .collect(Collectors.toList());
 
         List<String> upperMaxWork = thermometerList.stream()
-                .filter(t -> pointList.get(1).equals(t.getUpperLowerPoint()))
+                .filter(t -> max.equals(t.getUpperLowerPoint()))
                 .map(BizBusinessDeviceMeasureDataResistanceThermometer::getMaxWorkTemperatureDifferent)
                 .sorted(Comparator.reverseOrder())
                 .collect(Collectors.toList());