diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
index 951e1de..191f287 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
@@ -37,7 +37,7 @@
         return checkItemDataService.config(checkItemConfigRequest);
     }
 
-    @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
+    @ApiOperation("详情（后台根据传入参数判断取哪套的核查项）")
     @PostMapping("/detail")
     public ReturnDTO<CheckItemDataDetailResponse> detail(@RequestBody @Valid CheckItemDetailRequest request) throws Exception {
         return checkItemDataService.detail(request);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
index 951e1de..191f287 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
@@ -37,7 +37,7 @@
         return checkItemDataService.config(checkItemConfigRequest);
     }
 
-    @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
+    @ApiOperation("详情（后台根据传入参数判断取哪套的核查项）")
     @PostMapping("/detail")
     public ReturnDTO<CheckItemDataDetailResponse> detail(@RequestBody @Valid CheckItemDetailRequest request) throws Exception {
         return checkItemDataService.detail(request);
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml
index 09e15d8..3971000 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml
@@ -82,7 +82,7 @@
         JOIN eqpt_equipment_model_info eemi ON eemi.id = bbdmii.device_model_id
         JOIN biz_business_order_sample_relation bbosr ON (bbosr.order_id = bbdmi.order_id AND bbosr.sample_id = bbdmi.sample_id)
         JOIN biz_business_order_info bboi ON bbosr.order_id = bboi.id
-        LEFT JOIN biz_business_device_measure_approval bbdma ON (bbdma.data_id = bbdmi.id AND bbdma.approval_status != 5) <!--一条检定对应只有一个数据审批通过的证书，这里查非未通过的，证书为生成的前端前端展示空-->
+        LEFT JOIN biz_business_device_measure_approval bbdma ON (bbdma.data_id = bbdmi.id AND bbdma.approval_status != 5) <!--一条检定对应只有一个数据审批通过的证书，这里查非未通过的，证书为生成的前端展示空-->
         WHERE 1=1
         <if test="request != null and request.dataNo != null and request.dataNo !=''">
             and bbdmi.data_no like concat('%',#{request.dataNo},'%')

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
index 951e1de..191f287 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
@@ -37,7 +37,7 @@
         return checkItemDataService.config(checkItemConfigRequest);
     }
 
-    @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
+    @ApiOperation("详情（后台根据传入参数判断取哪套的核查项）")
     @PostMapping("/detail")
     public ReturnDTO<CheckItemDataDetailResponse> detail(@RequestBody @Valid CheckItemDetailRequest request) throws Exception {
         return checkItemDataService.detail(request);
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml
index 09e15d8..3971000 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml
@@ -82,7 +82,7 @@
         JOIN eqpt_equipment_model_info eemi ON eemi.id = bbdmii.device_model_id
         JOIN biz_business_order_sample_relation bbosr ON (bbosr.order_id = bbdmi.order_id AND bbosr.sample_id = bbdmi.sample_id)
         JOIN biz_business_order_info bboi ON bbosr.order_id = bboi.id
-        LEFT JOIN biz_business_device_measure_approval bbdma ON (bbdma.data_id = bbdmi.id AND bbdma.approval_status != 5) <!--一条检定对应只有一个数据审批通过的证书，这里查非未通过的，证书为生成的前端前端展示空-->
+        LEFT JOIN biz_business_device_measure_approval bbdma ON (bbdma.data_id = bbdmi.id AND bbdma.approval_status != 5) <!--一条检定对应只有一个数据审批通过的证书，这里查非未通过的，证书为生成的前端展示空-->
         WHERE 1=1
         <if test="request != null and request.dataNo != null and request.dataNo !=''">
             and bbdmi.data_no like concat('%',#{request.dataNo},'%')
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java
index 111c025..74420b7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java
@@ -117,6 +117,11 @@
          */
         @ApiModelProperty("意见内容")
         private String comment;
+
+        public FlowCommentDto(String type, String comment) {
+            this.type = type;
+            this.comment = comment;
+        }
     }
 }
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
index 951e1de..191f287 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
@@ -37,7 +37,7 @@
         return checkItemDataService.config(checkItemConfigRequest);
     }
 
-    @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
+    @ApiOperation("详情（后台根据传入参数判断取哪套的核查项）")
     @PostMapping("/detail")
     public ReturnDTO<CheckItemDataDetailResponse> detail(@RequestBody @Valid CheckItemDetailRequest request) throws Exception {
         return checkItemDataService.detail(request);
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml
index 09e15d8..3971000 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml
@@ -82,7 +82,7 @@
         JOIN eqpt_equipment_model_info eemi ON eemi.id = bbdmii.device_model_id
         JOIN biz_business_order_sample_relation bbosr ON (bbosr.order_id = bbdmi.order_id AND bbosr.sample_id = bbdmi.sample_id)
         JOIN biz_business_order_info bboi ON bbosr.order_id = bboi.id
-        LEFT JOIN biz_business_device_measure_approval bbdma ON (bbdma.data_id = bbdmi.id AND bbdma.approval_status != 5) <!--一条检定对应只有一个数据审批通过的证书，这里查非未通过的，证书为生成的前端前端展示空-->
+        LEFT JOIN biz_business_device_measure_approval bbdma ON (bbdma.data_id = bbdmi.id AND bbdma.approval_status != 5) <!--一条检定对应只有一个数据审批通过的证书，这里查非未通过的，证书为生成的前端展示空-->
         WHERE 1=1
         <if test="request != null and request.dataNo != null and request.dataNo !=''">
             and bbdmi.data_no like concat('%',#{request.dataNo},'%')
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java
index 111c025..74420b7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java
@@ -117,6 +117,11 @@
          */
         @ApiModelProperty("意见内容")
         private String comment;
+
+        public FlowCommentDto(String type, String comment) {
+            this.type = type;
+            this.comment = comment;
+        }
     }
 }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralCheckItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralCheckItemServiceImpl.java
index f784dd5..3b44903 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralCheckItemServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralCheckItemServiceImpl.java
@@ -72,6 +72,9 @@
         //1、获取执行service及使用参数
         String belongStandardEquipment = request.getBelongStandardEquipment();
         IService iService = CheckConfig.checkItemDataServiceMap.get(belongStandardEquipment);
+        if (Objects.isNull(iService)) {
+            return null;
+        }
         //2、执行通用操作
         QueryWrapper wrapper = new QueryWrapper();
         wrapper.eq("item_category_id", request.getItemCategoryId());

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
index 951e1de..191f287 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
@@ -37,7 +37,7 @@
         return checkItemDataService.config(checkItemConfigRequest);
     }
 
-    @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
+    @ApiOperation("详情（后台根据传入参数判断取哪套的核查项）")
     @PostMapping("/detail")
     public ReturnDTO<CheckItemDataDetailResponse> detail(@RequestBody @Valid CheckItemDetailRequest request) throws Exception {
         return checkItemDataService.detail(request);
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml
index 09e15d8..3971000 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml
@@ -82,7 +82,7 @@
         JOIN eqpt_equipment_model_info eemi ON eemi.id = bbdmii.device_model_id
         JOIN biz_business_order_sample_relation bbosr ON (bbosr.order_id = bbdmi.order_id AND bbosr.sample_id = bbdmi.sample_id)
         JOIN biz_business_order_info bboi ON bbosr.order_id = bboi.id
-        LEFT JOIN biz_business_device_measure_approval bbdma ON (bbdma.data_id = bbdmi.id AND bbdma.approval_status != 5) <!--一条检定对应只有一个数据审批通过的证书，这里查非未通过的，证书为生成的前端前端展示空-->
+        LEFT JOIN biz_business_device_measure_approval bbdma ON (bbdma.data_id = bbdmi.id AND bbdma.approval_status != 5) <!--一条检定对应只有一个数据审批通过的证书，这里查非未通过的，证书为生成的前端展示空-->
         WHERE 1=1
         <if test="request != null and request.dataNo != null and request.dataNo !=''">
             and bbdmi.data_no like concat('%',#{request.dataNo},'%')
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java
index 111c025..74420b7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java
@@ -117,6 +117,11 @@
          */
         @ApiModelProperty("意见内容")
         private String comment;
+
+        public FlowCommentDto(String type, String comment) {
+            this.type = type;
+            this.comment = comment;
+        }
     }
 }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralCheckItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralCheckItemServiceImpl.java
index f784dd5..3b44903 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralCheckItemServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralCheckItemServiceImpl.java
@@ -72,6 +72,9 @@
         //1、获取执行service及使用参数
         String belongStandardEquipment = request.getBelongStandardEquipment();
         IService iService = CheckConfig.checkItemDataServiceMap.get(belongStandardEquipment);
+        if (Objects.isNull(iService)) {
+            return null;
+        }
         //2、执行通用操作
         QueryWrapper wrapper = new QueryWrapper();
         wrapper.eq("item_category_id", request.getItemCategoryId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java
index 568645e..ccad65f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java
@@ -190,7 +190,7 @@
         wrapper.eq("data_id", id);
         List<BizBusinessDeviceMeasureApproval> measureApprovalList = measureApprovalMapper.selectList(wrapper);
         if (!CollectionUtils.isEmpty(measureApprovalList)) {
-            long count = measureApprovalList.stream().filter(measureApproval -> ApprovalStatusEnum.FAILED.equals(measureApproval.getApprovalStatus())).count();
+            long count = measureApprovalList.stream().filter(measureApproval -> !ApprovalStatusEnum.FAILED.equals(measureApproval.getApprovalStatus())).count();
             if (count > 0) {
                 throw new BusinessException(BusinessExceptionEnum.MEASURE_DATA_ALREADY_EXIST);
             }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
index 951e1de..191f287 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckItemDataController.java
@@ -37,7 +37,7 @@
         return checkItemDataService.config(checkItemConfigRequest);
     }
 
-    @ApiOperation("详情（后台根据传入参数判断取哪套的检定项）")
+    @ApiOperation("详情（后台根据传入参数判断取哪套的核查项）")
     @PostMapping("/detail")
     public ReturnDTO<CheckItemDataDetailResponse> detail(@RequestBody @Valid CheckItemDetailRequest request) throws Exception {
         return checkItemDataService.detail(request);
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml
index 09e15d8..3971000 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml
@@ -82,7 +82,7 @@
         JOIN eqpt_equipment_model_info eemi ON eemi.id = bbdmii.device_model_id
         JOIN biz_business_order_sample_relation bbosr ON (bbosr.order_id = bbdmi.order_id AND bbosr.sample_id = bbdmi.sample_id)
         JOIN biz_business_order_info bboi ON bbosr.order_id = bboi.id
-        LEFT JOIN biz_business_device_measure_approval bbdma ON (bbdma.data_id = bbdmi.id AND bbdma.approval_status != 5) <!--一条检定对应只有一个数据审批通过的证书，这里查非未通过的，证书为生成的前端前端展示空-->
+        LEFT JOIN biz_business_device_measure_approval bbdma ON (bbdma.data_id = bbdmi.id AND bbdma.approval_status != 5) <!--一条检定对应只有一个数据审批通过的证书，这里查非未通过的，证书为生成的前端展示空-->
         WHERE 1=1
         <if test="request != null and request.dataNo != null and request.dataNo !=''">
             and bbdmi.data_no like concat('%',#{request.dataNo},'%')
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java
index 111c025..74420b7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java
@@ -117,6 +117,11 @@
          */
         @ApiModelProperty("意见内容")
         private String comment;
+
+        public FlowCommentDto(String type, String comment) {
+            this.type = type;
+            this.comment = comment;
+        }
     }
 }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralCheckItemServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralCheckItemServiceImpl.java
index f784dd5..3b44903 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralCheckItemServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralCheckItemServiceImpl.java
@@ -72,6 +72,9 @@
         //1、获取执行service及使用参数
         String belongStandardEquipment = request.getBelongStandardEquipment();
         IService iService = CheckConfig.checkItemDataServiceMap.get(belongStandardEquipment);
+        if (Objects.isNull(iService)) {
+            return null;
+        }
         //2、执行通用操作
         QueryWrapper wrapper = new QueryWrapper();
         wrapper.eq("item_category_id", request.getItemCategoryId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java
index 568645e..ccad65f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java
@@ -190,7 +190,7 @@
         wrapper.eq("data_id", id);
         List<BizBusinessDeviceMeasureApproval> measureApprovalList = measureApprovalMapper.selectList(wrapper);
         if (!CollectionUtils.isEmpty(measureApprovalList)) {
-            long count = measureApprovalList.stream().filter(measureApproval -> ApprovalStatusEnum.FAILED.equals(measureApproval.getApprovalStatus())).count();
+            long count = measureApprovalList.stream().filter(measureApproval -> !ApprovalStatusEnum.FAILED.equals(measureApproval.getApprovalStatus())).count();
             if (count > 0) {
                 throw new BusinessException(BusinessExceptionEnum.MEASURE_DATA_ALREADY_EXIST);
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
index c2dd02c..4bf5d1d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
@@ -198,6 +198,23 @@
             }
 
         }
+        if (resultList.size() == 1 && resultList.get(0).size() == 1) {
+            resultList.get(0).get(0).setComment(new ApprovalLogResponse.FlowCommentDto("0", "自动通过"));
+        }
+
+        if (!CollectionUtils.isEmpty(resultList)) {
+            List<List<ApprovalLogResponse>> finalList = new ArrayList<>();
+            for (List<ApprovalLogResponse> elementList : resultList) {
+                List<ApprovalLogResponse> approvalLogs = new ArrayList<>();
+                for (ApprovalLogResponse element : elementList) {
+                    if (StringUtils.isNotBlank(element.getAssigneeName())) {
+                        approvalLogs.add(element);
+                    }
+                }
+                finalList.add(approvalLogs);
+            }
+            resultList = finalList;
+        }
 
         return resultList;
     }