Commit 4a4a16b680a9663e180d9172546aa6d018c92c60
1 parent
e5b003dab6
Exists in
master
and in
6 other branches
根据疾病查询
Showing 1 changed file with 11 additions and 12 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
4a4a16b
| ... | ... | @@ -434,27 +434,26 @@ |
| 434 | 434 | MongoCondition criteria = new MongoCondition("hospitalId", hospitalList, MongoOper.IN); |
| 435 | 435 | //乙肝查询 |
| 436 | 436 | if (StringUtils.contains(riskPatientsQueryRequest.getDiseaseType(), DiseaseTypeEnums.YIGAN.getId())) { |
| 437 | - criteria.andCondition(new MongoCondition("ygbmky", true, MongoOper.EXISTS) | |
| 438 | - .orCondition(new MongoCondition("ygbmkt", true, MongoOper.EXISTS)) | |
| 439 | - .orCondition(new MongoCondition("ygeky", true, MongoOper.EXISTS)) | |
| 440 | - .orCondition(new MongoCondition("ygekt", true, MongoOper.EXISTS)) | |
| 441 | - .orCondition(new MongoCondition("yghxkt", true, MongoOper.EXISTS)) | |
| 442 | - ); | |
| 437 | + criteria = criteria.and("ygbmky", true, MongoOper.EXISTS).orCondition( | |
| 438 | + new MongoCondition[]{new MongoCondition("ygbmkt", true, MongoOper.EXISTS), | |
| 439 | + new MongoCondition("ygeky", true, MongoOper.EXISTS), | |
| 440 | + new MongoCondition("ygekt", true, MongoOper.EXISTS), | |
| 441 | + new MongoCondition("yghxkt", true, MongoOper.EXISTS) | |
| 442 | + }); | |
| 443 | 443 | } |
| 444 | 444 | //丙肝查询 |
| 445 | 445 | if (StringUtils.contains(riskPatientsQueryRequest.getDiseaseType(), DiseaseTypeEnums.BINGGAN.getId())) { |
| 446 | - criteria.andCondition(new MongoCondition("bg", true, MongoOper.EXISTS)); | |
| 446 | + criteria = criteria.and("bg", true, MongoOper.EXISTS); | |
| 447 | 447 | } |
| 448 | 448 | //梅毒查询 |
| 449 | 449 | if (StringUtils.contains(riskPatientsQueryRequest.getDiseaseType(), DiseaseTypeEnums.MEIDU.getId())) { |
| 450 | - criteria.andCondition(new MongoCondition("syjg", true, MongoOper.EXISTS) | |
| 451 | - .orCondition(new MongoCondition("hivkt", true, MongoOper.EXISTS)) | |
| 452 | - ); | |
| 450 | + criteria = criteria.andCondition(new MongoCondition("syjg", true, MongoOper.EXISTS) | |
| 451 | + .orCondition(new MongoCondition("hivkt", true, MongoOper.EXISTS))); | |
| 453 | 452 | } |
| 454 | 453 | List<AntExChuModel> antExChuModels = antExService.queryAntExChu(criteria.toMongoQuery()); |
| 455 | 454 | List<String> pIds = new ArrayList<>(); |
| 456 | - for(AntExChuModel antChu : antExChuModels){ | |
| 457 | - pIds.add(antChu.getParentId()); | |
| 455 | + for (AntExChuModel antChu : antExChuModels) { | |
| 456 | + pIds.add(antChu.getPid()); | |
| 458 | 457 | } |
| 459 | 458 | patientsQuery.setpIds(pIds); |
| 460 | 459 | } |