From 245a3d058093732a5eb0aa5e4dc30c1ff4cf70aa Mon Sep 17 00:00:00 2001
From: swj <1211312234@qq.com>
Date: Thu, 13 Oct 2022 21:32:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=AF=95=E5=89=82=E4=B8=AD?=
 =?UTF-8?q?=E4=BC=9A=E6=9C=89=E4=B8=AD=E7=BA=BF=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lims/service/impl/EntrustServiceImpl.java       | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

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 5d0eb99..0ee3e26 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
@@ -1172,8 +1172,17 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         String[] split3 = batchNos.split(",");
         Map<String, List<String>> tempListMap = new HashMap();
         for (String batch : split3) {
-            String reagentId = batch.split("-")[0];
-            String realBatch = batch.split("-")[1];
+            String[] reagentIdAndBatchArr = batch.split("-");
+            String reagentId = reagentIdAndBatchArr[0];
+            // 试剂中会有中线的情况，如：1101-3，-3也要带着；原以为只有1101
+            String realBatch = "";
+            if (reagentIdAndBatchArr.length > 2) {
+                for (int i = 1; i < reagentIdAndBatchArr.length; i++) {
+                    realBatch += reagentIdAndBatchArr[i] + "-";
+                }
+            } else {
+                realBatch = reagentIdAndBatchArr[1];
+            }
             List<String> list = tempListMap.get(reagentId);
             if (CollectionUtils.isNotEmpty(list)) {
                 list.add(realBatch);