From aabe53ae884ee1b63529b9d22261bfaf1ba4254d Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Thu, 26 Jul 2018 15:08:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/Test2.java              | 33 ++++++++++++++++++++++
 .../operate/web/facade/MatDeliverFacade.java       | 22 +++++++--------
 2 files changed, 44 insertions(+), 11 deletions(-)
 create mode 100644 platform-operate-api/src/main/java/com/lyms/Test2.java

diff --git a/platform-operate-api/src/main/java/com/lyms/Test2.java b/platform-operate-api/src/main/java/com/lyms/Test2.java
new file mode 100644
index 0000000..44e62fa
--- /dev/null
+++ b/platform-operate-api/src/main/java/com/lyms/Test2.java
@@ -0,0 +1,33 @@
+package com.lyms;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @auther yangfei
+ * @createTime 2018年07月25日 16时56分
+ * @discription
+ */
+public class Test2 {
+
+
+    public static void main(String[] args) {
+        Map<String, String> testLMap = testLMap();
+        System.out.println("第二次："+testLMap.toString());
+    }
+    private static Map<String,String> testLMap() {
+        Map<String,String> dd=new HashMap<String, String>();
+        try {
+            dd.put("1", "1");
+            return dd;
+        } catch (Exception e) {
+            // TODO: handle exception
+        }finally{
+            dd.put("4", "4");
+            dd=null;
+            System.out.println("第一次："+dd);
+        }
+        return dd;
+    }
+
+}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index 388411a..929f64e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -1436,17 +1436,17 @@ public class MatDeliverFacade {
             //默认添加当前医院
             hospitalList.add(hospitalId);
 
-            // DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
-            // dataPermissionsModelQuery.setUserId(matdeliverFollowRequest.getOperatorId());
-            // List<DataPermissionsModel> dataPermissionsModelList = dataPermissionService.queryPermission(dataPermissionsModelQuery);
-            // if (CollectionUtils.isNotEmpty(dataPermissionsModelList)) {
-            //     Map data = dataPermissionsModelList.get(0).getData();
-            //     for (Object hosId : data.keySet()) {
-            //         if (StringUtils.isNotEmpty(hosId.toString()) && !hospitalList.contains(hosId.toString())) {
-            //             hospitalList.add(hosId.toString());
-            //         }
-            //     }
-            // }
+            DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
+            dataPermissionsModelQuery.setUserId(matdeliverFollowRequest.getOperatorId());
+            List<DataPermissionsModel> dataPermissionsModelList = dataPermissionService.queryPermission(dataPermissionsModelQuery);
+            if (CollectionUtils.isNotEmpty(dataPermissionsModelList)) {
+                Map data = dataPermissionsModelList.get(0).getData();
+                for (Object hosId : data.keySet()) {
+                    if (StringUtils.isNotEmpty(hosId.toString()) && !hospitalList.contains(hosId.toString())) {
+                        hospitalList.add(hosId.toString());
+                    }
+                }
+            }
             // 未传入查询条件,进行院内系统进行查询
             if (StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalProvinceId()) || StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalCityId()) || StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalAreaId())) {
                 // 传入了查询条件
-- 
1.8.3.1