布鲁氏杆菌抗体检测(虎红平板凝集)实验结果解析逻辑修改

lab-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java

@@ -28,7 +28,7 @@ public class LauncherServiceImpl implements LauncherService {
 		PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "e9bcb975-a8b3-43d1-812f-8408ce571137");
 		PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", "e9bcb975-a8b3-43d1-812f-8408ce571137");
 		PropsUtil.setProperty(props, "spring.cloud.nacos.username", "nacos");
-		PropsUtil.setProperty(props, "spring.cloud.nacos.password", "jiahe123!");
+		PropsUtil.setProperty(props, "spring.cloud.nacos.password", "nacos");
 //		PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile));
 //		PropsUtil.setProperty(props, "spring.zipkin.base-url", LauncherConstant.zipkinAddr(profile));
 		PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "false");

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineResultServiceImpl.java

@@ -866,26 +866,17 @@ public class ExamineResultServiceImpl extends BaseServiceImpl<ExamineResultMappe
             if ("2".equals(examineWay.getInputMode()) || "7".equals(examineWay.getInputMode())) {
                 for (int i = 0; i < read.size() - 2; i++) {
                     ExamineTemplate2Excel excel = read.get(i);
-                    if ("+".equals(excel.getValue())) {
+                    if (excel.getValue().contains("+")) {
                         excel.setResult("阳性");
                     } else if ("-".equals(excel.getValue())) {
                         excel.setResult("阴性");
-                    } else if (excel.getValue() == null || "".equals(excel.getValue())) {
+                    } else if (excel.getValue().isEmpty()) {
                         throw new Exception("有样品未填写的对应的结果！");
                     } else {
                         throw new Exception("数据填写错误！！！");
                     }
                     read.set(i, excel);
                 }
-//                for (ExamineTemplate2Excel excel : read) {
-//                    if ("+".equals(excel.getValue())) {
-//                        excel.setResult("阳性");
-//                    } else if ("-".equals(excel.getValue())) {
-//                        excel.setResult("阴性");
-//                    } else if (excel.getValue() == null || "".equals(excel.getValue())) {
-//                        throw new Exception("有样品未填写的对应的结果！");
-//                    }
-//                }
             }
             // 布鲁氏杆菌抗体检测（试管凝集微量法）
             else if ("6".equals(examineWay.getInputMode())) {
@@ -904,17 +895,6 @@ public class ExamineResultServiceImpl extends BaseServiceImpl<ExamineResultMappe
                     }
                     read.set(i, excel);
                 }
-//                for (ExamineTemplate2Excel excel : read) {
-//                    if ("++++".equals(excel.getValue()) || "+++".equals(excel.getValue()) || "++".equals(excel.getValue())) {
-//                        excel.setResult("阳性");
-//                    } else if ("+".equals(excel.getValue())) {
-//                        excel.setResult("可疑");
-//                    } else if ("-".equals(excel.getValue())) {
-//                        excel.setResult("阴性");
-//                    } else if (excel.getValue() == null || "".equals(excel.getValue())) {
-//                        throw new Exception("有样品未填写的对应的结果！");
-//                    }
-//                }
             }
             LambdaQueryWrapper<ExamineResult> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(ExamineResult::getExamineId, examineId);