diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs
index 8d7036b..67a58ed 100644
--- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs
+++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs
@@ -2003,8 +2003,8 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                     var company = this.GetEntity<T_FM_DEPARTMENT>(t => t.PARENT_ID == null && t.ENABLE_STATUS == 0);
                     var fmClass = this.GetEntities<T_FM_CLASS>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId), "Nav_ClassDetail");
                     var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0 && !t.CODE.Contains("admin"), new BaseFilter(filter.OrgId),"Nav_Department");
-                    var jobs = this.GetEntities<T_FO_SCHEDULING>(t => t.DATE.Date == DateTime.Now.Date, new BaseFilter(filter.OrgId), "Nav_User");
-                    var records = this.GetEntities<T_FO_LEADER_WELL_RECORD>(t => t.JOB_START_DATE.Value.Date == DateTime.Now.Date, new BaseFilter(filter.OrgId));
+                    var jobs = this.GetEntities<T_FO_SCHEDULING>(t => t.DATE.Date == dt.Date, new BaseFilter(filter.OrgId), "Nav_User");
+                    var records = this.GetEntities<T_FO_LEADER_WELL_RECORD>(t => t.JOB_START_DATE.Value.Date == dt.Date, new BaseFilter(filter.OrgId));
                     if (jobs != null && jobs.Any())
                     {
                         foreach (var item in jobs)
@@ -2014,7 +2014,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                             {
                                 var firstRecord = records.FirstOrDefault(t => t.CLASS_ID == item.CLASS_ID);
                                 var firstTime = classFisrt.Nav_ClassDetail.OrderBy(t => t.NUM).FirstOrDefault();
-                                if (firstTime.STARTTIME.Hour == DateTime.Now.AddHours(1).Hour && firstRecord == null)
+                                if (firstTime.STARTTIME.Hour == dt.AddHours(1).Hour && firstRecord == null)
                                 {
                                     var sendUser = users.FirstOrDefault(t => t.ID == item.USER_ID);
                                     if (sendUser != null)
@@ -2023,8 +2023,8 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                                         record.ORG_ID = item.ORG_ID;
                                         record.APPLY_USER_ID = sendUser.ID;
                                         record.APPLY_DEPARTMENT_ID = sendUser.DEPARTMENT_ID;
-                                        record.JOB_START_DATE = Convert.ToDateTime(DateTime.Now.Date.ToShortDateString() + firstTime.STARTTIME.ToShortTimeString());
-                                        record.JOB_END_DATE = Convert.ToDateTime(DateTime.Now.Date.ToShortDateString() + firstTime.ENDTIME.ToShortTimeString());
+                                        record.JOB_START_DATE = Convert.ToDateTime(dt.Date.ToShortDateString() +" "+ firstTime.STARTTIME.ToShortTimeString());
+                                        record.JOB_END_DATE = Convert.ToDateTime(dt.Date.ToShortDateString() +" "+ firstTime.ENDTIME.ToShortTimeString());
                                         record.APPLY_DEPARTMENT_ID = sendUser.DEPARTMENT_ID;
                                         record.COMPANY_ID = company?.ID;
                                         record.CLASS_ID = item.CLASS_ID;
@@ -2035,7 +2035,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
                                         ledUser.LEADER_WELL_RECORD_ID = record.ID;
                                         ledUser.USER_ID = sendUser.ID;
                                         wellRecordUsers.Add(ledUser);
-                                        var notice = NotificationTaskService.InsertUserNoticeTaskModel("领导带班下井记录"+DateTime.Now.Month.PadLeft(2,'0')+ DateTime.Now.Day.PadLeft(2, '0') + "-"+classFisrt.NAME, record.ID, item.ORG_ID, sendUser.ID, sendUser.NAME, DateTime.Now,
+                                        var notice = NotificationTaskService.InsertUserNoticeTaskModel("领导带班下井记录"+dt.Month.PadLeft(2,'0')+ dt.Day.PadLeft(2, '0') + "("+classFisrt.NAME+")", record.ID, item.ORG_ID, sendUser.ID, sendUser.NAME, DateTime.Now,
                                                               DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "FO041");
                                         notices.Add(notice);
                                     }
diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckSetController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckSetController.cs
index 3cc0990..4beda99 100644
--- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckSetController.cs
+++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckSetController.cs
@@ -71,7 +71,7 @@ namespace APT.SK.WebApi.Controllers.Api
                 detailIds = this.GetEntities<T_SK_CHECK_SET_CONTENTS>(t => t.CHECK_SET_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
                 basicIds = this.GetEntities<T_SK_CHECK_SET_CONTENTS_BASIC>(t => detailIds.Contains(t.CHECK_CONTENTS_SET_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
                 //hiddenIds = this.GetEntities<T_SK_CHECK_SET_CONTENTS_HIDDEN>(t => detailIds.Contains(t.CHECK_CONTENTS_SET_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
-                var record = this.GetEntity<T_SK_CHECK_SET>(t => t.ID != entity.ID && t.PRODUCTION_UNIT_ID == entity.PRODUCTION_UNIT_ID && t.CHECK_TYPE == entity.CHECK_TYPE && t.CHECK_TYPE_ID == entity.CHECK_TYPE_ID && t.CHECK_CYCLE == entity.CHECK_CYCLE && t.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.POST_ID == entity.POST_ID);
+                var record = this.GetEntity<T_SK_CHECK_SET>(t => t.ID != entity.ID && t.PRODUCTION_UNIT_ID == entity.PRODUCTION_UNIT_ID && t.CHECK_TYPE == entity.CHECK_TYPE && t.CHECK_TYPE_ID == entity.CHECK_TYPE_ID && t.CHECK_CYCLE == entity.CHECK_CYCLE && t.DEPARTMENT_ID == entity.DEPARTMENT_ID);
                 if (record != null)
                 {
                     throw new Exception("相同检查已存在，请修改检查信息或回到列表页检索");
@@ -445,7 +445,7 @@ namespace APT.SK.WebApi.Controllers.Api
         {
             return SafeExecute<bool>(() =>
             {
-                if (entity.PRODUCTION_UNIT_ID == null && entity.CHECK_TYPE_ID == null || entity.CHECK_TYPE == null || entity.DEPARTMENT_ID == null || entity.Nav_CheckUsers == null || !entity.Nav_CheckUsers.Any())
+                if (entity.PRODUCTION_UNIT_ID == null && entity.CHECK_TYPE_ID == null || entity.CHECK_TYPE == null || entity.DEPARTMENT_ID == null || entity.CHECK_CYCLE == null)
                 {
                     throw new Exception("生产单元,检查层级,检查类型,检查周期,检查部门,检查人都不能为空");
                 }