diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java
index 76dff21..1426e84 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,5 @@
  */
 public interface EquipmentStandardSupportMapper extends BaseMapper<EquipmentStandardSupportEquipment> {
 
+    List<EquipmentStandardSupportEquipment> selectBatchEquipmentIds(@Param("supportEquipmentIds") List<Long> supportEquipmentIds);
 }

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java
index 76dff21..1426e84 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,5 @@
  */
 public interface EquipmentStandardSupportMapper extends BaseMapper<EquipmentStandardSupportEquipment> {
 
+    List<EquipmentStandardSupportEquipment> selectBatchEquipmentIds(@Param("supportEquipmentIds") List<Long> supportEquipmentIds);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml
index 4c5c0ba..858b2e5 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml
@@ -19,4 +19,11 @@
         id, standard_equipment_id, equipment_id, remark, is_del, create_user, create_time, update_time
     </sql>
 
+    <select id="selectBatchEquipmentIds" resultMap="BaseResultMap">
+        SELECT * FROM equipment_standard_support_equipment
+        WHERE is_del = 0 AND equipment_id IN
+        <foreach collection="supportEquipmentIds" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
 </mapper>

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java
index 76dff21..1426e84 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,5 @@
  */
 public interface EquipmentStandardSupportMapper extends BaseMapper<EquipmentStandardSupportEquipment> {
 
+    List<EquipmentStandardSupportEquipment> selectBatchEquipmentIds(@Param("supportEquipmentIds") List<Long> supportEquipmentIds);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml
index 4c5c0ba..858b2e5 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml
@@ -19,4 +19,11 @@
         id, standard_equipment_id, equipment_id, remark, is_del, create_user, create_time, update_time
     </sql>
 
+    <select id="selectBatchEquipmentIds" resultMap="BaseResultMap">
+        SELECT * FROM equipment_standard_support_equipment
+        WHERE is_del = 0 AND equipment_id IN
+        <foreach collection="supportEquipmentIds" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index 92c54eb..d56197e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -275,6 +275,9 @@
         }
         if(MEASURE_COMPLETE.equals(currentSegment) || TO_GIVE_BACK.equals(currentSegment) || GIVE_BACK_COMPLETE.equals(currentSegment)){
             dispatchVO.setCurrentSegment(COMPLETE);
+            //产品：完成状态的不展示证书出具信息
+            dispatchVO.setRequireCertifications(null);
+            dispatchVO.setAlreadyCertifications(null);
         }
     }
 

diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java
index 76dff21..1426e84 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java
@@ -2,6 +2,9 @@
 
 import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,5 @@
  */
 public interface EquipmentStandardSupportMapper extends BaseMapper<EquipmentStandardSupportEquipment> {
 
+    List<EquipmentStandardSupportEquipment> selectBatchEquipmentIds(@Param("supportEquipmentIds") List<Long> supportEquipmentIds);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml
index 4c5c0ba..858b2e5 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml
@@ -19,4 +19,11 @@
         id, standard_equipment_id, equipment_id, remark, is_del, create_user, create_time, update_time
     </sql>
 
+    <select id="selectBatchEquipmentIds" resultMap="BaseResultMap">
+        SELECT * FROM equipment_standard_support_equipment
+        WHERE is_del = 0 AND equipment_id IN
+        <foreach collection="supportEquipmentIds" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
 </mapper>
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index 92c54eb..d56197e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -275,6 +275,9 @@
         }
         if(MEASURE_COMPLETE.equals(currentSegment) || TO_GIVE_BACK.equals(currentSegment) || GIVE_BACK_COMPLETE.equals(currentSegment)){
             dispatchVO.setCurrentSegment(COMPLETE);
+            //产品：完成状态的不展示证书出具信息
+            dispatchVO.setRequireCertifications(null);
+            dispatchVO.setAlreadyCertifications(null);
         }
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
index 0e3faa3..15a1e73 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
@@ -194,9 +194,13 @@
             }
             // 通过标准配套设备id字段查询需要修改的配套设备信息
             List<Long> supportEquipmentIds = meterStandardApplyEquipments.stream().map(EquipmentStandardApplyEquipment::getSupportEquipmentId).collect(Collectors.toList());
-            List<EquipmentStandardSupportEquipment> oldSupportEquipmentList = standardSupportMapper.selectBatchIds(supportEquipmentIds);
+            List<EquipmentStandardSupportEquipment> oldSupportEquipmentList = standardSupportMapper.selectBatchEquipmentIds(supportEquipmentIds);
             // 通过标准配套设备表中的设备id查询出设备详细信息
-            List<Long> oldEquipmentIds = oldSupportEquipmentList.stream().map(EquipmentStandardSupportEquipment::getEquipmentId).collect(Collectors.toList());
+            List<Long> oldEquipmentIds = oldSupportEquipmentList.stream()
+                    .filter(e -> {
+                        return e.getStandardEquipmentId().equals(request.getId());
+                    })
+                    .map(EquipmentStandardSupportEquipment::getEquipmentId).collect(Collectors.toList());
             if(!CollectionUtils.isEmpty(oldEquipmentIds) && oldEquipmentIds.size()!=0){
                 List<EquipmentStandardSupportEquipment> equipmentList = meterFixedAssetsMapper.queryEquipmentInfo(oldEquipmentIds);
                 for (EquipmentStandardSupportEquipment equipment : equipmentList) {
@@ -225,7 +229,7 @@
         String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo);
         meterStandardApply.setApplyNo(applyNo);
         meterStandardApply.setApprovalStatus(ApprovalStatusEnum.DRAFT);
-        // 新增标准装置基本信息
+        // 新增标准装置申请基本信息
         if(meterStandardApplyMapper.insert(meterStandardApply)>0){
             if(saveBatch(meterStandardApply)){
                 return ReturnUtil.success(meterStandardApply.getId());