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 c5f5e97..7a7a624 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 @@ -173,7 +173,7 @@ public class AntenatalExaminationFacade { p1.setRiskFactorId(patients.getRiskFactorId()); p1.setRiskLevelId(patients.getRiskLevelId()); p1.setRiskScore(patients.getRiskScore()); - p1.setNextCheckTime(nextCheckTime==null?null:DateUtil.parseYMD(nextCheckTime)); + p1.setNextCheckTime(com.lyms.platform.common.utils.StringUtils.isEmpty(nextCheckTime)?null:DateUtil.parseYMD(nextCheckTime)); p1.setFmDate(patients.getFmDate()); p1.setServiceStatus(patients.getServiceStatus()); p1.setLastCheckEmployeeId(patients.getLastCheckEmployeeId()); @@ -196,12 +196,12 @@ public class AntenatalExaminationFacade { p1.setRiskFactorId(patients.getRiskFactorId()); p1.setRiskLevelId(patients.getRiskLevelId()); p1.setRiskScore(patients.getRiskScore()); - p1.setNextCheckTime(nextCheckTime==null?null:DateUtil.parseYMD(nextCheckTime)); + p1.setNextCheckTime(com.lyms.platform.common.utils.StringUtils.isEmpty(nextCheckTime)?null:DateUtil.parseYMD(nextCheckTime)); p1.setFmDate(patients.getFmDate()); p1.setServiceStatus(patients.getServiceStatus()); p1.setLastCheckEmployeeId(patients.getLastCheckEmployeeId()); patientsService.updatePatient(p1); - patientsService.updatePatientOneCol(p.getId(), nextCheckTime); + patientsService.updatePatientOneCol(p.getId(), com.lyms.platform.common.utils.StringUtils.isEmpty(nextCheckTime)?null:DateUtil.parseYMD(nextCheckTime)); } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 5fe1b75..b4a7685 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -994,7 +994,7 @@ public class BookbuildingFacade { PatientCheckTicketQuery patientCheckTicketQuery=new PatientCheckTicketQuery(); patientCheckTicketQuery.setPatientId(id); - + patientCheckTicketQuery.setStatus(1); PatientCheckTicket patientCheckTicket=new PatientCheckTicket(); patientCheckTicket.setStatus(4); patientCheckTicket.setPatientId(id);