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 1f75983..c5f5e97 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 @@ -156,7 +156,7 @@ public class AntenatalExaminationFacade { } //当非建档医院修改初诊信息时,需要同步给建档医院 - private void syncMaster(String parentId) { + private void syncMaster(String parentId,String nextCheckTime) { //当前非建档医院最新的状态 Patients patients = patientsService.findOnePatientById(parentId); @@ -173,12 +173,12 @@ public class AntenatalExaminationFacade { p1.setRiskFactorId(patients.getRiskFactorId()); p1.setRiskLevelId(patients.getRiskLevelId()); p1.setRiskScore(patients.getRiskScore()); - p1.setNextCheckTime(patients.getNextCheckTime()); + p1.setNextCheckTime(nextCheckTime==null?null:DateUtil.parseYMD(nextCheckTime)); p1.setFmDate(patients.getFmDate()); p1.setServiceStatus(patients.getServiceStatus()); p1.setLastCheckEmployeeId(patients.getLastCheckEmployeeId()); patientsService.updatePatient(p1); - patientsService.updatePatientOneCol(masterPatients.getId(), patients.getNextCheckTime()); + patientsService.updatePatientOneCol(masterPatients.getId(), nextCheckTime); }else{ PatientsQuery patientsQuery1=new PatientsQuery(); patientsQuery1.setSource(parentId); @@ -196,12 +196,12 @@ public class AntenatalExaminationFacade { p1.setRiskFactorId(patients.getRiskFactorId()); p1.setRiskLevelId(patients.getRiskLevelId()); p1.setRiskScore(patients.getRiskScore()); - p1.setNextCheckTime(patients.getNextCheckTime()); + p1.setNextCheckTime(nextCheckTime==null?null:DateUtil.parseYMD(nextCheckTime)); p1.setFmDate(patients.getFmDate()); p1.setServiceStatus(patients.getServiceStatus()); p1.setLastCheckEmployeeId(patients.getLastCheckEmployeeId()); patientsService.updatePatient(p1); - patientsService.updatePatientOneCol(p.getId(), patients.getNextCheckTime()); + patientsService.updatePatientOneCol(p.getId(), nextCheckTime); } } } @@ -253,7 +253,7 @@ public class AntenatalExaminationFacade { //修改最后一次检查时间 setLashCTimes(antExAddRequest.getParentId()); //修改数据 - syncMaster(antExAddRequest.getParentId()); + syncMaster(antExAddRequest.getParentId(),antExAddRequest.getNextCheckTime()); //复诊,修改产检管理 antenatalExaminationService.updateAntExRecord(antExAddRequest.getId(), 2); @@ -312,7 +312,7 @@ public class AntenatalExaminationFacade { updateLastRhTime(patients.getId(), hospitalId); //修改数据 - syncMaster(antExAddRequest.getParentId()); + syncMaster(antExAddRequest.getParentId(),antExAddRequest.getNextCheckTime()); //复诊,修改产检管理 antenatalExaminationService.updateAntExRecord(model.getId(), 2); if (null != patients.getBuildType() && patients.getBuildType() == 3) { @@ -419,7 +419,7 @@ public class AntenatalExaminationFacade { antenatalExaminationService.updateAntExRecord(antExChuModel.getId(), 1); //修改数据 - syncMaster(excAddRequest.getParentId()); + syncMaster(excAddRequest.getParentId(),excAddRequest.getNextCheckTime()); } else { AntExChuQuery antExChuQuery1 = new AntExChuQuery(); antExChuQuery1.setParentId(excAddRequest.getParentId()); @@ -479,7 +479,7 @@ public class AntenatalExaminationFacade { setLashCTimes(antExChuModel.getParentId()); antenatalExaminationService.updateAntExRecord(antExChuModel.getId(), 1); - syncMaster(excAddRequest.getParentId()); + syncMaster(excAddRequest.getParentId(),excAddRequest.getNextCheckTime()); if (null != patients.getBuildType() && patients.getBuildType() == 3) { Patients patients1 = new Patients(); patients1.setEnable("1");