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 27d80fa..a329ced 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 @@ -521,10 +521,10 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (null != hScore) { condition = condition.and("riskScore", hScore, MongoOper.IS); } - if (null != isHighRisk) { - condition = condition.and("riskLevelId", null, MongoOper.NE); - } else if (StringUtils.isNotEmpty( rLevel)) { + if (StringUtils.isNotEmpty( rLevel)) { condition = condition.and("riskLevelId", rLevel, MongoOper.LIKE); + }else if (null != isHighRisk) { + condition = condition.and("riskLevelId", null, MongoOper.NE); } if (null != areaId) { condition = condition.and("areaId", areaId, MongoOper.IS);