From 6c8a933f8fb21ca0fad837661d12b7e36150d5b3 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Wed, 4 Jul 2018 19:01:45 +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

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

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 fb97c3a..5ac87d8 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
@@ -9,6 +9,7 @@ import com.lyms.platform.common.utils.StringUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.data.mongodb.core.query.Criteria;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -634,11 +635,16 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
         if (null != source) {
             condition = condition.and("source", source, MongoOper.IS);
         }
+        List<MongoCondition> mongoCondits = new ArrayList<>();
 
         if (-1 != yn) {
-            condition = condition.and("yn", yn, MongoOper.IS);
+            // MongoCondition mongoCondition1 = condition.and("yn", yn, MongoOper.IS);
+            mongoCondits.add(new MongoCondition("yn", yn, MongoOper.IS));
+            mongoCondits.add(new MongoCondition("dataStatus", 1, MongoOper.IS).andCondition(new MongoCondition("yn", 0, MongoOper.IS)));
         }
 
+        condition = condition.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()]));
+
         if (dataStatus) {//分娩自动建档
             condition = condition.and("dataStatus", 1, MongoOper.NE);
         }
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 cd1b30f..67cc5bd 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
@@ -1800,6 +1800,7 @@ public class MatDeliverFacade {
                 babyModelQuery.setYn(YnEnums.YES.getId());
                 babyModelQuery.setParentId(patients.getId());
                 babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId());
+                System.out.println("查询调价n:"+babyModelQuery.convertToQuery().convertToMongoQuery());
                 List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
                 if (CollectionUtils.isNotEmpty(babyModelList)) {
                     childbirthManagerQueryModel.setLivingNumber(babyModelList.size());
-- 
1.8.3.1