Commit c3b733802be28dd8dcc788dde5c380b17f2262c3
1 parent
44c6832bd1
Exists in
master
and in
8 other branches
update code
Showing 1 changed file with 12 additions and 9 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
c3b7338
| ... | ... | @@ -89,16 +89,19 @@ |
| 89 | 89 | //判断在儿童建档的时候，是否设置到这个儿童对应的孕妇 设置成产妇 |
| 90 | 90 | //计算规则 儿童生日 > 孕妇分娩时间 - 60 设置成分娩 |
| 91 | 91 | Date dueDate = patients.getDueDate(); |
| 92 | - Date brith = DateUtil.parseYMD(request.getBabyBirthday()); | |
| 93 | - Date tempDate = DateUtil.addDay(dueDate,-60); | |
| 94 | - if (brith.getTime() > tempDate.getTime()) | |
| 92 | + if(dueDate != null && request.getBabyBirthday() != null) | |
| 95 | 93 | { |
| 96 | - //设置孕妇已分娩 | |
| 97 | - Patients patientUpdate = new Patients(); | |
| 98 | - patientUpdate.setId(patients.getId()); | |
| 99 | - patientUpdate.setYn(YnEnums.YES.getId()); | |
| 100 | - patientUpdate.setType(3); | |
| 101 | - patientsService.updatePatient(patientUpdate); | |
| 94 | + Date brith = DateUtil.parseYMD(request.getBabyBirthday()); | |
| 95 | + Date tempDate = DateUtil.addDay(dueDate,-60); | |
| 96 | + if (brith.getTime() > tempDate.getTime()) | |
| 97 | + { | |
| 98 | + //设置孕妇已分娩 | |
| 99 | + Patients patientUpdate = new Patients(); | |
| 100 | + patientUpdate.setId(patients.getId()); | |
| 101 | + patientUpdate.setYn(YnEnums.YES.getId()); | |
| 102 | + patientUpdate.setType(3); | |
| 103 | + patientsService.updatePatient(patientUpdate); | |
| 104 | + } | |
| 102 | 105 | } |
| 103 | 106 | |
| 104 | 107 | } |