From b9ec34e74b10061a2d8fae4839504c7cc7ab47de Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 14 Dec 2017 14:13:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/common/enums/PatientSerEnums.java     |  2 +-
 .../operate/web/facade/RiskReportFacade.java       | 70 +++++++++++++---------
 2 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java
index bd17f85..6396e5b 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java
@@ -19,7 +19,7 @@ public class PatientSerEnums {
         xt(3, "血糖管理"),
         xy(4, "血压管理"),
         zjzx(5, "专家咨询"),
-        tw(6, "体温管理");
+        tw(7, "体温管理");
         private Integer id;
         private String title;
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
index f329ced..b884a52 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
@@ -277,10 +277,6 @@ public class RiskReportFacade {
         basicQuery.setYn(YnEnums.YES.getId());
         basicQuery.setTypeId("b7ea005c-dfac-4c2a-bdae-25239b3f44fd");
 
-        List<DataPermissionsModel> permissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(userId);
-
-        String permission = permissionsModelList.get(0).getAreaPermission();
-        System.out.println("permission======" + permission);
 
         if (StringUtils.isNotEmpty(countRequest.getProvinceId()))
         {
@@ -309,30 +305,8 @@ public class RiskReportFacade {
         //用于存在没有机构的区域Id
         List<String> addrId = new ArrayList<>();
 
-
-        //权限的id
-        List<String> childsId = new ArrayList<>();
-
-        if (StringUtils.isNotEmpty(permission)) {
-            List<Map> permissions = JsonUtil.toList(permission, Map.class);
-            if (CollectionUtils.isNotEmpty(permissions))
-            {
-                for (Map map : permissions)
-                {
-                    if (addrType == 1)
-                    {
-                        String c = String.valueOf(map.get("c"));
-                        childsId.add(c);
-                    }
-                    else if (addrType == 2)
-                    {
-                        String a = String.valueOf(map.get("a"));
-                        childsId.add(a);
-                    }
-
-                }
-            }
-        }
+        //区域权限id
+        List<String> childsId = getAreaPermission(userId, addrType);
         basicQuery.setIds(childsId);
 
         //获取地址列表
@@ -677,6 +651,43 @@ public class RiskReportFacade {
     }
 
     /**
+     * 获取用户下面的区域权限
+     * @param userId
+     * @param addrType
+     * @return
+     */
+    private List<String> getAreaPermission(Integer userId,int addrType) {
+        //权限的id
+        List<String> childsId = new ArrayList<>();
+        List<DataPermissionsModel> permissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(userId);
+        if (CollectionUtils.isNotEmpty(permissionsModelList))
+        {
+            String permission = permissionsModelList.get(0).getAreaPermission();
+            if (StringUtils.isNotEmpty(permission)) {
+                List<Map> permissions = JsonUtil.toList(permission, Map.class);
+                if (CollectionUtils.isNotEmpty(permissions))
+                {
+                    for (Map map : permissions)
+                    {
+                        if (addrType == 1)
+                        {
+                            String c = String.valueOf(map.get("c"));
+                            childsId.add(c);
+                        }
+                        else if (addrType == 2)
+                        {
+                            String a = String.valueOf(map.get("a"));
+                            childsId.add(a);
+                        }
+
+                    }
+                }
+            }
+        }
+        return childsId;
+    }
+
+    /**
      * 占比计算
      * @param series
      * @return
@@ -879,6 +890,9 @@ public class RiskReportFacade {
                 countRequest.setExportType(3);
             }
 
+            List<DataPermissionsModel> permissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(userId);
+            String permission = permissionsModelList.get(0).getAreaPermission();
+
 
             BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
             basicConfigQuery.setYn(YnEnums.YES.getId());
-- 
1.8.3.1