From 568cc179d98592ee4bb80ace578b422679bb8cc2 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 21 Mar 2017 11:23:23 +0800 Subject: [PATCH] update code --- .../operate/web/facade/BabyBookbuildingFacade.java | 24 ++++++++++++++++------ 1 file changed, 18 insertions(+), 6 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 cc83bb6..1c5b675 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 @@ -79,6 +79,9 @@ public class BabyBookbuildingFacade { private PatientsService patientsService; @Autowired + private MatDeliverService matDeliverService; + + @Autowired private PatientCheckTicketService patientCheckTicketService; @Autowired @@ -293,7 +296,7 @@ public class BabyBookbuildingFacade { * @return */ public BaseResponse updateBabyBookbuilding(BabyBookbuildingAddRequest request, Integer userId) { - BabyModel model = getBabyModel(request,false); + BabyModel model = getBabyModel(request,true); model.setModified(new Date()); model.setOperator(userId); if (StringUtils.isNotEmpty(request.getMommyCertificateNum())) { @@ -340,11 +343,20 @@ public class BabyBookbuildingFacade { Date brith = DateUtil.parseYMD(request.getBabyBirthday()); Date tempDate = DateUtil.addWeek(lastMenses, 24); if (brith.getTime() >= tempDate.getTime()) { - //设置孕妇分娩日期 - Patients patientUpdate = new Patients(); - patientUpdate.setId(pat.getId()); - patientUpdate.setFmDate(StringUtils.isEmpty(request.getDueDate()) ? DateUtil.parseYMD(request.getBabyBirthday()) : DateUtil.parseYMD(request.getDueDate())); - patientsService.updatePatient(patientUpdate); + MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); + matDeliverQuery.setPid(pat.getPid()); + matDeliverQuery.setYn(YnEnums.YES.getId()); + List list = matDeliverService.query(matDeliverQuery); + //有孕妇分娩记录就不修改分娩时间 否则修改分娩时间为儿童生日 + if (CollectionUtils.isEmpty(list)) + { + //设置孕妇分娩日期 + Patients patientUpdate = new Patients(); + patientUpdate.setId(pat.getId()); + patientUpdate.setFmDate(StringUtils.isEmpty(request.getDueDate()) ? DateUtil.parseYMD(request.getBabyBirthday()) : DateUtil.parseYMD(request.getDueDate())); + patientsService.updatePatient(patientUpdate); + } + } } } -- 1.8.3.1