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

lims流程性问题

Browse Source
dev
litao 3 years ago
parent 36fb49a8cc
commit 57fed63674
1 changed files with 33 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 54
      lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java

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

@ -724,10 +724,16 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
String result = ""; String result = "";
for (int i = 0; i < currExamResVoList.size(); i++) { for (int i = 0; i < currExamResVoList.size(); i++) {
ExamineResultVo resultVo = currExamResVoList.get(i); ExamineResultVo resultVo = currExamResVoList.get(i);
if (i == currExamResVoList.size() - 1) {
num += resultVo.getNum();
value += resultVo.getValue();
result += resultVo.getResult();
} else {
num += resultVo.getNum() + ","; num += resultVo.getNum() + ",";
value += resultVo.getValue() + ","; value += resultVo.getValue() + ",";
result += resultVo.getResult() + ","; result += resultVo.getResult() + ",";
} }
}
row.put("num" + index, num); row.put("num" + index, num);
row.put("value" + index, value); row.put("value" + index, value);
row.put("result" + index,result); row.put("result" + index,result);
@ -1195,7 +1201,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
// result.put("13", examineBasis.getContent().replace("$", "(char)11")); // result.put("13", examineBasis.getContent().replace("$", "(char)11"));
// } // }
// 结果判定方法和依据 // 结果判定方法和依据
result.put("13", examineResult.getExamineBasisContent().replace("$", "(char)11")); result.put("13", examineResult.getExamineBasisContent().replace("$", "\n"));
String path = sysClient.getParamValue("electronic_signature_real_path").getData(); String path = sysClient.getParamValue("electronic_signature_real_path").getData();
// 检测人 // 检测人
if (!"".equals(examine.getExamineBy()) && examine.getExamineBy() != null) { if (!"".equals(examine.getExamineBy()) && examine.getExamineBy() != null) {
@ -1932,9 +1938,9 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
ExamineDataArrVO dataArrVO1 = new ExamineDataArrVO(); ExamineDataArrVO dataArrVO1 = new ExamineDataArrVO();
ExamineDataArrVO dataArrVO2 = new ExamineDataArrVO(); ExamineDataArrVO dataArrVO2 = new ExamineDataArrVO();
dataArrVO1.setNum("阴性数量"); dataArrVO1.setNum("阴性数量");
dataArrVO1.setValue(String.valueOf(yin)); dataArrVO1.setLog2(String.valueOf(yin));
dataArrVO2.setNum("阳性数量"); dataArrVO2.setNum("阳性数量");
dataArrVO2.setValue(String.valueOf(yang)); dataArrVO2.setLog2(String.valueOf(yang));
list1.add(dataArrVO1); list1.add(dataArrVO1);
list1.add(dataArrVO2); list1.add(dataArrVO2);
@ -1965,15 +1971,15 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
for (int i = 0; i < voList.size() / 3; i++) { for (int i = 0; i < voList.size() / 3; i++) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("num1", voList.get(i).getNum()); map.put("num1", voList.get(i).getNum());
map.put("value1", voList.get(i).getValue()); map.put("log1", voList.get(i).getLog2());
map.put("result1", voList.get(i).getResult()); map.put("result1", voList.get(i).getResult());
map.put("num2", voList.get(voList.size() / 3 + i).getNum()); map.put("num2", voList.get(voList.size() / 3 + i).getNum());
map.put("value2", voList.get(voList.size() / 3 + i).getValue()); map.put("log2", voList.get(voList.size() / 3 + i).getLog2());
map.put("result2", voList.get(voList.size() / 3 + i).getResult()); map.put("result2", voList.get(voList.size() / 3 + i).getResult());
map.put("num3", voList.get(voList.size() / 3 * 2 + i).getNum()); map.put("num3", voList.get(voList.size() / 3 * 2 + i).getNum());
map.put("value3", voList.get(voList.size() / 3 * 2 + i).getValue()); map.put("log3", voList.get(voList.size() / 3 * 2 + i).getLog2());
map.put("result3", voList.get(voList.size() / 3 * 2 + i).getResult()); map.put("result3", voList.get(voList.size() / 3 * 2 + i).getResult());
resultList1.add(map); resultList1.add(map);
} }
@ -1982,28 +1988,28 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
if (voList.size() % 3 == 1) { if (voList.size() % 3 == 1) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("num1", voList.get(i).getNum()); map.put("num1", voList.get(i).getNum());
map.put("value1", voList.get(i).getValue()); map.put("log1", voList.get(i).getLog2());
map.put("result1", voList.get(i).getResult()); map.put("result1", voList.get(i).getResult());
if (i < voList.size() / 3) { if (i < voList.size() / 3) {
map.put("num2", voList.get(voList.size() / 3 + i + 1).getNum()); map.put("num2", voList.get(voList.size() / 3 + i + 1).getNum());
map.put("value2", voList.get(voList.size() / 3 + i + 1).getValue()); map.put("log2", voList.get(voList.size() / 3 + i + 1).getLog2());
map.put("result2", voList.get(voList.size() / 3 + i + 1).getResult()); map.put("result2", voList.get(voList.size() / 3 + i + 1).getResult());
map.put("num3", voList.get(voList.size() / 3 * 2 + i + 1).getNum()); map.put("num3", voList.get(voList.size() / 3 * 2 + i + 1).getNum());
map.put("value3", voList.get(voList.size() / 3 * 2 + i + 1).getValue()); map.put("log3", voList.get(voList.size() / 3 * 2 + i + 1).getLog2());
map.put("result3", voList.get(voList.size() / 3 * 2 + i + 1).getResult()); map.put("result3", voList.get(voList.size() / 3 * 2 + i + 1).getResult());
} }
resultList1.add(map); resultList1.add(map);
} else if (voList.size() % 3 == 2) { } else if (voList.size() % 3 == 2) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("num1", voList.get(i).getNum()); map.put("num1", voList.get(i).getNum());
map.put("value1", voList.get(i).getValue()); map.put("log1", voList.get(i).getLog2());
map.put("result1", voList.get(i).getResult()); map.put("result1", voList.get(i).getResult());
map.put("num2", voList.get(voList.size() / 3 + i + 1).getNum()); map.put("num2", voList.get(voList.size() / 3 + i + 1).getNum());
map.put("value2", voList.get(voList.size() / 3 + i + 1).getValue()); map.put("log2", voList.get(voList.size() / 3 + i + 1).getLog2());
map.put("result2", voList.get(voList.size() / 3 + i + 1).getResult()); map.put("result2", voList.get(voList.size() / 3 + i + 1).getResult());
if (i < voList.size() / 3) { if (i < voList.size() / 3) {
map.put("num3", voList.get(voList.size() / 3 * 2 + i + 2).getNum()); map.put("num3", voList.get(voList.size() / 3 * 2 + i + 2).getNum());
map.put("value3", voList.get(voList.size() / 3 * 2 + i + 2).getValue()); map.put("log3", voList.get(voList.size() / 3 * 2 + i + 2).getLog2());
map.put("result3", voList.get(voList.size() / 3 * 2 + i + 2).getResult()); map.put("result3", voList.get(voList.size() / 3 * 2 + i + 2).getResult());
} }
resultList1.add(map); resultList1.add(map);
@ -2225,9 +2231,9 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
ExamineDataArrVO dataArrVO1 = new ExamineDataArrVO(); ExamineDataArrVO dataArrVO1 = new ExamineDataArrVO();
ExamineDataArrVO dataArrVO2 = new ExamineDataArrVO(); ExamineDataArrVO dataArrVO2 = new ExamineDataArrVO();
dataArrVO1.setNum("阴性数量"); dataArrVO1.setNum("阴性数量");
dataArrVO1.setValue(String.valueOf(yin)); dataArrVO1.setLog2(String.valueOf(yin));
dataArrVO2.setNum("阳性数量"); dataArrVO2.setNum("阳性数量");
dataArrVO2.setValue(String.valueOf(yang)); dataArrVO2.setLog2(String.valueOf(yang));
list1.add(dataArrVO1); list1.add(dataArrVO1);
list1.add(dataArrVO2); list1.add(dataArrVO2);
@ -2258,15 +2264,15 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
for (int i = 0; i < voList.size() / 3; i++) { for (int i = 0; i < voList.size() / 3; i++) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("num1", voList.get(i).getNum()); map.put("num1", voList.get(i).getNum());
map.put("value1", voList.get(i).getValue()); map.put("log1", voList.get(i).getLog2());
map.put("result1", voList.get(i).getResult()); map.put("result1", voList.get(i).getResult());
map.put("num2", voList.get(voList.size() / 3 + i).getNum()); map.put("num2", voList.get(voList.size() / 3 + i).getNum());
map.put("value2", voList.get(voList.size() / 3 + i).getValue()); map.put("log2", voList.get(voList.size() / 3 + i).getLog2());
map.put("result2", voList.get(voList.size() / 3 + i).getResult()); map.put("result2", voList.get(voList.size() / 3 + i).getResult());
map.put("num3", voList.get(voList.size() / 3 * 2 + i).getNum()); map.put("num3", voList.get(voList.size() / 3 * 2 + i).getNum());
map.put("value3", voList.get(voList.size() / 3 * 2 + i).getValue()); map.put("log3", voList.get(voList.size() / 3 * 2 + i).getLog2());
map.put("result3", voList.get(voList.size() / 3 * 2 + i).getResult()); map.put("result3", voList.get(voList.size() / 3 * 2 + i).getResult());
resultList1.add(map); resultList1.add(map);
} }
@ -2275,28 +2281,28 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
if (voList.size() % 3 == 1) { if (voList.size() % 3 == 1) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("num1", voList.get(i).getNum()); map.put("num1", voList.get(i).getNum());
map.put("value1", voList.get(i).getValue()); map.put("log1", voList.get(i).getLog2());
map.put("result1", voList.get(i).getResult()); map.put("result1", voList.get(i).getResult());
if (i < voList.size() / 3) { if (i < voList.size() / 3) {
map.put("num2", voList.get(voList.size() / 3 + i + 1).getNum()); map.put("num2", voList.get(voList.size() / 3 + i + 1).getNum());
map.put("value2", voList.get(voList.size() / 3 + i + 1).getValue()); map.put("log2", voList.get(voList.size() / 3 + i + 1).getLog2());
map.put("result2", voList.get(voList.size() / 3 + i + 1).getResult()); map.put("result2", voList.get(voList.size() / 3 + i + 1).getResult());
map.put("num3", voList.get(voList.size() / 3 * 2 + i + 1).getNum()); map.put("num3", voList.get(voList.size() / 3 * 2 + i + 1).getNum());
map.put("value3", voList.get(voList.size() / 3 * 2 + i + 1).getValue()); map.put("log3", voList.get(voList.size() / 3 * 2 + i + 1).getLog2());
map.put("result3", voList.get(voList.size() / 3 * 2 + i + 1).getResult()); map.put("result3", voList.get(voList.size() / 3 * 2 + i + 1).getResult());
} }
resultList1.add(map); resultList1.add(map);
} else if (voList.size() % 3 == 2) { } else if (voList.size() % 3 == 2) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("num1", voList.get(i).getNum()); map.put("num1", voList.get(i).getNum());
map.put("value1", voList.get(i).getValue()); map.put("log1", voList.get(i).getLog2());
map.put("result1", voList.get(i).getResult()); map.put("result1", voList.get(i).getResult());
map.put("num2", voList.get(voList.size() / 3 + i + 1).getNum()); map.put("num2", voList.get(voList.size() / 3 + i + 1).getNum());
map.put("value2", voList.get(voList.size() / 3 + i + 1).getValue()); map.put("log2", voList.get(voList.size() / 3 + i + 1).getLog2());
map.put("result2", voList.get(voList.size() / 3 + i + 1).getResult()); map.put("result2", voList.get(voList.size() / 3 + i + 1).getResult());
if (i < voList.size() / 3) { if (i < voList.size() / 3) {
map.put("num3", voList.get(voList.size() / 3 * 2 + i + 2).getNum()); map.put("num3", voList.get(voList.size() / 3 * 2 + i + 2).getNum());
map.put("value3", voList.get(voList.size() / 3 * 2 + i + 2).getValue()); map.put("log3", voList.get(voList.size() / 3 * 2 + i + 2).getLog2());
map.put("result3", voList.get(voList.size() / 3 * 2 + i + 2).getResult()); map.put("result3", voList.get(voList.size() / 3 * 2 + i + 2).getResult());
} }
resultList1.add(map); resultList1.add(map);
@ -3193,7 +3199,6 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
} }
List<Map<String, Object>> resultList = new ArrayList<>(); List<Map<String, Object>> resultList = new ArrayList<>();
Map<String, Object> map = new HashMap<>();
LambdaQueryWrapper<Examine> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Examine> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Examine::getEntrustId, id); queryWrapper.eq(Examine::getEntrustId, id);
@ -3201,6 +3206,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
List<Examine> examineList = examineService.list(queryWrapper); List<Examine> examineList = examineService.list(queryWrapper);
if (CollectionUtils.isNotEmpty(examineList)) { if (CollectionUtils.isNotEmpty(examineList)) {
for (Examine examine : examineList) { for (Examine examine : examineList) {
Map<String, Object> map = new HashMap<>();
map.put("simpleName", examine.getSimpleName()); map.put("simpleName", examine.getSimpleName());
map.put("simpleCount", examine.getSimpleCount()); map.put("simpleCount", examine.getSimpleCount());
String[] split = examine.getExperieNum().split(","); String[] split = examine.getExperieNum().split(",");

Write Preview
Loading…
Cancel
Save