From b03cd68236974994965fc0ab73f91b5b629c467a Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 7 Sep 2017 16:55:12 +0800
Subject: [PATCH] =?UTF-8?q?SmsConfigModel=20=E8=BF=87=E6=BB=A4=E6=8E=89?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/query/LisCrisisItemQuery.java    | 32 ++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java
index 0e258b3..5a45eda 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java
@@ -9,6 +9,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.data.mongodb.core.query.Criteria;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -39,6 +40,28 @@ public class LisCrisisItemQuery extends BaseQuery implements IConvertToNativeQue
     //患者ID
     private List<String> parentIds;
 
+    //大于修改时间
+    private Date gteModified;
+    //大于创建时间
+    //大于创建时间
+    private Date gteCreated;
+
+    public Date getGteModified() {
+        return gteModified;
+    }
+
+    public void setGteModified(Date gteModified) {
+        this.gteModified = gteModified;
+    }
+
+    public Date getGteCreated() {
+        return gteCreated;
+    }
+
+    public void setGteCreated(Date gteCreated) {
+        this.gteCreated = gteCreated;
+    }
+
     public List<String> getParentIds() {
         return parentIds;
     }
@@ -253,7 +276,7 @@ public class LisCrisisItemQuery extends BaseQuery implements IConvertToNativeQue
             condition=condition.and("serviceStatus",serviceStatus,MongoOper.IS);
         }
         if(null!=age){
-            condition=condition.and("age",age,MongoOper.IS);
+            condition=condition.and("age", age, MongoOper.IS);
         }
         Criteria c1 = null;
         if(null!=startWeek){
@@ -266,10 +289,15 @@ public class LisCrisisItemQuery extends BaseQuery implements IConvertToNativeQue
                 c1 = c1.lte(endWeek);
             }
         }
+
         if (c1!=null) {
             condition = condition.andCondition(new MongoCondition(c1));
         }
-
+        if (null != gteModified && null != gteCreated) {
+            MongoCondition  mongoCondition = new MongoCondition("modified", gteModified, MongoOper.GTE);
+            MongoCondition condition2 = new MongoCondition("created", gteCreated, MongoOper.GTE);
+            condition = condition.orCondition(new MongoCondition[]{mongoCondition, condition2});
+        }
         return condition.toMongoQuery();
     }
 }
-- 
1.8.3.1