diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java
index ef3aa72..5bb15be 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java
@@ -123,6 +123,11 @@
     @TableField(exist = false)
     private String appearanceRemark;
 
+    @ApiModelProperty(value = "绝缘电阻(0.02活塞打印需要)", dataType = "String")
+    @TableField(exist = false)
+    private String insulationResistance;
+
+
 
     @ApiModelProperty(value = "绝缘电阻备注(0.02活塞打印需要)", dataType = "String")
     @TableField(exist = false)
@@ -136,6 +141,11 @@
     @TableField(exist = false)
     private String zeroDrift;
 
+    @ApiModelProperty(value = "指针平稳性(0.02活塞打印需要)", dataType = "String")
+    @TableField(exist = false)
+    private String pointerDeflectionStability;
+
+
     @ApiModelProperty(value = "零位漂移误差备注(0.02活塞打印需要)", dataType = "String")
     @TableField(exist = false)
     private String pointerDeflectionStabilityRemark;
@@ -196,7 +206,7 @@
     private String createUserName;
 
     @ApiModelProperty(value = "计量标识(前端要传)", dataType = "String")
-    @TableField(exist = false)
+    @TableField("meter_identify")
     private String meterIdentify;
 
     /**
@@ -273,7 +283,7 @@
 
     @ExcelProperty(value = "测试、校准或检定日期", order = 8)
     @ApiModelProperty(value = "测试、校准或检定日期（列表&详情返回参数）", dataType = "String")
-    @TableField(exist = false)
+    @TableField("trace_date")
     private String traceDate;
 
     @ApiModelProperty(value = "设备检定项分类名字(前端必传，打印需要)", dataType = "String")
@@ -340,7 +350,7 @@
     private String restrictionInstruction;
 
     @ApiModelProperty(value = "检定有效日期(前端必传，打印需要)", dataType = "String")
-    @TableField(exist = false)
+    @TableField("measure_valid_date")
     private String measureValidDate;
 
     @ApiModelProperty(value = "依据的技术文件(前端必传，打印需要)", dataType = "String")

diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java
index ef3aa72..5bb15be 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java
@@ -123,6 +123,11 @@
     @TableField(exist = false)
     private String appearanceRemark;
 
+    @ApiModelProperty(value = "绝缘电阻(0.02活塞打印需要)", dataType = "String")
+    @TableField(exist = false)
+    private String insulationResistance;
+
+
 
     @ApiModelProperty(value = "绝缘电阻备注(0.02活塞打印需要)", dataType = "String")
     @TableField(exist = false)
@@ -136,6 +141,11 @@
     @TableField(exist = false)
     private String zeroDrift;
 
+    @ApiModelProperty(value = "指针平稳性(0.02活塞打印需要)", dataType = "String")
+    @TableField(exist = false)
+    private String pointerDeflectionStability;
+
+
     @ApiModelProperty(value = "零位漂移误差备注(0.02活塞打印需要)", dataType = "String")
     @TableField(exist = false)
     private String pointerDeflectionStabilityRemark;
@@ -196,7 +206,7 @@
     private String createUserName;
 
     @ApiModelProperty(value = "计量标识(前端要传)", dataType = "String")
-    @TableField(exist = false)
+    @TableField("meter_identify")
     private String meterIdentify;
 
     /**
@@ -273,7 +283,7 @@
 
     @ExcelProperty(value = "测试、校准或检定日期", order = 8)
     @ApiModelProperty(value = "测试、校准或检定日期（列表&详情返回参数）", dataType = "String")
-    @TableField(exist = false)
+    @TableField("trace_date")
     private String traceDate;
 
     @ApiModelProperty(value = "设备检定项分类名字(前端必传，打印需要)", dataType = "String")
@@ -340,7 +350,7 @@
     private String restrictionInstruction;
 
     @ApiModelProperty(value = "检定有效日期(前端必传，打印需要)", dataType = "String")
-    @TableField(exist = false)
+    @TableField("measure_valid_date")
     private String measureValidDate;
 
     @ApiModelProperty(value = "依据的技术文件(前端必传，打印需要)", dataType = "String")
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
index 943c8f7..e023b35 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
@@ -99,19 +99,20 @@
         customOriginUrls.add(oldOriginRecordFile);
         SnowflakeUtil snowflakeUtil = new SnowflakeUtil();
         Map<String, Object> map2 = BeanUtil.beanToMap(deviceMeasureApproval);
+
         map2.put("id", snowflakeUtil.nextId());
         if (StringUtils.isNotEmpty(oldOriginRecordFile)) {
             //生成证书报告的,需要改变为动态选择性
             originFutureTask = CompletableFuture.supplyAsync(
                     () -> printFileRegister.registerPrintFile(ORIGINAL_RECORD_APPROVAL, "数据打印", null, map2, true, null, customOriginUrls), threadPool);
-            if (parallelCreateFile(originFutureTask, certificateFutureTask, id, map)) {
+            if (parallelCreateFile(originFutureTask, certificateFutureTask, id, map,deviceMeasureApproval)) {
                 return;
             }
         }
-        singleCreateFile(originFutureTask, certificateFutureTask, id, map);
+        singleCreateFile(originFutureTask, certificateFutureTask, id, map,deviceMeasureApproval);
     }
 
-    private void singleCreateFile(CompletableFuture<String> originFutureTask, CompletableFuture<String> certificateFutureTask, Long id, Map<String, Object> map) {
+    private void singleCreateFile(CompletableFuture<String> originFutureTask, CompletableFuture<String> certificateFutureTask, Long id, Map<String, Object> map,BizBusinessDeviceMeasureApproval oldMeasureApproval) {
         if (certificateFutureTask != null) {
             certificateFutureTask.thenRun(
                     () -> {
@@ -125,7 +126,7 @@
                             }
                             //更新记录
                             int updateFlag = bizBusinessMapper.updateById(measureApproval);
-                            saveCertificatePrintInfo(measureApproval);
+                            saveCertificatePrintInfo(oldMeasureApproval);
                             Assert.isFalse(updateFlag <= 0, () -> {
                                 throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED);
                             });
@@ -155,7 +156,7 @@
         }
     }
 
-    private Boolean parallelCreateFile(CompletableFuture<String> originFutureTask, CompletableFuture<String> certificateFutureTask, Long id, Map<String, Object> map) {
+    private Boolean parallelCreateFile(CompletableFuture<String> originFutureTask, CompletableFuture<String> certificateFutureTask, Long id, Map<String, Object> map,BizBusinessDeviceMeasureApproval oldMeasureApproval) {
         if (certificateFutureTask != null && originFutureTask != null) {
             CompletableFuture<String> tempCertificateFutureTask = certificateFutureTask;
             CompletableFuture<String> tempOriginFutureTask = originFutureTask;
@@ -174,7 +175,7 @@
                             }
                             //更新记录
                             int updateFlag = bizBusinessMapper.updateById(measureApproval);
-                            saveCertificatePrintInfo(measureApproval);
+                            saveCertificatePrintInfo(oldMeasureApproval);
                             Assert.isFalse(updateFlag <= 0, () -> {
                                 throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED);
                             });

diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java
index ef3aa72..5bb15be 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java
@@ -123,6 +123,11 @@
     @TableField(exist = false)
     private String appearanceRemark;
 
+    @ApiModelProperty(value = "绝缘电阻(0.02活塞打印需要)", dataType = "String")
+    @TableField(exist = false)
+    private String insulationResistance;
+
+
 
     @ApiModelProperty(value = "绝缘电阻备注(0.02活塞打印需要)", dataType = "String")
     @TableField(exist = false)
@@ -136,6 +141,11 @@
     @TableField(exist = false)
     private String zeroDrift;
 
+    @ApiModelProperty(value = "指针平稳性(0.02活塞打印需要)", dataType = "String")
+    @TableField(exist = false)
+    private String pointerDeflectionStability;
+
+
     @ApiModelProperty(value = "零位漂移误差备注(0.02活塞打印需要)", dataType = "String")
     @TableField(exist = false)
     private String pointerDeflectionStabilityRemark;
@@ -196,7 +206,7 @@
     private String createUserName;
 
     @ApiModelProperty(value = "计量标识(前端要传)", dataType = "String")
-    @TableField(exist = false)
+    @TableField("meter_identify")
     private String meterIdentify;
 
     /**
@@ -273,7 +283,7 @@
 
     @ExcelProperty(value = "测试、校准或检定日期", order = 8)
     @ApiModelProperty(value = "测试、校准或检定日期（列表&详情返回参数）", dataType = "String")
-    @TableField(exist = false)
+    @TableField("trace_date")
     private String traceDate;
 
     @ApiModelProperty(value = "设备检定项分类名字(前端必传，打印需要)", dataType = "String")
@@ -340,7 +350,7 @@
     private String restrictionInstruction;
 
     @ApiModelProperty(value = "检定有效日期(前端必传，打印需要)", dataType = "String")
-    @TableField(exist = false)
+    @TableField("measure_valid_date")
     private String measureValidDate;
 
     @ApiModelProperty(value = "依据的技术文件(前端必传，打印需要)", dataType = "String")
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
index 943c8f7..e023b35 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
@@ -99,19 +99,20 @@
         customOriginUrls.add(oldOriginRecordFile);
         SnowflakeUtil snowflakeUtil = new SnowflakeUtil();
         Map<String, Object> map2 = BeanUtil.beanToMap(deviceMeasureApproval);
+
         map2.put("id", snowflakeUtil.nextId());
         if (StringUtils.isNotEmpty(oldOriginRecordFile)) {
             //生成证书报告的,需要改变为动态选择性
             originFutureTask = CompletableFuture.supplyAsync(
                     () -> printFileRegister.registerPrintFile(ORIGINAL_RECORD_APPROVAL, "数据打印", null, map2, true, null, customOriginUrls), threadPool);
-            if (parallelCreateFile(originFutureTask, certificateFutureTask, id, map)) {
+            if (parallelCreateFile(originFutureTask, certificateFutureTask, id, map,deviceMeasureApproval)) {
                 return;
             }
         }
-        singleCreateFile(originFutureTask, certificateFutureTask, id, map);
+        singleCreateFile(originFutureTask, certificateFutureTask, id, map,deviceMeasureApproval);
     }
 
-    private void singleCreateFile(CompletableFuture<String> originFutureTask, CompletableFuture<String> certificateFutureTask, Long id, Map<String, Object> map) {
+    private void singleCreateFile(CompletableFuture<String> originFutureTask, CompletableFuture<String> certificateFutureTask, Long id, Map<String, Object> map,BizBusinessDeviceMeasureApproval oldMeasureApproval) {
         if (certificateFutureTask != null) {
             certificateFutureTask.thenRun(
                     () -> {
@@ -125,7 +126,7 @@
                             }
                             //更新记录
                             int updateFlag = bizBusinessMapper.updateById(measureApproval);
-                            saveCertificatePrintInfo(measureApproval);
+                            saveCertificatePrintInfo(oldMeasureApproval);
                             Assert.isFalse(updateFlag <= 0, () -> {
                                 throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED);
                             });
@@ -155,7 +156,7 @@
         }
     }
 
-    private Boolean parallelCreateFile(CompletableFuture<String> originFutureTask, CompletableFuture<String> certificateFutureTask, Long id, Map<String, Object> map) {
+    private Boolean parallelCreateFile(CompletableFuture<String> originFutureTask, CompletableFuture<String> certificateFutureTask, Long id, Map<String, Object> map,BizBusinessDeviceMeasureApproval oldMeasureApproval) {
         if (certificateFutureTask != null && originFutureTask != null) {
             CompletableFuture<String> tempCertificateFutureTask = certificateFutureTask;
             CompletableFuture<String> tempOriginFutureTask = originFutureTask;
@@ -174,7 +175,7 @@
                             }
                             //更新记录
                             int updateFlag = bizBusinessMapper.updateById(measureApproval);
-                            saveCertificatePrintInfo(measureApproval);
+                            saveCertificatePrintInfo(oldMeasureApproval);
                             Assert.isFalse(updateFlag <= 0, () -> {
                                 throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED);
                             });
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java
index 72c5bf4..e894dbf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java
@@ -262,15 +262,16 @@
         }
     }
 
-    protected void checkRemoveList(List<String> indexList, Map measureDataMap, String key, Map map, String titleParam, Integer titleIndex,
+    protected Integer checkRemoveList(List<String> indexList, String key, Map map, String titleParam, Integer titleIndex,
                                    List<ToBeRemoveDataItem> dataItems, Integer tableIndex, String titleKeyWords) {
-        if (measureDataMap.containsKey(key)) {
+        if (map.containsKey(key)) {
             if (StringUtils.isNotEmpty(titleParam)) {
                 map.put(titleParam, indexList.get(titleIndex++));
             }
         } else {
             addDataRemoveItem(dataItems, tableIndex, titleKeyWords);
         }
+        return titleIndex;
     }
 
     /**

diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java
index ef3aa72..5bb15be 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java
@@ -123,6 +123,11 @@
     @TableField(exist = false)
     private String appearanceRemark;
 
+    @ApiModelProperty(value = "绝缘电阻(0.02活塞打印需要)", dataType = "String")
+    @TableField(exist = false)
+    private String insulationResistance;
+
+
 
     @ApiModelProperty(value = "绝缘电阻备注(0.02活塞打印需要)", dataType = "String")
     @TableField(exist = false)
@@ -136,6 +141,11 @@
     @TableField(exist = false)
     private String zeroDrift;
 
+    @ApiModelProperty(value = "指针平稳性(0.02活塞打印需要)", dataType = "String")
+    @TableField(exist = false)
+    private String pointerDeflectionStability;
+
+
     @ApiModelProperty(value = "零位漂移误差备注(0.02活塞打印需要)", dataType = "String")
     @TableField(exist = false)
     private String pointerDeflectionStabilityRemark;
@@ -196,7 +206,7 @@
     private String createUserName;
 
     @ApiModelProperty(value = "计量标识(前端要传)", dataType = "String")
-    @TableField(exist = false)
+    @TableField("meter_identify")
     private String meterIdentify;
 
     /**
@@ -273,7 +283,7 @@
 
     @ExcelProperty(value = "测试、校准或检定日期", order = 8)
     @ApiModelProperty(value = "测试、校准或检定日期（列表&详情返回参数）", dataType = "String")
-    @TableField(exist = false)
+    @TableField("trace_date")
     private String traceDate;
 
     @ApiModelProperty(value = "设备检定项分类名字(前端必传，打印需要)", dataType = "String")
@@ -340,7 +350,7 @@
     private String restrictionInstruction;
 
     @ApiModelProperty(value = "检定有效日期(前端必传，打印需要)", dataType = "String")
-    @TableField(exist = false)
+    @TableField("measure_valid_date")
     private String measureValidDate;
 
     @ApiModelProperty(value = "依据的技术文件(前端必传，打印需要)", dataType = "String")
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
index 943c8f7..e023b35 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
@@ -99,19 +99,20 @@
         customOriginUrls.add(oldOriginRecordFile);
         SnowflakeUtil snowflakeUtil = new SnowflakeUtil();
         Map<String, Object> map2 = BeanUtil.beanToMap(deviceMeasureApproval);
+
         map2.put("id", snowflakeUtil.nextId());
         if (StringUtils.isNotEmpty(oldOriginRecordFile)) {
             //生成证书报告的,需要改变为动态选择性
             originFutureTask = CompletableFuture.supplyAsync(
                     () -> printFileRegister.registerPrintFile(ORIGINAL_RECORD_APPROVAL, "数据打印", null, map2, true, null, customOriginUrls), threadPool);
-            if (parallelCreateFile(originFutureTask, certificateFutureTask, id, map)) {
+            if (parallelCreateFile(originFutureTask, certificateFutureTask, id, map,deviceMeasureApproval)) {
                 return;
             }
         }
-        singleCreateFile(originFutureTask, certificateFutureTask, id, map);
+        singleCreateFile(originFutureTask, certificateFutureTask, id, map,deviceMeasureApproval);
     }
 
-    private void singleCreateFile(CompletableFuture<String> originFutureTask, CompletableFuture<String> certificateFutureTask, Long id, Map<String, Object> map) {
+    private void singleCreateFile(CompletableFuture<String> originFutureTask, CompletableFuture<String> certificateFutureTask, Long id, Map<String, Object> map,BizBusinessDeviceMeasureApproval oldMeasureApproval) {
         if (certificateFutureTask != null) {
             certificateFutureTask.thenRun(
                     () -> {
@@ -125,7 +126,7 @@
                             }
                             //更新记录
                             int updateFlag = bizBusinessMapper.updateById(measureApproval);
-                            saveCertificatePrintInfo(measureApproval);
+                            saveCertificatePrintInfo(oldMeasureApproval);
                             Assert.isFalse(updateFlag <= 0, () -> {
                                 throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED);
                             });
@@ -155,7 +156,7 @@
         }
     }
 
-    private Boolean parallelCreateFile(CompletableFuture<String> originFutureTask, CompletableFuture<String> certificateFutureTask, Long id, Map<String, Object> map) {
+    private Boolean parallelCreateFile(CompletableFuture<String> originFutureTask, CompletableFuture<String> certificateFutureTask, Long id, Map<String, Object> map,BizBusinessDeviceMeasureApproval oldMeasureApproval) {
         if (certificateFutureTask != null && originFutureTask != null) {
             CompletableFuture<String> tempCertificateFutureTask = certificateFutureTask;
             CompletableFuture<String> tempOriginFutureTask = originFutureTask;
@@ -174,7 +175,7 @@
                             }
                             //更新记录
                             int updateFlag = bizBusinessMapper.updateById(measureApproval);
-                            saveCertificatePrintInfo(measureApproval);
+                            saveCertificatePrintInfo(oldMeasureApproval);
                             Assert.isFalse(updateFlag <= 0, () -> {
                                 throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED);
                             });
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java
index 72c5bf4..e894dbf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java
@@ -262,15 +262,16 @@
         }
     }
 
-    protected void checkRemoveList(List<String> indexList, Map measureDataMap, String key, Map map, String titleParam, Integer titleIndex,
+    protected Integer checkRemoveList(List<String> indexList, String key, Map map, String titleParam, Integer titleIndex,
                                    List<ToBeRemoveDataItem> dataItems, Integer tableIndex, String titleKeyWords) {
-        if (measureDataMap.containsKey(key)) {
+        if (map.containsKey(key)) {
             if (StringUtils.isNotEmpty(titleParam)) {
                 map.put(titleParam, indexList.get(titleIndex++));
             }
         } else {
             addDataRemoveItem(dataItems, tableIndex, titleKeyWords);
         }
+        return titleIndex;
     }
 
     /**
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java
index dc85f19..d622679 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java
@@ -153,7 +153,6 @@
                 measureItemInfo.setOutcome("不合格*");
             }
             Map<String, Object> map = BeanUtil.beanToMap(measureItemInfo);
-            List<ToBeRemoveDataItem> dataItems = checkParamRemoveItem(measureItemInfo, map);
             prepareParams(safetyList, map);
             List<String> customTemplateUrls = new ArrayList<>();
             BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class);
@@ -177,6 +176,7 @@
             map.put("resultList", resultList);
             map.put("setPointGaugeList", setPointGaugeList);
             map.put("setPointList", setPointList);
+            List<ToBeRemoveDataItem> dataItems = checkParamRemoveItem(measureItemInfo, map);
             //检定数据
             //这一块逻辑比较复杂
             customTemplateUrls.add(bizBusinessMapper.customTemplateByCategory("1", measureItemInfo.getItemCategoryId()));
@@ -241,7 +241,6 @@
                         .collect(Collectors.toList());
             }
             Map<String, Object> map = BeanUtil.beanToMap(measureItemInfo);
-            List<ToBeRemoveDataItem> dataItems = checkCertificateRemoveItem(measureItemInfo, map);
             //准备封面参数
             readyForCoverParams(map, measureItemInfo.getLabCode());
             customParam(map, measureItemInfo);
@@ -256,6 +255,12 @@
             map.put("resultList", resultList);
             map.put("setPointGaugeList", setPointGaugeList);
             map.put("setPointList", setPointList);
+            List<ToBeRemoveDataItem> dataItems = checkCertificateRemoveItem(measureItemInfo, map);
+//            if (measureItemInfo.getMeasureCategoryName().contains("检定") || measureItemInfo.getMeasureCategoryName().contains("校检")) {
+//                for (ToBeRemoveDataItem dataItem : dataItems) {
+//                    dataItem.setCustomOffset(1);
+//                }
+//            }
             List<String> customTemplateUrls = new ArrayList<>();
             BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class);
             customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", measureItemInfo.getMeasureCategoryName()));
@@ -281,14 +286,13 @@
         }
     }
 
-
     private void customParam(Map<String, Object> map, BizBusinessDeviceMeasureApproval measureItemInfo) {
         map.put("appearanceRemark", StringUtils.isNotEmpty(measureItemInfo.getAppearanceRemark()) ? measureItemInfo.getAppearanceRemark() : "/");//外观
         map.put("pointerDeflectionStabilityRemark", StringUtils.isNotEmpty(measureItemInfo.getPointerDeflectionStabilityRemark()) ? measureItemInfo.getPointerDeflectionStabilityRemark() : "/");//零点漂移
         map.put("tightnessRemark", StringUtils.isNotEmpty(measureItemInfo.getTightnessRemark()) ? measureItemInfo.getTightnessRemark() : "/");//密封性
         map.put("insulationResistanceRemark", StringUtils.isNotEmpty(measureItemInfo.getInsulationResistanceRemark()) ? measureItemInfo.getInsulationResistanceRemark() : "/");//绝缘电阻
         map.put("outcome", StringUtils.isNotEmpty(measureItemInfo.getOutcome()) ? measureItemInfo.getOutcome() : "/");//示值输出备注
-        map.put("otherOutcome", StringUtils.isNotEmpty(measureItemInfo.getOtherOutcome()) ? measureItemInfo.getOtherOutcome() : "/");//设置点输出备注
+        map.put("otherOutcome", StringUtils.isNotEmpty(measureItemInfo.getOtherOutcome()) ? "不合格".equals(measureItemInfo.getOtherOutcome()) ? measureItemInfo.getOtherOutcome() + "*" : measureItemInfo.getOtherOutcome() : "/");//设置点输出备注
         BizBusinessDeviceMeasureDataPistonGauge dataPistonGauge = measureItemInfo.getMeasureDataPistonGaugeList().get(0);
         BizBusinessDeviceMeasureItemConfigPistonGauge pistonGauge = (BizBusinessDeviceMeasureItemConfigPistonGauge) map.get("measureItemConfigPistonGauge");
         map.put("upToStandard", "\uF0A3");
@@ -304,25 +308,21 @@
             map.put("equation", "截距a=" + measureItemInfo.getDataProcessing().getInterceptA() + "，斜率b=" + measureItemInfo.getDataProcessing().getSlopeB());
         }
         if (ObjectUtils.isNotEmpty(pistonGauge)) {
-            convertToValue(map, pistonGauge.getAppearance(), "upAppearance", "belowAppearance");//外观性检查
-            convertToValue(map, pistonGauge.getTightness(), "upTightness", "belowTightness");//密封性
             map.put("rangeUnit", pistonGauge.getRangeUnit());//单位
-            convertToValue(map, pistonGauge.getInsulationResistance(), "upResistance", "belowResistance");//绝缘电阻
-            convertToValue(map, pistonGauge.getPointerDeflectionStability(), "upStability", "belowStability");//指针偏转平稳性
-            convertToValue(map, pistonGauge.getPointerDeflectionStability(), "upOthercome", "belowOthercome");//指针偏转平稳性
-            map.put("zeroDriftResult", pistonGauge.getTightness() ? "合格" : "不合格*");//零点漂移
-            map.put("indicationError", pistonGauge.getIndicationError() ? "合格" : "不合格*");//示值误差、回程误差、轻敲位移
             if (pistonGauge.getZeroDrift()) {//零点漂移
                 map.put("upToStandard", "\uF052");
             } else {
                 map.put("belowStandard", "\uF052");
             }
-        } else {
-            convertIntToValue(map, "appearance", "upAppearance", "belowAppearance");//外观
-            convertIntToValue(map, "tightness", "upTightness", "belowTightness");//密封性
-            convertIntToValue(map, "insulationResistance", "upResistance", "belowResistance");//绝缘电阻
-            convertIntToValue(map, "pointerDeflectionStability", "upStability", "belowStability");//指针偏转平稳性
+        }
+        convertIntToValue(map, "appearance", "upAppearance", "belowAppearance");//外观
+        convertIntToValue(map, "tightness", "upTightness", "belowTightness");//密封性
+        convertIntToValue(map, "insulationResistance", "upResistance", "belowResistance");//绝缘电阻
+        convertIntToValue(map, "pointerDeflectionStability", "upStability", "belowStability");//指针偏转平稳性
+        if (map.containsKey("zeroDriftResult") && ObjectUtils.isNotEmpty(map.get("zeroDriftResult"))) {
             map.put("zeroDriftResult", ((Boolean) map.get("zeroDriftResult")) ? "合格" : "不合格*");//示值误差结果
+        }
+        if (map.containsKey("indicationError") && ObjectUtils.isNotEmpty(map.get("indicationError"))) {
             map.put("indicationError", ((Boolean) map.get("indicationError")) ? "合格" : "不合格*");//示值误差、回程误差、轻敲位移
         }
         map.put("zeroDriftFive", StringUtils.isNotEmpty(dataPistonGauge.getZeroDriftFive()) ? dataPistonGauge.getZeroDriftFive() : "/");//60
@@ -332,17 +332,10 @@
         map.put("zeroDriftTwo", StringUtils.isNotEmpty(dataPistonGauge.getZeroDriftTwo()) ? dataPistonGauge.getZeroDriftTwo() : "/");//15
     }
 
-    private void convertToValue(Map<String, Object> objectMap, boolean upStandard, String upKey, String belowKey) {
-        if (upStandard) {
-            objectMap.put(upKey, upStandard ? "\uF052" : "\uF0A3");
-            objectMap.put(belowKey, upStandard ? "\uF0A3" : "\uF052");
-        }
-    }
-
     private void convertIntToValue(Map<String, Object> objectMap, String key, String upKey, String belowKey) {
-        if (objectMap.containsKey(key)) {
-            objectMap.put(upKey, (Boolean) objectMap.get(key) ? "\uF052" : "\uF0A3");
-            objectMap.put(belowKey, (Boolean) objectMap.get(key) ? "\uF0A3" : "\uF052");
+        if (objectMap.containsKey(key) && ObjectUtils.isNotEmpty(objectMap.get(key))) {
+            objectMap.put(upKey, "1".equals((String) objectMap.get(key)) ? "\uF052" : "\uF0A3");
+            objectMap.put(belowKey, "1".equals((String) objectMap.get(key)) ? "\uF0A3" : "\uF052");
         }
     }
 
@@ -471,77 +464,73 @@
     private List<ToBeRemoveDataItem> checkParamRemoveItem(BizBusinessDeviceMeasureApproval measureItemInfo, Map<String, Object> map) {
         List<ToBeRemoveDataItem> dataItems = new ArrayList<>();
         List<String> indexList = Arrays.asList("一、", "二、", "三、", "四、", "五、", "六、");
-        int titleIndex = 1;
+        int titleIndex = 0;
         //外观及功能性检查  和检定项删除无关系
         if (StringUtils.isEmpty(measureItemInfo.getAppearance())) {
             addDataRemoveItem(dataItems, -1, "外观");
         } else {
             map.put("firstSeq", indexList.get(titleIndex++));
         }
-        Map<String, List<BizBusinessDeviceMeasureDataCalibrator>> measureDataMap = measureItemInfo.getMeasureDataCalibratorList().stream().collect(
-                Collectors.groupingBy(BizBusinessDeviceMeasureDataCalibrator::getParams)
-        );
         //如果是功能校准源，则进行一下删除
         switch (measureItemInfo.getItemCategoryName()) {
             case "电接点一般压力表":
-                checkRemoveList(indexList, measureDataMap, "measureDataPistonGaugeList", map, "secondSeq", titleIndex, dataItems, 3, "示值误差");
-                checkRemoveList(indexList, measureDataMap, "resultList", map, null, titleIndex, dataItems, 4, "outcome");
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
+                titleIndex = checkRemoveList(indexList, "measureDataPistonGaugeList", map, "secondSeq", titleIndex, dataItems, 3, "示值误差");
+                checkRemoveList(indexList, "resultList", map, null, titleIndex, dataItems, 4, "outcome");
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
                     addDataRemoveItem(dataItems, -1, "绝缘电阻");
                 } else {
                     map.put("thirdSeq", indexList.get(titleIndex++));
                 }
-                checkRemoveList(indexList, measureDataMap, "setPointGaugeList", map, "fourthSeq", titleIndex, dataItems, 5, "设定点偏差");
-                checkRemoveList(indexList, measureDataMap, "setPointList", map, null, titleIndex, dataItems, 6, "otherOutcome");
+                titleIndex = checkRemoveList(indexList, "setPointGaugeList", map, "fourthSeq", titleIndex, dataItems, 5, "设定点偏差");
+                checkRemoveList(indexList, "setPointList", map, null, titleIndex, dataItems, 6, "otherOutcome");
                 break;
             case "压力传感器":
                 //封闭性
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getTightness()) {
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getTightness()) {
                     addDataRemoveItem(dataItems, -1, "密封性");
                 } else {
                     map.put("secondSeq", indexList.get(titleIndex++));
                 }
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
                     addDataRemoveItem(dataItems, -1, "绝缘电阻");
                 } else {
                     map.put("thirdSeq", indexList.get(titleIndex++));
                 }
-                checkRemoveList(indexList, measureDataMap, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 3, "检定数据");
-                checkRemoveList(indexList, measureDataMap, "measureDataPistonGaugeList", map, "fifthSeq", titleIndex, dataItems, 4, "数据处理");
+                titleIndex = checkRemoveList(indexList, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 3, "检定数据");
+                checkRemoveList(indexList, "measureDataPistonGaugeList", map, "fifthSeq", titleIndex, dataItems, 4, "数据处理");
                 break;
             case "数字压力计":
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
                     addDataRemoveItem(dataItems, -1, "绝缘电阻");
                 } else {
                     map.put("secondSeq", indexList.get(titleIndex++));
                 }
-                checkRemoveList(indexList, measureDataMap, "zeroDrift", map, "fourthSeq", titleIndex, dataItems, 3, "零点漂移");
                 if (StringUtils.isEmpty(measureItemInfo.getZeroDrift())) {
                     addDataRemoveItem(dataItems, 3, "零点漂移");
                 } else {
                     map.put("thirdSeq", indexList.get(titleIndex++));
                 }
-                checkRemoveList(indexList, measureDataMap, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 4, "示值误差");
-                checkRemoveList(indexList, measureDataMap, "resultList", map, null, titleIndex, dataItems, 5, "outcome");
+                titleIndex = checkRemoveList(indexList, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 4, "示值误差");
+                checkRemoveList(indexList, "resultList", map, null, titleIndex, dataItems, 5, "{{outcome}}");
                 break;
             case "压力变送器":
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getTightness()) {
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getTightness()) {
                     addDataRemoveItem(dataItems, -1, "密封性");
                 } else {
                     map.put("secondSeq", indexList.get(titleIndex++));
                 }
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
                     addDataRemoveItem(dataItems, -1, "绝缘电阻");
                 } else {
                     map.put("thirdSeq", indexList.get(titleIndex++));
                 }
-                checkRemoveList(indexList, measureDataMap, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 3, "回程误差");
-                checkRemoveList(indexList, measureDataMap, "resultList", map, null, titleIndex, dataItems, 4, "outcome");
+                titleIndex = checkRemoveList(indexList, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 3, "回程误差");
+                checkRemoveList(indexList, "resultList", map, null, titleIndex, dataItems, 4, "outcome");
                 break;
             case "精密压力表":
             case "一般压力表":
-                checkRemoveList(indexList, measureDataMap, "measureDataPistonGaugeList", map, "secondSeq", titleIndex, dataItems, 3, "回程误差");
-                checkRemoveList(indexList, measureDataMap, "resultList", map, null, titleIndex, dataItems, 4, "outcome");
+                titleIndex = checkRemoveList(indexList, "measureDataPistonGaugeList", map, "secondSeq", titleIndex, dataItems, 3, "回程误差");
+                checkRemoveList(indexList, "resultList", map, null, titleIndex, dataItems, 4, "outcome");
                 break;
             default:
                 break;
@@ -567,72 +556,82 @@
         if (StringUtils.isEmpty(measureItemInfo.getAppearance())) {
             addDataRemoveItem(dataItems, -1, "外观");
         } else {
-            map.put("firstSeq", titleIndex++);
+            map.put("firstSeq", titleIndex+++".");
         }
-        Map<String, List<BizBusinessDeviceMeasureDataCalibrator>> measureDataMap = measureItemInfo.getMeasureDataCalibratorList().stream().collect(
-                Collectors.groupingBy(BizBusinessDeviceMeasureDataCalibrator::getParams)
-        );
         //如果是功能校准源，则进行一下删除
         switch (measureItemInfo.getItemCategoryName()) {
             case "电接点一般压力表":
-                checkRemoveItem(measureDataMap, "measureDataPistonGaugeList", map, "secondSeq", titleIndex, dataItems, 3, "示值误差");
-                checkRemoveItem(measureDataMap, "resultList", map, null, titleIndex, dataItems, 4, "outcome");
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
                     addDataRemoveItem(dataItems, -1, "绝缘电阻");
                 } else {
+                    map.put("secondSeq", titleIndex++ + ".");
+                }
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getPointerDeflectionStability()) {
+                    addDataRemoveItem(dataItems, -1, "指针偏转");
+                } else {
                     map.put("thirdSeq", titleIndex++ + ".");
                 }
-                checkRemoveItem(measureDataMap, "setPointGaugeList", map, "fourthSeq", titleIndex, dataItems, 5, "设定点偏差");
-                checkRemoveItem(measureDataMap, "setPointList", map, null, titleIndex, dataItems, 6, "otherOutcome");
+                titleIndex = checkRemoveItem("measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 4, "示值误差");
+                checkRemoveItem("resultList", map, null, titleIndex, dataItems, 5, "outcome");
+                titleIndex = checkRemoveItem("setPointGaugeList", map, "fifthSeq", titleIndex, dataItems, 6, "设定点偏差");
+                checkRemoveItem("setPointList", map, null, titleIndex, dataItems, 7, "otherOutcome");
                 break;
             case "压力传感器":
                 //封闭性
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getTightness()) {
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getTightness()) {
                     addDataRemoveItem(dataItems, -1, "密封性");
                 } else {
-                    map.put("secondSeq", titleIndex++);
+                    map.put("secondSeq", titleIndex+++ ".");
                 }
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
                     addDataRemoveItem(dataItems, -1, "绝缘电阻");
                 } else {
                     map.put("thirdSeq", titleIndex++ + ".");
                 }
-                checkRemoveItem(measureDataMap, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 3, "检定数据");
-                checkRemoveItem(measureDataMap, "measureDataPistonGaugeList", map, "fifthSeq", titleIndex, dataItems, 4, "数据处理");
+                if (StringUtils.isEmpty(measureItemInfo.getZeroDrift())) {
+                    addDataRemoveItem(dataItems, 5, "零点漂移");
+                } else {
+                    map.put("fourthSeq", titleIndex++ + ".");
+                }
+                checkRemoveItem("measureDataPistonGaugeList", map, "fifthSeq", titleIndex, dataItems, 4, "检定数据");
                 break;
             case "数字压力计":
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
                     addDataRemoveItem(dataItems, -1, "绝缘电阻");
                 } else {
                     map.put("secondSeq", titleIndex++ + ".");
                 }
-                checkRemoveItem(measureDataMap, "zeroDrift", map, "fourthSeq", titleIndex, dataItems, 3, "零点漂移");
                 if (StringUtils.isEmpty(measureItemInfo.getZeroDrift())) {
-                    addDataRemoveItem(dataItems, 3, "零点漂移");
+                    addDataRemoveItem(dataItems, 5, "零点漂移");
                 } else {
                     map.put("thirdSeq", titleIndex++ + ".");
                 }
-                checkRemoveItem(measureDataMap, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 4, "示值误差");
-                checkRemoveItem(measureDataMap, "resultList", map, null, titleIndex, dataItems, 5, "outcome");
+                titleIndex = checkRemoveItem("measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 6, "示值误差");
+                checkRemoveItem("resultList", map, null, titleIndex, dataItems, 7, "outcome");
                 break;
             case "压力变送器":
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getTightness()) {
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getTightness()) {
                     addDataRemoveItem(dataItems, -1, "密封性");
                 } else {
                     map.put("secondSeq", titleIndex++ + ".");
                 }
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
                     addDataRemoveItem(dataItems, -1, "绝缘电阻");
                 } else {
                     map.put("thirdSeq", titleIndex++ + ".");
                 }
-                checkRemoveItem(measureDataMap, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 3, "回程误差");
-                checkRemoveItem(measureDataMap, "resultList", map, null, titleIndex, dataItems, 4, "outcome");
+                titleIndex = checkRemoveItem("measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 4, "示值误差");
+                checkRemoveItem("resultList", map, null, titleIndex, dataItems, 5, "outcome");
                 break;
             case "精密压力表":
             case "一般压力表":
-                checkRemoveItem(measureDataMap, "measureDataPistonGaugeList", map, "secondSeq", titleIndex, dataItems, 3, "回程误差");
-                checkRemoveItem(measureDataMap, "resultList", map, null, titleIndex, dataItems, 4, "outcome");
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getPointerDeflectionStability()) {
+                    addDataRemoveItem(dataItems, -1, "指针偏转");
+                } else {
+                    map.put("secondSeq", titleIndex++ + ".");
+                }
+                titleIndex = checkRemoveItem("measureDataPistonGaugeList", map, "thirdSeq", titleIndex, dataItems, 4, "回程误差");
+                checkRemoveItem("resultList", map, null, titleIndex, dataItems, 5, "outcome");
                 break;
             default:
                 break;
@@ -640,6 +639,16 @@
         return dataItems;
     }
 
+    public Integer checkRemoveItem(String key, Map map, String titleParam, Integer titleIndex,
+                                   List<ToBeRemoveDataItem> dataItems, Integer tableIndex, String titleKeyWords) {
+        if (map.containsKey(key)) {
+            map.put(titleParam, (titleIndex++) + ".");
+        } else {
+            addDataRemoveItem(dataItems, tableIndex, titleKeyWords);
+        }
+        return tableIndex;
+    }
+
     private void prepareParams(List<BizBusinessDeviceMeasureDataPistonGauge> pistonGaugeList, Map<String, Object> map) {
         List<BizBusinessDeviceMeasureDataPistonGauge> voltageList = pistonGaugeList.stream()
                 .filter(e -> "1".equals(e.getDataType())).collect(Collectors.toList());

diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java
index ef3aa72..5bb15be 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java
@@ -123,6 +123,11 @@
     @TableField(exist = false)
     private String appearanceRemark;
 
+    @ApiModelProperty(value = "绝缘电阻(0.02活塞打印需要)", dataType = "String")
+    @TableField(exist = false)
+    private String insulationResistance;
+
+
 
     @ApiModelProperty(value = "绝缘电阻备注(0.02活塞打印需要)", dataType = "String")
     @TableField(exist = false)
@@ -136,6 +141,11 @@
     @TableField(exist = false)
     private String zeroDrift;
 
+    @ApiModelProperty(value = "指针平稳性(0.02活塞打印需要)", dataType = "String")
+    @TableField(exist = false)
+    private String pointerDeflectionStability;
+
+
     @ApiModelProperty(value = "零位漂移误差备注(0.02活塞打印需要)", dataType = "String")
     @TableField(exist = false)
     private String pointerDeflectionStabilityRemark;
@@ -196,7 +206,7 @@
     private String createUserName;
 
     @ApiModelProperty(value = "计量标识(前端要传)", dataType = "String")
-    @TableField(exist = false)
+    @TableField("meter_identify")
     private String meterIdentify;
 
     /**
@@ -273,7 +283,7 @@
 
     @ExcelProperty(value = "测试、校准或检定日期", order = 8)
     @ApiModelProperty(value = "测试、校准或检定日期（列表&详情返回参数）", dataType = "String")
-    @TableField(exist = false)
+    @TableField("trace_date")
     private String traceDate;
 
     @ApiModelProperty(value = "设备检定项分类名字(前端必传，打印需要)", dataType = "String")
@@ -340,7 +350,7 @@
     private String restrictionInstruction;
 
     @ApiModelProperty(value = "检定有效日期(前端必传，打印需要)", dataType = "String")
-    @TableField(exist = false)
+    @TableField("measure_valid_date")
     private String measureValidDate;
 
     @ApiModelProperty(value = "依据的技术文件(前端必传，打印需要)", dataType = "String")
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
index 943c8f7..e023b35 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java
@@ -99,19 +99,20 @@
         customOriginUrls.add(oldOriginRecordFile);
         SnowflakeUtil snowflakeUtil = new SnowflakeUtil();
         Map<String, Object> map2 = BeanUtil.beanToMap(deviceMeasureApproval);
+
         map2.put("id", snowflakeUtil.nextId());
         if (StringUtils.isNotEmpty(oldOriginRecordFile)) {
             //生成证书报告的,需要改变为动态选择性
             originFutureTask = CompletableFuture.supplyAsync(
                     () -> printFileRegister.registerPrintFile(ORIGINAL_RECORD_APPROVAL, "数据打印", null, map2, true, null, customOriginUrls), threadPool);
-            if (parallelCreateFile(originFutureTask, certificateFutureTask, id, map)) {
+            if (parallelCreateFile(originFutureTask, certificateFutureTask, id, map,deviceMeasureApproval)) {
                 return;
             }
         }
-        singleCreateFile(originFutureTask, certificateFutureTask, id, map);
+        singleCreateFile(originFutureTask, certificateFutureTask, id, map,deviceMeasureApproval);
     }
 
-    private void singleCreateFile(CompletableFuture<String> originFutureTask, CompletableFuture<String> certificateFutureTask, Long id, Map<String, Object> map) {
+    private void singleCreateFile(CompletableFuture<String> originFutureTask, CompletableFuture<String> certificateFutureTask, Long id, Map<String, Object> map,BizBusinessDeviceMeasureApproval oldMeasureApproval) {
         if (certificateFutureTask != null) {
             certificateFutureTask.thenRun(
                     () -> {
@@ -125,7 +126,7 @@
                             }
                             //更新记录
                             int updateFlag = bizBusinessMapper.updateById(measureApproval);
-                            saveCertificatePrintInfo(measureApproval);
+                            saveCertificatePrintInfo(oldMeasureApproval);
                             Assert.isFalse(updateFlag <= 0, () -> {
                                 throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED);
                             });
@@ -155,7 +156,7 @@
         }
     }
 
-    private Boolean parallelCreateFile(CompletableFuture<String> originFutureTask, CompletableFuture<String> certificateFutureTask, Long id, Map<String, Object> map) {
+    private Boolean parallelCreateFile(CompletableFuture<String> originFutureTask, CompletableFuture<String> certificateFutureTask, Long id, Map<String, Object> map,BizBusinessDeviceMeasureApproval oldMeasureApproval) {
         if (certificateFutureTask != null && originFutureTask != null) {
             CompletableFuture<String> tempCertificateFutureTask = certificateFutureTask;
             CompletableFuture<String> tempOriginFutureTask = originFutureTask;
@@ -174,7 +175,7 @@
                             }
                             //更新记录
                             int updateFlag = bizBusinessMapper.updateById(measureApproval);
-                            saveCertificatePrintInfo(measureApproval);
+                            saveCertificatePrintInfo(oldMeasureApproval);
                             Assert.isFalse(updateFlag <= 0, () -> {
                                 throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED);
                             });
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java
index 72c5bf4..e894dbf 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java
@@ -262,15 +262,16 @@
         }
     }
 
-    protected void checkRemoveList(List<String> indexList, Map measureDataMap, String key, Map map, String titleParam, Integer titleIndex,
+    protected Integer checkRemoveList(List<String> indexList, String key, Map map, String titleParam, Integer titleIndex,
                                    List<ToBeRemoveDataItem> dataItems, Integer tableIndex, String titleKeyWords) {
-        if (measureDataMap.containsKey(key)) {
+        if (map.containsKey(key)) {
             if (StringUtils.isNotEmpty(titleParam)) {
                 map.put(titleParam, indexList.get(titleIndex++));
             }
         } else {
             addDataRemoveItem(dataItems, tableIndex, titleKeyWords);
         }
+        return titleIndex;
     }
 
     /**
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java
index dc85f19..d622679 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java
@@ -153,7 +153,6 @@
                 measureItemInfo.setOutcome("不合格*");
             }
             Map<String, Object> map = BeanUtil.beanToMap(measureItemInfo);
-            List<ToBeRemoveDataItem> dataItems = checkParamRemoveItem(measureItemInfo, map);
             prepareParams(safetyList, map);
             List<String> customTemplateUrls = new ArrayList<>();
             BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class);
@@ -177,6 +176,7 @@
             map.put("resultList", resultList);
             map.put("setPointGaugeList", setPointGaugeList);
             map.put("setPointList", setPointList);
+            List<ToBeRemoveDataItem> dataItems = checkParamRemoveItem(measureItemInfo, map);
             //检定数据
             //这一块逻辑比较复杂
             customTemplateUrls.add(bizBusinessMapper.customTemplateByCategory("1", measureItemInfo.getItemCategoryId()));
@@ -241,7 +241,6 @@
                         .collect(Collectors.toList());
             }
             Map<String, Object> map = BeanUtil.beanToMap(measureItemInfo);
-            List<ToBeRemoveDataItem> dataItems = checkCertificateRemoveItem(measureItemInfo, map);
             //准备封面参数
             readyForCoverParams(map, measureItemInfo.getLabCode());
             customParam(map, measureItemInfo);
@@ -256,6 +255,12 @@
             map.put("resultList", resultList);
             map.put("setPointGaugeList", setPointGaugeList);
             map.put("setPointList", setPointList);
+            List<ToBeRemoveDataItem> dataItems = checkCertificateRemoveItem(measureItemInfo, map);
+//            if (measureItemInfo.getMeasureCategoryName().contains("检定") || measureItemInfo.getMeasureCategoryName().contains("校检")) {
+//                for (ToBeRemoveDataItem dataItem : dataItems) {
+//                    dataItem.setCustomOffset(1);
+//                }
+//            }
             List<String> customTemplateUrls = new ArrayList<>();
             BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class);
             customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", measureItemInfo.getMeasureCategoryName()));
@@ -281,14 +286,13 @@
         }
     }
 
-
     private void customParam(Map<String, Object> map, BizBusinessDeviceMeasureApproval measureItemInfo) {
         map.put("appearanceRemark", StringUtils.isNotEmpty(measureItemInfo.getAppearanceRemark()) ? measureItemInfo.getAppearanceRemark() : "/");//外观
         map.put("pointerDeflectionStabilityRemark", StringUtils.isNotEmpty(measureItemInfo.getPointerDeflectionStabilityRemark()) ? measureItemInfo.getPointerDeflectionStabilityRemark() : "/");//零点漂移
         map.put("tightnessRemark", StringUtils.isNotEmpty(measureItemInfo.getTightnessRemark()) ? measureItemInfo.getTightnessRemark() : "/");//密封性
         map.put("insulationResistanceRemark", StringUtils.isNotEmpty(measureItemInfo.getInsulationResistanceRemark()) ? measureItemInfo.getInsulationResistanceRemark() : "/");//绝缘电阻
         map.put("outcome", StringUtils.isNotEmpty(measureItemInfo.getOutcome()) ? measureItemInfo.getOutcome() : "/");//示值输出备注
-        map.put("otherOutcome", StringUtils.isNotEmpty(measureItemInfo.getOtherOutcome()) ? measureItemInfo.getOtherOutcome() : "/");//设置点输出备注
+        map.put("otherOutcome", StringUtils.isNotEmpty(measureItemInfo.getOtherOutcome()) ? "不合格".equals(measureItemInfo.getOtherOutcome()) ? measureItemInfo.getOtherOutcome() + "*" : measureItemInfo.getOtherOutcome() : "/");//设置点输出备注
         BizBusinessDeviceMeasureDataPistonGauge dataPistonGauge = measureItemInfo.getMeasureDataPistonGaugeList().get(0);
         BizBusinessDeviceMeasureItemConfigPistonGauge pistonGauge = (BizBusinessDeviceMeasureItemConfigPistonGauge) map.get("measureItemConfigPistonGauge");
         map.put("upToStandard", "\uF0A3");
@@ -304,25 +308,21 @@
             map.put("equation", "截距a=" + measureItemInfo.getDataProcessing().getInterceptA() + "，斜率b=" + measureItemInfo.getDataProcessing().getSlopeB());
         }
         if (ObjectUtils.isNotEmpty(pistonGauge)) {
-            convertToValue(map, pistonGauge.getAppearance(), "upAppearance", "belowAppearance");//外观性检查
-            convertToValue(map, pistonGauge.getTightness(), "upTightness", "belowTightness");//密封性
             map.put("rangeUnit", pistonGauge.getRangeUnit());//单位
-            convertToValue(map, pistonGauge.getInsulationResistance(), "upResistance", "belowResistance");//绝缘电阻
-            convertToValue(map, pistonGauge.getPointerDeflectionStability(), "upStability", "belowStability");//指针偏转平稳性
-            convertToValue(map, pistonGauge.getPointerDeflectionStability(), "upOthercome", "belowOthercome");//指针偏转平稳性
-            map.put("zeroDriftResult", pistonGauge.getTightness() ? "合格" : "不合格*");//零点漂移
-            map.put("indicationError", pistonGauge.getIndicationError() ? "合格" : "不合格*");//示值误差、回程误差、轻敲位移
             if (pistonGauge.getZeroDrift()) {//零点漂移
                 map.put("upToStandard", "\uF052");
             } else {
                 map.put("belowStandard", "\uF052");
             }
-        } else {
-            convertIntToValue(map, "appearance", "upAppearance", "belowAppearance");//外观
-            convertIntToValue(map, "tightness", "upTightness", "belowTightness");//密封性
-            convertIntToValue(map, "insulationResistance", "upResistance", "belowResistance");//绝缘电阻
-            convertIntToValue(map, "pointerDeflectionStability", "upStability", "belowStability");//指针偏转平稳性
+        }
+        convertIntToValue(map, "appearance", "upAppearance", "belowAppearance");//外观
+        convertIntToValue(map, "tightness", "upTightness", "belowTightness");//密封性
+        convertIntToValue(map, "insulationResistance", "upResistance", "belowResistance");//绝缘电阻
+        convertIntToValue(map, "pointerDeflectionStability", "upStability", "belowStability");//指针偏转平稳性
+        if (map.containsKey("zeroDriftResult") && ObjectUtils.isNotEmpty(map.get("zeroDriftResult"))) {
             map.put("zeroDriftResult", ((Boolean) map.get("zeroDriftResult")) ? "合格" : "不合格*");//示值误差结果
+        }
+        if (map.containsKey("indicationError") && ObjectUtils.isNotEmpty(map.get("indicationError"))) {
             map.put("indicationError", ((Boolean) map.get("indicationError")) ? "合格" : "不合格*");//示值误差、回程误差、轻敲位移
         }
         map.put("zeroDriftFive", StringUtils.isNotEmpty(dataPistonGauge.getZeroDriftFive()) ? dataPistonGauge.getZeroDriftFive() : "/");//60
@@ -332,17 +332,10 @@
         map.put("zeroDriftTwo", StringUtils.isNotEmpty(dataPistonGauge.getZeroDriftTwo()) ? dataPistonGauge.getZeroDriftTwo() : "/");//15
     }
 
-    private void convertToValue(Map<String, Object> objectMap, boolean upStandard, String upKey, String belowKey) {
-        if (upStandard) {
-            objectMap.put(upKey, upStandard ? "\uF052" : "\uF0A3");
-            objectMap.put(belowKey, upStandard ? "\uF0A3" : "\uF052");
-        }
-    }
-
     private void convertIntToValue(Map<String, Object> objectMap, String key, String upKey, String belowKey) {
-        if (objectMap.containsKey(key)) {
-            objectMap.put(upKey, (Boolean) objectMap.get(key) ? "\uF052" : "\uF0A3");
-            objectMap.put(belowKey, (Boolean) objectMap.get(key) ? "\uF0A3" : "\uF052");
+        if (objectMap.containsKey(key) && ObjectUtils.isNotEmpty(objectMap.get(key))) {
+            objectMap.put(upKey, "1".equals((String) objectMap.get(key)) ? "\uF052" : "\uF0A3");
+            objectMap.put(belowKey, "1".equals((String) objectMap.get(key)) ? "\uF0A3" : "\uF052");
         }
     }
 
@@ -471,77 +464,73 @@
     private List<ToBeRemoveDataItem> checkParamRemoveItem(BizBusinessDeviceMeasureApproval measureItemInfo, Map<String, Object> map) {
         List<ToBeRemoveDataItem> dataItems = new ArrayList<>();
         List<String> indexList = Arrays.asList("一、", "二、", "三、", "四、", "五、", "六、");
-        int titleIndex = 1;
+        int titleIndex = 0;
         //外观及功能性检查  和检定项删除无关系
         if (StringUtils.isEmpty(measureItemInfo.getAppearance())) {
             addDataRemoveItem(dataItems, -1, "外观");
         } else {
             map.put("firstSeq", indexList.get(titleIndex++));
         }
-        Map<String, List<BizBusinessDeviceMeasureDataCalibrator>> measureDataMap = measureItemInfo.getMeasureDataCalibratorList().stream().collect(
-                Collectors.groupingBy(BizBusinessDeviceMeasureDataCalibrator::getParams)
-        );
         //如果是功能校准源，则进行一下删除
         switch (measureItemInfo.getItemCategoryName()) {
             case "电接点一般压力表":
-                checkRemoveList(indexList, measureDataMap, "measureDataPistonGaugeList", map, "secondSeq", titleIndex, dataItems, 3, "示值误差");
-                checkRemoveList(indexList, measureDataMap, "resultList", map, null, titleIndex, dataItems, 4, "outcome");
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
+                titleIndex = checkRemoveList(indexList, "measureDataPistonGaugeList", map, "secondSeq", titleIndex, dataItems, 3, "示值误差");
+                checkRemoveList(indexList, "resultList", map, null, titleIndex, dataItems, 4, "outcome");
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
                     addDataRemoveItem(dataItems, -1, "绝缘电阻");
                 } else {
                     map.put("thirdSeq", indexList.get(titleIndex++));
                 }
-                checkRemoveList(indexList, measureDataMap, "setPointGaugeList", map, "fourthSeq", titleIndex, dataItems, 5, "设定点偏差");
-                checkRemoveList(indexList, measureDataMap, "setPointList", map, null, titleIndex, dataItems, 6, "otherOutcome");
+                titleIndex = checkRemoveList(indexList, "setPointGaugeList", map, "fourthSeq", titleIndex, dataItems, 5, "设定点偏差");
+                checkRemoveList(indexList, "setPointList", map, null, titleIndex, dataItems, 6, "otherOutcome");
                 break;
             case "压力传感器":
                 //封闭性
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getTightness()) {
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getTightness()) {
                     addDataRemoveItem(dataItems, -1, "密封性");
                 } else {
                     map.put("secondSeq", indexList.get(titleIndex++));
                 }
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
                     addDataRemoveItem(dataItems, -1, "绝缘电阻");
                 } else {
                     map.put("thirdSeq", indexList.get(titleIndex++));
                 }
-                checkRemoveList(indexList, measureDataMap, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 3, "检定数据");
-                checkRemoveList(indexList, measureDataMap, "measureDataPistonGaugeList", map, "fifthSeq", titleIndex, dataItems, 4, "数据处理");
+                titleIndex = checkRemoveList(indexList, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 3, "检定数据");
+                checkRemoveList(indexList, "measureDataPistonGaugeList", map, "fifthSeq", titleIndex, dataItems, 4, "数据处理");
                 break;
             case "数字压力计":
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
                     addDataRemoveItem(dataItems, -1, "绝缘电阻");
                 } else {
                     map.put("secondSeq", indexList.get(titleIndex++));
                 }
-                checkRemoveList(indexList, measureDataMap, "zeroDrift", map, "fourthSeq", titleIndex, dataItems, 3, "零点漂移");
                 if (StringUtils.isEmpty(measureItemInfo.getZeroDrift())) {
                     addDataRemoveItem(dataItems, 3, "零点漂移");
                 } else {
                     map.put("thirdSeq", indexList.get(titleIndex++));
                 }
-                checkRemoveList(indexList, measureDataMap, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 4, "示值误差");
-                checkRemoveList(indexList, measureDataMap, "resultList", map, null, titleIndex, dataItems, 5, "outcome");
+                titleIndex = checkRemoveList(indexList, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 4, "示值误差");
+                checkRemoveList(indexList, "resultList", map, null, titleIndex, dataItems, 5, "{{outcome}}");
                 break;
             case "压力变送器":
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getTightness()) {
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getTightness()) {
                     addDataRemoveItem(dataItems, -1, "密封性");
                 } else {
                     map.put("secondSeq", indexList.get(titleIndex++));
                 }
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
                     addDataRemoveItem(dataItems, -1, "绝缘电阻");
                 } else {
                     map.put("thirdSeq", indexList.get(titleIndex++));
                 }
-                checkRemoveList(indexList, measureDataMap, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 3, "回程误差");
-                checkRemoveList(indexList, measureDataMap, "resultList", map, null, titleIndex, dataItems, 4, "outcome");
+                titleIndex = checkRemoveList(indexList, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 3, "回程误差");
+                checkRemoveList(indexList, "resultList", map, null, titleIndex, dataItems, 4, "outcome");
                 break;
             case "精密压力表":
             case "一般压力表":
-                checkRemoveList(indexList, measureDataMap, "measureDataPistonGaugeList", map, "secondSeq", titleIndex, dataItems, 3, "回程误差");
-                checkRemoveList(indexList, measureDataMap, "resultList", map, null, titleIndex, dataItems, 4, "outcome");
+                titleIndex = checkRemoveList(indexList, "measureDataPistonGaugeList", map, "secondSeq", titleIndex, dataItems, 3, "回程误差");
+                checkRemoveList(indexList, "resultList", map, null, titleIndex, dataItems, 4, "outcome");
                 break;
             default:
                 break;
@@ -567,72 +556,82 @@
         if (StringUtils.isEmpty(measureItemInfo.getAppearance())) {
             addDataRemoveItem(dataItems, -1, "外观");
         } else {
-            map.put("firstSeq", titleIndex++);
+            map.put("firstSeq", titleIndex+++".");
         }
-        Map<String, List<BizBusinessDeviceMeasureDataCalibrator>> measureDataMap = measureItemInfo.getMeasureDataCalibratorList().stream().collect(
-                Collectors.groupingBy(BizBusinessDeviceMeasureDataCalibrator::getParams)
-        );
         //如果是功能校准源，则进行一下删除
         switch (measureItemInfo.getItemCategoryName()) {
             case "电接点一般压力表":
-                checkRemoveItem(measureDataMap, "measureDataPistonGaugeList", map, "secondSeq", titleIndex, dataItems, 3, "示值误差");
-                checkRemoveItem(measureDataMap, "resultList", map, null, titleIndex, dataItems, 4, "outcome");
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
                     addDataRemoveItem(dataItems, -1, "绝缘电阻");
                 } else {
+                    map.put("secondSeq", titleIndex++ + ".");
+                }
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getPointerDeflectionStability()) {
+                    addDataRemoveItem(dataItems, -1, "指针偏转");
+                } else {
                     map.put("thirdSeq", titleIndex++ + ".");
                 }
-                checkRemoveItem(measureDataMap, "setPointGaugeList", map, "fourthSeq", titleIndex, dataItems, 5, "设定点偏差");
-                checkRemoveItem(measureDataMap, "setPointList", map, null, titleIndex, dataItems, 6, "otherOutcome");
+                titleIndex = checkRemoveItem("measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 4, "示值误差");
+                checkRemoveItem("resultList", map, null, titleIndex, dataItems, 5, "outcome");
+                titleIndex = checkRemoveItem("setPointGaugeList", map, "fifthSeq", titleIndex, dataItems, 6, "设定点偏差");
+                checkRemoveItem("setPointList", map, null, titleIndex, dataItems, 7, "otherOutcome");
                 break;
             case "压力传感器":
                 //封闭性
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getTightness()) {
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getTightness()) {
                     addDataRemoveItem(dataItems, -1, "密封性");
                 } else {
-                    map.put("secondSeq", titleIndex++);
+                    map.put("secondSeq", titleIndex+++ ".");
                 }
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
                     addDataRemoveItem(dataItems, -1, "绝缘电阻");
                 } else {
                     map.put("thirdSeq", titleIndex++ + ".");
                 }
-                checkRemoveItem(measureDataMap, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 3, "检定数据");
-                checkRemoveItem(measureDataMap, "measureDataPistonGaugeList", map, "fifthSeq", titleIndex, dataItems, 4, "数据处理");
+                if (StringUtils.isEmpty(measureItemInfo.getZeroDrift())) {
+                    addDataRemoveItem(dataItems, 5, "零点漂移");
+                } else {
+                    map.put("fourthSeq", titleIndex++ + ".");
+                }
+                checkRemoveItem("measureDataPistonGaugeList", map, "fifthSeq", titleIndex, dataItems, 4, "检定数据");
                 break;
             case "数字压力计":
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
                     addDataRemoveItem(dataItems, -1, "绝缘电阻");
                 } else {
                     map.put("secondSeq", titleIndex++ + ".");
                 }
-                checkRemoveItem(measureDataMap, "zeroDrift", map, "fourthSeq", titleIndex, dataItems, 3, "零点漂移");
                 if (StringUtils.isEmpty(measureItemInfo.getZeroDrift())) {
-                    addDataRemoveItem(dataItems, 3, "零点漂移");
+                    addDataRemoveItem(dataItems, 5, "零点漂移");
                 } else {
                     map.put("thirdSeq", titleIndex++ + ".");
                 }
-                checkRemoveItem(measureDataMap, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 4, "示值误差");
-                checkRemoveItem(measureDataMap, "resultList", map, null, titleIndex, dataItems, 5, "outcome");
+                titleIndex = checkRemoveItem("measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 6, "示值误差");
+                checkRemoveItem("resultList", map, null, titleIndex, dataItems, 7, "outcome");
                 break;
             case "压力变送器":
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getTightness()) {
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getTightness()) {
                     addDataRemoveItem(dataItems, -1, "密封性");
                 } else {
                     map.put("secondSeq", titleIndex++ + ".");
                 }
-                if (measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getInsulationResistance()) {
                     addDataRemoveItem(dataItems, -1, "绝缘电阻");
                 } else {
                     map.put("thirdSeq", titleIndex++ + ".");
                 }
-                checkRemoveItem(measureDataMap, "measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 3, "回程误差");
-                checkRemoveItem(measureDataMap, "resultList", map, null, titleIndex, dataItems, 4, "outcome");
+                titleIndex = checkRemoveItem("measureDataPistonGaugeList", map, "fourthSeq", titleIndex, dataItems, 4, "示值误差");
+                checkRemoveItem("resultList", map, null, titleIndex, dataItems, 5, "outcome");
                 break;
             case "精密压力表":
             case "一般压力表":
-                checkRemoveItem(measureDataMap, "measureDataPistonGaugeList", map, "secondSeq", titleIndex, dataItems, 3, "回程误差");
-                checkRemoveItem(measureDataMap, "resultList", map, null, titleIndex, dataItems, 4, "outcome");
+                if (!measureItemInfo.getMeasureItemConfigPistonGauge().getPointerDeflectionStability()) {
+                    addDataRemoveItem(dataItems, -1, "指针偏转");
+                } else {
+                    map.put("secondSeq", titleIndex++ + ".");
+                }
+                titleIndex = checkRemoveItem("measureDataPistonGaugeList", map, "thirdSeq", titleIndex, dataItems, 4, "回程误差");
+                checkRemoveItem("resultList", map, null, titleIndex, dataItems, 5, "outcome");
                 break;
             default:
                 break;
@@ -640,6 +639,16 @@
         return dataItems;
     }
 
+    public Integer checkRemoveItem(String key, Map map, String titleParam, Integer titleIndex,
+                                   List<ToBeRemoveDataItem> dataItems, Integer tableIndex, String titleKeyWords) {
+        if (map.containsKey(key)) {
+            map.put(titleParam, (titleIndex++) + ".");
+        } else {
+            addDataRemoveItem(dataItems, tableIndex, titleKeyWords);
+        }
+        return tableIndex;
+    }
+
     private void prepareParams(List<BizBusinessDeviceMeasureDataPistonGauge> pistonGaugeList, Map<String, Object> map) {
         List<BizBusinessDeviceMeasureDataPistonGauge> voltageList = pistonGaugeList.stream()
                 .filter(e -> "1".equals(e.getDataType())).collect(Collectors.toList());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/WordUtil.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/WordUtil.java
index 4d1caa9..1015d60 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/WordUtil.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/util/WordUtil.java
@@ -43,7 +43,7 @@
             // 存在两个下标，一个是当前文档的下标，一个是查询空的下标，两个下标同时移动，判断是表还是普通文段
             int tableIndex = 0, currentTableIndex = 0;
             for (int paragraphIndex = 0; (tableIndex + paragraphIndex) < document.getBodyElements().size() && (
-                    dataItemIndex < paragraphDataItem.size() || tableItemIndex < tableDataItem.size()); paragraphIndex++) {
+                    dataItemIndex < paragraphDataItem.size() || tableItemIndex < tableDataItem.size()); ) {
                 //段落的情况下根据内容进行删除
                 if ("PARAGRAPH".equals(document.getBodyElements().get(tableIndex + paragraphIndex).getElementType().name())) {
                     if (dataItemIndex < paragraphDataItem.size()) {
@@ -55,6 +55,7 @@
                             continue;
                         }
                     }
+                    paragraphIndex++;
                 } else if ("TABLE".equals(document.getBodyElements().get(paragraphIndex + tableIndex).getElementType().name())) {
                     if (tableItemIndex < tableDataItem.size()) {
                         ToBeRemoveDataItem removeTableItem = tableDataItem.get(tableItemIndex);