From 6d49d84fda736248e0c6ac23c49fcdf1346f1fbf Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 24 Aug 2018 14:39:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=9B=BE=E9=AB=98=E5=8D=B1=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/AntExRecordFacade.java      | 60 +++++++++++++++++-----
 1 file changed, 48 insertions(+), 12 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
index d148566..e26a407 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
@@ -2,13 +2,11 @@ package com.lyms.platform.operate.web.facade;
 
 import com.lyms.platform.biz.service.*;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
+import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
 import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.result.BaseListResponse;
 import com.lyms.platform.common.result.BaseResponse;
-import com.lyms.platform.common.utils.DateUtil;
-import com.lyms.platform.common.utils.ExcelUtil;
-import com.lyms.platform.common.utils.ExceptionUtils;
-import com.lyms.platform.common.utils.StringUtils;
+import com.lyms.platform.common.utils.*;
 import com.lyms.platform.operate.web.request.AntExManagerQueryRequest;
 import com.lyms.platform.operate.web.request.CjStatisticsQueryRequest;
 import com.lyms.platform.operate.web.result.AntExManagerResult;
@@ -644,6 +642,8 @@ public class AntExRecordFacade {
 
     private List<AntExRecordModel> getIncrRiskAntexRecard(final Map<String,List<AntExRecordModel>> map,AntExRecordQuery pageAntExRecordsQuery,final AntExManagerQueryRequest request)
     {
+
+        initBasicData();
         List<String> ids = new ArrayList<>();
         Map<String,List<String>> incriskMap = new HashMap<>();
 
@@ -781,7 +781,7 @@ public class AntExRecordFacade {
                     }
                 }
             }
-
+            riskBasicMap.clear();
 
 
 //            for (String patientId : map.keySet())
@@ -917,23 +917,59 @@ public class AntExRecordFacade {
     }
 
 
-    private boolean isExistsLevel(String level,List<String> incrHrisk)
+    private boolean isExistsLevel(String level,List<String> incrHrisks)
     {
         if (StringUtils.isNotEmpty(level))
         {
-            BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
-            basicConfigQuery.setIds(incrHrisk);
-            basicConfigQuery.setParentId(level);
-            List<BasicConfig> configs = basicConfigService.queryBasicConfig(basicConfigQuery);
-            if (CollectionUtils.isNotEmpty(configs))
+            List<String> list = riskBasicMap.get(level);
+            if (CollectionUtils.isNotEmpty(list))
             {
-                return true;
+                return list.containsAll(incrHrisks);
             }
             return false;
         }
         return true;
+
+//        if (StringUtils.isNotEmpty(level))
+//        {
+//            BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
+//            basicConfigQuery.setIds(incrHrisk);
+//            basicConfigQuery.setParentId(level);
+//            List<BasicConfig> configs = basicConfigService.queryBasicConfig(basicConfigQuery);
+//            if (CollectionUtils.isNotEmpty(configs))
+//            {
+//                return true;
+//            }
+//            return false;
+//        }
+//        return true;
+    }
+
+    private Map<String,List<String>>  riskBasicMap = new HashMap<>();
+
+    private void initBasicData()
+    {
+        BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
+        basicConfigQuery.setYn(YnEnums.YES.getId());
+        basicConfigQuery.setParentId(SystemConfig.HIGH_RISK_ID);
+        List<BasicConfig> basicConfigs = basicConfigService.queryBasicConfig(basicConfigQuery);
+
+        if (CollectionUtils.isNotEmpty(basicConfigs)) {
+            for (BasicConfig basicConfig : basicConfigs) {
+                List<String> ids = new ArrayList<>();
+                basicConfigQuery.setParentId(basicConfig.getId());
+                List<BasicConfig> basicConfigs2 = basicConfigService.queryBasicConfig(basicConfigQuery);
+                if (CollectionUtils.isNotEmpty(basicConfigs2)) {
+                    for (BasicConfig bc : basicConfigs2) {
+                        ids.add(bc.getId());
+                    }
+                }
+                riskBasicMap.put(basicConfig.getId(),ids);
+            }
+        }
     }
 
+
     private boolean getConditionRisk(String riskId,List<String> incrHrisk,String level)
     {
         if (StringUtils.isEmpty(riskId))
-- 
1.8.3.1