From eb31871dc7d22571ee66fc617f01fd8fd3aadf0d Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 15 Jul 2016 11:35:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/ApplyOrderFacade.java       | 34 ++++++++++++++--------
 .../operate/web/result/ApplyOrderOutResult.java    | 28 ++++++++++++++++--
 .../operate/web/result/BabyApplyOrderResult.java   | 25 +++++++++++++++-
 3 files changed, 71 insertions(+), 16 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 1a45cf0..e4767cd 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
@@ -199,13 +199,19 @@ public class ApplyOrderFacade {
         if(CollectionUtils.isNotEmpty(orderModels)){
             for(ReferralApplyOrderModel applyOrderModel:orderModels){
                 BabyApplyOrderResult babyApplyOrderResult=new BabyApplyOrderResult();
-                babyApplyOrderResult.convert(applyOrderModel);
-                if(StringUtils.isNotEmpty(applyOrderModel.getTransferredHospital())){
-                    Organization organization = organizationService.getOrganization(Integer.valueOf(applyOrderModel.getTransferredHospital()));
-                    if(null!=organization){
-                        babyApplyOrderResult.setTransferredHospital(organization.getName());
-                    }
+
+                String zhuanchu =applyOrderModel.getOutHospitalId();
+                Organization zhuanc =organizationService.getOrganization(Integer.valueOf(zhuanchu));
+                String zhuanCName=""; String zhuanRname="";
+                if(null!=zhuanc){
+                    zhuanCName= zhuanc.getName();
+                }
+                Organization zhuanc1 =organizationService.getOrganization(Integer.valueOf(zhuanchu));
+                if(null!=zhuanc1){
+                    zhuanRname =zhuanc1.getName();
                 }
+
+                babyApplyOrderResult.convert(applyOrderModel,zhuanCName,zhuanRname);
                 babyApplyOrderResults.add(babyApplyOrderResult);
             }
         }
@@ -251,13 +257,17 @@ public class ApplyOrderFacade {
         if (CollectionUtils.isNotEmpty(orderModels)) {
             for (ReferralApplyOrderModel orderModel : orderModels) {
                 ApplyOrderOutResult applyOrderResult = new ApplyOrderOutResult();
-                applyOrderResult.convertToResult(orderModel);
-                if(StringUtils.isNotEmpty(orderModel.getTransferredHospital())){
-                    Organization organization = organizationService.getOrganization(Integer.valueOf(orderModel.getTransferredHospital()));
-                    if(null!=organization){
-                        applyOrderResult.setTransferredHospital(organization.getName());
-                    }
+                String zhuanchu =orderModel.getOutHospitalId();
+                Organization zhuanc =organizationService.getOrganization(Integer.valueOf(zhuanchu));
+                String zhuanCName=""; String zhuanRname="";
+                if(null!=zhuanc){
+                    zhuanCName= zhuanc.getName();
+                }
+                Organization zhuanc1 =organizationService.getOrganization(Integer.valueOf(zhuanchu));
+                if(null!=zhuanc1){
+                    zhuanRname =zhuanc1.getName();
                 }
+                applyOrderResult.convertToResult(orderModel,zhuanCName,zhuanRname);
 
                 data.add(applyOrderResult);
             }
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 3dbd41b..aaf4c53 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
@@ -12,7 +12,7 @@ import java.util.List;
  * 高危转诊(转出)
  * Created by Administrator on 2016/6/27 0027.
  */
-public class ApplyOrderOutResult implements IBasicResultConvert<ApplyOrderOutResult,ReferralApplyOrderModel> {
+public class ApplyOrderOutResult {
     private String id;
     //名字
     private String name;
@@ -47,6 +47,27 @@ public class ApplyOrderOutResult implements IBasicResultConvert<ApplyOrderOutRes
     private String created;
     private String status;
 
+    //转出医院
+    private String zhuanCName;
+    //转入医院
+    private String zhuanRname;
+
+    public String getZhuanCName() {
+        return zhuanCName;
+    }
+
+    public void setZhuanCName(String zhuanCName) {
+        this.zhuanCName = zhuanCName;
+    }
+
+    public String getZhuanRname() {
+        return zhuanRname;
+    }
+
+    public void setZhuanRname(String zhuanRname) {
+        this.zhuanRname = zhuanRname;
+    }
+
     public String getPhone() {
         return phone;
     }
@@ -199,8 +220,9 @@ public class ApplyOrderOutResult implements IBasicResultConvert<ApplyOrderOutRes
         this.transferredDisease = transferredDisease;
     }
 
-    @Override
-    public ApplyOrderOutResult convertToResult(ReferralApplyOrderModel destModel) {
+    public ApplyOrderOutResult convertToResult(ReferralApplyOrderModel destModel,String zhuanCName,String zhuanRname) {
+        setZhuanCName(zhuanCName);
+        setZhuanRname(zhuanRname);
         setId(destModel.getId());
         setName(destModel.getName());
         setScore(destModel.getScore());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java
index 2095964..ac7856c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java
@@ -39,6 +39,27 @@ public class BabyApplyOrderResult {
     private String phone;
     private String babyId;
 
+    //转出医院
+    private String zhuanCName;
+    //转入医院
+    private String zhuanRname;
+
+    public String getZhuanCName() {
+        return zhuanCName;
+    }
+
+    public void setZhuanCName(String zhuanCName) {
+        this.zhuanCName = zhuanCName;
+    }
+
+    public String getZhuanRname() {
+        return zhuanRname;
+    }
+
+    public void setZhuanRname(String zhuanRname) {
+        this.zhuanRname = zhuanRname;
+    }
+
     public String getBabyId() {
         return babyId;
     }
@@ -47,7 +68,9 @@ public class BabyApplyOrderResult {
         this.babyId = babyId;
     }
 
-    public BabyApplyOrderResult convert(ReferralApplyOrderModel referralApplyOrderModel) {
+    public BabyApplyOrderResult convert(ReferralApplyOrderModel referralApplyOrderModel, String zhuanCName,String zhuanRname) {
+        setZhuanRname(zhuanRname);
+        setZhuanCName(zhuanCName);
         setId(referralApplyOrderModel.getId());
         setName(referralApplyOrderModel.getName());
         setBabyId(referralApplyOrderModel.getParentId());
-- 
1.8.3.1