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);