From c3b733802be28dd8dcc788dde5c380b17f2262c3 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 4 Jul 2016 17:49:51 +0800 Subject: [PATCH] update code --- .../operate/web/facade/BabyBookbuildingFacade.java | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index b37c742..085dcf0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -89,16 +89,19 @@ public class BabyBookbuildingFacade { //判断在儿童建档的时候，是否设置到这个儿童对应的孕妇 设置成产妇 //计算规则 儿童生日 > 孕妇分娩时间 - 60 设置成分娩 Date dueDate = patients.getDueDate(); - Date brith = DateUtil.parseYMD(request.getBabyBirthday()); - Date tempDate = DateUtil.addDay(dueDate,-60); - if (brith.getTime() > tempDate.getTime()) + if(dueDate != null && request.getBabyBirthday() != null) { - //设置孕妇已分娩 - Patients patientUpdate = new Patients(); - patientUpdate.setId(patients.getId()); - patientUpdate.setYn(YnEnums.YES.getId()); - patientUpdate.setType(3); - patientsService.updatePatient(patientUpdate); + Date brith = DateUtil.parseYMD(request.getBabyBirthday()); + Date tempDate = DateUtil.addDay(dueDate,-60); + if (brith.getTime() > tempDate.getTime()) + { + //设置孕妇已分娩 + Patients patientUpdate = new Patients(); + patientUpdate.setId(patients.getId()); + patientUpdate.setYn(YnEnums.YES.getId()); + patientUpdate.setType(3); + patientsService.updatePatient(patientUpdate); + } } } -- 1.8.3.1