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 61012eb..76be5c2 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 @@ -1192,7 +1192,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { }else { c1 = c.andCondition(MongoCondition.newInstance("riskFactorId", null, MongoOper.NE)).getCriteria(); } - }else if(null!=rFactorList){ + }else if(null!=rFactorList &&!rFactorList.isEmpty()){ condition = condition.and("riskFactorId", rFactorList, MongoOper.IN); } if (-1 != yn) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 2298e8f..ed7819d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -245,7 +245,7 @@ public class PatientFacade { patientsQuery.setLikeName(riskPatientsQueryRequest.getName()); patientsQuery.sethScoreStart(riskPatientsQueryRequest.getStrtHScore()); patientsQuery.sethScoreEnd(riskPatientsQueryRequest.getEndHScore()); - patientsQuery.setrFactor(riskPatientsQueryRequest.getrFacotr()); + patientsQuery.setrFactorList(com.lyms.platform.common.utils.StringUtils.covertToList(riskPatientsQueryRequest.getrFacotr(),String.class)); Date currentDate = DateUtil.formatDate(new Date()); patientsQuery.setPostViewTimes(riskPatientsQueryRequest.getPostViewTimes());