From 6dfa38c188301b65cad6414430f882153def990d Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 26 Jan 2018 11:35:20 +0800
Subject: [PATCH] 1

---
 .../platform/operate/web/facade/ApplyOrderFacade.java | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 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 7f63956..f68c18f 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
@@ -68,6 +68,8 @@ public class ApplyOrderFacade {
 
     @Autowired
     private OperateLogFacade operateLogFacade;
+    @Autowired
+    private CommonService commonService;
 
     /**
      * 增加转诊申请
@@ -135,10 +137,17 @@ public class ApplyOrderFacade {
                     days = DateUtil.daysBetween(patients.getLastMenses(), new Date());
                 }
                 referralApplyOrderModel.setLastMenses(patients.getLastMenses());
-                HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true);
-                referralApplyOrderModel.setrRisk(highScoreResult.gethighRiskList());
-                referralApplyOrderModel.setScore(highScoreResult.getScore());
-                List lsit = new ArrayList();
+                referralApplyOrderModel.setrRisk(Arrays.asList(commonService.resloveFactor(patients.getRiskFactorId()).split(",")));
+                referralApplyOrderModel.setOtherHighRisk(patients.getoRiskFactor());
+                List<String> rlevel=Collections.emptyList();
+                if(StringUtils.isNotEmpty(patients.getRiskLevelId())&&!"[]".equals(patients.getRiskLevelId())){
+                    rlevel= JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class);
+                    HashSet set =new HashSet(rlevel);
+                    rlevel=new ArrayList<String>(set);
+                }
+                referralApplyOrderModel.setrLevel(rlevel);
+               referralApplyOrderModel.setScore(patients.getRiskScore());
+               /*  List lsit = new ArrayList();
                 List<Map> list = highScoreResult.filter(highScoreResult.getLevel());
                 for (Map<String, String> map : list) {
                     String name = map.get("name");
@@ -146,7 +155,7 @@ public class ApplyOrderFacade {
                         lsit.add(name);
                     }
                 }
-                referralApplyOrderModel.setrLevel(lsit);
+                referralApplyOrderModel.setrLevel(lsit);*/
                 referralApplyOrderModel.setPid(patients.getPid());
                 referralApplyOrderModel.setDueWeek(new Date());
                 days = DateUtil.daysBetween(patients.getLastMenses(), new Date());
-- 
1.8.3.1