From a344d755c33c899e3d37731378393a1030883a36 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 31 Aug 2018 11:15:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E8=A7=86=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/query/MatDeliverFollowQuery.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverFollowQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverFollowQuery.java index d7981ed..c0df9cc 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverFollowQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverFollowQuery.java @@ -253,12 +253,6 @@ public class MatDeliverFollowQuery extends BaseQuery implements IConvertToNative condition = condition.and("hospitalId",hospitalId , MongoOper.IS); } - if (visitStartDate!=null) { - condition = condition.and("visitDate",visitStartDate , MongoOper.GTE); - } - if (visitEndDate!=null) { - condition = condition.and("visitDate",visitEndDate , MongoOper.LTE); - } if (StringUtils.isNotBlank(deliverId)) { condition = condition.and("deliverId",deliverId , MongoOper.IS); } @@ -287,6 +281,9 @@ public class MatDeliverFollowQuery extends BaseQuery implements IConvertToNative if(null != createdTimeStart && createdTimeEnd != null){ c = Criteria.where("createDate").gte(createdTimeStart).lte(createdTimeEnd); } + if(null != visitStartDate && visitEndDate != null){ + c = Criteria.where("visitDate").gte(createdTimeStart).lte(createdTimeEnd); + } if(null != updateDateStart && updateDateEnd != null){ c = Criteria.where("updateDate").gte(updateDateStart).lte(updateDateEnd); } -- 1.8.3.1