Commit 443ae729212b552f458f323a51644281239f549d
1 parent
9e179c6e46
Exists in
master
and in
1 other branch
update
Showing 1 changed file with 6 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
View file @
443ae72
| ... | ... | @@ -315,8 +315,9 @@ |
| 315 | 315 | List<String> orgId = new ArrayList<>(); |
| 316 | 316 | orgId.add(antExManagerQueryRequest.getCzhospitalId()); |
| 317 | 317 | hospitalList.retainAll(orgId); |
| 318 | - antExRecordQuery.setType(2);//查询初诊数据 | |
| 319 | - | |
| 318 | + if(CollectionUtils.isNotEmpty(orgId)){ | |
| 319 | + antExRecordQuery.setType(2);//查询初诊数据 | |
| 320 | + } | |
| 320 | 321 | } else if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(antExManagerQueryRequest.getCzprovinceId())&& ( |
| 321 | 322 | StringUtils.isEmpty(antExManagerQueryRequest.gethId()) || StringUtils.isEmpty(antExManagerQueryRequest.getCprovinceId()) |
| 322 | 323 | || StringUtils.isEmpty(antExManagerQueryRequest.getCcityId()) || StringUtils.isEmpty(antExManagerQueryRequest.getCareaId()) )) { |
| ... | ... | @@ -339,7 +340,9 @@ |
| 339 | 340 | } |
| 340 | 341 | } |
| 341 | 342 | hospitalList.retainAll(orgId); |
| 342 | - antExRecordQuery.setType(2);//查询初诊数据 | |
| 343 | + if(CollectionUtils.isNotEmpty(orgId)){ | |
| 344 | + antExRecordQuery.setType(2);//查询初诊数据 | |
| 345 | + } | |
| 343 | 346 | } |
| 344 | 347 | // 产检医院,初诊医院只能选择其中一个查询 |
| 345 | 348 | antExRecordQuery.setHospitalList(hospitalList); |