From bc8731643b0f3439f05e83e2258e09856bc7076a Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Mon, 4 Dec 2017 14:54:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/RiskReportFacade.java       | 27 +++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

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 33a8a63..fc88af3 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
@@ -302,6 +302,9 @@ public class RiskReportFacade {
 
         result.add(title);
 
+        //用于存在没有机构的区域Id
+        List<String> addrId = new ArrayList<>();
+
 
         //序列号
         int seq = 0;
@@ -330,7 +333,16 @@ public class RiskReportFacade {
                     //查询机构数
                     List<Organization> orgs = organizationService.queryOrganization(query);
 
-                    orgNumTotal += CollectionUtils.isNotEmpty(orgs) ? orgs.size() : 0 ;
+
+                    int orgSize = CollectionUtils.isNotEmpty(orgs) ? orgs.size() : 0;
+                    //机构为0的时候不显示区域名称
+                    if (orgSize == 0)
+                    {
+                        addrId.add(c.getId()+c.getName());
+                        continue;
+                    }
+
+                    orgNumTotal += orgSize;
 
                     List<String> hids = getConditionHospitalIds(currentUserHospPermissions,orgs);
 
@@ -527,6 +539,10 @@ public class RiskReportFacade {
             {
                 for (Map<String, Object> addr : list)
                 {
+                    if (addrId.contains(String.valueOf(addr.get("id")) + String.valueOf(addr.get("name"))))
+                    {
+                        continue;
+                    }
                     xAxis.add(String.valueOf(addr.get("name")));
                 }
                 for (BasicConfig config : riskLevelConfig)
@@ -542,6 +558,11 @@ public class RiskReportFacade {
 
                     for (Map<String, Object> addr : list)
                     {
+                        if (addrId.contains(String.valueOf(addr.get("id")) + String.valueOf(addr.get("name"))))
+                        {
+                            continue;
+                        }
+
                         String id = String.valueOf(addr.get("id"));
                         if (addrType == 1)
                         {
@@ -617,8 +638,8 @@ public class RiskReportFacade {
         }
         datas.put("series",series);
         datas.put("xAxis",xAxis);
-        datas.put("legend",titleItems);
-        datas.put("tableDatas",result);
+        datas.put("legend", titleItems);
+        datas.put("tableDatas", result);
         return new BaseObjectResponse()
                 .setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(datas);
     }
-- 
1.8.3.1