代码优化,统一用出院时间discharge_time

This commit is contained in:
zhuangyuanke 2024-07-24 18:21:18 +08:00
parent 34438bbbd2
commit 39c068eb69

View File

@ -58,52 +58,67 @@ public class subscribeTaskServiceImpl implements SubscribeTaskService {
} }
//判断路径节点组装数据 //判断路径节点组装数据
//如果节点 适用范围是 出院后或就诊/出院后 PatientVO patientVO = patientList.stream().filter(Objects::nonNull).filter(item -> signPatientManageRouteNode.getPatientId().equals(item.getPatientId())).findFirst().orElse(new PatientVO());
if (signPatientManageRouteNode.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_DISCHARGE.getInfo()) || signPatientManageRouteNode.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_VISIT_DISCHARGE.getInfo())) { LocalDate localDate = patientVO.getDischargeTime().plusDays(signPatientManageRouteNode.getRouteNodeDay());
PatientVO patientVO = patientList.stream().filter(Objects::nonNull).filter(item -> signPatientManageRouteNode.getPatientId().equals(item.getPatientId())).findFirst().orElse(new PatientVO()); boolean before = localDate.isBefore(LocalDate.now()) || localDate.isEqual(LocalDate.now());
//患者类型如果是 出院患者 if (before) {
if (patientVO.getPatientType().equals(PatientTypeEnum.DISCHARGED_PATIENT.getInfo())) { signPatientManageRouteNode.setOpenId(patientVO.getOpenId());
//出院时间 //转换成中文
LocalDate localDate = patientVO.getDischargeTime().plusDays(signPatientManageRouteNode.getRouteNodeDay()); signPatientManageRouteNode.setRouteNodeName(RouteNodeNameEnum.getNameByInfo(signPatientManageRouteNode.getRouteNodeName()).getName());
boolean before = localDate.isBefore(LocalDate.now()) || localDate.isEqual(LocalDate.now()); patientVOList.add(signPatientManageRouteNode);
if (before) {
signPatientManageRouteNode.setOpenId(patientVO.getOpenId());
signPatientManageRouteNode.setRouteNodeName(RouteNodeNameEnum.AFTER_DISCHARGE.getName());
patientVOList.add(signPatientManageRouteNode);
}
}
} }
//如果节点适用范围是 入院后 patientVOList.add(signPatientManageRouteNode);
if (signPatientManageRouteNode.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_ADMISSION.getInfo())) {
PatientVO patientVO = patientList.stream().filter(Objects::nonNull).filter(item -> signPatientManageRouteNode.getPatientId().equals(item.getPatientId())).findFirst().orElse(new PatientVO());
//患者类型如果是 在院患者 // //如果节点 适用范围是 出院后或就诊/出院后
if (patientVO.getPatientType().equals(PatientTypeEnum.IN_HOSPITAL_PATIENT.getInfo())) { // if (signPatientManageRouteNode.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_DISCHARGE.getInfo()) || signPatientManageRouteNode.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_VISIT_DISCHARGE.getInfo())) {
//入院时间 // PatientVO patientVO = patientList.stream().filter(Objects::nonNull).filter(item -> signPatientManageRouteNode.getPatientId().equals(item.getPatientId())).findFirst().orElse(new PatientVO());
LocalDate localDate = patientVO.getAdmissionTime().plusDays(signPatientManageRouteNode.getRouteNodeDay()); // //患者类型如果是 出院患者
boolean before = localDate.isBefore(LocalDate.now()) || localDate.isEqual(LocalDate.now()); // if (patientVO.getPatientType().equals(PatientTypeEnum.DISCHARGED_PATIENT.getInfo())) {
if (before) { // //出院时间
signPatientManageRouteNode.setOpenId(patientVO.getOpenId()); // LocalDate localDate = patientVO.getDischargeTime().plusDays(signPatientManageRouteNode.getRouteNodeDay());
signPatientManageRouteNode.setRouteNodeName(RouteNodeNameEnum.AFTER_ADMISSION.getName()); // boolean before = localDate.isBefore(LocalDate.now()) || localDate.isEqual(LocalDate.now());
patientVOList.add(signPatientManageRouteNode); // if (before) {
} // signPatientManageRouteNode.setOpenId(patientVO.getOpenId());
} // signPatientManageRouteNode.setRouteNodeName(RouteNodeNameEnum.AFTER_DISCHARGE.getName());
} // patientVOList.add(signPatientManageRouteNode);
//如果节点 适用范围是 就诊后 就诊/出院后 // }
if (signPatientManageRouteNode.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_CONSULTATION.getInfo()) || signPatientManageRouteNode.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_VISIT_DISCHARGE.getInfo())) { // }
PatientVO patientVO = patientList.stream().filter(Objects::nonNull).filter(item -> signPatientManageRouteNode.getPatientId().equals(item.getPatientId())).findFirst().orElse(new PatientVO()); // }
//患者类型如果是 门诊患者 // //如果节点适用范围是 入院后
if (patientVO.getPatientType().equals(PatientTypeEnum.OUTPATIENT.getInfo()) && patientVO.getAdmissionTime() == null) { // if (signPatientManageRouteNode.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_ADMISSION.getInfo())) {
//就诊时间 // PatientVO patientVO = patientList.stream().filter(Objects::nonNull).filter(item -> signPatientManageRouteNode.getPatientId().equals(item.getPatientId())).findFirst().orElse(new PatientVO());
LocalDate localDate = patientVO.getVisitDate().plusDays(signPatientManageRouteNode.getRouteNodeDay()); // //患者类型如果是 在院患者
boolean before = localDate.isBefore(LocalDate.now()) || localDate.isEqual(LocalDate.now()); // if (patientVO.getPatientType().equals(PatientTypeEnum.IN_HOSPITAL_PATIENT.getInfo())) {
if (before) { // //入院时间
signPatientManageRouteNode.setOpenId(patientVO.getOpenId()); // LocalDate localDate = patientVO.getAdmissionTime().plusDays(signPatientManageRouteNode.getRouteNodeDay());
signPatientManageRouteNode.setRouteNodeName(RouteNodeNameEnum.AFTER_CONSULTATION.getName()); // boolean before = localDate.isBefore(LocalDate.now()) || localDate.isEqual(LocalDate.now());
patientVOList.add(signPatientManageRouteNode); // if (before) {
} // signPatientManageRouteNode.setOpenId(patientVO.getOpenId());
} // signPatientManageRouteNode.setRouteNodeName(RouteNodeNameEnum.AFTER_ADMISSION.getName());
} // patientVOList.add(signPatientManageRouteNode);
} // }
// }
// }
// //如果节点 适用范围是 就诊后 就诊/出院后
// if (signPatientManageRouteNode.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_CONSULTATION.getInfo()) || signPatientManageRouteNode.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_VISIT_DISCHARGE.getInfo())) {
// PatientVO patientVO = patientList.stream().filter(Objects::nonNull).filter(item -> signPatientManageRouteNode.getPatientId().equals(item.getPatientId())).findFirst().orElse(new PatientVO());
// //患者类型如果是 门诊患者
// if (patientVO.getPatientType().equals(PatientTypeEnum.OUTPATIENT.getInfo()) && patientVO.getAdmissionTime() == null) {
// //就诊时间
// LocalDate localDate = patientVO.getVisitDate().plusDays(signPatientManageRouteNode.getRouteNodeDay());
// boolean before = localDate.isBefore(LocalDate.now()) || localDate.isEqual(LocalDate.now());
// if (before) {
// signPatientManageRouteNode.setOpenId(patientVO.getOpenId());
// signPatientManageRouteNode.setRouteNodeName(RouteNodeNameEnum.AFTER_CONSULTATION.getName());
// patientVOList.add(signPatientManageRouteNode);
// }
// }
// }
}
List<Long> signPatientManageRouteNodeIds = new ArrayList<>(); List<Long> signPatientManageRouteNodeIds = new ArrayList<>();
//发送 //发送
for (PatientVO patientVO : patientVOList) { for (PatientVO patientVO : patientVOList) {