Commit aabe53ae884ee1b63529b9d22261bfaf1ba4254d
1 parent
42f983d320
Exists in
master
and in
6 other branches
追访
Showing 2 changed files with 44 additions and 11 deletions
platform-operate-api/src/main/java/com/lyms/Test2.java
View file @
aabe53a
| 1 | +package com.lyms; | |
| 2 | + | |
| 3 | +import java.util.HashMap; | |
| 4 | +import java.util.Map; | |
| 5 | + | |
| 6 | +/** | |
| 7 | + * @auther yangfei | |
| 8 | + * @createTime 2018年07月25日 16时56分 | |
| 9 | + * @discription | |
| 10 | + */ | |
| 11 | +public class Test2 { | |
| 12 | + | |
| 13 | + | |
| 14 | + public static void main(String[] args) { | |
| 15 | + Map<String, String> testLMap = testLMap(); | |
| 16 | + System.out.println("第二次："+testLMap.toString()); | |
| 17 | + } | |
| 18 | + private static Map<String,String> testLMap() { | |
| 19 | + Map<String,String> dd=new HashMap<String, String>(); | |
| 20 | + try { | |
| 21 | + dd.put("1", "1"); | |
| 22 | + return dd; | |
| 23 | + } catch (Exception e) { | |
| 24 | + // TODO: handle exception | |
| 25 | + }finally{ | |
| 26 | + dd.put("4", "4"); | |
| 27 | + dd=null; | |
| 28 | + System.out.println("第一次："+dd); | |
| 29 | + } | |
| 30 | + return dd; | |
| 31 | + } | |
| 32 | + | |
| 33 | +} |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
aabe53a
| ... | ... | @@ -1436,17 +1436,17 @@ |
| 1436 | 1436 | //默认添加当前医院 |
| 1437 | 1437 | hospitalList.add(hospitalId); |
| 1438 | 1438 | |
| 1439 | - // DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); | |
| 1440 | - // dataPermissionsModelQuery.setUserId(matdeliverFollowRequest.getOperatorId()); | |
| 1441 | - // List<DataPermissionsModel> dataPermissionsModelList = dataPermissionService.queryPermission(dataPermissionsModelQuery); | |
| 1442 | - // if (CollectionUtils.isNotEmpty(dataPermissionsModelList)) { | |
| 1443 | - // Map data = dataPermissionsModelList.get(0).getData(); | |
| 1444 | - // for (Object hosId : data.keySet()) { | |
| 1445 | - // if (StringUtils.isNotEmpty(hosId.toString()) && !hospitalList.contains(hosId.toString())) { | |
| 1446 | - // hospitalList.add(hosId.toString()); | |
| 1447 | - // } | |
| 1448 | - // } | |
| 1449 | - // } | |
| 1439 | + DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); | |
| 1440 | + dataPermissionsModelQuery.setUserId(matdeliverFollowRequest.getOperatorId()); | |
| 1441 | + List<DataPermissionsModel> dataPermissionsModelList = dataPermissionService.queryPermission(dataPermissionsModelQuery); | |
| 1442 | + if (CollectionUtils.isNotEmpty(dataPermissionsModelList)) { | |
| 1443 | + Map data = dataPermissionsModelList.get(0).getData(); | |
| 1444 | + for (Object hosId : data.keySet()) { | |
| 1445 | + if (StringUtils.isNotEmpty(hosId.toString()) && !hospitalList.contains(hosId.toString())) { | |
| 1446 | + hospitalList.add(hosId.toString()); | |
| 1447 | + } | |
| 1448 | + } | |
| 1449 | + } | |
| 1450 | 1450 | // 未传入查询条件,进行院内系统进行查询 |
| 1451 | 1451 | if (StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalProvinceId()) || StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalCityId()) || StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalAreaId())) { |
| 1452 | 1452 | // 传入了查询条件 |