jiangjiazhi / regional-platform

Download as
Browse Code »

Commit add96c3c62e802b851ce0108451e4ccb1fc3f42c

Authored by zhangchao
1 parent a986dbb822
Exists in dev

#fix:优化大同高危疾病查询

Showing 2 changed files with 13 additions and 5 deletions

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ add96c3
... ... @@ -1247,7 +1247,15 @@
1247 1247 } else if (null != rFactorList && !rFactorList.isEmpty()) {
1248 1248 condition = condition.and("riskFactorId", rFactorList, MongoOper.IN);
1249 1249 }else if (null != jFactorList && !jFactorList.isEmpty()) {
1250   - condition = condition.and("riskFactorId", jFactorList,MongoOper.OR);
  1250 + if (jFactorList.size()==1){
  1251 + condition = new MongoCondition("riskFactorId",jFactorList.get(0),MongoOper.IN);
  1252 + }else {
  1253 + MongoCondition condition2 = new MongoCondition("riskFactorId",jFactorList.get(0),MongoOper.IN);
  1254 + MongoCondition condition3 = new MongoCondition("riskFactorId",jFactorList.get(1),MongoOper.IN);
  1255 + MongoCondition condition4 = new MongoCondition("riskFactorId",jFactorList.get(2),MongoOper.IN);
  1256 + MongoCondition condition5 = new MongoCondition("riskFactorId",jFactorList.get(3),MongoOper.IN);
  1257 + condition=condition.orCondition(new MongoCondition[]{condition2, condition3,condition4,condition5});
  1258 + }
1251 1259 }
1252 1260  
1253 1261 if (isNullrFactor) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/HypothyroidismWorker.java View file @ add96c3
... ... @@ -321,7 +321,7 @@
321 321 }
322 322  
323 323 } else if ("2".equals(twinsType)) {
324   - if (twinsPatientsResult.getrFactor().contains("甲减(需药物治疗)")) {
  324 + if (twinsPatientsResult.getrFactor().contains("甲减（需药物治疗）")) {
325 325 data.add(twinsPatientsResult);
326 326 }
327 327 } else if ("3".equals(twinsType)) {
328 328  
329 329  
... ... @@ -329,13 +329,13 @@
329 329 data.add(twinsPatientsResult);
330 330 }
331 331 } else if ("4".equals(twinsType)) {
332   - if (twinsPatientsResult.getrFactor().contains("甲状腺功能减低(无需药物治疗)")) {
  332 + if (twinsPatientsResult.getrFactor().contains("甲状腺功能减低（无需药物治疗）")) {
333 333 data.add(twinsPatientsResult);
334 334 }
335 335 }else if (twinsPatientsResult.getrFactor().contains("亚临床甲减") ||
336   - twinsPatientsResult.getrFactor().contains("甲减(需药物治疗)") ||
  336 + twinsPatientsResult.getrFactor().contains("甲减（需药物治疗）") ||
337 337 twinsPatientsResult.getrFactor().contains("甲状腺功能减退引起相应系统功能障碍，基础代谢率小于-50%")||
338   - twinsPatientsResult.getrFactor().contains("甲状腺功能减低(无需药物治疗)")
  338 + twinsPatientsResult.getrFactor().contains("甲状腺功能减低（无需药物治疗）")
339 339 ) {
340 340 data.add(twinsPatientsResult);
341 341 }