From e68178973766c4ebb293bc707958dc558ab683c5 Mon Sep 17 00:00:00 2001
From: "[wangbo]" <www.184677810@qq.com>
Date: Fri, 6 Sep 2019 15:27:52 +0800
Subject: [PATCH] update

---
 .../main/java/com/lyms/platform/operate/web/facade/SieveFacade.java  | 2 +-
 .../java/com/lyms/platform/operate/web/result/SieveListResult.java   | 2 +-
 .../main/java/com/lyms/platform/operate/web/worker/SieveWorker.java  | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
index 3a6c55a..ba44518 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
@@ -2249,7 +2249,7 @@ public class SieveFacade {
             if (CollectionUtils.isNotEmpty(list)) {
                 for (SieveListResult sive : list) {
                     Map<String, Object> data = new HashMap<>();
-                    data.put("aoolyHospital", sive.getApplyHospital());
+                    data.put("aoolyHospital", sive.getApplyDoctor());
                     data.put("versionNo", sive.getNumber());
                     data.put("exportTime", sive.getExportTime());
                     data.put("highRisk", sive.getZtfxText());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java
index da3f24c..90dcd07 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java
@@ -108,7 +108,7 @@ public class SieveListResult implements IBasicResultConvert<SieveListResult, Sie
      */
     private String reportTypeStr;
 
-    //申请医生
+    //申请医院 名字错了，没改
     private String applyDoctor;
 
     //报告时间
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java
index dae7ebb..ee38bb0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java
@@ -108,7 +108,8 @@ public class SieveWorker implements Callable<List<SieveListResult>> {
             if (CollectionUtils.isNotEmpty(applyOrderModels)) {
                 SieveApplyOrderModel sieveApplyOrderModel = applyOrderModels.get(0);
                 //送检医生
-                sieveListResult.setApplyDoctor(StringUtils.isNotEmpty(sieveApplyOrderModel.getApplyDoctor()) ? usersService.getUsers(Integer.valueOf(sieveApplyOrderModel.getApplyDoctor())).getName() : "--");
+                sieveListResult.setApplyDoctor(StringUtils.isNotEmpty(sieveApplyOrderModel.getSieveHospitalId()) ?
+                        organizationService.getOrganization(Integer.valueOf(sieveApplyOrderModel.getSieveHospitalId())).getName() : "--");
                 //版本号
                 sieveListResult.setNumber(sieveApplyOrderModel.getNumber());
                 //采血日期
@@ -120,7 +121,7 @@ public class SieveWorker implements Callable<List<SieveListResult>> {
                     String bpd = null;
                     String crl = null;
                     bpd = StringUtils.isNotEmpty(sieveApplyOrderModel.getBpd()) ? "BPD:" + sieveApplyOrderModel.getBpd() : "";
-                    crl = StringUtils.isNotEmpty(sieveApplyOrderModel.getCrl()) ? "CRL:"+sieveApplyOrderModel.getCrl() : "";
+                    crl = StringUtils.isNotEmpty(sieveApplyOrderModel.getCrl()) ? "CRL:" + sieveApplyOrderModel.getCrl() : "";
                     sieveListResult.setbScanInfo(bpd + "," + crl);
                 } else if ("2".equals(sieveApplyOrderModel.getSieveType())) {
                     sieveListResult.setbScanInfo(StringUtils.isNotEmpty(sieveApplyOrderModel.getFetusNum()) ? data.get(sieveApplyOrderModel.getFetusNum()) : "--");
-- 
1.8.3.1