From 8b42bc18d881db91eecb75837881bced77e8efc5 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Fri, 29 Jun 2018 16:10:53 +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

---
 .../operate/web/controller/ViewController.java     |  6 +--
 .../platform/operate/web/facade/ViewFacade.java    | 44 ++++++++++++++++++----
 2 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
index 3aefcce..cb461bd 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
@@ -188,9 +188,7 @@ public class ViewController extends BaseController {
 
                 List<List<String>> allAntExList = (List<List<String>>) map.get("antExData");
 
-                NodeCollection allTables = doc.getChildNodes(NodeType.TABLE, true); //拿到所有表格
-
-
+                // NodeCollection allTables = doc.getChildNodes(NodeType.TABLE, true); //拿到所有表格
                 DocumentBuilder builder = new DocumentBuilder(doc);
 
                 List widthList = new ArrayList();
@@ -219,7 +217,7 @@ public class ViewController extends BaseController {
                     builder.endRow();
                 }
 
-                Table table = (Table) allTables.get(0); //拿到表格
+                // Table table = (Table) allTables.get(0); //拿到表格
                 /*for(int i=0; i<allAntExList.size(); i++) {
                     Row r2 = new Row(doc);
                     for (int a =0;a<allAntExList.get(i).size();a++) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index 23d8405..82dca6b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -2923,22 +2923,52 @@ public class ViewFacade {
 
                 antExChu.add(DateUtil.getyyyy_MM_dd(an.getCheckTime()));
                 antExChu.add(ResolveUtils.getPregnancyWeek(patients.getLastMenses(), an.getCheckTime()));
-                String hightRiskStr = basicConfigService.getScreenResult(JsonUtil.jkstr2Obj(an.getHighrisk(), List.class));
-                antExChu.add(hightRiskStr);
+                // String hightRiskStr = basicConfigService.getScreenResult(JsonUtil.jkstr2Obj(an.getHighrisk(), List.class));
 
-                List list2 = JsonUtil.toList(an.getHighrisk(), List.class);
-                HighScoreResult highScoreResult = antenatalExaminationFacade.queryRisk(list2, true);
+
+                // List list2 = JsonUtil.toList(an.getHighrisk(), List.class);
+                // HighScoreResult highScoreResult = antenatalExaminationFacade.queryRisk(list2, true);
+
+                // for (int i = 0;i<highScoreResult.getLevel().size();i++) {
+                //     Map<String, Object> mp = (Map<String, Object>) highScoreResult.getLevel().get(i);
+                //     sbLev.add(mp.get("name"));
+                // }
 
                 Set sbLev = new HashSet();
-                for (int i = 0;i<highScoreResult.getLevel().size();i++) {
-                    Map<String, Object> mp = (Map<String, Object>) highScoreResult.getLevel().get(i);
-                    sbLev.add(mp.get("name"));
+                Set riskName = new HashSet();
+
+                Map<String, Object> riskMap = new HashMap<>();
+                //处理高危因素
+                getRisk(an.getHighrisk(), an.getOtherHighRisk(), riskMap);
+
+                if(riskMap.get("highRisk")!=null){
+                    List<Map<String, Object>> riksList = (List<Map<String, Object>>) riskMap.get("highRisk");
+                    for(Map<String,Object> risk:riksList){
+                        if(String.valueOf(risk.get("color")).contains("yellow")){
+                            sbLev.add("黄色");
+                        }else if(String.valueOf(risk.get("color")).contains("orange")){
+                            sbLev.add("橙色");
+                        }else if(String.valueOf(risk.get("color")).contains("red")){
+                            sbLev.add("红色");
+                        }else if(String.valueOf(risk.get("color")).contains("purple")){
+                            sbLev.add("紫色");
+                        }
+                        riskName.add(risk.get("name"));
+                    }
                 }
+
+                if(CollectionUtils.isNotEmpty(sbLev)){
+                    antExChu.add(riskName.toString());
+                }else{
+                    antExChu.add("-");
+                }
+
                 if(CollectionUtils.isNotEmpty(sbLev)){
                     antExChu.add(sbLev.toString());
                 }else{
                     antExChu.add("健康");
                 }
+
                 antExChu.add(an.getTreatOpinion()==null?" ":an.getTreatOpinion());
                 antExChu.add(organization.getName());
                 String doctName = "";
-- 
1.8.3.1