Commit 30b4de5b58e30f57f4a372cc8344968ffd8e8a45
1 parent
a2bfbf1634
Exists in
master
and in
8 other branches
修改新电子病历
Showing 1 changed file with 7 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
30b4de5
| ... | ... | @@ -285,13 +285,16 @@ |
| 285 | 285 | patientsQuery.setYn(YnEnums.YES.getId()); |
| 286 | 286 | patientsQuery.setType(type); |
| 287 | 287 | patientsQuery.setDueStatus(0); |
| 288 | + patientsQuery.setBuildType(1); | |
| 288 | 289 | List<Patients> patientsList = patientsService.queryPatient(patientsQuery); |
| 289 | 290 | for (Patients patients : patientsList) { |
| 290 | 291 | //判断分娩日期是否大于24孕周 |
| 291 | - if (fmDate.getTime() >= DateUtil.addDay(patients.getLastMenses(), 168).getTime()) { | |
| 292 | - patients.setFmDate(fmDate); | |
| 293 | - patients.setType(3); | |
| 294 | - patientsService.updatePatient(patients); | |
| 292 | + if(null!=patients.getLastMenses()){ | |
| 293 | + if (fmDate.getTime() >= DateUtil.addDay(patients.getLastMenses(), 168).getTime()) { | |
| 294 | + patients.setFmDate(fmDate); | |
| 295 | + patients.setType(3); | |
| 296 | + patientsService.updatePatient(patients); | |
| 297 | + } | |
| 295 | 298 | } |
| 296 | 299 | } |
| 297 | 300 | } |