From db787892e1686d8a6765a232e80a0928f56d37df Mon Sep 17 00:00:00 2001
From: litao <a15234804788@163.com>
Date: Wed, 21 Sep 2022 20:42:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E9=AA=8C=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E8=AF=A6=E6=83=85=E8=BF=94=E5=9B=9E=E8=AF=95=E5=89=82?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lims/controller/EntrustController.java    | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java
index 7c2f240..7b7752e 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java
+++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java
@@ -1048,12 +1048,27 @@ public class EntrustController extends BladeController {
                 }
                 String reagentId = examineResult.getReagentId();
                 if (reagentId != null) {
-                    Reagent reagent = reagentService.getById(reagentId);
-                    if (reagent != null) {
-                        examineResult.setReagentName(reagent.getName());
-                        examineResult.setReagentManufacturerName(reagent.getManufacturer());
-                        examineResult.setReagentBatchNo(reagent.getBatchNo());
+                    String[] split = reagentId.split(",");
+                    String name = "";
+                    String manufacturer = "";
+                    String batchNo = "";
+                    for (int i = 0; i < split.length; i++) {
+                        Reagent reagent = reagentService.getById(split[i]);
+                        if (reagent != null) {
+                            if (i == split.length - 1) {
+                                name += reagent.getName();
+                                manufacturer += reagent.getManufacturer();
+                                batchNo += reagent.getBatchNo();
+                            } else {
+                                name += reagent.getName() + ",";
+                                manufacturer += reagent.getManufacturer() + ",";
+                                batchNo += reagent.getBatchNo() + ",";
+                            }
+                        }
                     }
+                    examineResult.setReagentName(name);
+                    examineResult.setReagentManufacturerName(manufacturer);
+                    examineResult.setReagentBatchNo(batchNo);
                 }
                 String instrumentId = examineResult.getInstrumentId();
                 if (instrumentId != null) {