From f398c43c938e92bed16cff60a60ca86ce7998b59 Mon Sep 17 00:00:00 2001 From: liuqingkun Date: Wed, 14 Jan 2026 15:02:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=9E=E9=AA=8C?= =?UTF-8?q?=E8=AF=95=E5=89=82=E9=85=8D=E7=BD=AE=E8=AF=95=E5=89=82=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/lims/service/IExamineReagentService.java | 2 +- .../lims/service/impl/ExamineReagentServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/IExamineReagentService.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/IExamineReagentService.java index 55ecd79..3d5c2ee 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/IExamineReagentService.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/IExamineReagentService.java @@ -41,7 +41,7 @@ public interface IExamineReagentService { /** * 数据库ID：2010597883441655810 * 试剂名称：非洲猪瘟病毒(ASFV)阻断ELISA抗体检测试剂盒 - * 生产厂家：北京鑫康生物技术开发有限公司 + * 生产厂家：北京森康生物技术开发有限公司 * * @param group 填报实验结果的组数，每组9行，12列 * @param groupExcelData diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineReagentServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineReagentServiceImpl.java index 04f4d68..66721fc 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineReagentServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineReagentServiceImpl.java @@ -131,7 +131,7 @@ public class ExamineReagentServiceImpl implements IExamineReagentService { /** * 数据库ID：2010597883441655810 * 试剂名称：非洲猪瘟病毒(ASFV)阻断ELISA抗体检测试剂盒 - * 生产厂家：北京鑫康生物技术开发有限公司 + * 生产厂家：北京森康生物技术开发有限公司 * * 
      * 1. 成立条件：

From 23daf0729d3d890263e3ac3037fa120d12e867b1 Mon Sep 17 00:00:00 2001
From: liuqingkun 
Date: Thu, 15 Jan 2026 11:09:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=9E=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=95=E5=89=82=E9=85=8D=E7=BD=AE=E8=AF=95=E5=89=82=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=88=90=E7=AB=8B=E6=9D=A1=E4=BB=B6=E6=95=B0=E5=80=BC?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lims/service/impl/EntrustServiceImpl.java | 85 ++++++++++++++++++-
 1 file changed, 84 insertions(+), 1 deletion(-)

diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java
index c1b2bb2..bee1796 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java
+++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java
@@ -3267,12 +3267,95 @@ public class EntrustServiceImpl extends BaseServiceImpl
             map2.put("3", format1);
         }
         // 鸡毒支原体间接 ELISA 抗体检测试剂盒、鸡滑液囊支原体间接 ELISA 抗体检测试剂盒--北京天之泰生物科技有限公司
-        else if ("2002188351753383937".equals(reagentId)||"2002188672294678529".equals(reagentId)) {
+        else if ("2002188351753383937".equals(reagentId) || "2002188672294678529".equals(reagentId)) {
             map1.put("2", "阴性对照OD平均值");
             map1.put("3", format);
             map2.put("2", "阳性对照OD平均值");
             map2.put("3", format1);
         }
+        // 非洲猪瘟病毒阻断ELISA抗体检测试剂盒--青岛立见生物科技有限公司
+        else if ("2010597883441655809".equals(reagentId)) {
+            double v3 = (c1 + c2) / 2;
+            map1.put("2", "阴性对照血清阻断率");
+            map1.put("3", df.format(100 - (Double.parseDouble(format) / v3 * 100)) + "%");
+            map2.put("2", "阳性对照血清阻断率");
+            map2.put("3", df.format(100 - (Double.parseDouble(format1) / v3 * 100)) + "%");
+        }
+        // 非洲猪瘟病毒(ASFV)阻断ELISA抗体检测试剂盒--北京森康生物技术开发有限公司 || 猪瘟病毒ELISA抗体检测试剂盒--科前生物
+        else if ("2010597883441655810".equals(reagentId) || "2010597883512958982".equals(reagentId)) {
+            map1.put("2", "阴性对照血清OD平均值");
+            map1.put("3", format);
+            map2.put("2", "阳性对照血清OD平均值");
+            map2.put("3", format1);
+        }
+        // 非洲猪瘟病毒抗体阻断ELISA检测试剂盒--测易生物 || 猪伪狂犬病病毒gE蛋白阻断ELISA抗体检测试剂盒--科前生物
+        // || 猪伪狂犬病病毒gB蛋自阻断ELIA抗体检测试剂盒--科前生物 || 猪伪狂犬病毒gPI竞争ELISA抗体检测试剂盒--禾旭生物
+        // || 猪伪狂犬病毒gB竞争ELISA抗体检测试剂盒 -- 禾旭生物
+        else if ("2010597883441655811".equals(reagentId) || "2010597883512958977".equals(reagentId)
+                || "2010597883512958978".equals(reagentId) || "2010597883512958979".equals(reagentId)
+                || "2010597883512958980".equals(reagentId)
+        ) {
+            map1.put("2", "阴性对照血清OD平均值");
+            map1.put("3", format);
+            map2.put("2", "阳性对照血清OD平均值");
+            map2.put("3", format1);
+        }
+        // 猪瘟病毒ELISA抗体检测试剂盒 -- 深圳市绿诗源生物技术有限公司
+        else if ("2010597883512958981".equals(reagentId)) {
+            map1.put("2", "阴性对照血清OD平均值");
+            map1.put("3", format);
+            map2.put("2", "阳性对照血清OD平均值");
+            map2.put("3", format1);
+        }
+        // 猪瘟病毒间接ELISA抗体检测试剂盒--禾旭生物
+        else if ("2010597883512958983".equals(reagentId)) {
+            map1.put("2", "阴性对照血清OD平均值");
+            map1.put("3", format);
+            map2.put("2", "阳性对照血清OD平均值");
+            map2.put("3", format1);
+        }
+        // 猪繁殖与呼吸综合征病毒ELISA抗体检测试剂盒（维伯鑫）--维伯鑫
+        else if ("2010597883512958984".equals(reagentId)) {
+            map1.put("2", "阴性对照血清OD平均值");
+            map1.put("3", format);
+            map2.put("2", "阳性对照血清OD平均值");
+            map2.put("3", format1);
+        }
+        // 猪繁殖与呼吸综合征病毒ELISA抗体检测试剂盒（绿诗源）-禾旭生物
+        else if ("2010597883512958985".equals(reagentId)) {
+            map1.put("2", "阴性对照血清OD平均值");
+            map1.put("3", format);
+            map2.put("2", "阳性对照血清OD平均值");
+            map2.put("3", format1);
+        }
+        // 猪繁殖与呼吸综合征病毒间接ELISA抗体检测试剂盒-禾旭生物
+        else if ("2010597883512958986".equals(reagentId)) {
+            map1.put("2", "阴性对照血清OD平均值");
+            map1.put("3", format);
+            map2.put("2", "阳性对照血清OD平均值");
+            map2.put("3", format1);
+        }
+        // 猪繁殖与呼吸综合征病毒ELISA抗体检测试剂盒（测易）--测易生物
+        else if ("2010597883512958987".equals(reagentId)) {
+            map1.put("2", "阴性对照血清OD平均值");
+            map1.put("3", format);
+            map2.put("2", "阳性对照血清OD平均值");
+            map2.put("3", format1);
+        }
+        // 猪口蹄疫病毒O型VP1间接ELISA抗体检测试剂盒--洛阳莱普生信息科技有限公司
+        else if ("2010597883512958988".equals(reagentId)) {
+            map1.put("2", "阴性对照血清OD平均值");
+            map1.put("3", format);
+            map2.put("2", "阳性对照血清OD平均值");
+            map2.put("3", format1);
+        }
+        // 禽白血病病毒J亚群ELISA抗体检测试剂盒--哈尔滨国生生物科技股份有限公司 || 禽白血病病毒AB亚群ELISA抗体检测试剂盒--哈尔滨国生生物科技股份有限公司
+        else if ("2010597883512958989".equals(reagentId) || "2010597883512958990".equals(reagentId)) {
+            map1.put("2", "阴性对照血清OD平均值");
+            map1.put("3", format);
+            map2.put("2", "阳性对照血清OD平均值");
+            map2.put("3", format1);
+        }
         map1.put("5", "成立");
         map2.put("5", "成立");
         resultList3.add(map1);

From 0f8dae8ef5d97cd4046349b57644022669fa7ff9 Mon Sep 17 00:00:00 2001
From: liuqingkun 
Date: Thu, 15 Jan 2026 11:31:54 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=9E=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=95=E5=89=82=E9=85=8D=E7=BD=AE=E8=AF=95=E5=89=82=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E6=88=90=E7=AB=8B=E6=9D=A1=E4=BB=B6=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lims/service/impl/EntrustServiceImpl.java | 94 ++++++++++++-------
 1 file changed, 58 insertions(+), 36 deletions(-)

diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java
index bee1796..a2e88a0 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java
+++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java
@@ -3281,80 +3281,102 @@ public class EntrustServiceImpl extends BaseServiceImpl
             map2.put("2", "阳性对照血清阻断率");
             map2.put("3", df.format(100 - (Double.parseDouble(format1) / v3 * 100)) + "%");
         }
-        // 非洲猪瘟病毒(ASFV)阻断ELISA抗体检测试剂盒--北京森康生物技术开发有限公司 || 猪瘟病毒ELISA抗体检测试剂盒--科前生物
-        else if ("2010597883441655810".equals(reagentId) || "2010597883512958982".equals(reagentId)) {
-            map1.put("2", "阴性对照血清OD平均值");
-            map1.put("3", format);
-            map2.put("2", "阳性对照血清OD平均值");
-            map2.put("3", format1);
+        // 非洲猪瘟病毒(ASFV)阻断ELISA抗体检测试剂盒--北京森康生物技术开发有限公司
+        else if ("2010597883441655810".equals(reagentId)) {
+            map1.put("2", "阳性对照OD平均值/阴性对照OD平均值");
+            map1.put("3", df.format(Double.parseDouble(format1) / Double.parseDouble(format)));
         }
-        // 非洲猪瘟病毒抗体阻断ELISA检测试剂盒--测易生物 || 猪伪狂犬病病毒gE蛋白阻断ELISA抗体检测试剂盒--科前生物
-        // || 猪伪狂犬病病毒gB蛋自阻断ELIA抗体检测试剂盒--科前生物 || 猪伪狂犬病毒gPI竞争ELISA抗体检测试剂盒--禾旭生物
-        // || 猪伪狂犬病毒gB竞争ELISA抗体检测试剂盒 -- 禾旭生物
-        else if ("2010597883441655811".equals(reagentId) || "2010597883512958977".equals(reagentId)
-                || "2010597883512958978".equals(reagentId) || "2010597883512958979".equals(reagentId)
-                || "2010597883512958980".equals(reagentId)
-        ) {
-            map1.put("2", "阴性对照血清OD平均值");
+        // 非洲猪瘟病毒抗体阻断ELISA检测试剂盒--测易生物
+        else if ("2010597883441655811".equals(reagentId)) {
+            map1.put("2", "阴性对照OD平均值");
             map1.put("3", format);
-            map2.put("2", "阳性对照血清OD平均值");
-            map2.put("3", format1);
+            map2.put("2", "阳性对照OD平均值/阴性对照OD平均值");
+            map2.put("3", df.format(Double.parseDouble(format1) / Double.parseDouble(format)));
+        }
+        //  猪伪狂犬病病毒gE蛋白阻断ELISA抗体检测试剂盒--科前生物
+        else if ("2010597883512958977".equals(reagentId)) {
+            map1.put("2", "阳性对照OD平均值-阴性对照OD平均值");
+            map1.put("3", df.format(Double.parseDouble(format1) - Double.parseDouble(format)));
+        }
+        // 猪伪狂犬病病毒gB蛋自阻断ELIA抗体检测试剂盒--科前生物
+        else if ("2010597883512958978".equals(reagentId)){
+            map1.put("2", "阳性血清OD值");
+            map1.put("3", b1);
+            map1.put("4", b2);
+            map2.put("2", "阳性对照OD平均值-阴性对照OD平均值");
+            map2.put("3", df.format(Double.parseDouble(format1) - Double.parseDouble(format)));
+        }
+        // 猪伪狂犬病毒gPI竞争ELISA抗体检测试剂盒--禾旭生物 ||  猪伪狂犬病毒gB竞争ELISA抗体检测试剂盒 -- 禾旭生物
+        else if ("2010597883512958979".equals(reagentId) || "2010597883512958980".equals(reagentId)) {
+            map1.put("2", "阳性对照OD平均值");
+            map1.put("3", format1);
+            map2.put("2", "阳性对照OD平均值-阴性对照OD平均值");
+            map2.put("3", df.format(Double.parseDouble(format1) - Double.parseDouble(format)));
         }
         // 猪瘟病毒ELISA抗体检测试剂盒 -- 深圳市绿诗源生物技术有限公司
         else if ("2010597883512958981".equals(reagentId)) {
-            map1.put("2", "阴性对照血清OD平均值");
+            map1.put("2", "阴性对照OD平均值");
             map1.put("3", format);
-            map2.put("2", "阳性对照血清OD平均值");
+            map2.put("2", "阳性对照OD平均值");
             map2.put("3", format1);
         }
+        // 猪瘟病毒ELISA抗体检测试剂盒--科前生物
+        else if ("2010597883512958982".equals(reagentId)) {
+            map1.put("2", "阴性对照OD值");
+            map1.put("3", a1);
+            map1.put("4", a2);
+            map2.put("2", "阳性对照阻断率");
+            map2.put("3", df.format(100 - (Double.parseDouble(format1) / Double.parseDouble(format) * 100)) + "%");
+        }
         // 猪瘟病毒间接ELISA抗体检测试剂盒--禾旭生物
         else if ("2010597883512958983".equals(reagentId)) {
-            map1.put("2", "阴性对照血清OD平均值");
+            map1.put("2", "阴性对照OD平均值");
             map1.put("3", format);
-            map2.put("2", "阳性对照血清OD平均值");
+            map2.put("2", "阳性对照OD平均值");
             map2.put("3", format1);
         }
         // 猪繁殖与呼吸综合征病毒ELISA抗体检测试剂盒（维伯鑫）--维伯鑫
         else if ("2010597883512958984".equals(reagentId)) {
-            map1.put("2", "阴性对照血清OD平均值");
+            map1.put("2", "阴性对照OD平均值");
             map1.put("3", format);
-            map2.put("2", "阳性对照血清OD平均值");
+            map2.put("2", "阳性对照OD平均值");
             map2.put("3", format1);
         }
-        // 猪繁殖与呼吸综合征病毒ELISA抗体检测试剂盒（绿诗源）-禾旭生物
+        // 猪繁殖与呼吸综合征病毒ELISA抗体检测试剂盒（绿诗源）-深圳市绿诗源生物技术有限公司
         else if ("2010597883512958985".equals(reagentId)) {
-            map1.put("2", "阴性对照血清OD平均值");
+            map1.put("2", "阴性对照OD平均值");
             map1.put("3", format);
-            map2.put("2", "阳性对照血清OD平均值");
+            map2.put("2", "阳性对照OD平均值");
             map2.put("3", format1);
         }
         // 猪繁殖与呼吸综合征病毒间接ELISA抗体检测试剂盒-禾旭生物
         else if ("2010597883512958986".equals(reagentId)) {
-            map1.put("2", "阴性对照血清OD平均值");
+            map1.put("2", "阴性对照OD平均值");
             map1.put("3", format);
-            map2.put("2", "阳性对照血清OD平均值");
-            map2.put("3", format1);
+            map2.put("2", "阳性对照OD平均值-阴性对照OD平均值");
+            map2.put("3", df.format(Double.parseDouble(format1) - Double.parseDouble(format)));
         }
         // 猪繁殖与呼吸综合征病毒ELISA抗体检测试剂盒（测易）--测易生物
         else if ("2010597883512958987".equals(reagentId)) {
-            map1.put("2", "阴性对照血清OD平均值");
+            map1.put("2", "阴性对照OD平均值");
             map1.put("3", format);
-            map2.put("2", "阳性对照血清OD平均值");
-            map2.put("3", format1);
+            map2.put("2", "阳性对照OD平均值-阴性对照OD平均值");
+            map2.put("3", df.format(Double.parseDouble(format1) - Double.parseDouble(format)));
         }
         // 猪口蹄疫病毒O型VP1间接ELISA抗体检测试剂盒--洛阳莱普生信息科技有限公司
         else if ("2010597883512958988".equals(reagentId)) {
-            map1.put("2", "阴性对照血清OD平均值");
+            map1.put("2", "阴性对照OD平均值");
             map1.put("3", format);
-            map2.put("2", "阳性对照血清OD平均值");
-            map2.put("3", format1);
+            map2.put("2", "阳性对照OD平均值-阴性对照OD平均值");
+            map2.put("3", df.format(Double.parseDouble(format1) - Double.parseDouble(format)));
         }
         // 禽白血病病毒J亚群ELISA抗体检测试剂盒--哈尔滨国生生物科技股份有限公司 || 禽白血病病毒AB亚群ELISA抗体检测试剂盒--哈尔滨国生生物科技股份有限公司
         else if ("2010597883512958989".equals(reagentId) || "2010597883512958990".equals(reagentId)) {
             map1.put("2", "阴性对照血清OD平均值");
             map1.put("3", format);
-            map2.put("2", "阳性对照血清OD平均值");
-            map2.put("3", format1);
+            map2.put("2", "阳性血清OD值");
+            map2.put("3", b1);
+            map2.put("4", b2);
         }
         map1.put("5", "成立");
         map2.put("5", "成立");