From a729dda72d31165e4e3f96a8e77d530751950c42 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 14 Dec 2017 09:23:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BD=93=E6=B8=A9=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/common/enums/PatientSerEnums.java     |  3 ++-
 .../operate/web/facade/RiskReportFacade.java       | 29 +++++++++++++++++++---
 2 files changed, 28 insertions(+), 4 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 d956933..bd17f85 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
@@ -18,7 +18,8 @@ public class PatientSerEnums {
         tz(2, "体重管理"),
         xt(3, "血糖管理"),
         xy(4, "血压管理"),
-        zjzx(5, "专家咨询");
+        zjzx(5, "专家咨询"),
+        tw(6, "体温管理");
         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 c9e535c..bfff26e 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
@@ -41,8 +41,8 @@ public class RiskReportFacade {
     static
     {
         HighLevelMap.put("绿色预警", "低风险");
-        HighLevelMap.put("橙色预警", "一般风险");
-        HighLevelMap.put("黄色预警", "较高风险");
+        HighLevelMap.put("黄色预警", "一般风险");
+        HighLevelMap.put("橙色预警", "较高风险");
         HighLevelMap.put("红色预警", "高风险");
         HighLevelMap.put("紫色预警", "传染病");
     }
@@ -280,7 +280,7 @@ public class RiskReportFacade {
         List<DataPermissionsModel> permissionsModelList = accessPermissionFacade.findAccessPerminssionByUserId(userId);
 
         String permission = permissionsModelList.get(0).getAreaPermission();
-        System.out.println("permission======"+permission);
+        System.out.println("permission======" + permission);
 
         String parentId = "";
         if (StringUtils.isNotEmpty(countRequest.getProvinceId()))
@@ -306,6 +306,7 @@ public class RiskReportFacade {
             countRequest.setExportType(3);
         }
 
+
         int addrType = countRequest.getExportType();
         List<String> title =  getTableDataTitle(addrType,times);
 
@@ -314,6 +315,28 @@ public class RiskReportFacade {
         //用于存在没有机构的区域Id
         List<String> addrId = new ArrayList<>();
 
+//
+//        List<String> childsId = new ArrayList<>();
+//
+//        if (addrType == 1)
+//        {
+//            if (StringUtils.isNotEmpty(permission))
+//            {
+//                List<Map> permissions = JsonUtil.toList(permission,Map.class);
+//            }
+//        }
+//        else if(addrType == 2)
+//        {
+//        }
+//        else
+//        {
+//        }
+//
+//        if (addrType < 3)
+//        {
+//        }
+
+
 
         //序列号
         int seq = 0;
-- 
1.8.3.1