From 613ef1c6304a16688b68b4c150f2b8145a1ad63e Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 19 Aug 2016 15:32:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AEparentid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/ApplyOrderFacade.java       |  6 ++--
 .../operate/web/result/HighScoreResult.java        | 41 +++++++++++++++++++---
 2 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
index d749380..2d4befc 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
@@ -114,9 +114,9 @@ public class ApplyOrderFacade {
                     referralApplyOrderModel.setExpVip(patients.getExpVip());
                     int days = DateUtil.daysBetween(patients.getLastMenses(), new Date());
                     HighScoreResult highScoreResult=   antenatalExaminationFacade.findLastRisk(patients.getPid(), true);
-                    referralApplyOrderModel.setrRisk(highScoreResult.getHighRisk());
+                    referralApplyOrderModel.setrRisk(highScoreResult.getHighId());
                     referralApplyOrderModel.setScore(highScoreResult.getScore());
-                    referralApplyOrderModel.setrLevel(highScoreResult.getLevel());
+                    referralApplyOrderModel.setrLevel(highScoreResult.getLevelId());
                     referralApplyOrderModel.setPid(patients.getPid());
                     referralApplyOrderModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days));
                     if (StringUtils.isNotEmpty(referralApplyOrderModel.getTransferredHospital()) && NumberUtils.isNumber(referralApplyOrderModel.getTransferredHospital())) {
@@ -181,8 +181,6 @@ public class ApplyOrderFacade {
 
             referralApplyOrderModel.setId(null);
             referralApplyOrderModel.setHospitalId(referralApplyOrderModel.getTransferredHospital());
-        /*    referralApplyOrderModel.setOutHospitalId(referralApplyOrderModel.getTransferredHospital());
-            referralApplyOrderModel.setTransferredHospital(hospital);*/
 
             applyOrderService.addOneReferralApplyOrder(referralApplyOrderModel);
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java
index 89be653..4ff6a4c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java
@@ -1,6 +1,9 @@
 package com.lyms.platform.operate.web.result;
 
+import com.lyms.platform.common.utils.StringUtils;
+
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -11,7 +14,7 @@ public class HighScoreResult {
     //高危因素
     private List highRisk = new ArrayList();
     //风险等级颜色
-    private List level= new ArrayList();
+    private List level = new ArrayList();
     //高危评分
     private Integer score = 0;
 
@@ -32,12 +35,42 @@ public class HighScoreResult {
     }
 
     public Integer getScore() {
-        if(null==score){
+        if (null == score) {
             return 0;
         }
         return score;
     }
 
+    public List<String> getLevelId() {
+        if (null == level) {
+            return Collections.emptyList();
+        }
+        List<String> idList = new ArrayList<>();
+        for (int i1 = 0; i1 < level.size(); i1++) {
+            java.util.Map<String, String> map = (java.util.Map<String, String>) level.get(i1);
+            String name = map.get("id");
+            if (StringUtils.isNotEmpty(name)) {
+                idList.add(name);
+            }
+        }
+        return idList;
+    }
+
+    public List<String> getHighId() {
+        if (null == highRisk) {
+            return Collections.emptyList();
+        }
+        List<String> idList = new ArrayList<>();
+        for (int i1 = 0; i1 < highRisk.size(); i1++) {
+            java.util.Map<String, String> map = (java.util.Map<String, String>) highRisk.get(i1);
+            String id = map.get("id");
+            if (StringUtils.isNotEmpty(id)) {
+                idList.add(id);
+            }
+        }
+        return idList;
+    }
+
     public void setScore(Integer score) {
         this.score = score;
     }
@@ -54,7 +87,7 @@ public class HighScoreResult {
                 stringBuilder.append(map.get("name")).append(", ");
             }
         }
-        if(stringBuilder.length()>=2){
+        if (stringBuilder.length() >= 2) {
             stringBuilder.setLength(stringBuilder.length() - 2);
         }
         return stringBuilder.toString();
@@ -69,7 +102,7 @@ public class HighScoreResult {
             java.util.Map<String, String> map = (java.util.Map<String, String>) highRisk.get(i1);
             stringBuilder.append(map.get("name")).append(", ");
         }
-        if(stringBuilder.length()>=2) {
+        if (stringBuilder.length() >= 2) {
             stringBuilder.setLength(stringBuilder.length() - 2);
         }
         return stringBuilder.toString();
-- 
1.8.3.1