diff --git a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java
index 21f21106..032e1c20 100644
--- a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java
+++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java
@@ -69,6 +69,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
 			entity.put("TYPE", "0");
 			entity.put("TYPE_NAME", "动火交底人");
 			entity.put("APPROVAL_OPINIONS",info.getString("CONFESS_DEPARTMENT_OPINIONS"));
+			entity.put("APPROVAL_STATUS", "0");
 			entity.put("STATUS", "0");
 			entity.put("CREATE_TIME", time);
 			entity.put("VALID_FLAG", "1");
@@ -350,7 +351,6 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
 		condition.put("TYPE", "0");
 		condition.put("USER_ID", pd.get("USER_ID"));
 		condition.put("APPROVAL_STATUS", "0");
-		busHotworkCfdExamineMapper.findByCondition(condition);
 		//动火交底人需处理数
 		info.put("confessNum", busHotworkCfdExamineMapper.findByCondition(condition).size());
 		condition.put("TYPE", "1");
@@ -359,6 +359,7 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
 		condition.put("TYPE", "2");
 		// 安全项检查人需处理数
 		info.put("safetyNum", busHotworkCfdExamineMapper.findByCondition(condition).size());
+		// 气体分析人需处理数
 		return info;
 	}
 
diff --git a/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml
index 6bd33592..acc00233 100644
--- a/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml
+++ b/src/main/resources/mybatis/datasource/highriskwork/BusHotworkCfdExamineMapper.xml
@@ -143,6 +143,9 @@
 		<if test="TYPE != null and TYPE != ''">
 			and f.TYPE = #{TYPE}
 		</if>
+		<if test="APPROVAL_STATUS != null and APPROVAL_STATUS != ''">
+			and f.APPROVAL_STATUS = #{APPROVAL_STATUS}
+		</if>
 	</select>
 	<select id="safetylistPage" resultType="com.zcloud.entity.PageData">
 		select
@@ -296,7 +299,7 @@
 		</if>
 		<if test="pd.USER_ID != null and pd.USER_ID != ''">
 			and exists (select 1 from bus_hotwork_cfd_examine bhce where bhce.USER_ID = #{pd.USER_ID} and bhce.IS_DELETE =
-			'0' and bhce.VALID_FLAG = '1' and bhce.APPROVAL_STATUS = '0' and bhce.TYPE = '0')
+			'0' and bhce.VALID_FLAG = '1' and bhce.APPROVAL_STATUS = '0' and bhce.TYPE = '0' and bhce.HOTWORK_ID = f.HOTWORK_ID)
 		</if>
 		ORDER BY f.APPLY_STATUS,f.CREATTIME DESC
 
diff --git a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml
index 22372bfb..9b468f50 100644
--- a/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml
+++ b/src/main/resources/mybatis/datasource/highriskwork/HotworkCfdMapper.xml
@@ -1694,7 +1694,6 @@
 		COUNT(CASE WHEN f.APPLY_STATUS &lt; '7' AND f.APPLY_STATUS &gt; 0  AND f.ANALYZE_USER_ID = #{USER_ID} THEN f.HOTWORK_ID END) COUNTANALYZE,
 		COUNT(CASE WHEN f.APPLY_STATUS &lt; '8' AND f.APPLY_STATUS &gt; 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.HOTWORK_ID END) COUNTGUARDIAN,
 		COUNT(CASE WHEN f.APPLY_STATUS &lt; '8' AND f.APPLY_STATUS &gt; 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.HOTWORK_ID END) COUNTCONFESS,
-		<!--COUNT(CASE WHEN f.APPLY_STATUS &lt; '8' AND f.APPLY_STATUS &gt; 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from BUS_HOTWORK_ACCEPTUSER m where m.HOTWORK_ID = f.HOTWORK_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID)-->
 		COUNT(CASE WHEN f.APPLY_STATUS &lt; '8' AND f.APPLY_STATUS &gt; 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from BUS_HOTWORK_ACCEPTUSER_CFD m where m.HOTWORK_ID = f.HOTWORK_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID)
 		THEN f.HOTWORK_ID END) COUNTACCEPTCONFESS
 		FROM <include refid="tableName"></include> f