From a90f17d8e7bb020a67090ef79f47f7caffe11fe3 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 10 Jul 2018 14:08:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E9=99=A2=E5=B0=8F=E7=BB=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/facade/AntenatalExaminationFacade.java     |  1 -
 .../operate/web/facade/MatDeliverFacade.java       | 33 ++++++++++++++++------
 .../operate/web/worker/MaterDeliverWorker.java     |  7 ++++-
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
index a85451d..95ae7ab 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
@@ -2341,7 +2341,6 @@ public class AntenatalExaminationFacade {
             patientsQuery.setEnable("2");
         }
         Patients patients = null;
-        System.out.println("复诊时查询当前医院是否有隐藏建档条件：" + patientsQuery.convertToQuery().convertToMongoQuery());
         List<Patients> list = patientsService.queryPatient1(patientsQuery, "modified");
         if (CollectionUtils.isNotEmpty(list)) {
             return list.get(0);
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 dec226c..cfc62fc 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
@@ -598,15 +598,32 @@ public class MatDeliverFacade {
                 BabyModelQuery query = new BabyModelQuery();
                 query.setId(babyModel.getId());
                 babyModel1.setParentId(deliverAddRequest.getParentId());
-                //修改分娩后自动建档了 的原因修改成这样 20180703
-//                if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) {
-//                    babyModel1.setYn(YnEnums.YES.getId());
-//                } else {
-                    babyModel1.setYn(YnEnums.NO.getId());
 
-                    //修改满足条件的person数据
-                    List<BabyModel> updateBaby = babyService.queryBabyWithQuery(query);
+                //修改满足条件的person数据
+                List<BabyModel> updateBaby = babyService.queryBabyWithQuery(query);
 
+                //修改分娩后自动建档了 的原因修改成这样 20180703
+                if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) {
+                    //判断是否已经建档
+                    if (CollectionUtils.isNotEmpty(updateBaby) && updateBaby.get(0).getDataStatus() != null && updateBaby.get(0).getDataStatus() == 0)
+                    {
+                        babyModel1.setYn(YnEnums.YES.getId());
+
+                        if (CollectionUtils.isNotEmpty(updateBaby)) {
+                            for (BabyModel babydel : updateBaby) {
+                                if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(babydel.getPid())) {
+                                    PersonModel p = new PersonModel();
+                                    p.setYn(YnEnums.YES.getId());
+                                    p.setId(babydel.getPid());
+                                    personService.updatePerson(p, babydel.getPid());
+                                }
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    babyModel1.setYn(YnEnums.NO.getId());
                     if (CollectionUtils.isNotEmpty(updateBaby)) {
                         for (BabyModel babydel : updateBaby) {
                             if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(babydel.getPid())) {
@@ -617,7 +634,7 @@ public class MatDeliverFacade {
                             }
                         }
                     }
-//                }
+                }
                 babyModel1.setBirth(DateUtil.parseYMD(baby.getDueTime()));
                 babyModel1.setSex(Integer.valueOf(baby.getBabyGender()));
                 Map map = deliverAddRequest.getDeliveryMode();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
index 7621d93..b2f8ac7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
@@ -114,7 +114,12 @@ public class MaterDeliverWorker implements Callable<List<ChildbirthManagerQueryM
 
             // 查询活产数
             // 妊娠结局，儿童性别，儿童体重，儿童身长，Apgar1分钟，Apgar5分钟，Apgar10分钟，窒息分钟数，新生儿疾病，畸形
-            if (initQuery.contains("livingNumber") || initQuery.contains("pregnancyOut") || initQuery.contains("sex") || initQuery.contains("babyWeight") || initQuery.contains("babyHeight") || initQuery.contains("apgarScorePf1") || initQuery.contains("apgarScorePf5") || initQuery.contains("apgarScorePf10") || initQuery.contains("asphyxiaM") || initQuery.contains("babyHealthy") || initQuery.contains("malformation")) {
+            if (initQuery.contains("livingNumber") || initQuery.contains("pregnancyOut")
+                    || initQuery.contains("sex") || initQuery.contains("babyWeight")
+                    || initQuery.contains("babyHeight") || initQuery.contains("apgarScorePf1") ||
+                    initQuery.contains("apgarScorePf5") || initQuery.contains("apgarScorePf10") ||
+                    initQuery.contains("asphyxiaM") || initQuery.contains("babyHealthy") ||
+                    initQuery.contains("malformation")) {
                 BabyModelQuery babyModelQuery = new BabyModelQuery();
                 // babyModelQuery.setYn(YnEnums.YES.getId());
                 babyModelQuery.setParentId(patients.getId());
-- 
1.8.3.1