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 3030473..5e1e1ab 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 @@ -5,6 +5,7 @@ import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.utils.StringUtils; import org.springframework.data.mongodb.core.query.Criteria; import java.util.Date; @@ -469,26 +470,26 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { } if (null != isHighRisk) { condition = condition.and("riskLevelId", null, MongoOper.NE); - } else if (null != rLevel) { + } else if (StringUtils.isNotEmpty( rLevel)) { condition = condition.and("riskLevelId", rLevel, MongoOper.IS); } if (null != areaId) { condition = condition.and("areaId", areaId, MongoOper.IS); } - if (null != id) { + if (StringUtils.isNotEmpty(id)) { condition = condition.and("id", id, MongoOper.IS); } if (null != vcCardNo) { condition = condition.and("vcCardNo", vcCardNo, MongoOper.IS); } - if (null != cardNo) { + if (StringUtils.isNotEmpty(cardNo)) { condition = condition.and("cardNo", cardNo, MongoOper.IS); } - if (null != phone) { + if (StringUtils.isNotEmpty( phone)) { condition = condition.and("phone", phone, MongoOper.IS); } - if (null != name) { + if (StringUtils.isNotEmpty(name)) { condition = condition.and("username", name, MongoOper.IS); } else if (null != likeName) { condition = condition.and("username", likeName, MongoOper.LIKE); @@ -537,7 +538,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { } - if (null != rFactor) { + if (StringUtils.isNotEmpty(rFactor)) { condition = condition.and("riskFactorId", rFactor, MongoOper.ALL); } if (-1 != yn) {