jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit ff0e827bedafaaa0f2a090d9ed824814312d8f68

Authored by yangfei
2 parents 024252dac7 9b58ae7312
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java View file @ ff0e827
... ... @@ -222,7 +222,9 @@
222 222 if (isNotEmpty(s)) {
223 223 String[] values = s.split(",");
224 224 for (String value : values) {
225   - list.add((T) value);
  225 + if(isNotEmpty(value)){
  226 + list.add((T) value);
  227 + }
226 228 }
227 229 }
228 230 return list;
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ ff0e827
... ... @@ -1192,7 +1192,7 @@
1192 1192 }else {
1193 1193 c1 = c.andCondition(MongoCondition.newInstance("riskFactorId", null, MongoOper.NE)).getCriteria();
1194 1194 }
1195   - }else if(null!=rFactorList){
  1195 + }else if(null!=rFactorList &&!rFactorList.isEmpty()){
1196 1196 condition = condition.and("riskFactorId", rFactorList, MongoOper.IN);
1197 1197 }
1198 1198 if (-1 != yn) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ ff0e827
... ... @@ -245,7 +245,7 @@
245 245 patientsQuery.setLikeName(riskPatientsQueryRequest.getName());
246 246 patientsQuery.sethScoreStart(riskPatientsQueryRequest.getStrtHScore());
247 247 patientsQuery.sethScoreEnd(riskPatientsQueryRequest.getEndHScore());
248   - patientsQuery.setrFactor(riskPatientsQueryRequest.getrFacotr());
  248 + patientsQuery.setrFactorList(com.lyms.platform.common.utils.StringUtils.covertToList(riskPatientsQueryRequest.getrFacotr(),String.class));
249 249 Date currentDate = DateUtil.formatDate(new Date());
250 250  
251 251 patientsQuery.setPostViewTimes(riskPatientsQueryRequest.getPostViewTimes());