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 cdc9e87..b3b98a1 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 @@ -1006,6 +1006,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (c1 != null) { c1 = c1.andOperator(c.andCondition(MongoCondition.newInstance("lastCheckEmployeeId", null, MongoOper.NE)).getCriteria()); } else { + c1 = Criteria.where("lastCheckEmployeeId").ne(null);//下面这样写会导致重复and c1 = c.andCondition(MongoCondition.newInstance("lastCheckEmployeeId", null, MongoOper.NE)).getCriteria(); } } @@ -1077,7 +1078,8 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (c1 != null) { c1 = c1.andOperator(c.andCondition(MongoCondition.newInstance("riskFactorId", null, MongoOper.NE)).getCriteria()); } else { - c1 = c.andCondition(MongoCondition.newInstance("riskFactorId", Arrays.asList("d42eec03-aa86-45b8-a4e0-78a0ff365fb6"), MongoOper.NE)).getCriteria(); + c1 = Criteria.where("postViewTimes").ne(Arrays.asList("d42eec03-aa86-45b8-a4e0-78a0ff365fb6"));//下面这样写会导致重复and +// c1 = c.andCondition(MongoCondition.newInstance("riskFactorId", Arrays.asList("d42eec03-aa86-45b8-a4e0-78a0ff365fb6"), MongoOper.NE)).getCriteria(); } } else if (null != rFactorList && !rFactorList.isEmpty()) { condition = condition.and("riskFactorId", rFactorList, MongoOper.IN); @@ -1392,8 +1394,10 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (null != c1) { return new MongoCondition(c1.andOperator(condition.getCriteria(),c2)).toMongoQuery(); +// return new MongoCondition(c1.andOperator(condition.getCriteria())).toMongoQuery(); } return new MongoCondition(c2.andOperator(condition.getCriteria())).toMongoQuery(); +// return condition.toMongoQuery(); } public boolean isExistRiskLevel() {