diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
index 32b6035..b69180e 100644
--- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
+++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
@@ -5340,6 +5340,14 @@ namespace APT.PP.WebApi.Controllers.Api
                         }
                         if (detailContents != null && detailContents.Any())
                         {
+                            foreach (var item in contents)
+                            {
+                                var detailLib = libraryDetails.FirstOrDefault(t => t.ID == item.ENTERPRISE_LIBRARY_DETAIL_ID);
+                                var lib = librarys.FirstOrDefault(t => t.ID == detailLib?.ENTERPRISE_LIBRARY_ID);
+                                item.RISK_NAME = lib?.RISK_NAME;
+                                item.AREA_ID = lib?.AREA_ID;
+                                item.Nav_Area = lib?.Nav_Area;
+                            }
                             foreach (var item in detailContents)
                             {
                                 if (checkTypeIds != null && checkTypeIds.Any() && item.CHECK_TYPE_ID != null && checkTypeIds.Contains((Guid)item.CHECK_TYPE_ID))
@@ -5477,7 +5485,7 @@ namespace APT.PP.WebApi.Controllers.Api
                                             record.DEPARTMENT_TYPE = item.DepartType;
                                             record.STATUS = PFStandardStatus.Draft;
                                             record.ISAUTO = true;
-                                            record.NOTICE_CODE = "GWPC" + DateTime.Now.ToString("yyyyMMddHH") + j.ToString().PadLeft(4, '0');
+                                            record.NOTICE_CODE = "GWPC" + DateTime.Now.ToString("yyyyMMddHH") + new Random().Next(1, 9999);
                                             records.Add(record);
                                             if (item.details != null && item.details.Any())
                                             {
@@ -5584,7 +5592,7 @@ namespace APT.PP.WebApi.Controllers.Api
                                             send = false;
                                         }
                                     }
-                                    if ((send && exist == null && item.CheckPost == "班组负责人") || (send && exist == null && item.CheckPost != "班组负责人" && setTime != null && dt.Hour == setTime.CHECKTIME.Value.Hour))
+                                    if ((!send && exist == null && item.CheckPost == "班组负责人" && dt.Hour == 8) || (send && exist == null && item.CheckPost == "班组负责人") || (send && exist == null && item.CheckPost != "班组负责人" && setTime != null && dt.Hour == setTime.CHECKTIME.Value.Hour))
                                     {
                                         T_SK_SECURITY_INSPECTION_NOTICE safeNotice = new T_SK_SECURITY_INSPECTION_NOTICE();
                                         safeNotice.ORG_ID = filter.OrgId;
@@ -5595,7 +5603,7 @@ namespace APT.PP.WebApi.Controllers.Api
                                         safeNotice.PLANCHECKFREQUENCY = item.Cycle;
                                         safeNotice.DEPARTMENT_TYPE = item.DepartType;
                                         safeNotice.STATUS = PFStandardStatus.Draft;
-                                        safeNotice.NOTICE_CODE = "JCZD" + DateTime.Now.ToString("yyyyMMddHH") + j.ToString().PadLeft(4, '0');
+                                        safeNotice.NOTICE_CODE = "JCZD" + DateTime.Now.ToString("yyyyMMddHH") + new Random().Next(1, 9999);
                                         safeNotice.ISAUTO = true;
                                         safeNotices.Add(safeNotice);
                                         if (item.details != null && item.details.Any())
diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
index b642cc6..26d1571 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
@@ -77,8 +77,8 @@ namespace APT.SK.WebApi.Controllers.Api
     public class CheckListNew
     {
         public string MineType { get; set; }
-        public Guid? PRODUCTION_UNIT_ID { get; set; }
-
+        public Guid? PRODUCTION_UNIT_ID { get; set; }
+        public Guid? CHECK_TYPE_ID { get; set; }
         public string CheckType { get; set; }
         public string CheckCycle { get; set; }
         public string CheckLevel { get; set; }
@@ -2677,6 +2677,7 @@ namespace APT.SK.WebApi.Controllers.Api
                 {
                     CheckListNew listNew = new CheckListNew();
                     listNew.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID;
+                    listNew.CHECK_TYPE_ID = item.Key.CHECK_TYPE_ID;
                     listNew.MineType = item.Key.MINE_NAME;
                     listNew.CheckType = item.Key.TYPE_NAME;
                     listNew.CheckCycle = item.Key.CHECK_CYCLE.GetDescription();
diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs
index ba11039..c66b776 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs
@@ -460,6 +460,10 @@ namespace APT.SK.WebApi.Controllers.Api
                     throw new Exception("检查类型不能为空");
                 if (entity.CHECK_TIME == null || entity.CHECK_TIME == DateTime.MinValue)
                     throw new Exception("检查时间必须填写");
+                if (string.IsNullOrEmpty(entity.NOTICE_CODE))
+                {
+                    entity.NOTICE_CODE = "JCSD" + DateTime.Now.ToString("yyyyMMddHH") + new Random().Next(1, 9999);
+                }
                 T_FM_NOTIFICATION_TASK finishNotice = null;
                 if (entity.STATUS != PFStandardStatus.Draft)
                 {