From 2148f6c87131282188760147190ece6efc6e71d0 Mon Sep 17 00:00:00 2001
From: litao <a15234804788@163.com>
Date: Fri, 2 Feb 2024 15:19:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E6=A3=80=E6=8A=A5=E5=91=8A=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lims/service/impl/EntrustServiceImpl.java         | 11 ++++++++++-
 .../lims/service/impl/ExamineResultServiceImpl.java   |  2 +-
 2 files changed, 11 insertions(+), 2 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 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<EntrustMapper, Entrust>
             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<EntrustMapper, Entrust>
     private List<Map<String, Object>> fillExamineItemAndAll(List<Examine> examineList) {
         List<Map<String, Object>> ItemAndAllList = new ArrayList<>();
         for (Examine examine : examineList) {
+            // 如果是复检跳过
+            if (examine.getIsRecheck() != null && examine.getIsRecheck() == 1) {
+                continue;
+            }
             HashMap<String, Object> 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<ExamineResultMappe
                     }
 
                     if (pcr2Excels.size() > 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 {