From 7f6a24e2ecc4a81914a5dd99b9678353bdcc198b Mon Sep 17 00:00:00 2001
From: liquanyu <lyms@2023>
Date: Thu, 9 Jan 2025 19:58:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E5=84=BF=E7=AB=A5?=
 =?UTF-8?q?=E3=80=81=E4=BA=A7=E5=A6=87=E8=BD=AC=E8=AF=8A=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/result/ApplyScreeningOutResult.java        | 22 ++++++++++++++++++++++
 .../web/result/ReferralApplyScreeningResult.java   | 14 ++++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyScreeningOutResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyScreeningOutResult.java
index 2080b0d..4c62d61 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyScreeningOutResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyScreeningOutResult.java
@@ -73,6 +73,26 @@ public class ApplyScreeningOutResult {
 
     //拒绝接收的原因
     private String reason;
+    //转入科室
+    private String transferredDepartment;
+    //转出科室
+    private String outDepartment;
+
+    public String getTransferredDepartment() {
+        return transferredDepartment;
+    }
+
+    public void setTransferredDepartment(String transferredDepartment) {
+        this.transferredDepartment = transferredDepartment;
+    }
+
+    public String getOutDepartment() {
+        return outDepartment;
+    }
+
+    public void setOutDepartment(String outDepartment) {
+        this.outDepartment = outDepartment;
+    }
 
     public String getReason() {
         return reason;
@@ -400,6 +420,8 @@ public class ApplyScreeningOutResult {
         setCardNo(destModel.getCardNo());
         setPhone(StringUtils.encryPhone(destModel.getPhone()));
         setRealPhone(destModel.getPhone());
+        setOutDepartment(destModel.getOutDepartment());
+        setTransferredDepartment(destModel.getTransferredDepartment());
         return this;
     }
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyScreeningResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyScreeningResult.java
index 4298da2..063405f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyScreeningResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyScreeningResult.java
@@ -72,6 +72,16 @@ public class ReferralApplyScreeningResult {
     private List diagnosis;
     //其他诊断
     private String otherDiagn;
+    //转出科室
+    private String outDepartment;
+
+    public String getOutDepartment() {
+        return outDepartment;
+    }
+
+    public void setOutDepartment(String outDepartment) {
+        this.outDepartment = outDepartment;
+    }
 
     public Map getRecDoctor() {
         return recDoctor;
@@ -294,8 +304,8 @@ public class ReferralApplyScreeningResult {
         setTransferredDisease(destModel.getTransferredDisease());
         setPotentialRisk(destModel.getPotentialRisk());
         setTransferMode(destModel.getTransferMode());
-
-
+        setTransferredDepartment(destModel.getTransferredDepartment());
+        setOutDepartment(destModel.getOutDepartment());
         setZhuanCName(zhuanCName);
         setZhuanRname(zhuanRname);
         if(null!=patients){
-- 
1.8.3.1