From 13015a7f71ef05eb9674532a5851b5bc8811414f Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 2 Sep 2016 10:19:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E7=97=85=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/operate/web/facade/ApplyOrderFacade.java |  2 +-
 .../lyms/platform/operate/web/result/ApplyOrderOutResult.java  | 10 ++++------
 2 files changed, 5 insertions(+), 7 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 85b3c28..300b920 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
@@ -639,7 +639,7 @@ public class ApplyOrderFacade {
                 applyOrderResult.convertToResult(orderModel, zhuanCName, zhuanRname);
                 applyOrderResult.setrRisk(stringBuilder.toString());
                 applyOrderResult.setScore(orderModel.getScore());
-                applyOrderResult.setrLevel(highScoreResult.getLevelStr());
+                applyOrderResult.setrLevel(highScoreResult.getLevel());
                 Patients patients = patientsService.findOnePatientById(orderModel.getParentId());
                 if (null != patients) {
                     if (1 == patients.getDueStatus())
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
index 78184d5..50b99c5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
@@ -10,6 +10,7 @@ import org.apache.commons.collections.CollectionUtils;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 高危转诊(转出)
@@ -32,7 +33,7 @@ public class ApplyOrderOutResult {
     //预产期
     private String dueDate;
     //高危等级
-    private String rLevel;
+    private List<java.util.Map> rLevel;
     //风险因素
     private String rRisk;
 
@@ -268,14 +269,11 @@ public class ApplyOrderOutResult {
         this.received = received;
     }
 
-    public String getrLevel() {
-        if(StringUtils.isEmpty(rLevel)){
-            return SPIT;
-        }
+    public List<Map> getrLevel() {
         return rLevel;
     }
 
-    public void setrLevel(String rLevel) {
+    public void setrLevel(List<Map> rLevel) {
         this.rLevel = rLevel;
     }
 
-- 
1.8.3.1