From 08297494c8c5b1714fd833dfe498d8e8d3405185 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 4 Aug 2016 17:49:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=BB=88=E6=AD=A2=E5=88=86=E5=A8=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/BabyBookbuildingFacade.java | 7 ++-- .../operate/web/facade/StopPregnancyFacade.java | 39 ++++++++-------------- 2 files changed, 17 insertions(+), 29 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 048013d..cf1c72f 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 @@ -256,12 +256,13 @@ public class BabyBookbuildingFacade { if (patients.getType() == 1) { //判断在儿童建档的时候，是否设置到这个儿童对应的孕妇 设置成产妇 - //计算规则 儿童生日 > 孕妇分娩时间 - 60 设置成分娩 + //计算规则 儿童生日 >= 孕妇预产期 + 24周 设置成分娩 (高帆 2016-08-04 17:34定) Date dueDate = patients.getDueDate(); if (dueDate != null && request.getBabyBirthday() != null) { Date brith = DateUtil.parseYMD(request.getBabyBirthday()); - Date tempDate = DateUtil.addMonth(dueDate, -2); - if (brith.getTime() > tempDate.getTime()) { +// Date tempDate = DateUtil.addMonth(dueDate, -2); + Date tempDate = DateUtil.addWeek(dueDate, 24); + if (brith.getTime() >= tempDate.getTime()) { //设置孕妇已分娩 Patients patientUpdate = new Patients(); patientUpdate.setYn(YnEnums.YES.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java index 492e385..0092f08 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java @@ -89,38 +89,25 @@ public class StopPregnancyFacade { { patient.setModified(new Date()); patient.setDueStatus(1); + + //更新状态为过期 + //判断其为增值服务还是 标准服务 + if (patient.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId()) + { + patient.setServiceStatus(ServiceStatusEnums.STANDARD_OVERDUE.getId()); + } + else if (patient.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId()) + { + patient.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); + } + patient.setDueDate(new Date()); + //分娩状态 0未终止妊娠 1终止妊娠 yunBookbuildingService.updatePregnant(patient, request.getPid()); } } - Patients pat = null; - PatientsQuery patientsQuery1 = new PatientsQuery(); - patientsQuery1.setYn(YnEnums.YES.getId()); - patientsQuery1.setId(request.getId()); - List pats = yunBookbuildingService.queryPregnantWithQuery(patientsQuery1); - if (CollectionUtils.isNotEmpty(pats)) - { - pat = pats.get(0); - } - if (pat != null) - { - //更新状态为过期 - //判断其为增值服务还是 标准服务 - if (pat.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId()) - { - pat.setServiceStatus(ServiceStatusEnums.STANDARD_OVERDUE.getId()); - } - else if (pat.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId()) - { - pat.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); - } - yunBookbuildingService.updatePregnant(pat,pat.getId()); - } - - - StopPregModel model = getStopPregModel(request); model.setCreated(new Date()); model.setModified(new Date()); -- 1.8.3.1