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 5ac87d8..39c4217 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,16 +638,19 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
         List<MongoCondition> mongoCondits = new ArrayList<>();
 
         if (-1 != yn) {
-            // 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)));
+            MongoCondition mongoCondition1 = condition.and("yn", yn, MongoOper.IS);
         }
 
-        condition = condition.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()]));
-
         if (dataStatus) {//分娩自动建档
             condition = condition.and("dataStatus", 1, MongoOper.NE);
+        }else{
+            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 (null != buildType) {
             condition = condition.and("buildType", buildType, MongoOper.IS);
         }