suojin
/
project_husbandry_back
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

获取检测编号后面序号问题

Browse Source
dev
litao 3 years ago
parent 6957a7450a
commit 3bb83f46eb
1 changed files with 48 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 83
      lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java

83
lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java
Unescape View File

@ -714,8 +714,8 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
Collections.sort(currExamResVoList, new Comparator<ExamineResultVo>() {
@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<EntrustMapper, Entrust>
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<EntrustMapper, Entrust>
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<EntrustMapper, Entrust>
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<EntrustMapper, Entrust>
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<EntrustMapper, Entrust>
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<EntrustMapper, Entrust>
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<EntrustMapper, Entrust>
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<EntrustMapper, Entrust>
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<EntrustMapper, Entrust>
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<EntrustMapper, Entrust>
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<EntrustMapper, Entrust>
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<EntrustMapper, Entrust>
Map<String, Object> 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<EntrustMapper, Entrust>
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<EntrustMapper, Entrust>
} 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);

Write Preview
Loading…
Cancel
Save