From c0c4233b8ecfb10a10f1310cc2a581581266b595 Mon Sep 17 00:00:00 2001 From: litao Date: Sun, 9 Oct 2022 17:58:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=8C=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=88=86=E6=A0=B7=EF=BC=8C=E6=A3=80=E6=B5=8B=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E8=AE=BE=E7=BD=AE=EF=BC=8C=E5=85=B3=E8=81=94?= =?UTF-8?q?=E7=9A=84=E5=9C=B0=E6=96=B9=E5=81=9A=E4=BA=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lims/controller/SimpleRelController.java | 22 +++++++++++++-- .../lims/service/impl/EntrustServiceImpl.java | 28 ++++++++++++------- 2 files changed, 37 insertions(+), 13 deletions(-) diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/SimpleRelController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/SimpleRelController.java index 5e19e4e..a286c10 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/SimpleRelController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/SimpleRelController.java @@ -53,7 +53,17 @@ public class SimpleRelController extends BladeController { @PostMapping("/update") public void update(@RequestBody SimpleRel simpleRel) { // 0.数据准备：检验编号 - String experieNum = simpleRel.getExamineExperieNum().substring(0, 13); +// String experieNum = simpleRel.getExamineExperieNum().substring(0, 13); + String experieNum = ""; + // 第一个检测编号 + String firstNum = simpleRel.getExamineExperieNum().split(",")[0]; + // 用“-”切割切割第一个编号 + String[] split = firstNum.split("-"); + // 取最后一个“-”之前的数据 + for (int i = 0; i < split.length - 1; i++) { + experieNum += split[i] + "-"; + } + // 1.修改样品关联 simpleRelService.updateById(simpleRel); // 2.查所有的样品关联 @@ -70,7 +80,10 @@ public class SimpleRelController extends BladeController { for (SimpleRel currRel : currSimpleRels) { String examineExperieNum = ""; for (Integer j = 0; j < currRel.getExamineNum(); j++) { - examineExperieNum += experieNum + num + ","; + examineExperieNum += experieNum + num; + if (j < currRel.getExamineNum() - 1) { + examineExperieNum += ","; + } num ++; } currRel.setExamineExperieNum(examineExperieNum); @@ -79,7 +92,10 @@ public class SimpleRelController extends BladeController { for (SimpleRel currRel : currSimpleRels) { String reagentNum = ""; for (Integer k = 0; k < currRel.getReagentNum(); k++) { - reagentNum += experieNum + num + ","; + reagentNum += experieNum + num; + if (k < currRel.getReagentNum() - 1) { + reagentNum += ","; + } num ++; } currRel.setReagentExperieNum(reagentNum); 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 a160701..88cacd9 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 @@ -1108,8 +1108,8 @@ public class EntrustServiceImpl extends BaseServiceImpl String[] split = examine.getExperieNum().split(","); // 如果检测编号截取后长度 String s = "/"; - if (split[0].length() > 12) { - s = split[0].substring(0, 12); + if (split[0].split("-").length > 1) { + s = split[0].split("-")[0]; } result.put("1", s); result.put("2", examineResult.getDisposal()); @@ -3178,13 +3178,16 @@ public class EntrustServiceImpl extends BaseServiceImpl Map map = new HashMap<>(); map.put("simpleName", examine.getSimpleName()); map.put("simpleCount", examine.getSimpleCount()); + // 获取当前检测对应的检测编号 String[] split = examine.getExperieNum().split(","); - String[] split1 = split[0].split("-"); - String num = split1[0]; - if (split.length > 1) { - num = split1[0] + "-" + split1[1]; - } - map.put("experieNum", num + examine.getMin() + "~" + num + examine.getMax()); +// String[] split1 = split[0].split("-"); + // 组装检测编号（只要开头和结尾） + String num = split[0] + "~" + split[split.length - 1]; +// if (split.length > 1) { +// num = split1[0] + "-" + split1[1]; +// } +// map.put("experieNum", num + examine.getMin() + "~" + num + examine.getMax()); + map.put("experieNum", num); //检测项目 ExamineItem examineItem = examineItemService.getById(examine.getExamineItemId()); if (examineItem != null) { @@ -3928,6 +3931,8 @@ public class EntrustServiceImpl extends BaseServiceImpl Integer simpleCount = 0; List> list = entrust.getSimpleNames(); + // 检测编号计数器 + int experieNumCount = 1; // 样品排序 for (int sort = 0; sort < list.size(); sort++) { Map map = list.get(sort); @@ -3955,15 +3960,17 @@ public class EntrustServiceImpl extends BaseServiceImpl } simpleRel.setSimpleName(name); simpleRel.setReagentNum(1); - simpleRel.setReagentExperieNum(s + ((a - 1) * 2 + i + 1 + count)); + simpleRel.setReagentExperieNum(experieNumCount + count + ""); simpleRel.setExamineNum(1); - simpleRel.setExamineExperieNum(s + ((a - 1) * 2 + i + 1)); + simpleRel.setExamineExperieNum(experieNumCount + ""); simpleRel.setRecessiveNum((i + a) + ""); simpleRel.setOriginalNum((i + a) + ""); simpleRel.setStatus(0); simpleRel.setSort(sort); + experieNumCount++; rels.add(simpleRel); } + experieNumCount += count; } simpleRelService.saveBatch(rels); // 委托单内容补充 @@ -4019,6 +4026,7 @@ public class EntrustServiceImpl extends BaseServiceImpl customer.setStatus(2); customer.setId(RandomUtils.nextLong()); customer.setPhone(entrust.getTakePhone()); + // 单位名称 customer.setName(entrust.getTakeCompany()); customer.setFullName(entrust.getTakePerson()); customer.setAddress(entrust.getTakeCompanyAddress());