From f0c228edb6f05eb4033de51eced89c02b801a86c Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 25 Mar 2021 14:52:30 +0800
Subject: [PATCH] update

---
 .../operate/web/facade/ApplyOrderFacade.java         | 20 +++++++++++++++++---
 .../operate/web/result/ReferralApplyOrderResult.java |  2 +-
 2 files changed, 18 insertions(+), 4 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 29f385f..51edd2f 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
@@ -856,7 +856,7 @@ public class ApplyOrderFacade {
             ReferralApplyOrderModel referralApplyOrderModel = list.get(0);
             String zhuanCName = "";
             String zhuanRname = "";
-            Patients patients = patientsService.findOnePatientById(referralApplyOrderModel.getParentId());
+
             String zhuanchu = referralApplyOrderModel.getOutHospitalId();
             String zhuanru = referralApplyOrderModel.getTransferredHospital();
             Map map1 = new HashMap();
@@ -886,9 +886,24 @@ public class ApplyOrderFacade {
 
                 }
             }
+
+            Patients patients = null;
+            BabyModel babyModel = null;
+            if (referralApplyOrderModel.getType() == 2 )
+            {
+                patients = patientsService.findOnePatientById(referralApplyOrderModel.getParentId());
+                List<Map<String, Object>> screenList = antenatalExaminationFacade.getscreenResult(patients.getScreenResult());
+                referralApplyOrderResult.setScreenResult(screenList);
+            }
+            else
+            {
+                babyModel = babyService.getOneBabyById(referralApplyOrderModel.getParentId());
+            }
+
             referralApplyOrderResult.convertToResult(referralApplyOrderModel, patients, zhuanCName, zhuanRname);
             referralApplyOrderResult.setTransferredHospital(map1);
 
+
             try {
                 if (StringUtils.isNotEmpty(referralApplyOrderModel.getDiagnosis())) {
                     List diagnosis = JsonUtil.toList(referralApplyOrderModel.getDiagnosis(), List.class);
@@ -916,8 +931,7 @@ public class ApplyOrderFacade {
             }
 
             referralApplyOrderResult.setApplyDoctor(map);
-            List<Map<String, Object>> screenList = antenatalExaminationFacade.getscreenResult(patients.getScreenResult());
-            referralApplyOrderResult.setScreenResult(screenList);
+
 
 
             Map<String, Object> recDoctorMap = new HashMap<>();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java
index 2338861..8865898 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java
@@ -279,7 +279,7 @@ public class ReferralApplyOrderResult {
         //其他诊断
         setOtherDiagn(destModel.getOtherDiagn());
         setId(destModel.getId());
-        setDiseaseDesc(destModel.getDiseaseDesc());
+//        setDiseaseDesc(destModel.getDiseaseDesc());
         setParentId(destModel.getParentId());
         setName(destModel.getName());
         setAge(destModel.getAge());
-- 
1.8.3.1