diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
index 65da9cc..3c56211 100644
--- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
+++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
@@ -6753,7 +6753,6 @@ namespace APT.BaseData.Services.DomainServices
 
 
 
-
         /// <summary>
         /// 隐患上报 审核通过 给每个通知负责人发送通知
         /// </summary>
@@ -6797,7 +6796,7 @@ namespace APT.BaseData.Services.DomainServices
                 List<T_BS_RISK_SUBMIT_CONTENT> listContent = entity.Nav_ListRiskSubmitContent;
                 int delayDays = 0;
                 bool isNoticeCheck = false;//新版 直接通知 验收人
-                if (listContent != null && listContent.Any() && listContent[0].CHECK_USER_ID.HasValue && listContent[0].LastDateUser.HasValue)
+                if (listContent != null && listContent.Any() && listContent[0].DEAL_USER_ID.HasValue && listContent[0].LastDateUser.HasValue)//CHECK_USER_ID =>DEAL_USER_ID
                 {
                     //新版 有设置验收人 整改期限
                     isNoticeCheck = true;
@@ -6903,12 +6902,12 @@ namespace APT.BaseData.Services.DomainServices
                     //隐患上报 问题 通知责任人 相同 同一个通知 （后续分配整改信息） 
                     if (isNoticeCheck)
                     {
-                        temp = listNoticePerson.FirstOrDefault(x => x.USER_ID == item.CHECK_USER_ID.Value);
+                        temp = listNoticePerson.FirstOrDefault(x => x.USER_ID == item.DEAL_USER_ID.Value);//CHECK_USER_ID
                         if (temp == null)
                         {
                             temp = new T_BS_RISK_SUBMIT_NOTICE_PERSON();
                             temp.ID = Guid.NewGuid();
-                            temp.USER_ID = item.CHECK_USER_ID.Value;
+                            temp.USER_ID = item.DEAL_USER_ID.Value;//CHECK_USER_ID
                             temp.ORG_ID = item.ORG_ID;
                             temp.NAME = item.NAME;
                             temp.CODE = item.CODE;
@@ -6920,28 +6919,24 @@ namespace APT.BaseData.Services.DomainServices
                             listDataID.Add(temp.ID);
                             listUserID.Add(temp.USER_ID);
 
-                            dtTaskEndTime = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.BS_RiskUp_Checker, entity.ORG_ID.Value, DateTime.Now, null, entity.Nav_ListRiskSubmitContent.Where(e => e.CHECK_USER_ID == temp.USER_ID && e.LastDateUser.HasValue).OrderBy(e => e.LastDateUser).ToList()[0].LastDateUser.Value);
+                            dtTaskEndTime = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.BS_RiskUp_Checker, entity.ORG_ID.Value, DateTime.Now, null, entity.Nav_ListRiskSubmitContent.Where(e => e.DEAL_USER_ID == temp.USER_ID && e.LastDateUser.HasValue).OrderBy(e => e.LastDateUser).ToList()[0].LastDateUser.Value);//CHECK_USER_ID
                             listEndTime.Add(dtTaskEndTime);
 
-                            if (item.Nav_UserCheck == null)
+                            if (item.Nav_UserDeal != null)//Nav_UserCheck
                             {
-                                listUserName.Add(GetEntity<T_FM_USER>(item.CHECK_USER_ID.Value).NAME);
-                            }
-                            else
-                            {
-                                listUserName.Add(item.Nav_UserCheck.NAME);
+                                listUserName.Add(item.Nav_UserDeal.NAME);//Nav_UserCheck
                             }//listUserName.Add(item.Nav_User.NAME);
-                            listName.Add(temp.NAME);
+                            listName.Add("整改责任人确认：" + entity.NAME);// temp.NAME
                         }
                     }
                     else
                     {
-                        temp = listNoticePerson.FirstOrDefault(x => x.USER_ID == item.USER_ID);
+                        temp = listNoticePerson.FirstOrDefault(x => x.USER_ID == item.DEAL_USER_ID);//USER_ID
                         if (temp == null)
                         {
                             temp = new T_BS_RISK_SUBMIT_NOTICE_PERSON();
                             temp.ID = Guid.NewGuid();
-                            temp.USER_ID = item.USER_ID.Value;
+                            temp.USER_ID = item.DEAL_USER_ID.Value;//USER_ID
                             temp.ORG_ID = item.ORG_ID;
                             temp.NAME = item.NAME;
                             temp.CODE = item.CODE;
@@ -6952,18 +6947,31 @@ namespace APT.BaseData.Services.DomainServices
                             listNoticePerson.Add(temp);
                             listDataID.Add(temp.ID);
                             listUserID.Add(temp.USER_ID);
-                            listUserName.Add(item.Nav_User.NAME);
-                            listName.Add(temp.NAME);
+                            if (item.Nav_UserDeal != null)
+                            {
+                                listUserName.Add(item.Nav_UserDeal?.NAME);
+                            }
+                            listName.Add("整改责任人确认：" + entity.NAME);//temp.NAME
 
                             dtTaskEndTime = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.BS_RiskUp_Checker, entity.ORG_ID.Value, DateTime.Now, null, entity.Nav_ListRiskSubmitContent.Where(e => e.CHECK_USER_ID == temp.USER_ID && e.LastDateUser.HasValue).OrderBy(e => e.LastDateUser).ToList()[0].LastDateUser.Value);
                             listEndTime.Add(dtTaskEndTime);
                         }
                     }
 
+                    if (listUserName != null && string.IsNullOrEmpty(listUserName[0]))
+                    {
+                        var listUserIDDis = listUserID.Distinct();
+                        var listModelUser = GetEntities<T_FM_USER>(e => listUserIDDis.Contains(e.ID));
+                        for (int j = 0; j < listUserID.Count; j++)
+                        {
+                            listUserName[i] = listModelUser.FirstOrDefault(e => e.ID == listUserID[j])?.NAME;
+                        }
+                    }
+
                     item.RISK_SUBMIT_NOTICE_PERSON_ID = temp.ID;//个人通知ID绑定明细
                     if (item.Nav_SafeCheckDetail != null)
                     {
-                        if (item.Nav_SafeCheckDetail.CHECKRESULT.HasValue && item.Nav_SafeCheckDetail.CHECKRESULT == 30)
+                        if (item.Nav_SafeCheckDetail.CHECKRESULT.HasValue && item.Nav_SafeCheckDetail.CHECKRESULT == 30)//检查结果 其他
                         {
                             //添加安全检查库信息
 
@@ -7285,7 +7293,6 @@ namespace APT.BaseData.Services.DomainServices
 
         }
 
-
         /// <summary>
         /// 隐患上报  完成   修改各种状态   完善隐患库
         /// </summary>