布鲁氏试管凝集解析

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

@@ -82,7 +82,7 @@ public class ExamineResultController extends BladeController {
     public R excel(MultipartFile file, String examineId) throws Exception {
         Examine examine = examineService.getById(examineId);
         ExamineItem examineItem = examineItemService.getById(examine.getExamineItemId());
-            if ("2".equals(examineItem.getInputMode()) || "6".equals(examineItem.getInputMode())) {
+        if ("2".equals(examineItem.getInputMode()) || "6".equals(examineItem.getInputMode())) {
             return blsExcel(file, examineId);
         } else if ("3".equals(examineItem.getInputMode())) {
             return ktyExcel(file, examineId);
@@ -828,10 +828,11 @@ public class ExamineResultController extends BladeController {
      */
     private R blsExcel(MultipartFile file, String examineId) throws Exception {
         Examine examine = examineService.getById(examineId);
+        ExamineItem examineItem = examineItemService.getById(examine.getExamineItemId());
         List<ExamineTemplate2Excel> read = ExcelUtil.read(file, ExamineTemplate2Excel.class);
         if (read != null && read.size() > 0) {
             // 布鲁氏杆菌抗体检测(平板凝集)
-            if ("2".equals(examine.getInputMode())) {
+            if ("2".equals(examineItem.getInputMode())) {
                 for (ExamineTemplate2Excel excel : read) {
                     if ("+".equals(excel.getValue())) {
                         excel.setResult("阳性");
@@ -843,7 +844,7 @@ public class ExamineResultController extends BladeController {
                 }
             }
             // 布鲁氏杆菌抗体检测（试管凝集微量法）
-            else if ("6".equals(examine.getInputMode())){
+            else if ("6".equals(examineItem.getInputMode())) {
                 for (ExamineTemplate2Excel excel : read) {
                     if ("++++".equals(excel.getValue()) || "+++".equals(excel.getValue()) || "++".equals(excel.getValue())) {
                         excel.setResult("阳性");
@@ -1081,14 +1082,14 @@ public class ExamineResultController extends BladeController {
                             data1.put("log2", isPig ? "≥1:64" : "≥1:128");
                             data1.put("result", "阳性");
                             allDatas.add(data1);
-                            yangCount ++;
-                            simpleCount ++;
+                            yangCount++;
+                            simpleCount++;
                         } else {
                             data1.put("log2", isPig ? "<1:64" : "<1:128");
                             data1.put("result", "阴性");
                             allDatas.add(data1);
-                            yinCount ++;
-                            simpleCount ++;
+                            yinCount++;
+                            simpleCount++;
                         }
                     }
                 }
@@ -1218,14 +1219,14 @@ public class ExamineResultController extends BladeController {
                             data1.put("log2", isPig ? "≥1:64" : "≥1:128");
                             data1.put("result", "阳性");
                             allDatas.add(data1);
-                            yangCount ++;
-                            simpleCount ++;
+                            yangCount++;
+                            simpleCount++;
                         } else {
                             data1.put("log2", isPig ? "<1:64" : "<1:128");
                             data1.put("result", "阴性");
                             allDatas.add(data1);
-                            yinCount ++;
-                            simpleCount ++;
+                            yinCount++;
+                            simpleCount++;
                         }
                     }
                 }
@@ -1685,7 +1686,7 @@ public class ExamineResultController extends BladeController {
      * 上传检测结果照片
      */
     @PostMapping("/resultPicture")
-    public R<String> resultPicture(@RequestParam MultipartFile file, @RequestParam(required=false) String examineId) {
+    public R<String> resultPicture(@RequestParam MultipartFile file, @RequestParam(required = false) String examineId) {
         return R.data(service.resultPicture(file, examineId));
     }
 }