From 910065eab9dc03275ddbf0b87fd21cbbf1c196e6 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Wed, 4 Jul 2018 20:19:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java | 2 +-
 .../java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
index 39c4217..9c68f66 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
@@ -638,7 +638,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
         List<MongoCondition> mongoCondits = new ArrayList<>();
 
         if (-1 != yn) {
-            MongoCondition mongoCondition1 = condition.and("yn", yn, MongoOper.IS);
+            condition = condition.and("yn", yn, MongoOper.IS);
         }
 
         if (dataStatus) {//分娩自动建档
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 67cc5bd..456ef47 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
@@ -1797,8 +1797,9 @@ public class MatDeliverFacade {
             // 妊娠结局，儿童性别，儿童体重，儿童身长，Apgar1分钟，Apgar5分钟，Apgar10分钟，窒息分钟数，新生儿疾病，畸形
             if (childbirthManagerRequest.getInitQuery().contains("livingNumber") || childbirthManagerRequest.getInitQuery().contains("pregnancyOut") || childbirthManagerRequest.getInitQuery().contains("sex") || childbirthManagerRequest.getInitQuery().contains("babyWeight") || childbirthManagerRequest.getInitQuery().contains("babyHeight") || childbirthManagerRequest.getInitQuery().contains("apgarScorePf1") || childbirthManagerRequest.getInitQuery().contains("apgarScorePf5") || childbirthManagerRequest.getInitQuery().contains("apgarScorePf10") || childbirthManagerRequest.getInitQuery().contains("asphyxiaM") || childbirthManagerRequest.getInitQuery().contains("babyHealthy") || childbirthManagerRequest.getInitQuery().contains("malformation")) {
                 BabyModelQuery babyModelQuery = new BabyModelQuery();
-                babyModelQuery.setYn(YnEnums.YES.getId());
+                // babyModelQuery.setYn(YnEnums.YES.getId());
                 babyModelQuery.setParentId(patients.getId());
+                babyModelQuery.setDataStatus(false);
                 babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId());
                 System.out.println("查询调价n:"+babyModelQuery.convertToQuery().convertToMongoQuery());
                 List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
-- 
1.8.3.1