|
|
@@ -16,10 +16,7 @@ import com.zd.common.core.utils.SaveUtil;
|
|
|
import com.zd.common.core.utils.SecurityUtils;
|
|
|
import com.zd.laboratory.api.entity.LabMessageContent;
|
|
|
import com.zd.laboratory.api.entity.SubAddrr;
|
|
|
-import com.zd.laboratory.domain.LabRiskPlanAbnormalLog;
|
|
|
-import com.zd.laboratory.domain.LabRiskPlanLevel;
|
|
|
-import com.zd.laboratory.domain.LabSubject;
|
|
|
-import com.zd.laboratory.domain.WarningNoticeLog;
|
|
|
+import com.zd.laboratory.domain.*;
|
|
|
import com.zd.laboratory.domain.dto.LabMessageContentDTO;
|
|
|
import com.zd.laboratory.domain.dto.LabMessageContentListQuery;
|
|
|
import com.zd.laboratory.domain.vo.LabMessageContentVO;
|
|
|
@@ -94,7 +91,7 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
|
|
|
private WarningNoticeLogService warningNoticeLogService;
|
|
|
|
|
|
@Autowired
|
|
|
- private LabRiskPlanAbnormalLogMapper labRiskPlanAbnormalLogMapper;
|
|
|
+ private LabRiskPlanAbnormalGroupMapper labRiskPlanAbnormalGroupMapper;
|
|
|
|
|
|
@Autowired
|
|
|
private LabHardwareStateMapper hardwareStateMapper;
|
|
|
@@ -302,9 +299,9 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
|
|
|
riskPlanName = "高风险";
|
|
|
}
|
|
|
warningNoticeLog.setWarningContent(labRiskPlanLevel.getDescribe()+"-"+riskPlanName);
|
|
|
- LabRiskPlanAbnormalLog labRiskPlanAbnormalLog = labRiskPlanAbnormalLogMapper.selectLabRiskPlanAbnormalLogById(groupId);
|
|
|
- if (labRiskPlanAbnormalLog != null ) {
|
|
|
- warningNoticeLog.setStartTime(LocalDateTimeUtil.of(labRiskPlanAbnormalLog.getCreateTime()));
|
|
|
+ LabRiskPlanAbnormalGroup labRiskPlanAbnormalGroup = labRiskPlanAbnormalGroupMapper.selectById(groupId);
|
|
|
+ if (labRiskPlanAbnormalGroup != null ) {
|
|
|
+ warningNoticeLog.setStartTime(LocalDateTimeUtil.of(labRiskPlanAbnormalGroup.getCreateTime()));
|
|
|
}
|
|
|
//获取实验室内人员
|
|
|
Map<String, Object> params = new HashMap<>();
|