From d3c49109f356f344dcd31d80e0f0da1eb9d0c0d6 Mon Sep 17 00:00:00 2001 From: swj <1211312234@qq.com> Date: Wed, 12 Oct 2022 21:34:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=A3=80=E6=B5=8B=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lims/service/impl/EntrustServiceImpl.java | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 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 1ab3f6c..716bfbf 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 @@ -1115,11 +1115,8 @@ public class EntrustServiceImpl extends BaseServiceImpl // 检测依据 ExamineBasis examineBasis = examineBasisService.getById(examine.getExamineBasisId()); String[] split = examine.getExperieNum().split(","); - // 如果检测编号截取后长度 - String s = "/"; - if (split[0].split("-").length > 1) { - s = split[0].split("-")[0]; - } + // 获取检测编号前缀 + String s = getExperieNumPrefix(split[0]); result.put("1", s); result.put("2", examineResult.getDisposal()); result.put("3", examine.getSimpleName()); @@ -2916,6 +2913,22 @@ public class EntrustServiceImpl extends BaseServiceImpl } } + /** + * 计算检测编号前缀 + */ + private String getExperieNumPrefix(String experieNum) { + String result = ""; + if (experieNum != null && !"".equals(experieNum) && experieNum.split("-").length > 1) { + String[] split = experieNum.split("-"); + // 如：J-20221012-1，length = 3，split.length - 1 = 2，split[0]=J，split[1]=20221012， + for (int i = 0; i < split.length - 1; i++) { + result += split[i] + "-"; + } + result = result.substring(0, result.length()-1); + } + return result; + } + /** * 通过空格替换null *