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 2c4b652..8e59ee2 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 @@ -391,7 +391,12 @@ public class EntrustServiceImpl extends BaseServiceImpl if ("6".equals(examineWay.getInputMode())) { reportMainBody.put("name" + i, examineItem.getName() + examineWay.getName()); } else { - reportMainBody.put("name" + i, examineItem.getName()); + // 如果是复检需要加上“(复检)” + if (examine.getIsRecheck() != null && examine.getIsRecheck() == 1) { + reportMainBody.put("name" + i, examineItem.getName() + "(复检)"); + } else { + reportMainBody.put("name" + i, examineItem.getName()); + } } // 判断是哪种检测 // String inputMode = examineItem.getInputMode(); @@ -1138,6 +1143,10 @@ public class EntrustServiceImpl extends BaseServiceImpl private List> fillExamineItemAndAll(List examineList) { List> ItemAndAllList = new ArrayList<>(); for (Examine examine : examineList) { + // 如果是复检跳过 + if (examine.getIsRecheck() != null && examine.getIsRecheck() == 1) { + continue; + } HashMap map = new HashMap<>(4); if (examine.getExamineItemId() != null) { ExamineItem byId = examineItemService.getById(examine.getExamineItemId()); diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java index c050125..9acb4d8 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java @@ -436,7 +436,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl 0) { - pcr2Excels.sort(Comparator.comparing(pcr2Excel -> Integer.parseInt(pcr2Excel.getCtValue().replace(" ", "")))); + pcr2Excels.sort(Comparator.comparing(pcr2Excel -> Double.parseDouble(pcr2Excel.getCtValue().replace(" ", "")))); excels.add(pcr2Excels.get(0)); pcr2Excels.clear(); } else {