From c8c258763ebdae9cbe286f93b5329231bf72bf90 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 27 Sep 2016 10:52:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/query/PatientsQuery.java | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) 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){ -- 1.8.3.1