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 2e34cbe..6099401 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
@@ -93,7 +93,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
     /**
      * 数据状态 true:排除孕妇分娩自动建档
      */
-    private boolean dataStatus = false;
+    private Boolean dataStatus;
 
     //母亲证件号
     private String mcertNo;
@@ -312,11 +312,11 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
         this.buildType = buildType;
     }
 
-    public boolean isDataStatus() {
+    public Boolean getDataStatus() {
         return dataStatus;
     }
 
-    public void setDataStatus(boolean dataStatus) {
+    public void setDataStatus(Boolean dataStatus) {
         this.dataStatus = dataStatus;
     }
 
@@ -639,14 +639,16 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
 
         if (-1 != yn) {
             condition = condition.and("yn", yn, MongoOper.IS);
-        }
-
-        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()]));
+            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()]));
+                }
+            }
         }