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 a6e6c99..368a312 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
@@ -1965,15 +1965,18 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
                 c = Criteria.where("created").gte(createdTimeStart).lte(createdTimeEnd);
             }
         }
-        Criteria cor=null;
-        if(null != highRiskAndWeakSon){ //隆化县， 1：高危体弱合并
-            MongoCondition c1 = MongoCondition.newInstance();
+
+        //隆化县， 1：高危体弱合并
+        Criteria cor=MongoCondition.newInstance().getCriteria();//这里不能给null return拼接不能为空
+        if(null != highRiskAndWeakSon){
+            MongoCondition con = MongoCondition.newInstance();
             MongoCondition con1 = MongoCondition.newInstance("highRisk", 1, MongoOper.IS);
             MongoCondition con2 = MongoCondition.newInstance("weakSon", 1, MongoOper.IS);
-            cor=c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
+            cor=con.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
         }
+
         //条件查询：儿童疾病是否开通字段 查询冲突问题解决
-        Criteria cor2=null;
+        Criteria cor2=MongoCondition.newInstance().getCriteria();//这里不能给null return拼接不能为空
         if (StringUtils.isNotEmpty(openDisease)) {
             if ("2".equals(openDisease))
             {
@@ -1991,17 +1994,10 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
         /**
          * 多个orCondition 需要添加Criteria来控制json同级两个and或者or来解决mongodb执行查询问题
          */
-        if(c!=null&&cor!=null&&cor2!=null){
-           return new MongoCondition(c.andOperator(condition.getCriteria(), cor,cor2)).toMongoQuery();
-        }else if(c!=null){
-            return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
-        }else if(cor!=null){
-            return new MongoCondition(cor.andOperator(condition.getCriteria())).toMongoQuery();
-        }else if(cor2!=null){
-            return new MongoCondition(cor2.andOperator(condition.getCriteria())).toMongoQuery();
-        }else {
-            return condition.toMongoQuery();
+        if(c!=null){
+           return new MongoCondition(c.andOperator(condition.getCriteria(),cor,cor2)).toMongoQuery();
         }
+            return condition.toMongoQuery();
     }
 
     public Boolean getFmDataStatu() {