From 6c8d7bbd53b3f3995ca265a894e46f096719df38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Fri, 19 Dec 2025 21:25:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E9=B2=81=E6=B0=8F=E6=9D=86=E8=8F=8C?=
 =?UTF-8?q?=E6=8A=97=E4=BD=93=E6=A3=80=E6=B5=8B(=E8=99=8E=E7=BA=A2?=
 =?UTF-8?q?=E5=B9=B3=E6=9D=BF=E5=87=9D=E9=9B=86)=E5=AE=9E=E9=AA=8C?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E8=A7=A3=E6=9E=90=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/launch/LauncherServiceImpl.java    |  2 +-
 .../impl/ExamineResultServiceImpl.java        | 24 ++-----------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/lab-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java b/lab-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java
index 8328439..b933372 100644
--- a/lab-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java
+++ b/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");
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 aa8205f..941eb1e 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
@@ -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);