From 19a9ca878e697ed8424c69198322bc7a39869be3 Mon Sep 17 00:00:00 2001 From: litao Date: Sat, 8 Oct 2022 11:27:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=A7=94=E6=89=98=E5=8D=95?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=A0=B7=E5=93=81=E8=BF=90=E8=BE=93=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E7=94=A8=E5=AD=97=E5=85=B8=E8=8E=B7=E5=8F=96=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/system/enums/DictBizEnum.java | 5 ++++- .../lims/service/impl/EntrustServiceImpl.java | 13 +++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/lab-service-api/lab-dict-api/src/main/java/org/springblade/system/enums/DictBizEnum.java b/lab-service-api/lab-dict-api/src/main/java/org/springblade/system/enums/DictBizEnum.java index db86643..0736e27 100644 --- a/lab-service-api/lab-dict-api/src/main/java/org/springblade/system/enums/DictBizEnum.java +++ b/lab-service-api/lab-dict-api/src/main/java/org/springblade/system/enums/DictBizEnum.java @@ -69,7 +69,10 @@ public enum DictBizEnum { * 打印的url配置 */ PRINT_URL("printUrl"), - + /** + * 样品传输条件 + */ + SAMPLE_TRANSPORTATION("sampleTransportation") ; 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 3e03f85..a160701 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 @@ -253,9 +253,10 @@ public class EntrustServiceImpl extends BaseServiceImpl result.put("facsimile", entrust.getFacsimile()); result.put("phone", entrust.getPhone()); result.put("simpleSource", entrust.getSimpleSource()); - String value1 = DictBizCache.getValue(DictBizEnum.ENTRUST_REPORT_SEND_TYPE, entrust.getReportSendType()); - result.put("reportSendType", value1); - result.put("simpleTransRequire", entrust.getSimpleTransRequire()); + // 字典查报告发送方式 + result.put("reportSendType", DictBizCache.getValue(DictBizEnum.ENTRUST_REPORT_SEND_TYPE, entrust.getReportSendType())); + // 字典查样品运输条件 + result.put("simpleTransRequire", DictBizCache.getValue(DictBizEnum.SAMPLE_TRANSPORTATION, entrust.getSimpleTransRequire())); result.put("simpleState", entrust.getSimpleState()); String simpleJson = entrust.getSimpleJson(); List mapList = JSON.parseArray(simpleJson, Map.class); @@ -1105,7 +1106,11 @@ public class EntrustServiceImpl extends BaseServiceImpl // 检测依据 ExamineBasis examineBasis = examineBasisService.getById(examine.getExamineBasisId()); String[] split = examine.getExperieNum().split(","); - String s = split[0].substring(0, 12); + // 如果检测编号截取后长度 + String s = "/"; + if (split[0].length() > 12) { + s = split[0].substring(0, 12); + } result.put("1", s); result.put("2", examineResult.getDisposal()); result.put("3", examine.getSimpleName());