Merge branch 'dev' of http://42.192.7.176:3000/suojin/project_husbandry_back into dev

lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ExamineResultController.java

@@ -1310,17 +1310,21 @@ public class ExamineResultController extends BladeController {
         }
         Map<String, Object> cPosData = new HashMap<>(4);
         int b = (group * 96) + row;
+        int order = (group * 192) + row;
         if (col != 1) {
             b += (u * 8);
+            order += (u * 8);
         }
         boolean isIncludeCurr = col == 12 ? false : (examineType == 1 && col == 11 ? false : true);
         if (value != null && isIncludeCurr) {
             cPosData.put("value", value);
             // 如果是参照组
             if (a == 1) {
-                cPosData.put("order", b + 1);
+//                cPosData.put("order", b + 1);
+                cPosData.put("order", order + 1);
             } else {
-                cPosData.put("order", b + 1 + 96);
+//                cPosData.put("order", b + 1 + 96);
+                cPosData.put("order", order + 1 + 96);
             }
             cPosData.put("num", experieNum[b - ((group + 1) * 6 + (group * 16))]);
             cPosData.put("result", Double.parseDouble(value) > avg ? "阳性" : "阴性");
@@ -1329,9 +1333,11 @@ public class ExamineResultController extends BladeController {
         cPosData.put("value", value != null ? value : " ");
         // 如果是参照组
         if (a == 1) {
-            cPosData.put("order", b + 1);
+//            cPosData.put("order", b + 1);
+            cPosData.put("order", order + 1);
         } else {
-            cPosData.put("order", b + 1 + 96);
+//            cPosData.put("order", b + 1 + 96);
+            cPosData.put("order", order + 1 + 96);
         }
         return cPosData;
     }