From 3bb83f46ebb2e8b8e78db5840dba0caa3b51e0b7 Mon Sep 17 00:00:00 2001 From: litao Date: Mon, 10 Oct 2022 18:36:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=A3=80=E6=B5=8B=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E5=90=8E=E9=9D=A2=E5=BA=8F=E5=8F=B7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lims/service/impl/EntrustServiceImpl.java | 83 +++++++++++-------- 1 file changed, 48 insertions(+), 35 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 b7fc8dc..e65a6a8 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 @@ -714,8 +714,8 @@ public class EntrustServiceImpl extends BaseServiceImpl Collections.sort(currExamResVoList, new Comparator() { @Override public int compare(ExamineResultVo o1, ExamineResultVo o2) { - Integer expirNum1 = Integer.valueOf(o1.getNum().split("-")[2]); - Integer expirNum2 = Integer.valueOf(o2.getNum().split("-")[2]); + Integer expirNum1 = Integer.valueOf(o1.getNum().split("-")[o1.getNum().split("-").length - 1]); + Integer expirNum2 = Integer.valueOf(o2.getNum().split("-")[o1.getNum().split("-").length - 1]); return expirNum1 - expirNum2; } }); @@ -1201,12 +1201,12 @@ public class EntrustServiceImpl extends BaseServiceImpl result.put("10", examineResult.getSimpleStatus()); result.put("11", "温度" + examineResult.getTemperature() + "℃; " + "湿度" + examineResult.getHumidity() + "%RH"); // 操作程序内容 - result.put("12", examineResult.getOperateContent().replace("$", "\n")); + result.put("12", examineResult.getOperateContent().replace("$", "\r")); // if (examineBasis != null) { // result.put("13", examineBasis.getContent().replace("$", "(char)11")); // } // 结果判定方法和依据 - result.put("13", examineResult.getExamineBasisContent().replace("$", "\n")); + result.put("13", examineResult.getExamineBasisContent().replace("$", "\r")); String path = sysClient.getParamValue("electronic_signature_real_path").getData(); // 检测人 if (!"".equals(examine.getExamineBy()) && examine.getExamineBy() != null) { @@ -1789,16 +1789,16 @@ public class EntrustServiceImpl extends BaseServiceImpl String endNum = ""; for (int k = 0; k < 96; k++) { String num = list.get((i * 96) + k).getNum(); - if (num != null && !"".equals(num) && num.split("-").length == 3) { - startNum = num.split("-")[2]; + if (num != null && !"".equals(num) && num.split("-").length > 1) { + startNum = num.split("-")[num.split("-").length - 1]; break; } } for (int k = 95; k >= 0; k--) { if ((i * 96) + k < list.size()) { String num = list.get((i * 96) + k).getNum(); - if (num != null && !"".equals(num) && num.split("-").length == 3) { - endNum = num.split("-")[2]; + if (num != null && !"".equals(num) && num.split("-").length > 1) { + endNum = num.split("-")[num.split("-").length - 1]; break; } } @@ -1855,8 +1855,8 @@ public class EntrustServiceImpl extends BaseServiceImpl for (int k = 1; k <= 12; k++) { map.put(k + "", list.get(start + (8 * x + j) - 2).getValue()); String num = list.get(start + (8 * x + j) - 2).getNum(); - if (num != null && !"".equals(num) && num.split("-").length == 3) { - map.put((k + 12) + "", num.split("-")[2]); + if (num != null && !"".equals(num) && num.split("-").length > 1) { + map.put((k + 12) + "", num.split("-")[num.split("-").length - 1]); } else { map.put((k + 12) + "", " "); } @@ -2073,16 +2073,16 @@ public class EntrustServiceImpl extends BaseServiceImpl String endNum = ""; for (int k = 0; k < 96; k++) { String num = arrVOList.get((i * 96) + k).getNum(); - if (num != null && !"".equals(num) && num.split("-").length == 3) { - startNum = num.split("-")[2]; + if (num != null && !"".equals(num) && num.split("-").length > 1) { + startNum = num.split("-")[num.split("-").length - 1]; break; } } for (int k = 95; k >= 0; k--) { if ((i * 96) + k < arrVOList.size()) { String num = arrVOList.get((i * 96) + k).getNum(); - if (num != null && !"".equals(num) && num.split("-").length == 3) { - endNum = num.split("-")[2]; + if (num != null && !"".equals(num) && num.split("-").length > 1) { + endNum = num.split("-")[num.split("-").length - 1]; break; } } @@ -2139,8 +2139,8 @@ public class EntrustServiceImpl extends BaseServiceImpl for (int k = 1; k <= 12; k++) { map.put(k + "", arrVOList.get(start + (8 * x + j) - 2).getValue()); String num = arrVOList.get(start + (8 * x + j) - 2).getNum(); - if (num != null && !"".equals(num) && num.split("-").length == 3) { - map.put((k + 12) + "", num.split("-")[2]); + if (num != null && !"".equals(num) && num.split("-").length > 1) { + map.put((k + 12) + "", num.split("-")[num.split("-").length - 1]); } else { map.put((k + 12) + "", " "); } @@ -2357,16 +2357,16 @@ public class EntrustServiceImpl extends BaseServiceImpl String endNum = ""; for (int k = 0; k < 96; k++) { String num = arrVOList.get((i * 96) + k).getNum(); - if (num != null && !"".equals(num) && num.split("-").length == 3) { - startNum = num.split("-")[2]; + if (num != null && !"".equals(num) && num.split("-").length > 1) { + startNum = num.split("-")[num.split("-").length - 1]; break; } } for (int k = 95; k >= 0; k--) { if ((i * 96) + k < arrVOList.size()) { String num = arrVOList.get((i * 96) + k).getNum(); - if (num != null && !"".equals(num) && num.split("-").length == 3) { - endNum = num.split("-")[2]; + if (num != null && !"".equals(num) && num.split("-").length > 1) { + endNum = num.split("-")[num.split("-").length - 1]; break; } } @@ -2423,8 +2423,8 @@ public class EntrustServiceImpl extends BaseServiceImpl for (int k = 1; k <= 12; k++) { map.put(k + "", arrVOList.get(start + (8 * x + j) - 2).getValue()); String num = arrVOList.get(start + (8 * x + j) - 2).getNum(); - if (num != null && !"".equals(num) && num.split("-").length == 3) { - map.put((k + 12) + "", num.split("-")[2]); + if (num != null && !"".equals(num) && num.split("-").length > 1) { + map.put((k + 12) + "", num.split("-")[num.split("-").length - 1]); } else { map.put((k + 12) + "", " "); } @@ -2619,16 +2619,16 @@ public class EntrustServiceImpl extends BaseServiceImpl String endNum = ""; for (int k = 0; k < 96; k++) { String num = list.get((i * 96) + k).getNum(); - if (num != null && !"".equals(num) && num.split("-").length == 3) { - startNum = num.split("-")[2]; + if (num != null && !"".equals(num) && num.split("-").length > 1) { + startNum = num.split("-")[num.split("-").length - 1]; break; } } for (int k = 95; k >= 0; k--) { if ((i * 96) + k < list.size()) { String num = list.get((i * 96) + k).getNum(); - if (num != null && !"".equals(num) && num.split("-").length == 3) { - endNum = num.split("-")[2]; + if (num != null && !"".equals(num) && num.split("-").length > 1) { + endNum = num.split("-")[num.split("-").length - 1]; break; } } @@ -2687,8 +2687,8 @@ public class EntrustServiceImpl extends BaseServiceImpl if (list.size() - 1 >= start + (8 * x + j) - 2) { map.put(k + "", list.get(start + (8 * x + j) - 2).getOriginResult()); String num = list.get(start + (8 * x + j) - 2).getNum(); - if (num != null && !"".equals(num) && num.split("-").length == 3) { - map.put((k + 12) + "", num.split("-")[2]); + if (num != null && !"".equals(num) && num.split("-").length > 1) { + map.put((k + 12) + "", num.split("-")[num.split("-").length - 1]); } else { map.put((k + 12) + "", " "); } @@ -2762,16 +2762,16 @@ public class EntrustServiceImpl extends BaseServiceImpl String endNum = ""; for (int k = 0; k < 96; k++) { String num = list.get((i * 96) + k).getNum(); - if (num != null && !"".equals(num) && num.split("-").length == 3) { - startNum = num.split("-")[2]; + if (num != null && !"".equals(num) && num.split("-").length > 1) { + startNum = num.split("-")[num.split("-").length - 1]; break; } } for (int k = 95; k >= 0; k--) { if ((i * 96) + k < list.size()) { String num = list.get((i * 96) + k).getNum(); - if (num != null && !"".equals(num) && num.split("-").length == 3) { - endNum = num.split("-")[2]; + if (num != null && !"".equals(num) && num.split("-").length > 1) { + endNum = num.split("-")[num.split("-").length - 1]; break; } } @@ -2828,8 +2828,8 @@ public class EntrustServiceImpl extends BaseServiceImpl for (int k = 1; k <= 12; k++) { map.put(k + "", list.get(start + (8 * x + j) - 2).getOriginResult()); String num = list.get(start + (8 * x + j) - 2).getNum(); - if (num != null && !"".equals(num) && num.split("-").length == 3) { - map.put((k + 12) + "", num.split("-")[2]); + if (num != null && !"".equals(num) && num.split("-").length > 1) { + map.put((k + 12) + "", num.split("-")[num.split("-").length - 1]); } else { map.put((k + 12) + "", " "); } @@ -3938,6 +3938,7 @@ public class EntrustServiceImpl extends BaseServiceImpl Map map = list.get(sort); // 样品名称 String name = (String) map.get("simpleName"); + // 拼接样品名称并去逗号 if (sort == (list.size() - 1)) { simpleName.append(name); } else { @@ -3948,9 +3949,10 @@ public class EntrustServiceImpl extends BaseServiceImpl simpleCount += count; // 原始编号 String num = (String) map.get("originalNum"); + // 获取原始编号第一位序号 String[] split = num.split("-"); int a = Integer.parseInt(split[0]); - + // 根据样品数量遍历 for (int i = 0; i < count; i++) { SimpleRel simpleRel = new SimpleRel(); if (entrust.getId() != null) { @@ -3958,18 +3960,29 @@ public class EntrustServiceImpl extends BaseServiceImpl } else { simpleRel.setEntrustId(id); } + // 样品名称 simpleRel.setSimpleName(name); + // 留样样品数量 simpleRel.setReagentNum(1); + // 留样样品检测编号 simpleRel.setReagentExperieNum(experieNumCount + count + ""); + // 实验样品数量 simpleRel.setExamineNum(1); + // 实验样品检测编号 simpleRel.setExamineExperieNum(experieNumCount + ""); + // 原始编号（隐性） simpleRel.setRecessiveNum((i + a) + ""); + // 原始编号（显性） simpleRel.setOriginalNum((i + a) + ""); + // 状态 simpleRel.setStatus(0); + // 排序 simpleRel.setSort(sort); + // 检测编号加1 experieNumCount++; rels.add(simpleRel); } + // 检测编号加样品数量 experieNumCount += count; } simpleRelService.saveBatch(rels);