From 171dd03d83688a1a92291e4ec331a7dcc54a4548 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 26 Mar 2018 13:41:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=AD=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/result/SieveListResult.java | 11 ++++++++ .../platform/operate/web/worker/SieveWorker.java | 32 ++++++++++++++++------ 2 files changed, 35 insertions(+), 8 deletions(-) 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 a137549..9b3468b 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 @@ -57,6 +57,17 @@ public class SieveListResult implements IBasicResultConvert> { sieveListResult.setAge(DateUtil.getAge(patients.getBirth()) + "岁"); } -// ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); -// referralApplyOrderQuery.setType(2); -// referralApplyOrderQuery.setParentId(sieveModel.getParentId()); -// List orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); -// if (CollectionUtils.isNotEmpty(orderModels)) -// { -// -// } + //转诊状态 0转诊 1待接收 2已转出 + Integer referralStatus = 0; + + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); + referralApplyOrderQuery.setType(2); + referralApplyOrderQuery.setParentId(sieveModel.getParentId()); + referralApplyOrderQuery.setTransferredHospital(hospitalId); + List orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); + if (CollectionUtils.isNotEmpty(orderModels)) + { + ReferralApplyOrderModel model = orderModels.get(0); + //申请单状态 0 已接收 1 已转出 2 建议转诊 + Integer status = model.getStatus(); + if (status == 0) + { + referralStatus = 2; + } + else if (status == 0) + { + referralStatus = 1; + } + } + + sieveListResult.setReferralStatus(referralStatus); results.add(sieveListResult); -- 1.8.3.1