diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 32b6803..e8c170a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -136,8 +136,8 @@ public class AntenatalExaminationFacade { Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId()); patients.setLastCheckEmployeeId(antExAddRequest.getCheckDoctor()); - patientsService.updatePatientOneCol(patients.getId(), com.lyms.platform.common.utils.StringUtils.isEmpty(antExAddRequest.getNextCheckTime()) == true ? null : DateUtil.parseYMD(antExAddRequest.getNextCheckTime())); patientsService.updatePatient(patients); + patientsService.updatePatientOneCol(patients.getId(), com.lyms.platform.common.utils.StringUtils.isEmpty(antExAddRequest.getNextCheckTime()) == true ? null : DateUtil.parseYMD(antExAddRequest.getNextCheckTime())); //修改孕妇高危等级 updateLastRisk(antExAddRequest.getParentId()); @@ -160,12 +160,13 @@ public class AntenatalExaminationFacade { } Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId()); patients.setLastCheckEmployeeId(antExAddRequest.getCheckDoctor()); - patientsService.updatePatientOneCol(patients.getId(), com.lyms.platform.common.utils.StringUtils.isEmpty(antExAddRequest.getNextCheckTime()) == true ? null : DateUtil.parseYMD(antExAddRequest.getNextCheckTime())); + model.setPid(patients.getPid()); if (StringUtils.isNotEmpty(patients.getEnable()) && "0".equals(patients.getEnable())) { patients.setEnable("1"); } patientsService.updatePatient(patients); + patientsService.updatePatientOneCol(patients.getId(), com.lyms.platform.common.utils.StringUtils.isEmpty(antExAddRequest.getNextCheckTime()) == true ? null : DateUtil.parseYMD(antExAddRequest.getNextCheckTime())); antenatalExaminationService.addOneBabyAnt(model); //修改最后一次检查时间 @@ -248,13 +249,14 @@ public class AntenatalExaminationFacade { Patients patients = patientsService.findOnePatientById(excAddRequest.getParentId()); patients.setLastCheckEmployeeId(excAddRequest.getProdDoctor()); - patientsService.updatePatientOneCol(patients.getId(), com.lyms.platform.common.utils.StringUtils.isEmpty(excAddRequest.getNextCheckTime()) == true ? null : DateUtil.parseYMD(excAddRequest.getNextCheckTime())); + if (StringUtils.isNotEmpty(patients.getEnable()) && "0".equals(patients.getEnable())) { patients.setEnable("1"); } //修改患者风险等级 // updatePatientRiskLevel(antExChuModel, patients); patientsService.updatePatient(patients); + patientsService.updatePatientOneCol(patients.getId(), com.lyms.platform.common.utils.StringUtils.isEmpty(excAddRequest.getNextCheckTime()) == true ? null : DateUtil.parseYMD(excAddRequest.getNextCheckTime())); //修改本系统最后的高危 updateLastRisk(patients.getId()); //修改本院最后一次定义高危 @@ -292,10 +294,11 @@ public class AntenatalExaminationFacade { antExChuModel.setHospitalId(autoMatchFacade.getHospitalId(userId)); antenatalExaminationService.addOneAntEx(antExChuModel); //修改患者风险等级 - patientsService.updatePatientOneCol(patients.getId(), com.lyms.platform.common.utils.StringUtils.isEmpty(excAddRequest.getNextCheckTime()) == true ? null : DateUtil.parseYMD(excAddRequest.getNextCheckTime())); + patients.setLastCheckEmployeeId(excAddRequest.getProdDoctor()); // updatePatientRiskLevel(antExChuModel, patients); patientsService.updatePatient(patients); + patientsService.updatePatientOneCol(patients.getId(), com.lyms.platform.common.utils.StringUtils.isEmpty(excAddRequest.getNextCheckTime()) == true ? null : DateUtil.parseYMD(excAddRequest.getNextCheckTime())); updateLastRisk(patients.getId()); //修改本院最后一次定义高危