From 73f7cad2029eabde86e56f313f98d6b3f7d68e25 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 19 Aug 2016 15:10:47 +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

---
 .../lyms/platform/pojo/ReferralApplyOrderModel.java   |  6 +++---
 .../lyms/platform/query/ReferralApplyOrderQuery.java  |  2 +-
 .../platform/operate/web/facade/ApplyOrderFacade.java | 19 +++++++++----------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java
index b8f48b1..abc2dde 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java
@@ -38,7 +38,7 @@ public class ReferralApplyOrderModel {
     //预产期
     private Date dueDate;
     //高危分级
-    private String rLevel;
+    private List<String> rLevel;
     //高危风险因素
     private List<String> rRisk;
     //高危评分
@@ -210,11 +210,11 @@ public class ReferralApplyOrderModel {
         this.received = received;
     }
 
-    public String getrLevel() {
+    public List<String> getrLevel() {
         return rLevel;
     }
 
-    public void setrLevel(String rLevel) {
+    public void setrLevel(List<String> rLevel) {
         this.rLevel = rLevel;
     }
 
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java
index 1525f6b..152c09e 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java
@@ -196,7 +196,7 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati
             condition=condition.and("score",score, MongoOper.IS);
         }
         if(null!=riskFactor){
-            condition=condition.and("riskFactor",riskFactor, MongoOper.IS);
+            condition=condition.and("riskFactor",riskFactor, MongoOper.IN);
         }
         if(StringUtils.isNotEmpty(cardNo)){
             condition=condition.and("cardNo",cardNo, MongoOper.IS);
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 f6454bd..d749380 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
@@ -36,6 +36,8 @@ import java.util.*;
  */
 @Component
 public class ApplyOrderFacade {
+
+
     @Autowired
     private ApplyOrderService applyOrderService;
     @Autowired
@@ -56,8 +58,7 @@ public class ApplyOrderFacade {
     private UsersService usersService;
     @Autowired
     private BasicConfigService basicConfigService;
-    @Autowired
-    private BabyBookbuildingService babyBookbuildingService;
+
     @Autowired
     private BabyCheckFacade babyCheckFacade;
 
@@ -86,8 +87,7 @@ public class ApplyOrderFacade {
             organizationQuery.setName(referralApplyOrderModel.getTransferredHospital());
             List<Organization> organization = organizationService.queryOrganization(organizationQuery);
             if (CollectionUtils.isNotEmpty(organization)) {
-                referralApplyOrderModel.setTransferredHospital(organization
-                        .get(0).getId() + "");
+                referralApplyOrderModel.setTransferredHospital(organization.get(0).getId() + "");
             }
         }
 
@@ -113,7 +113,10 @@ public class ApplyOrderFacade {
                     referralApplyOrderModel.setBirth(patients.getBirth());
                     referralApplyOrderModel.setExpVip(patients.getExpVip());
                     int days = DateUtil.daysBetween(patients.getLastMenses(), new Date());
-
+                    HighScoreResult highScoreResult=   antenatalExaminationFacade.findLastRisk(patients.getPid(), true);
+                    referralApplyOrderModel.setrRisk(highScoreResult.getHighRisk());
+                    referralApplyOrderModel.setScore(highScoreResult.getScore());
+                    referralApplyOrderModel.setrLevel(highScoreResult.getLevel());
                     referralApplyOrderModel.setPid(patients.getPid());
                     referralApplyOrderModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days));
                     if (StringUtils.isNotEmpty(referralApplyOrderModel.getTransferredHospital()) && NumberUtils.isNumber(referralApplyOrderModel.getTransferredHospital())) {
@@ -363,10 +366,6 @@ public class ApplyOrderFacade {
                     }
                 }
 
-            /*    BabyModelQuery babyModelQuery=new BabyModelQuery();
-                babyModelQuery.setId(applyOrderModel.getParentId());
-                babyModelQuery.setYn(YnEnums.YES.getId());
-                List<BabyModel> babyModel=babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);*/
                 babyApplyOrderResult.convert(applyOrderModel, zhuanCName, zhuanRname);
                 List<String> diagnoseList = babyCheckFacade.getBabyLastDiagnose(applyOrderModel.getPid());
                 String diagnose = "";
@@ -412,7 +411,7 @@ public class ApplyOrderFacade {
         referralApplyOrderQuery.setTransferredHospital(applyOrderQueryRequest.getTransferredHospital());
         referralApplyOrderQuery.setLimit(applyOrderQueryRequest.getLimit());
         referralApplyOrderQuery.setType(applyOrderQueryRequest.getType());
-
+        referralApplyOrderQuery.setNeed("1");
         String hospital = autoMatchFacade.getHospitalId(userId);
         referralApplyOrderQuery.setHospitalId(hospital);
         referralApplyOrderQuery.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospital)).getName());
-- 
1.8.3.1