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());