diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java
index 0aae27b..d5d054c 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java
@@ -1,7 +1,6 @@
 package com.lyms.platform.query;
 
 import com.lyms.platform.common.base.IConvertToNativeQuery;
-import com.lyms.platform.common.core.annotation.form.FormParam;
 import com.lyms.platform.common.dao.BaseQuery;
 import com.lyms.platform.common.dao.operator.MongoCondition;
 import com.lyms.platform.common.dao.operator.MongoOper;
@@ -23,7 +22,7 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati
     private String parentId;
     private String pid;
     /**
-     *孕妇名字
+     * 孕妇名字
      */
     private String name;
     //母亲的名字
@@ -289,48 +288,48 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati
 
     @Override
     public MongoQuery convertToQuery() {
-        MongoCondition condition =  MongoCondition.newInstance();
-        if(null!=parentId){
-            condition=condition.and("parentId",parentId, MongoOper.IS);
+        MongoCondition condition = MongoCondition.newInstance();
+        if (null != parentId) {
+            condition = condition.and("parentId", parentId, MongoOper.IS);
         }
-        if(null!=id){
-            condition=condition.and("id",id, MongoOper.IS);
+        if (null != id) {
+            condition = condition.and("id", id, MongoOper.IS);
         }
-        if(null!=pid){
-            condition=condition.and("pid",pid, MongoOper.IS);
+        if (null != pid) {
+            condition = condition.and("pid", pid, MongoOper.IS);
         }
-        if(StringUtils.isNotEmpty(name)){
-            condition=condition.and("name",name, MongoOper.LIKE);
+        if (StringUtils.isNotEmpty(name)) {
+            condition = condition.and("name", name, MongoOper.LIKE);
         }
-        if(null!=serviceStatus){
-            condition=condition.and("serviceStatus",serviceStatus, MongoOper.IS);
+        if (null != serviceStatus) {
+            condition = condition.and("serviceStatus", serviceStatus, MongoOper.IS);
         }
-        if(null!=status){
-            condition=condition.and("status",status, MongoOper.IS);
+        if (null != status) {
+            condition = condition.and("status", status, MongoOper.IS);
         }
-        if(null!=age){
-            condition=condition.and("age",age, MongoOper.IS);
+        if (null != age) {
+            condition = condition.and("age", age, MongoOper.IS);
         }
-        if(null!=expVip){
-            condition=condition.and("expVip",expVip, MongoOper.IS);
+        if (null != expVip) {
+            condition = condition.and("expVip", expVip, MongoOper.IS);
         }
-        if(null!=serviceType){
-            condition=condition.and("serviceType",serviceType, MongoOper.IS);
+        if (null != serviceType) {
+            condition = condition.and("serviceType", serviceType, MongoOper.IS);
         }
-        if(StringUtils.isNotEmpty(mCardNo)){
-            condition=condition.and("mCardNo",mCardNo, MongoOper.IS);
+        if (StringUtils.isNotEmpty(mCardNo)) {
+            condition = condition.and("mCardNo", mCardNo, MongoOper.IS);
         }
 
-        if(StringUtils.isNotEmpty(phone)){
-            condition=condition.and("phone",phone, MongoOper.IS);
+        if (StringUtils.isNotEmpty(phone)) {
+            condition = condition.and("phone", phone, MongoOper.IS);
         }
-        if(null!=hospitalId){
-            condition=condition.and("hospitalId",hospitalId, MongoOper.IS);
+        if (null != hospitalId) {
+            condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
         }
 
 
-        if(null!=rLevel){
-            condition=condition.and("rLevel",rLevel, MongoOper.IS);
+        if (null != rLevel) {
+            condition = condition.and("rLevel", rLevel, MongoOper.IS);
         }
         boolean isAddStart = Boolean.FALSE;
 
@@ -345,114 +344,123 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati
             } else {
                 c = Criteria.where("score").lte(scoreEnd);
             }
-            isAddStart = Boolean.TRUE;
         }
+        if (null != c) {
+            condition = condition.andCondition(new MongoCondition(c));
+        }
+        Criteria c1 = null;
+        isAddStart = Boolean.FALSE;
         if (null != revicedStart) {
-            c = Criteria.where("received").gte(revicedStart);
+            c1 = Criteria.where("received").gte(revicedStart);
             isAddStart = Boolean.TRUE;
         }
         if (null != revicedEnd) {
             if (isAddStart) {
-                c = c.lte(revicedEnd);
+                c1 = c1.lte(revicedEnd);
             } else {
-                c = Criteria.where("received").lte(revicedEnd);
+                c1 = Criteria.where("received").lte(revicedEnd);
             }
             isAddStart = Boolean.TRUE;
         }
+        if (null != c1) {
+            condition = condition.andCondition(new MongoCondition(c1));
+        }
+        Criteria c2 = null;
+        isAddStart = Boolean.FALSE;
         if (null != transferredStart) {
-            c = Criteria.where("created").gte(transferredStart);
+            c2 = Criteria.where("created").gte(transferredStart);
             isAddStart = Boolean.TRUE;
         }
 
         if (null != transferredEnd) {
             if (isAddStart) {
-                c = c.lte(transferredEnd);
+                c2 = c2.lte(transferredEnd);
             } else {
-                c = Criteria.where("created").lte(transferredEnd);
+                c2 = Criteria.where("created").lte(transferredEnd);
             }
             isAddStart = Boolean.TRUE;
         }
+        if (null != c2) {
+            condition = condition.andCondition(new MongoCondition(c2));
+        }
 
 
-
-        if(StringUtils.isNotEmpty(riskFactor)){
-            condition=condition.and("rRisk",riskFactor, MongoOper.IN);
+        if (StringUtils.isNotEmpty(riskFactor)) {
+            condition = condition.and("rRisk", riskFactor, MongoOper.IN);
         }
-        if(StringUtils.isNotEmpty(cardNo)){
-            condition=condition.and("cardNo",cardNo, MongoOper.IS);
+        if (StringUtils.isNotEmpty(cardNo)) {
+            condition = condition.and("cardNo", cardNo, MongoOper.IS);
         }
-        if(null!=type){
-            condition=condition.and("type",type, MongoOper.IS);
+        if (null != type) {
+            condition = condition.and("type", type, MongoOper.IS);
         }
-        if(null!=outHospitalId){
+        if (null != outHospitalId) {
             List<String> list = new ArrayList<>();
             list.add(outHospitalId);
-            if(null!=hospitalName){
+            if (null != hospitalName) {
                 list.add(hospitalName);
             }
-            condition=condition.and("outHospitalId",outHospitalId, MongoOper.IN);
+            condition = condition.and("outHospitalId", outHospitalId, MongoOper.IN);
         }
 
-        if(null!=transferredHospital){
+        if (null != transferredHospital) {
             List<String> list = new ArrayList<>();
             list.add(transferredHospital);
-            if(null!=hospitalName){
+            if (null != hospitalName) {
                 list.add(hospitalName);
             }
-            MongoCondition mongoCondition1=MongoCondition.newInstance("transferredHospital", list, MongoOper.IN);
-            condition=condition.andCondition(mongoCondition1);
-        }
-        if (isAddStart) {
-            return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
+            MongoCondition mongoCondition1 = MongoCondition.newInstance("transferredHospital", list, MongoOper.IN);
+            condition = condition.andCondition(mongoCondition1);
         }
-
+        Criteria c24 = null;
+        isAddStart = Boolean.FALSE;
 
         if (null != dueDateStart) {
-            c = Criteria.where("days").gte(dueDateStart);
+            c24 = Criteria.where("days").gte(dueDateStart);
             isAddStart = Boolean.TRUE;
         }
         if (null != dueDateEnd) {
             if (isAddStart) {
-                c = c.lte(dueDateEnd);
+                c24 = c.lte(dueDateEnd);
             } else {
-                c = Criteria.where("days").lte(dueDateEnd);
+                c24 = Criteria.where("days").lte(dueDateEnd);
             }
-            isAddStart = Boolean.TRUE;
         }
-        if (isAddStart) {
-            return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
+        if(null!=c24){
+            condition=condition.andCondition(new MongoCondition(c24));
         }
 
+        Criteria c3 = null;
+        isAddStart = Boolean.FALSE;
         if (null != lastMensesStart) {
-            c = Criteria.where("lastMenses").gte(lastMensesStart);
+            c3 = Criteria.where("lastMenses").gte(lastMensesStart);
             isAddStart = Boolean.TRUE;
         }
         if (null != lastMensesEnd) {
             if (isAddStart) {
-                c = c.lte(lastMensesEnd);
+                c3 = c3.lte(lastMensesEnd);
             } else {
-                c = Criteria.where("lastMenses").lte(lastMensesEnd);
+                c3 = Criteria.where("lastMenses").lte(lastMensesEnd);
             }
-            isAddStart = Boolean.TRUE;
         }
-        if (isAddStart) {
-            return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
+        if (null != c3) {
+            condition = condition.andCondition(new MongoCondition(c3));
         }
-
+        Criteria c4 = null;
+        isAddStart = Boolean.FALSE;
         if (null != birthStart) {
-            c = Criteria.where("birth").gte(birthStart);
+            c4 = Criteria.where("birth").gte(birthStart);
             isAddStart = Boolean.TRUE;
         }
         if (null != birthEnd) {
             if (isAddStart) {
-                c = c.lte(birthEnd);
+                c4 = c4.lte(birthEnd);
             } else {
-                c = Criteria.where("birth").lte(birthEnd);
+                c4 = Criteria.where("birth").lte(birthEnd);
             }
-            isAddStart = Boolean.TRUE;
         }
-        if (isAddStart) {
-            return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
+        if (null != c4) {
+            condition = condition.andCondition(new MongoCondition(c4));
         }
         return condition.toMongoQuery();
     }
@@ -475,7 +483,6 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati
     }
 
 
-
     public String getName() {
         return name;
     }
@@ -501,7 +508,6 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati
     }
 
 
-
     public String getServiceStatus() {
         return serviceStatus;
     }
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java
index f0e1775..2f22a32 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java
@@ -197,26 +197,27 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery {
             } else {
                 c = Criteria.where("dueWeek").lte(dueWeekEnd);
             }
-            isAddStart = Boolean.TRUE;
         }
 
-        if (isAddStart) {
-            return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
+        if (null!=c) {
+          condition=condition.andCondition(new MongoCondition(c));
         }
+
+        Criteria c1 = null;
+         isAddStart = Boolean.FALSE;
         if (null != lastMensesStart) {
-            c = Criteria.where("lastMenses").gte(lastMensesStart);
+            c1 = Criteria.where("lastMenses").gte(lastMensesStart);
             isAddStart = Boolean.TRUE;
         }
         if (null != lastMensesEnd) {
             if (isAddStart) {
-                c = c.lte(lastMensesEnd);
+                c1 = c1.lte(lastMensesEnd);
             } else {
-                c = Criteria.where("lastMenses").lte(lastMensesEnd);
+                c1 = Criteria.where("lastMenses").lte(lastMensesEnd);
             }
-            isAddStart = Boolean.TRUE;
         }
-        if (isAddStart) {
-            return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
+        if (null!=c1) {
+            condition=condition.andCondition(new MongoCondition(c1));
         }
         return condition.toMongoQuery();
     }