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) {