Commit 9ff64c586fdb94e08b5b00f2c87eb75ed6e504bf
1 parent
c7498d25e1
Exists in
master
and in
6 other branches
1
Showing 2 changed files with 4 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
9ff64c5
| ... | ... | @@ -173,7 +173,7 @@ |
| 173 | 173 | p1.setRiskFactorId(patients.getRiskFactorId()); |
| 174 | 174 | p1.setRiskLevelId(patients.getRiskLevelId()); |
| 175 | 175 | p1.setRiskScore(patients.getRiskScore()); |
| 176 | - p1.setNextCheckTime(nextCheckTime==null?null:DateUtil.parseYMD(nextCheckTime)); | |
| 176 | + p1.setNextCheckTime(com.lyms.platform.common.utils.StringUtils.isEmpty(nextCheckTime)?null:DateUtil.parseYMD(nextCheckTime)); | |
| 177 | 177 | p1.setFmDate(patients.getFmDate()); |
| 178 | 178 | p1.setServiceStatus(patients.getServiceStatus()); |
| 179 | 179 | p1.setLastCheckEmployeeId(patients.getLastCheckEmployeeId()); |
| 180 | 180 | |
| ... | ... | @@ -196,12 +196,12 @@ |
| 196 | 196 | p1.setRiskFactorId(patients.getRiskFactorId()); |
| 197 | 197 | p1.setRiskLevelId(patients.getRiskLevelId()); |
| 198 | 198 | p1.setRiskScore(patients.getRiskScore()); |
| 199 | - p1.setNextCheckTime(nextCheckTime==null?null:DateUtil.parseYMD(nextCheckTime)); | |
| 199 | + p1.setNextCheckTime(com.lyms.platform.common.utils.StringUtils.isEmpty(nextCheckTime)?null:DateUtil.parseYMD(nextCheckTime)); | |
| 200 | 200 | p1.setFmDate(patients.getFmDate()); |
| 201 | 201 | p1.setServiceStatus(patients.getServiceStatus()); |
| 202 | 202 | p1.setLastCheckEmployeeId(patients.getLastCheckEmployeeId()); |
| 203 | 203 | patientsService.updatePatient(p1); |
| 204 | - patientsService.updatePatientOneCol(p.getId(), nextCheckTime); | |
| 204 | + patientsService.updatePatientOneCol(p.getId(), com.lyms.platform.common.utils.StringUtils.isEmpty(nextCheckTime)?null:DateUtil.parseYMD(nextCheckTime)); | |
| 205 | 205 | } |
| 206 | 206 | } |
| 207 | 207 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
9ff64c5
| ... | ... | @@ -994,7 +994,7 @@ |
| 994 | 994 | |
| 995 | 995 | PatientCheckTicketQuery patientCheckTicketQuery=new PatientCheckTicketQuery(); |
| 996 | 996 | patientCheckTicketQuery.setPatientId(id); |
| 997 | - | |
| 997 | + patientCheckTicketQuery.setStatus(1); | |
| 998 | 998 | PatientCheckTicket patientCheckTicket=new PatientCheckTicket(); |
| 999 | 999 | patientCheckTicket.setStatus(4); |
| 1000 | 1000 | patientCheckTicket.setPatientId(id); |