From 4d3f9864e1460b525f02502925c9a6a28ed34c6b Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Wed, 30 Nov 2016 14:53:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=8C=BB?= =?UTF-8?q?=E9=99=A2=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/query/PatientsQuery.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 b07ae51..2bf217f 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 @@ -726,12 +726,14 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (buildTypeEq != null) { condition = condition.and("buildType", buildTypeEq, MongoOper.IS); } + Criteria c1 = null; if (lastCheckEmployeeId != null) { condition = condition.and("lastCheckEmployeeId", lastCheckEmployeeId, MongoOper.IS); } else if(lastCheckEId){ - condition = condition.and("lastCheckEmployeeId", "", MongoOper.NE); - condition = condition.andCondition(MongoCondition.newInstance("lastCheckEmployeeId", null, MongoOper.NE)); + // condition = condition.and("lastCheckEmployeeId", "", MongoOper.NE); + // condition = condition.andCondition(MongoCondition.newInstance("lastCheckEmployeeId", null, MongoOper.NE)); + c1 = Criteria.where("lastCheckEmployeeId").ne("").ne(null); } if (bookbuildingDoctor != null) { condition = condition.and("bookbuildingDoctor", bookbuildingDoctor, MongoOper.IS); @@ -805,14 +807,13 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { } if(CollectionUtils.isNotEmpty(hospitalList)){ condition = condition.and("hospitalId", hospitalList, MongoOper.IN); - }else + } if (null != hospitalId) { condition = condition.and("hospitalId", hospitalId, MongoOper.IS); } if (null != pid) { condition = condition.and("pid", pid, MongoOper.IS); } - Criteria c1 = null; if (null != queryNo) { MongoCondition c = MongoCondition.newInstance(); MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS); -- 1.8.3.1