diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index e5c661f..9ff97e2 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -669,21 +669,23 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { /*if(null!=c1){ return new MongoCondition(condition.getCriteria().andOperator(new Criteria[]{c1})).toMongoQuery(); }*/ - /*Criteria c = null; + /**/ +// Criteria c = null; if (null != lastMensesStart) { - c = Criteria.where("lastMenses").gte(lastMensesStart); - isAddStart = Boolean.TRUE; + if(null!=c1){ + c1 = c1.where("lastMenses").gte(lastMensesStart); + }else{ + c1 = Criteria.where("lastMenses").gte(lastMensesStart); + } } if (null != lastMensesEnd) { - if (isAddStart) { - c = c.lte(lastMensesEnd); + if (c1!=null) { + c1 = c1.lte(lastMensesEnd); } else { - c = Criteria.where("lastMenses").lte(lastMensesEnd); + c1 = Criteria.where("lastMenses").lte(lastMensesEnd); } } - if (null != c) { - condition.andCondition(new MongoCondition(c)); - }*/ + if (null != dueDateStart) { if(null!=c1){