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 d538753..55af008 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
@@ -758,21 +758,8 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
         if (null != malformation) {
             condition = condition.and("malformation", malformation, MongoOper.IS);
         }
-        List<MongoCondition> mongoCondits = new ArrayList<>();
 
-        if (-1 != yn) {
-            condition = condition.and("yn", yn, MongoOper.IS);
-        } else {
-            if (dataStatus != null) {
-                if (dataStatus) {//分娩自动建档
-                    condition = condition.and("dataStatus", 1, MongoOper.NE);
-                } else {
-                    mongoCondits.add(new MongoCondition("yn", 1, MongoOper.IS));
-                    mongoCondits.add(new MongoCondition("dataStatus", 1, MongoOper.IS).andCondition(new MongoCondition("yn", 0, MongoOper.IS)));
-                    condition = condition.andCondition(condition.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()])));
-                }
-            }
-        }
+
 
 
         if (null != buildType) {
@@ -973,6 +960,22 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
             }
         }
 
+
+        if (-1 != yn) {
+            condition = condition.and("yn", yn, MongoOper.IS);
+        } else {
+            if (dataStatus != null) {
+                if (dataStatus) {//分娩自动建档
+                    condition = condition.and("dataStatus", 1, MongoOper.NE);
+                } else {
+                    List<MongoCondition> mongoCondits = new ArrayList<>();
+                    mongoCondits.add(new MongoCondition("yn", 1, MongoOper.IS));
+                    mongoCondits.add(new MongoCondition("dataStatus", 1, MongoOper.IS).andCondition(new MongoCondition("yn", 0, MongoOper.IS)));
+                    condition.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()]));
+                }
+            }
+        }
+
         if (null != babyWeightStart) {
             if (null != c) {
                 c = c.and("babyWeight").gte(babyWeightStart);