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 ea7fbda..51f5bee 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
@@ -2223,22 +2223,16 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
                     condition = condition.and("dataStatus", 1, MongoOper.NE);
                 } else {
                     List<MongoCondition> mongoCondits = new ArrayList<>();
-                    mongoCondits.add(new MongoCondition("yn", 1, MongoOper.IS).andCondition(new MongoCondition("dataStatus", 2, MongoOper.IS)));
-                    mongoCondits.add(new MongoCondition("dataStatus", 1, MongoOper.IS).andCondition(new MongoCondition("yn", 0, MongoOper.IS)));
+                    mongoCondits.add(new MongoCondition("yn", 1, MongoOper.IS));
+                    mongoCondits.add(new MongoCondition("dataStatus", Arrays.asList(1,2), MongoOper.IN).andCondition(new MongoCondition("yn", 0, MongoOper.IS)));
                     condition.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()]));
                 }
             }
         }
 
         if (fmDataStatu != null && fmDataStatu == true) {
-//            condition = condition.and("dataStatus", 1, MongoOper.IS);
-//            condition = condition.and("yn", 0, MongoOper.IS);
-            List<MongoCondition> mongoCondits = new ArrayList<>();
-            mongoCondits.add(new MongoCondition("dataStatus", 1, MongoOper.IS));
-            mongoCondits.add(new MongoCondition("yn", 0, MongoOper.IS).andCondition(new MongoCondition("dataStatus", 2, MongoOper.IS)));
-
-            condition.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()]));
-
+            condition = condition.and("dataStatus", Arrays.asList(1,2), MongoOper.IN);
+            condition = condition.and("yn", 0, MongoOper.IS);
         }
 
         if (null != babyWeightStart) {