Commit 8de43fe1a1458fac96c39693dba04b7a5c78b4a7
1 parent
56a24cb230
Exists in
master
and in
1 other branch
update
Showing 1 changed file with 24 additions and 13 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
View file @
8de43fe
| ... | ... | @@ -643,19 +643,30 @@ |
| 643 | 643 | |
| 644 | 644 | //权限所有的医院 |
| 645 | 645 | List<String> allHospitalList = new ArrayList<>(); |
| 646 | - DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); | |
| 647 | - dataPermissionsModelQuery.setUserId(userId); | |
| 648 | - List<DataPermissionsModel> permissionsModels = dataPermissionService.queryPermission(dataPermissionsModelQuery); | |
| 649 | - if (CollectionUtils.isNotEmpty(permissionsModels)) { | |
| 650 | - Set<String> set = permissionsModels.get(0).getData().keySet(); | |
| 651 | - Iterator<String> it = set.iterator(); | |
| 652 | - while (it.hasNext()) { | |
| 653 | - String id = it.next(); | |
| 654 | - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(id) && !hospitalList.contains(id)) { | |
| 655 | - allHospitalList.add(id); | |
| 656 | - } | |
| 657 | - } | |
| 658 | - } | |
| 646 | +// DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); | |
| 647 | +// dataPermissionsModelQuery.setUserId(userId); | |
| 648 | +// List<DataPermissionsModel> permissionsModels = dataPermissionService.queryPermission(dataPermissionsModelQuery); | |
| 649 | +// if (CollectionUtils.isNotEmpty(permissionsModels)) { | |
| 650 | +// Set<String> set = permissionsModels.get(0).getData().keySet(); | |
| 651 | +// Iterator<String> it = set.iterator(); | |
| 652 | +// while (it.hasNext()) { | |
| 653 | +// String id = it.next(); | |
| 654 | +// if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(id) && !hospitalList.contains(id)) { | |
| 655 | +// allHospitalList.add(id); | |
| 656 | +// } | |
| 657 | +// } | |
| 658 | +// } | |
| 659 | + List<Integer> list = autoMatchFacade.matchAreaOrgId(userId); | |
| 660 | + if (CollectionUtils.isNotEmpty(list)) | |
| 661 | + { | |
| 662 | + for(Integer id : list) | |
| 663 | + { | |
| 664 | + if (id != null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(id.toString()) && !hospitalList.contains(id.toString())) { | |
| 665 | + allHospitalList.add(id.toString()); | |
| 666 | + } | |
| 667 | + } | |
| 668 | + } | |
| 669 | + | |
| 659 | 670 | |
| 660 | 671 | //条件查询到的医院 |
| 661 | 672 | List<String> orgHospitalList = new ArrayList<>(); |