From 805275d0fbb33480064cca2702eca391f7d69768 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 8 Sep 2016 16:42:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E7=97=85=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/MatDeliverFacade.java       | 50 +++++++++++++---------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index c30b6e3..43c55f9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -115,7 +115,7 @@ public class MatDeliverFacade {
             if (CollectionUtils.isNotEmpty(list2)) {
                 return new BaseResponse().setErrormsg("您已分娩").setErrorcode(ErrorCodeConstants.DATA_EXIST);
             }
-            Patients patients2=  patientsService.findOnePatientById(deliverAddRequest.getParentId());
+            Patients patients2 = patientsService.findOnePatientById(deliverAddRequest.getParentId());
             matDeliverQuery.setDueDate(deliverAddRequest.getDueDate());
             matDeliverQuery.setParentId(null);
             matDeliverQuery.setPid(patients2.getPid());
@@ -196,15 +196,15 @@ public class MatDeliverFacade {
             MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel();
             MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
 
-            Patients patients2=  patientsService.findOnePatientById(deliverAddRequest.getParentId());
+            Patients patients2 = patientsService.findOnePatientById(deliverAddRequest.getParentId());
             matDeliverQuery.setPid(patients2.getPid());
             matDeliverQuery.setYn(YnEnums.YES.getId());
             matDeliverQuery.setDueDate(deliverAddRequest.getDueDate());
-            List<MaternalDeliverModel>   list2 = matDeliverService.query(matDeliverQuery);
+            List<MaternalDeliverModel> list2 = matDeliverService.query(matDeliverQuery);
 
-            for(int i=0;i<list2.size();i++){
-                MaternalDeliverModel model=   list2.get(i);
-                if(model.getId().equals(deliverAddRequest.getId())){
+            for (int i = 0; i < list2.size(); i++) {
+                MaternalDeliverModel model = list2.get(i);
+                if (model.getId().equals(deliverAddRequest.getId())) {
                     list2.remove(i);
                 }
             }
@@ -312,6 +312,8 @@ public class MatDeliverFacade {
             babyModel.setBuildDoctor("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29");
             babyModel.setServiceStatus(patients.getServiceStatus());
             babyModel.setServiceType(patients.getServiceType());
+            int day=DateUtil.getDays(patients.getLastMenses(),patients.getFmDate());
+            babyModel.setDueWeek(day/7);
         }
         // 产妇分娩建档
         babyModel.setBuildType(2);
@@ -497,21 +499,21 @@ public class MatDeliverFacade {
         Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 1, false, null);
         //本院产妇
         Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 3, false, null);
-        PersonModelQuery personModelQuery=new PersonModelQuery();
+        PersonModelQuery personModelQuery = new PersonModelQuery();
         String pid = "";
-        if(null!=patients1){
-            pid=patients1.getPid();
-        }else if (null!=patients){
-            pid=patients.getPid();
-        }else if(null!=patients3){
-            pid= patients3.getPid();
-        }
-        if(StringUtils.isNotEmpty(pid)){
+        if (null != patients1) {
+            pid = patients1.getPid();
+        } else if (null != patients) {
+            pid = patients.getPid();
+        } else if (null != patients3) {
+            pid = patients3.getPid();
+        }
+        if (StringUtils.isNotEmpty(pid)) {
             personModelQuery.setId(pid);
             List<PersonModel> personModels = personService.queryPersons(personModelQuery);
-            if(CollectionUtils.isNotEmpty(personModels)){
-                PersonModel personModel=   personModels.get(0);
-                if(personModel.getType()==1 &&null==patients){
+            if (CollectionUtils.isNotEmpty(personModels)) {
+                PersonModel personModel = personModels.get(0);
+                if (personModel.getType() == 1 && null == patients) {
                     return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA);
                 }
             }
@@ -539,7 +541,7 @@ public class MatDeliverFacade {
         MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
         matDeliverQuery.setPid(patients.getPid());
         matDeliverQuery.setCreatedStart(patients.getLastMenses());
-//        matDeliverQuery.setYn(YnEnums.YES.getId());
+        matDeliverQuery.setYn(YnEnums.YES.getId());
 //        matDeliverQuery.setspatients.getFmDate();
         List<MaternalDeliverModel> list = matDeliverService.query(matDeliverQuery);
         MatDeliverListResult matDeliverListResult = new MatDeliverListResult();
@@ -572,9 +574,15 @@ public class MatDeliverFacade {
             });
             list12.get(0).setEnableEdit("1");
             matDeliverListResult.setData(list12);
-        } else {
+        }
+
+
+        MatDeliverQuery matDeliverQuery1 = new MatDeliverQuery();
+        matDeliverQuery1.setPid(patients.getPid());
+        matDeliverQuery1.setCreatedStart(patients.getLastMenses());
+        list = matDeliverService.query(matDeliverQuery);
+        if (CollectionUtils.isEmpty(list)) {
             StopPregQuery stopPregQuery = new StopPregQuery();
-//            stopPregQuery.setYn(YnEnums.YES.getId());
             stopPregQuery.setPatientId(patients.getId());
             stopPregQuery.setStopDateStart(patients.getLastMenses());
             List<StopPregModel> list2 = stopPregnancyService.queryStopPreg(stopPregQuery);
-- 
1.8.3.1