diff --git a/casic-metering-api/src/main/build/bin/start.sh b/casic-metering-api/src/main/build/bin/start.sh
index b312cdc..d66853c 100644
--- a/casic-metering-api/src/main/build/bin/start.sh
+++ b/casic-metering-api/src/main/build/bin/start.sh
@@ -1 +1 @@
-nohup java -jar ./lib/casic-metering-api-1.1.0.jar > /dev/null 2>&1 &
\ No newline at end of file
+nohup java -jar ./lib/casic-metering-api-1.2.0.jar > /dev/null 2>&1 &
\ No newline at end of file

diff --git a/casic-metering-api/src/main/build/bin/start.sh b/casic-metering-api/src/main/build/bin/start.sh
index b312cdc..d66853c 100644
--- a/casic-metering-api/src/main/build/bin/start.sh
+++ b/casic-metering-api/src/main/build/bin/start.sh
@@ -1 +1 @@
-nohup java -jar ./lib/casic-metering-api-1.1.0.jar > /dev/null 2>&1 &
\ No newline at end of file
+nohup java -jar ./lib/casic-metering-api-1.2.0.jar > /dev/null 2>&1 &
\ No newline at end of file
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 2d2bd12..b249e59 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -19,6 +19,7 @@
     PARAMS_NULL(2301, "参数不能为空"),
     PROCESS_ID_NULL(2302, "流程实例id不能为空"),
     DUPLICATE_NUMBER(2303, "编号生成重复，请重新提交"),
+    DUPLICATE_NUMBER_ONE(2303, "编号重复，请重新提交"),
     PARAM_INVALID(2304, "参数不合法"),
     LOGIN_USER_ACQUIRE_FAILED(2305, "无法获取登录者用户信息，请尝试重新登录再进行操作"),
     LABEL_IS_EMPTY(2306, "标签字段为空，无法绑定"),

diff --git a/casic-metering-api/src/main/build/bin/start.sh b/casic-metering-api/src/main/build/bin/start.sh
index b312cdc..d66853c 100644
--- a/casic-metering-api/src/main/build/bin/start.sh
+++ b/casic-metering-api/src/main/build/bin/start.sh
@@ -1 +1 @@
-nohup java -jar ./lib/casic-metering-api-1.1.0.jar > /dev/null 2>&1 &
\ No newline at end of file
+nohup java -jar ./lib/casic-metering-api-1.2.0.jar > /dev/null 2>&1 &
\ No newline at end of file
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 2d2bd12..b249e59 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -19,6 +19,7 @@
     PARAMS_NULL(2301, "参数不能为空"),
     PROCESS_ID_NULL(2302, "流程实例id不能为空"),
     DUPLICATE_NUMBER(2303, "编号生成重复，请重新提交"),
+    DUPLICATE_NUMBER_ONE(2303, "编号重复，请重新提交"),
     PARAM_INVALID(2304, "参数不合法"),
     LOGIN_USER_ACQUIRE_FAILED(2305, "无法获取登录者用户信息，请尝试重新登录再进行操作"),
     LABEL_IS_EMPTY(2306, "标签字段为空，无法绑定"),
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java
index 3bd555f..07a6312 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java
@@ -1717,6 +1717,9 @@
                     String cycleSignalUnit = measureData.getCycleSignalUnit();
                     BigDecimal convertCycleSignal = UnitConvertUtil.timeConvert(cycleSignal, cycleSignalUnit, "ns");
                     BigDecimal timeBaseAbsoluteError = new BigDecimal(measureData.getTimeBaseAbsoluteError());
+                    if (convertCycleSignal.compareTo(BigDecimal.ZERO) == 0) {
+                        continue;
+                    }
                     BigDecimal timeBaseRelativeError = timeBaseAbsoluteError.divide(convertCycleSignal, 20, RoundingMode.DOWN);
                     measureData.setTimeBaseRelativeError(String.valueOf(timeBaseRelativeError));
                     String symbol = measureData.getTechnicalIndexSymbol();
@@ -1806,6 +1809,9 @@
                     }
                     BigDecimal nominalValue = new BigDecimal(measureData.getNominalValue());
                     BigDecimal measureValue = new BigDecimal(measureData.getMeasureValue());
+                    if (measureValue.compareTo(BigDecimal.ZERO) == 0) {
+                        continue;
+                    }
                     BigDecimal beforeBeforeRelativeError = (nominalValue.subtract(measureValue)).divide(measureValue, 6, RoundingMode.DOWN);
                     BigDecimal beforeRelativeError = beforeBeforeRelativeError.multiply(BigDecimal.valueOf(100));
                     String relativeError = relativeErrorScaleHandle(beforeRelativeError) + "%";
@@ -2266,7 +2272,7 @@
         measureData.setTestValueThree(String.valueOf(testValueThree));
         //测量值误差 = ((测量值1+测量值2+测量值3)/3-标称值)/标称值，有保留小数规则
         BigDecimal nominalValue = new BigDecimal(measureData.getNominalValue());
-        if (nominalValue.compareTo(BigDecimal.valueOf(0)) == 0) {
+        if (nominalValue.compareTo(BigDecimal.ZERO) == 0) {
             return true;
         }
         BigDecimal beforeTestValueError = (testValueOne.add(testValueTwo).add(testValueThree)).divide(BigDecimal.valueOf(3), 4, RoundingMode.DOWN);

diff --git a/casic-metering-api/src/main/build/bin/start.sh b/casic-metering-api/src/main/build/bin/start.sh
index b312cdc..d66853c 100644
--- a/casic-metering-api/src/main/build/bin/start.sh
+++ b/casic-metering-api/src/main/build/bin/start.sh
@@ -1 +1 @@
-nohup java -jar ./lib/casic-metering-api-1.1.0.jar > /dev/null 2>&1 &
\ No newline at end of file
+nohup java -jar ./lib/casic-metering-api-1.2.0.jar > /dev/null 2>&1 &
\ No newline at end of file
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 2d2bd12..b249e59 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -19,6 +19,7 @@
     PARAMS_NULL(2301, "参数不能为空"),
     PROCESS_ID_NULL(2302, "流程实例id不能为空"),
     DUPLICATE_NUMBER(2303, "编号生成重复，请重新提交"),
+    DUPLICATE_NUMBER_ONE(2303, "编号重复，请重新提交"),
     PARAM_INVALID(2304, "参数不合法"),
     LOGIN_USER_ACQUIRE_FAILED(2305, "无法获取登录者用户信息，请尝试重新登录再进行操作"),
     LABEL_IS_EMPTY(2306, "标签字段为空，无法绑定"),
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java
index 3bd555f..07a6312 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java
@@ -1717,6 +1717,9 @@
                     String cycleSignalUnit = measureData.getCycleSignalUnit();
                     BigDecimal convertCycleSignal = UnitConvertUtil.timeConvert(cycleSignal, cycleSignalUnit, "ns");
                     BigDecimal timeBaseAbsoluteError = new BigDecimal(measureData.getTimeBaseAbsoluteError());
+                    if (convertCycleSignal.compareTo(BigDecimal.ZERO) == 0) {
+                        continue;
+                    }
                     BigDecimal timeBaseRelativeError = timeBaseAbsoluteError.divide(convertCycleSignal, 20, RoundingMode.DOWN);
                     measureData.setTimeBaseRelativeError(String.valueOf(timeBaseRelativeError));
                     String symbol = measureData.getTechnicalIndexSymbol();
@@ -1806,6 +1809,9 @@
                     }
                     BigDecimal nominalValue = new BigDecimal(measureData.getNominalValue());
                     BigDecimal measureValue = new BigDecimal(measureData.getMeasureValue());
+                    if (measureValue.compareTo(BigDecimal.ZERO) == 0) {
+                        continue;
+                    }
                     BigDecimal beforeBeforeRelativeError = (nominalValue.subtract(measureValue)).divide(measureValue, 6, RoundingMode.DOWN);
                     BigDecimal beforeRelativeError = beforeBeforeRelativeError.multiply(BigDecimal.valueOf(100));
                     String relativeError = relativeErrorScaleHandle(beforeRelativeError) + "%";
@@ -2266,7 +2272,7 @@
         measureData.setTestValueThree(String.valueOf(testValueThree));
         //测量值误差 = ((测量值1+测量值2+测量值3)/3-标称值)/标称值，有保留小数规则
         BigDecimal nominalValue = new BigDecimal(measureData.getNominalValue());
-        if (nominalValue.compareTo(BigDecimal.valueOf(0)) == 0) {
+        if (nominalValue.compareTo(BigDecimal.ZERO) == 0) {
             return true;
         }
         BigDecimal beforeTestValueError = (testValueOne.add(testValueTwo).add(testValueThree)).divide(BigDecimal.valueOf(3), 4, RoundingMode.DOWN);
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java
index 903f6ea..4357627 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java
@@ -14,7 +14,7 @@
 @Data
 public class MeasureInfoCalculateHandleRequest {
     @ApiModelProperty(value = "检定项分类名称", dataType = "String")
-    private String itemCategoryName;
+        private String itemCategoryName;
 
     @ApiModelProperty(value = "检校标准装置", dataType = "String")
     private String belongStandardEquipment;

diff --git a/casic-metering-api/src/main/build/bin/start.sh b/casic-metering-api/src/main/build/bin/start.sh
index b312cdc..d66853c 100644
--- a/casic-metering-api/src/main/build/bin/start.sh
+++ b/casic-metering-api/src/main/build/bin/start.sh
@@ -1 +1 @@
-nohup java -jar ./lib/casic-metering-api-1.1.0.jar > /dev/null 2>&1 &
\ No newline at end of file
+nohup java -jar ./lib/casic-metering-api-1.2.0.jar > /dev/null 2>&1 &
\ No newline at end of file
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 2d2bd12..b249e59 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -19,6 +19,7 @@
     PARAMS_NULL(2301, "参数不能为空"),
     PROCESS_ID_NULL(2302, "流程实例id不能为空"),
     DUPLICATE_NUMBER(2303, "编号生成重复，请重新提交"),
+    DUPLICATE_NUMBER_ONE(2303, "编号重复，请重新提交"),
     PARAM_INVALID(2304, "参数不合法"),
     LOGIN_USER_ACQUIRE_FAILED(2305, "无法获取登录者用户信息，请尝试重新登录再进行操作"),
     LABEL_IS_EMPTY(2306, "标签字段为空，无法绑定"),
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java
index 3bd555f..07a6312 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java
@@ -1717,6 +1717,9 @@
                     String cycleSignalUnit = measureData.getCycleSignalUnit();
                     BigDecimal convertCycleSignal = UnitConvertUtil.timeConvert(cycleSignal, cycleSignalUnit, "ns");
                     BigDecimal timeBaseAbsoluteError = new BigDecimal(measureData.getTimeBaseAbsoluteError());
+                    if (convertCycleSignal.compareTo(BigDecimal.ZERO) == 0) {
+                        continue;
+                    }
                     BigDecimal timeBaseRelativeError = timeBaseAbsoluteError.divide(convertCycleSignal, 20, RoundingMode.DOWN);
                     measureData.setTimeBaseRelativeError(String.valueOf(timeBaseRelativeError));
                     String symbol = measureData.getTechnicalIndexSymbol();
@@ -1806,6 +1809,9 @@
                     }
                     BigDecimal nominalValue = new BigDecimal(measureData.getNominalValue());
                     BigDecimal measureValue = new BigDecimal(measureData.getMeasureValue());
+                    if (measureValue.compareTo(BigDecimal.ZERO) == 0) {
+                        continue;
+                    }
                     BigDecimal beforeBeforeRelativeError = (nominalValue.subtract(measureValue)).divide(measureValue, 6, RoundingMode.DOWN);
                     BigDecimal beforeRelativeError = beforeBeforeRelativeError.multiply(BigDecimal.valueOf(100));
                     String relativeError = relativeErrorScaleHandle(beforeRelativeError) + "%";
@@ -2266,7 +2272,7 @@
         measureData.setTestValueThree(String.valueOf(testValueThree));
         //测量值误差 = ((测量值1+测量值2+测量值3)/3-标称值)/标称值，有保留小数规则
         BigDecimal nominalValue = new BigDecimal(measureData.getNominalValue());
-        if (nominalValue.compareTo(BigDecimal.valueOf(0)) == 0) {
+        if (nominalValue.compareTo(BigDecimal.ZERO) == 0) {
             return true;
         }
         BigDecimal beforeTestValueError = (testValueOne.add(testValueTwo).add(testValueThree)).divide(BigDecimal.valueOf(3), 4, RoundingMode.DOWN);
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java
index 903f6ea..4357627 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java
@@ -14,7 +14,7 @@
 @Data
 public class MeasureInfoCalculateHandleRequest {
     @ApiModelProperty(value = "检定项分类名称", dataType = "String")
-    private String itemCategoryName;
+        private String itemCategoryName;
 
     @ApiModelProperty(value = "检校标准装置", dataType = "String")
     private String belongStandardEquipment;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemConfigRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemConfigRequest.java
index da2b567..e1356a5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemConfigRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemConfigRequest.java
@@ -90,7 +90,7 @@
     @ApiModelProperty(value = "平均噪声电平(频谱分析仪)", dataType = "Integer")
     private Integer averageNoiseLevel;
 
-    @ApiModelProperty(value = "谐波失真(频谱分析仪)", dataType = "Integer")
+    @ApiModelProperty(value = "谐波失真(频谱分析仪)/(低频信号源)", dataType = "Integer")
     private Integer harmonicDistortion;
 
     @ApiModelProperty(value = "输入衰减(频谱分析仪)", dataType = "Integer")
@@ -123,7 +123,7 @@
     @ApiModelProperty(value = "触发灵敏度(示波器-数字)", dataType = "Integer")
     private Integer triggerSensitivity;
 
-    @ApiModelProperty(value = "上升时间(示波器-数字/模拟)", dataType = "Integer")
+    @ApiModelProperty(value = "上升时间(示波器-数字/模拟)/(低频信号源)", dataType = "Integer")
     private Integer riseTime;
 
     @ApiModelProperty(value = "输入电阻(示波器-数字/模拟)", dataType = "Integer")

diff --git a/casic-metering-api/src/main/build/bin/start.sh b/casic-metering-api/src/main/build/bin/start.sh
index b312cdc..d66853c 100644
--- a/casic-metering-api/src/main/build/bin/start.sh
+++ b/casic-metering-api/src/main/build/bin/start.sh
@@ -1 +1 @@
-nohup java -jar ./lib/casic-metering-api-1.1.0.jar > /dev/null 2>&1 &
\ No newline at end of file
+nohup java -jar ./lib/casic-metering-api-1.2.0.jar > /dev/null 2>&1 &
\ No newline at end of file
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 2d2bd12..b249e59 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -19,6 +19,7 @@
     PARAMS_NULL(2301, "参数不能为空"),
     PROCESS_ID_NULL(2302, "流程实例id不能为空"),
     DUPLICATE_NUMBER(2303, "编号生成重复，请重新提交"),
+    DUPLICATE_NUMBER_ONE(2303, "编号重复，请重新提交"),
     PARAM_INVALID(2304, "参数不合法"),
     LOGIN_USER_ACQUIRE_FAILED(2305, "无法获取登录者用户信息，请尝试重新登录再进行操作"),
     LABEL_IS_EMPTY(2306, "标签字段为空，无法绑定"),
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java
index 3bd555f..07a6312 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java
@@ -1717,6 +1717,9 @@
                     String cycleSignalUnit = measureData.getCycleSignalUnit();
                     BigDecimal convertCycleSignal = UnitConvertUtil.timeConvert(cycleSignal, cycleSignalUnit, "ns");
                     BigDecimal timeBaseAbsoluteError = new BigDecimal(measureData.getTimeBaseAbsoluteError());
+                    if (convertCycleSignal.compareTo(BigDecimal.ZERO) == 0) {
+                        continue;
+                    }
                     BigDecimal timeBaseRelativeError = timeBaseAbsoluteError.divide(convertCycleSignal, 20, RoundingMode.DOWN);
                     measureData.setTimeBaseRelativeError(String.valueOf(timeBaseRelativeError));
                     String symbol = measureData.getTechnicalIndexSymbol();
@@ -1806,6 +1809,9 @@
                     }
                     BigDecimal nominalValue = new BigDecimal(measureData.getNominalValue());
                     BigDecimal measureValue = new BigDecimal(measureData.getMeasureValue());
+                    if (measureValue.compareTo(BigDecimal.ZERO) == 0) {
+                        continue;
+                    }
                     BigDecimal beforeBeforeRelativeError = (nominalValue.subtract(measureValue)).divide(measureValue, 6, RoundingMode.DOWN);
                     BigDecimal beforeRelativeError = beforeBeforeRelativeError.multiply(BigDecimal.valueOf(100));
                     String relativeError = relativeErrorScaleHandle(beforeRelativeError) + "%";
@@ -2266,7 +2272,7 @@
         measureData.setTestValueThree(String.valueOf(testValueThree));
         //测量值误差 = ((测量值1+测量值2+测量值3)/3-标称值)/标称值，有保留小数规则
         BigDecimal nominalValue = new BigDecimal(measureData.getNominalValue());
-        if (nominalValue.compareTo(BigDecimal.valueOf(0)) == 0) {
+        if (nominalValue.compareTo(BigDecimal.ZERO) == 0) {
             return true;
         }
         BigDecimal beforeTestValueError = (testValueOne.add(testValueTwo).add(testValueThree)).divide(BigDecimal.valueOf(3), 4, RoundingMode.DOWN);
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java
index 903f6ea..4357627 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java
@@ -14,7 +14,7 @@
 @Data
 public class MeasureInfoCalculateHandleRequest {
     @ApiModelProperty(value = "检定项分类名称", dataType = "String")
-    private String itemCategoryName;
+        private String itemCategoryName;
 
     @ApiModelProperty(value = "检校标准装置", dataType = "String")
     private String belongStandardEquipment;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemConfigRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemConfigRequest.java
index da2b567..e1356a5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemConfigRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemConfigRequest.java
@@ -90,7 +90,7 @@
     @ApiModelProperty(value = "平均噪声电平(频谱分析仪)", dataType = "Integer")
     private Integer averageNoiseLevel;
 
-    @ApiModelProperty(value = "谐波失真(频谱分析仪)", dataType = "Integer")
+    @ApiModelProperty(value = "谐波失真(频谱分析仪)/(低频信号源)", dataType = "Integer")
     private Integer harmonicDistortion;
 
     @ApiModelProperty(value = "输入衰减(频谱分析仪)", dataType = "Integer")
@@ -123,7 +123,7 @@
     @ApiModelProperty(value = "触发灵敏度(示波器-数字)", dataType = "Integer")
     private Integer triggerSensitivity;
 
-    @ApiModelProperty(value = "上升时间(示波器-数字/模拟)", dataType = "Integer")
+    @ApiModelProperty(value = "上升时间(示波器-数字/模拟)/(低频信号源)", dataType = "Integer")
     private Integer riseTime;
 
     @ApiModelProperty(value = "输入电阻(示波器-数字/模拟)", dataType = "Integer")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java
index b0b1090..acd20d4 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java
@@ -236,7 +236,7 @@
     @TableField("average_noise_level")
     private Integer averageNoiseLevel;
 
-    @ApiModelProperty(value = "谐波失真(频谱分析仪)", dataType = "Integer")
+    @ApiModelProperty(value = "谐波失真(频谱分析仪)/(低频信号源)", dataType = "Integer")
     @TableField("harmonic_distortion")
     private Integer harmonicDistortion;
 
@@ -280,7 +280,7 @@
     @TableField("trigger_sensitivity")
     private Integer triggerSensitivity;
 
-    @ApiModelProperty(value = "上升时间(示波器-数字/模拟)", dataType = "Integer")
+    @ApiModelProperty(value = "上升时间(示波器-数字/模拟)/(低频信号源)", dataType = "Integer")
     @TableField("rise_time")
     private Integer riseTime;
 

diff --git a/casic-metering-api/src/main/build/bin/start.sh b/casic-metering-api/src/main/build/bin/start.sh
index b312cdc..d66853c 100644
--- a/casic-metering-api/src/main/build/bin/start.sh
+++ b/casic-metering-api/src/main/build/bin/start.sh
@@ -1 +1 @@
-nohup java -jar ./lib/casic-metering-api-1.1.0.jar > /dev/null 2>&1 &
\ No newline at end of file
+nohup java -jar ./lib/casic-metering-api-1.2.0.jar > /dev/null 2>&1 &
\ No newline at end of file
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 2d2bd12..b249e59 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -19,6 +19,7 @@
     PARAMS_NULL(2301, "参数不能为空"),
     PROCESS_ID_NULL(2302, "流程实例id不能为空"),
     DUPLICATE_NUMBER(2303, "编号生成重复，请重新提交"),
+    DUPLICATE_NUMBER_ONE(2303, "编号重复，请重新提交"),
     PARAM_INVALID(2304, "参数不合法"),
     LOGIN_USER_ACQUIRE_FAILED(2305, "无法获取登录者用户信息，请尝试重新登录再进行操作"),
     LABEL_IS_EMPTY(2306, "标签字段为空，无法绑定"),
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java
index 3bd555f..07a6312 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java
@@ -1717,6 +1717,9 @@
                     String cycleSignalUnit = measureData.getCycleSignalUnit();
                     BigDecimal convertCycleSignal = UnitConvertUtil.timeConvert(cycleSignal, cycleSignalUnit, "ns");
                     BigDecimal timeBaseAbsoluteError = new BigDecimal(measureData.getTimeBaseAbsoluteError());
+                    if (convertCycleSignal.compareTo(BigDecimal.ZERO) == 0) {
+                        continue;
+                    }
                     BigDecimal timeBaseRelativeError = timeBaseAbsoluteError.divide(convertCycleSignal, 20, RoundingMode.DOWN);
                     measureData.setTimeBaseRelativeError(String.valueOf(timeBaseRelativeError));
                     String symbol = measureData.getTechnicalIndexSymbol();
@@ -1806,6 +1809,9 @@
                     }
                     BigDecimal nominalValue = new BigDecimal(measureData.getNominalValue());
                     BigDecimal measureValue = new BigDecimal(measureData.getMeasureValue());
+                    if (measureValue.compareTo(BigDecimal.ZERO) == 0) {
+                        continue;
+                    }
                     BigDecimal beforeBeforeRelativeError = (nominalValue.subtract(measureValue)).divide(measureValue, 6, RoundingMode.DOWN);
                     BigDecimal beforeRelativeError = beforeBeforeRelativeError.multiply(BigDecimal.valueOf(100));
                     String relativeError = relativeErrorScaleHandle(beforeRelativeError) + "%";
@@ -2266,7 +2272,7 @@
         measureData.setTestValueThree(String.valueOf(testValueThree));
         //测量值误差 = ((测量值1+测量值2+测量值3)/3-标称值)/标称值，有保留小数规则
         BigDecimal nominalValue = new BigDecimal(measureData.getNominalValue());
-        if (nominalValue.compareTo(BigDecimal.valueOf(0)) == 0) {
+        if (nominalValue.compareTo(BigDecimal.ZERO) == 0) {
             return true;
         }
         BigDecimal beforeTestValueError = (testValueOne.add(testValueTwo).add(testValueThree)).divide(BigDecimal.valueOf(3), 4, RoundingMode.DOWN);
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java
index 903f6ea..4357627 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java
@@ -14,7 +14,7 @@
 @Data
 public class MeasureInfoCalculateHandleRequest {
     @ApiModelProperty(value = "检定项分类名称", dataType = "String")
-    private String itemCategoryName;
+        private String itemCategoryName;
 
     @ApiModelProperty(value = "检校标准装置", dataType = "String")
     private String belongStandardEquipment;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemConfigRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemConfigRequest.java
index da2b567..e1356a5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemConfigRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemConfigRequest.java
@@ -90,7 +90,7 @@
     @ApiModelProperty(value = "平均噪声电平(频谱分析仪)", dataType = "Integer")
     private Integer averageNoiseLevel;
 
-    @ApiModelProperty(value = "谐波失真(频谱分析仪)", dataType = "Integer")
+    @ApiModelProperty(value = "谐波失真(频谱分析仪)/(低频信号源)", dataType = "Integer")
     private Integer harmonicDistortion;
 
     @ApiModelProperty(value = "输入衰减(频谱分析仪)", dataType = "Integer")
@@ -123,7 +123,7 @@
     @ApiModelProperty(value = "触发灵敏度(示波器-数字)", dataType = "Integer")
     private Integer triggerSensitivity;
 
-    @ApiModelProperty(value = "上升时间(示波器-数字/模拟)", dataType = "Integer")
+    @ApiModelProperty(value = "上升时间(示波器-数字/模拟)/(低频信号源)", dataType = "Integer")
     private Integer riseTime;
 
     @ApiModelProperty(value = "输入电阻(示波器-数字/模拟)", dataType = "Integer")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java
index b0b1090..acd20d4 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java
@@ -236,7 +236,7 @@
     @TableField("average_noise_level")
     private Integer averageNoiseLevel;
 
-    @ApiModelProperty(value = "谐波失真(频谱分析仪)", dataType = "Integer")
+    @ApiModelProperty(value = "谐波失真(频谱分析仪)/(低频信号源)", dataType = "Integer")
     @TableField("harmonic_distortion")
     private Integer harmonicDistortion;
 
@@ -280,7 +280,7 @@
     @TableField("trigger_sensitivity")
     private Integer triggerSensitivity;
 
-    @ApiModelProperty(value = "上升时间(示波器-数字/模拟)", dataType = "Integer")
+    @ApiModelProperty(value = "上升时间(示波器-数字/模拟)/(低频信号源)", dataType = "Integer")
     @TableField("rise_time")
     private Integer riseTime;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralMeasureItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralMeasureItemServiceImpl.java
index f389077..7883b98 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralMeasureItemServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralMeasureItemServiceImpl.java
@@ -167,6 +167,8 @@
             belongStandardEquipment = MeasureItemBelongStandardEquipmentDictEnum.E2_WEIGHT;
         } else if (!CollectionUtils.isEmpty(configRequest.getMeasureItemDataOscilloscopeList())) {
             belongStandardEquipment = MeasureItemBelongStandardEquipmentDictEnum.OSCILLOSCOPE;
+        } else if (!CollectionUtils.isEmpty(configRequest.getMeasureItemDataCesiumAtomList())) {
+            belongStandardEquipment = MeasureItemBelongStandardEquipmentDictEnum.CESIUM_ATOM;
         }
         return MeasureConfig.measureItemDataServiceMap.get(belongStandardEquipment);
     }

diff --git a/casic-metering-api/src/main/build/bin/start.sh b/casic-metering-api/src/main/build/bin/start.sh
index b312cdc..d66853c 100644
--- a/casic-metering-api/src/main/build/bin/start.sh
+++ b/casic-metering-api/src/main/build/bin/start.sh
@@ -1 +1 @@
-nohup java -jar ./lib/casic-metering-api-1.1.0.jar > /dev/null 2>&1 &
\ No newline at end of file
+nohup java -jar ./lib/casic-metering-api-1.2.0.jar > /dev/null 2>&1 &
\ No newline at end of file
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 2d2bd12..b249e59 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -19,6 +19,7 @@
     PARAMS_NULL(2301, "参数不能为空"),
     PROCESS_ID_NULL(2302, "流程实例id不能为空"),
     DUPLICATE_NUMBER(2303, "编号生成重复，请重新提交"),
+    DUPLICATE_NUMBER_ONE(2303, "编号重复，请重新提交"),
     PARAM_INVALID(2304, "参数不合法"),
     LOGIN_USER_ACQUIRE_FAILED(2305, "无法获取登录者用户信息，请尝试重新登录再进行操作"),
     LABEL_IS_EMPTY(2306, "标签字段为空，无法绑定"),
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java
index 3bd555f..07a6312 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/MeasureInfoFormulaCalculateUtil.java
@@ -1717,6 +1717,9 @@
                     String cycleSignalUnit = measureData.getCycleSignalUnit();
                     BigDecimal convertCycleSignal = UnitConvertUtil.timeConvert(cycleSignal, cycleSignalUnit, "ns");
                     BigDecimal timeBaseAbsoluteError = new BigDecimal(measureData.getTimeBaseAbsoluteError());
+                    if (convertCycleSignal.compareTo(BigDecimal.ZERO) == 0) {
+                        continue;
+                    }
                     BigDecimal timeBaseRelativeError = timeBaseAbsoluteError.divide(convertCycleSignal, 20, RoundingMode.DOWN);
                     measureData.setTimeBaseRelativeError(String.valueOf(timeBaseRelativeError));
                     String symbol = measureData.getTechnicalIndexSymbol();
@@ -1806,6 +1809,9 @@
                     }
                     BigDecimal nominalValue = new BigDecimal(measureData.getNominalValue());
                     BigDecimal measureValue = new BigDecimal(measureData.getMeasureValue());
+                    if (measureValue.compareTo(BigDecimal.ZERO) == 0) {
+                        continue;
+                    }
                     BigDecimal beforeBeforeRelativeError = (nominalValue.subtract(measureValue)).divide(measureValue, 6, RoundingMode.DOWN);
                     BigDecimal beforeRelativeError = beforeBeforeRelativeError.multiply(BigDecimal.valueOf(100));
                     String relativeError = relativeErrorScaleHandle(beforeRelativeError) + "%";
@@ -2266,7 +2272,7 @@
         measureData.setTestValueThree(String.valueOf(testValueThree));
         //测量值误差 = ((测量值1+测量值2+测量值3)/3-标称值)/标称值，有保留小数规则
         BigDecimal nominalValue = new BigDecimal(measureData.getNominalValue());
-        if (nominalValue.compareTo(BigDecimal.valueOf(0)) == 0) {
+        if (nominalValue.compareTo(BigDecimal.ZERO) == 0) {
             return true;
         }
         BigDecimal beforeTestValueError = (testValueOne.add(testValueTwo).add(testValueThree)).divide(BigDecimal.valueOf(3), 4, RoundingMode.DOWN);
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java
index 903f6ea..4357627 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureInfoCalculateHandleRequest.java
@@ -14,7 +14,7 @@
 @Data
 public class MeasureInfoCalculateHandleRequest {
     @ApiModelProperty(value = "检定项分类名称", dataType = "String")
-    private String itemCategoryName;
+        private String itemCategoryName;
 
     @ApiModelProperty(value = "检校标准装置", dataType = "String")
     private String belongStandardEquipment;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemConfigRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemConfigRequest.java
index da2b567..e1356a5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemConfigRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureItemConfigRequest.java
@@ -90,7 +90,7 @@
     @ApiModelProperty(value = "平均噪声电平(频谱分析仪)", dataType = "Integer")
     private Integer averageNoiseLevel;
 
-    @ApiModelProperty(value = "谐波失真(频谱分析仪)", dataType = "Integer")
+    @ApiModelProperty(value = "谐波失真(频谱分析仪)/(低频信号源)", dataType = "Integer")
     private Integer harmonicDistortion;
 
     @ApiModelProperty(value = "输入衰减(频谱分析仪)", dataType = "Integer")
@@ -123,7 +123,7 @@
     @ApiModelProperty(value = "触发灵敏度(示波器-数字)", dataType = "Integer")
     private Integer triggerSensitivity;
 
-    @ApiModelProperty(value = "上升时间(示波器-数字/模拟)", dataType = "Integer")
+    @ApiModelProperty(value = "上升时间(示波器-数字/模拟)/(低频信号源)", dataType = "Integer")
     private Integer riseTime;
 
     @ApiModelProperty(value = "输入电阻(示波器-数字/模拟)", dataType = "Integer")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java
index b0b1090..acd20d4 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java
@@ -236,7 +236,7 @@
     @TableField("average_noise_level")
     private Integer averageNoiseLevel;
 
-    @ApiModelProperty(value = "谐波失真(频谱分析仪)", dataType = "Integer")
+    @ApiModelProperty(value = "谐波失真(频谱分析仪)/(低频信号源)", dataType = "Integer")
     @TableField("harmonic_distortion")
     private Integer harmonicDistortion;
 
@@ -280,7 +280,7 @@
     @TableField("trigger_sensitivity")
     private Integer triggerSensitivity;
 
-    @ApiModelProperty(value = "上升时间(示波器-数字/模拟)", dataType = "Integer")
+    @ApiModelProperty(value = "上升时间(示波器-数字/模拟)/(低频信号源)", dataType = "Integer")
     @TableField("rise_time")
     private Integer riseTime;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralMeasureItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralMeasureItemServiceImpl.java
index f389077..7883b98 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralMeasureItemServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralMeasureItemServiceImpl.java
@@ -167,6 +167,8 @@
             belongStandardEquipment = MeasureItemBelongStandardEquipmentDictEnum.E2_WEIGHT;
         } else if (!CollectionUtils.isEmpty(configRequest.getMeasureItemDataOscilloscopeList())) {
             belongStandardEquipment = MeasureItemBelongStandardEquipmentDictEnum.OSCILLOSCOPE;
+        } else if (!CollectionUtils.isEmpty(configRequest.getMeasureItemDataCesiumAtomList())) {
+            belongStandardEquipment = MeasureItemBelongStandardEquipmentDictEnum.CESIUM_ATOM;
         }
         return MeasureConfig.measureItemDataServiceMap.get(belongStandardEquipment);
     }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java
index 056fd41..b177a69 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceCustomerExamineFormServiceImpl.java
@@ -29,6 +29,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
@@ -60,8 +61,17 @@
         String labCode = request.getLabCode();
         String groupCode = request.getGroupCode();
         Long maxNo = this.baseMapper.selectMaxFormNo();
-        String reportNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.SUGGEST_FORM, groupCode, maxNo);
-        request.setFormNo(reportNo);
+        if (StringUtils.isEmpty(request.getFormNo())) {
+            String reportNo = NoGeneratorUtil.getCode(NoGenerateFileCodeEnum.F, labCode, NoGenerateRecordTypeCodeEnum.SUGGEST_FORM, groupCode, maxNo);
+            request.setFormNo(reportNo);
+        } else {
+            QueryWrapper<BizResourceCustomerExamineForm> wrapper = new QueryWrapper<>();
+            wrapper.eq("form_no", request.getFormNo());
+            Long count = this.baseMapper.selectCount(wrapper);
+            if (count > 0) {
+                throw new BusinessException(BusinessExceptionEnum.DUPLICATE_NUMBER_ONE);
+            }
+        }
         request.setCreateUserId(request.getUserId());
         request.setCreateUserName(request.getUserName());
         request.setSignStatus(SignStatusDictEnum.TO_APPROVAL.getCode());
@@ -82,6 +92,22 @@
     }
 
     @Override
+    @Transactional
+    public ReturnDTO draftUpdate(BizResourceCustomerExamineForm request) {
+        QueryWrapper<BizResourceCustomerExamineForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("form_no", request.getFormNo());
+        wrapper.ne("id", request.getId());
+        Long count = this.baseMapper.selectCount(wrapper);
+        if (count > 0) {
+            throw new BusinessException(BusinessExceptionEnum.DUPLICATE_NUMBER_ONE);
+        }
+        if (this.baseMapper.updateById(request) > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+    @Override
     public ReturnDTO sendTo(ExamineFormSendToRequest request) {
         BizResourceCustomerExamineForm examineForm = new BizResourceCustomerExamineForm();
         examineForm.setId(request.getId());