预案触发时间

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpStockServiceImpl.java

@@ -1046,8 +1046,8 @@ public class HxpStockServiceImpl implements IHxpStockService {
      * @Param []
      * @Return void
      **/
-    @Scheduled(cron = "0 0/1 * * * ? ")
-//    @Scheduled(cron = "0 0 0 * * ?")
+//    @Scheduled(cron = "0 0/1 * * * ? ")
+    @Scheduled(cron = "0 0 0 * * ?")
     public void hxpTimeOut() {
         // 查询配置
         ResultData<WarningConfigDto> byType = remoteLaboratoryService.getByType(2);

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabMessageContentServiceImpl.java

@@ -282,6 +282,7 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
                 warningNoticeLog.setKeyId(groupId);
                 warningNoticeLog.setSubName(subject.getName());
                 warningNoticeLog.setBuildName(subject.getDeptName());
+                warningNoticeLog.setFloorId(subject.getFloorId());
                 warningNoticeLog.setFloorName(subject.getFloorName());
                 warningNoticeLog.setRoomNum(subject.getRoom());
                 warningNoticeLog.setWarningType(4);
@@ -301,13 +302,9 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
                     riskPlanName = "高风险";
                 }
                 warningNoticeLog.setWarningContent(labRiskPlanLevel.getDescribe()+"-"+riskPlanName);
-
-                LabRiskPlanAbnormalLog labRiskPlanAbnormalLogByGroupId = new LabRiskPlanAbnormalLog();
-                labRiskPlanAbnormalLogByGroupId.setGroupId(groupId);
-                List<LabRiskPlanAbnormalLog> list = labRiskPlanAbnormalLogMapper.selectLabRiskPlanAbnormalLogOrderByList(labRiskPlanAbnormalLogByGroupId);
-                if (list != null && list.size() > 0) {
-                    LabRiskPlanAbnormalLog labRiskPlanAbnormalLog = list.get(0);
-                    warningNoticeLog.setStartTime(LocalDateTimeUtil.of(labRiskPlanAbnormalLog.getStartDate()));
+                LabRiskPlanAbnormalLog labRiskPlanAbnormalLog = labRiskPlanAbnormalLogMapper.selectLabRiskPlanAbnormalLogById(groupId);
+                if (labRiskPlanAbnormalLog != null ) {
+                    warningNoticeLog.setStartTime(LocalDateTimeUtil.of(labRiskPlanAbnormalLog.getCreateTime()));
                 }
                 //获取实验室内人员
                 Map<String, Object> params = new HashMap<>();