From f3359d764ab1a9627c6c899c26087c9b3eaa4eb7 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 31 Aug 2016 18:41:58 +0800
Subject: [PATCH] code update

---
 .../src/main/java/com/lyms/platform/query/PersonModelQuery.java       | 4 ++++
 .../com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PersonModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PersonModelQuery.java
index c855b0d..c5cdd00 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/PersonModelQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/PersonModelQuery.java
@@ -63,6 +63,10 @@ public class PersonModelQuery extends BaseQuery implements IConvertToNativeQuery
         if (type != null) {
             condition = condition.and("type", type, MongoOper.IS);
         }
+        if (type != yn) {
+            condition = condition.and("yn", yn, MongoOper.IS);
+        }
+
         if (types != null && types.length == 2) {
             Criteria c = Criteria.where("type").in(types[0],types[1]);
             return new MongoCondition(condition.getCriteria().andOperator(c)).toMongoQuery();
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 0bd7a38..2a69aa3 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
@@ -747,7 +747,7 @@ public class BabyBookbuildingFacade {
             List<BabyModel> allModels = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
             if (CollectionUtils.isNotEmpty(allModels))
             {
-                if (allModels.get(0) != null && allModels.get(0).getId().equals(id) && allModels.size() == 0)
+                if (allModels.get(0) != null  && allModels.size() == 1 && allModels.get(0).getId().equals(id))
                 {
                     PersonModel personModel = new PersonModel();
                     personModel.setYn(YnEnums.NO.getId());
-- 
1.8.3.1