From bf6299c31be26e8fa12e8631c6a2c729fb28430d Mon Sep 17 00:00:00 2001
From: litao <a15234804788@163.com>
Date: Sun, 9 Oct 2022 17:51:46 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8F=A3=E8=B9=84=E7=96=AB=E5=85=B0=E6=89=80?=
 =?UTF-8?q?=E5=8D=95=E6=9D=BF=E8=A7=A3=E6=9E=90=E7=9A=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=A0=B9=E7=BB=9Dorder=E8=BF=9B=E8=A1=8C=E6=8E=92=E5=BA=8F=202?=
 =?UTF-8?q?.=E8=A7=A3=E5=86=B3=E5=8F=A3=E8=B9=84=E7=96=AB=E5=85=B0?=
 =?UTF-8?q?=E6=89=80=E5=8D=95=E6=9D=BF=E7=94=9F=E6=88=90=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E6=BB=B4=E5=BA=A6=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ExamineResultController.java   | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java
index b2c60f3..16f8ea9 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java
+++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java
@@ -27,6 +27,8 @@ import java.text.DecimalFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static java.util.stream.Collectors.toList;
+
 @RestController
 @AllArgsConstructor
 @RequestMapping("/examineResult")
@@ -960,11 +962,22 @@ public class ExamineResultController extends BladeController {
 
             List<Map<String, Object>> mapList = new ArrayList<>();
             for (Map<String, Object> map : resultList) {
-                if (!"".equals(map.get("log")) && !"".equals(map.get("result"))) {
+                if (!"".equals(map.get("log2")) && !"".equals(map.get("result"))) {
                     mapList.add(map);
                 }
             }
 
+            // mapList根据order排序
+            Collections.sort(mapList, new Comparator<Map<String, Object>>() {
+                @Override
+                public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+                    Integer id1 = (Integer) o1.get("order");
+                    Integer id2 = (Integer) o2.get("order");
+                    // 升序
+                    return id1.compareTo(id2);
+                }
+            });
+
             // 判断应实验样品数量和实际样品数量是否相等
             if (experieNum.length != mapList.size()) {
                 throw new Exception("分配样品数量与检测样品数量不一致!");
@@ -1485,7 +1498,7 @@ public class ExamineResultController extends BladeController {
                 Map<String, Object> map = new HashMap<>();
                 map.put("order", order);
                 map.put("value", value);
-                map.put("log", log);
+                map.put("log2", log);
                 map.put("result", result);
                 map.put("num", experieNums[col - 1]);
                 return map;
@@ -1493,7 +1506,7 @@ public class ExamineResultController extends BladeController {
                 Map<String, Object> map = new HashMap<>();
                 map.put("order", order);
                 map.put("value", "");
-                map.put("log", "");
+                map.put("log2", "");
                 map.put("result", "");
                 map.put("num", "");
                 return map;
@@ -1502,7 +1515,7 @@ public class ExamineResultController extends BladeController {
             Map<String, Object> map = new HashMap<>();
             map.put("order", order);
             map.put("value", value);
-            map.put("log", "");
+            map.put("log2", "");
             map.put("result", "");
             map.put("num", "");
             return map;