From 3579a11c77e960d7e0398c499fd3c87dad63f4c7 Mon Sep 17 00:00:00 2001 From: litao Date: Sun, 9 Oct 2022 17:49:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E5=91=98=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E7=9A=84=E6=A0=B7=E5=93=81=E7=8A=B6=E6=80=81?= =?UTF-8?q?=EF=BC=8C=E6=A0=B9=E6=8D=AE=E6=A0=B7=E5=93=81=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=AD=97=E5=85=B8=E5=8A=A8=E6=80=81=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/lims/controller/ExamineController.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineController.java index 3e469fc..a6f8bcf 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineController.java @@ -18,6 +18,8 @@ import org.springblade.lims.entry.*; import org.springblade.lims.service.*; import org.springblade.resource.enums.SysTypeEnum; import org.springblade.resource.feign.IMessageClient; +import org.springblade.system.cache.DictBizCache; +import org.springblade.system.enums.DictBizEnum; import org.springblade.system.feign.ISysClient; import org.springblade.system.user.entity.User; import org.springblade.system.user.feign.IUserClient; @@ -122,8 +124,10 @@ public class ExamineController extends BladeController { Map map = new HashMap<>(); //检验数据 Examine examine = examineService.getById(id); - Entrust entrust = service.getById(examine.getEntrustId()); - examine.setSimpleStatus(entrust.getSimpleState()); +// Entrust entrust = service.getById(examine.getEntrustId()); + // 字典获取样品状态 + String simpleStatus = DictBizCache.getValue(DictBizEnum.SIMPLE_STATUS, examine.getSimpleName().split("-")[1]); + examine.setSimpleStatus(simpleStatus); if (examine != null) { //实验项目