From 6fe2470326efa73f8d3a0160aa3ecf9d35a19a07 Mon Sep 17 00:00:00 2001 From: swj <1211312234@qq.com> Date: Tue, 11 Oct 2022 21:10:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E6=A0=B7=E4=BA=BA=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E6=98=AF=E7=BA=BF=E4=B8=8B=E7=AD=BE=E5=90=8D=EF=BC=8C=E8=BF=99?= =?UTF-8?q?=E9=87=8C=E4=B8=8D=E5=81=9A=E5=86=99=E5=9B=9B=20+=20=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E7=9A=84=E6=A0=B7=E5=93=81=E7=BC=96=E5=8F=B7=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E8=A1=A8=EF=BC=9A=E4=B8=8D=E9=9C=80=E8=A6=81=E7=95=99?= =?UTF-8?q?=E6=A0=B7=E7=9A=84=E6=A0=B7=E5=93=81=E5=8F=8A=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=20+=20=E4=B8=8B=E8=BD=BD=E5=A7=94=E6=89=98=E5=8D=95=E6=96=87?= =?UTF-8?q?=E6=A1=A3=20=E6=8A=A5=E5=91=8A=E5=8F=91=E9=80=81=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E4=B8=8E=E5=AE=9E=E9=99=85=E5=AF=B9=E5=BA=94=E4=B8=8D?= =?UTF-8?q?=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lims/service/impl/EntrustServiceImpl.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java index 30705a3..1ab3f6c 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java @@ -247,14 +247,23 @@ public class EntrustServiceImpl extends BaseServiceImpl result.put("investigativeType", value); result.put("acceptanceNum", entrust.getAcceptanceNum()); result.put("entrustCustomerName", entrust.getEntrustCustomerName()); - result.put("submittedBy", entrust.getSubmittedBy()); + // ↓ 采样人应该是线下签名，这里不做写四，后期可删 + // result.put("submittedBy", entrust.getSubmittedBy()); result.put("mailAddr", entrust.getCustomeAddress()); result.put("postalCode", entrust.getPostalCode()); result.put("facsimile", entrust.getFacsimile()); result.put("phone", entrust.getPhone()); result.put("simpleSource", entrust.getSimpleSource()); // 字典查报告发送方式 - result.put("reportSendType", DictBizCache.getValue(DictBizEnum.ENTRUST_REPORT_SEND_TYPE, entrust.getReportSendType())); + if ("0".equals(entrust.getReportSendType())) { + result.put("reportSendType", "☑自取 □传真 □邮寄 □其他"); + } else if ("1".equals(entrust.getReportSendType())) { + result.put("reportSendType", "□自取 ☑传真 □邮寄 □其他"); + } else if ("2".equals(entrust.getReportSendType())) { + result.put("reportSendType", "□自取 □传真 ☑邮寄 □其他"); + } else if ("3".equals(entrust.getReportSendType())) { + result.put("reportSendType", "□自取 □传真 □邮寄 ☑其他"); + } // 字典查样品运输条件 result.put("simpleTransRequire", DictBizCache.getValue(DictBizEnum.SAMPLE_TRANSPORTATION, entrust.getSimpleTransRequire())); result.put("simpleState", entrust.getSimpleState()); @@ -3016,9 +3025,10 @@ public class EntrustServiceImpl extends BaseServiceImpl List> resultList1 = new ArrayList<>(); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.orderByAsc(Simple::getId); wrapper.eq(Simple::getEntrustId, id); + wrapper.eq(Simple::getIsReagent, "0"); wrapper.orderByAsc(Simple::getIsReagent); - wrapper.orderByAsc(Simple::getId); List simples = simpleService.list(wrapper); List> keyValueList = new ArrayList<>(); for (Simple simple : simples) {