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 6099401..015dd26 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
@@ -639,20 +639,19 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
 
         if (-1 != yn) {
             condition = condition.and("yn", yn, MongoOper.IS);
-        }else{
+        } 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.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()]));
+                    condition = condition.andCondition(condition.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()])));
                 }
             }
         }
 
 
-
         if (null != buildType) {
             condition = condition.and("buildType", buildType, MongoOper.IS);
         }