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

$替换\n换行

Browse Source
dev
litao 3 years ago
parent 98111d335a
commit c817448719
1 changed files with 22 additions and 19 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. 41
      lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java

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

@ -1190,9 +1190,9 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
result.put("10", examineResult.getSimpleStatus());
result.put("11", "温度" + examineResult.getTemperature() + "℃; " + "湿度" + examineResult.getHumidity() + "%RH");
// result.put("12", examineWay.getOperation());
result.put("12", examineResult.getOperateContent());
result.put("12", examineResult.getOperateContent().replace("$", "\n"));
if (examineBasis != null) {
result.put("13", examineBasis.getContent());
result.put("13", examineBasis.getContent().replace("$", "\n"));
}
String path = sysClient.getParamValue("electronic_signature_real_path").getData();
// 检测人
@ -1248,23 +1248,26 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
// 如果是布鲁氏检测
if ("2".equals(byId.getInputMode())) {
List<ExamineTemplate2Excel> list = JSON.parseArray(examineResult.getExamineDataArr(), ExamineTemplate2Excel.class);
// 阴阳性数量
// 阴性数量
long yin = list.stream().filter((ExamineTemplate2Excel e) -> "阴性".equals(e.getResult())).count();
long yang = list.stream().filter((ExamineTemplate2Excel e) -> "阳性".equals(e.getResult())).count();
// TODO 缺一个判断，如果是平板的，只有阴性和阳性，如果是试管的才有可疑
long keyi = list.stream().filter((ExamineTemplate2Excel e) -> "可疑".equals(e.getResult())).count();
ExamineTemplate2Excel examineTemplate2Excel1 = new ExamineTemplate2Excel();
ExamineTemplate2Excel examineTemplate2Excel2 = new ExamineTemplate2Excel();
ExamineTemplate2Excel examineTemplate2Excel3 = new ExamineTemplate2Excel();
examineTemplate2Excel1.setExperieNum("阴性数量");
examineTemplate2Excel1.setValue(String.valueOf(yin));
list.add(examineTemplate2Excel1);
// 阳性数量
long yang = list.stream().filter((ExamineTemplate2Excel e) -> "阳性".equals(e.getResult())).count();
ExamineTemplate2Excel examineTemplate2Excel2 = new ExamineTemplate2Excel();
examineTemplate2Excel2.setExperieNum("阳性数量");
examineTemplate2Excel2.setValue(String.valueOf(yang));
examineTemplate2Excel3.setExperieNum("可疑数量");
examineTemplate2Excel3.setValue(String.valueOf(keyi));
list.add(examineTemplate2Excel1);
list.add(examineTemplate2Excel2);
list.add(examineTemplate2Excel3);
// 可疑数量
long keyi = list.stream().filter((ExamineTemplate2Excel e) -> "可疑".equals(e.getResult())).count();
if (keyi > 0) {
ExamineTemplate2Excel examineTemplate2Excel3 = new ExamineTemplate2Excel();
examineTemplate2Excel3.setExperieNum("可疑数量");
examineTemplate2Excel3.setValue(String.valueOf(keyi));
list.add(examineTemplate2Excel3);
}
if (list.size() > 0) {
Map<String, List<ExamineTemplate2Excel>> resultMap = new HashMap<>();
@ -2054,7 +2057,7 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
// }
// }
// }
// result.put("list1", resultList1);
result.put("list1", resultList1);
}
for (int i = 0; i < (arrVOList.size() / 96); i++) {
int start = i * 96;
@ -2064,15 +2067,15 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
String startNum = "";
String endNum = "";
for (int k = 0; k < 96; k++) {
String num = list.get((i * 96) + k).getNum();
String num = arrVOList.get((i * 96) + k).getNum();
if (num != null && !"".equals(num) && num.split("-").length == 3) {
startNum = num.split("-")[2];
break;
}
}
for (int k = 95; k >= 0; k--) {
if ((i * 96) + k < list.size()) {
String num = list.get((i * 96) + k).getNum();
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];
break;
@ -2357,15 +2360,15 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
String startNum = "";
String endNum = "";
for (int k = 0; k < 96; k++) {
String num = list.get((i * 96) + k).getNum();
String num = arrVOList.get((i * 96) + k).getNum();
if (num != null && !"".equals(num) && num.split("-").length == 3) {
startNum = num.split("-")[2];
break;
}
}
for (int k = 95; k >= 0; k--) {
if ((i * 96) + k < list.size()) {
String num = list.get((i * 96) + k).getNum();
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];
break;

Write Preview
Loading…
Cancel
Save