From 973f3f3373969aaa542d41fbef9d9723b5579409 Mon Sep 17 00:00:00 2001 From: liuqingkun Date: Tue, 13 Jan 2026 14:52:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=9E=E9=AA=8C=E8=AF=95?= =?UTF-8?q?=E5=89=82=E9=85=8D=E7=BD=AE=20=E7=A6=BD=E7=99=BD=E8=A1=80?= =?UTF-8?q?=E7=97=85=E7=97=85=E6=AF=92J=E4=BA=9A=E7=BE=A4ELISA=E6=8A=97?= =?UTF-8?q?=E4=BD=93=E6=A3=80=E6=B5=8B=E8=AF=95=E5=89=82=E7=9B=92=20?= =?UTF-8?q?=E7=A6=BD=E7=99=BD=E8=A1=80=E7=97=85=E7=97=85=E6=AF=92AB?= =?UTF-8?q?=E4=BA=9A=E7=BE=A4ELISA=E6=8A=97=E4=BD=93=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E5=89=82=E7=9B=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/LauncherConstant.java.mine | 254 ----------------- .../constant/LauncherConstant.java.r1252 | 254 ----------------- .../constant/LauncherConstant.java.r1253 | 254 ----------------- .../lims/service/IExamineReagentService.java | 72 +++++ .../lims/service/impl/EntrustServiceImpl.java | 15 + .../impl/ExamineReagentServiceImpl.java | 256 ++++++++++++++++++ .../impl/ExamineResultServiceImpl.java | 97 ++++--- 7 files changed, 391 insertions(+), 811 deletions(-) delete mode 100644 lab-common/src/main/java/org/springblade/common/constant/LauncherConstant.java.mine delete mode 100644 lab-common/src/main/java/org/springblade/common/constant/LauncherConstant.java.r1252 delete mode 100644 lab-common/src/main/java/org/springblade/common/constant/LauncherConstant.java.r1253 create mode 100644 lab-service/lab-lims/src/main/java/org/springblade/lims/service/IExamineReagentService.java create mode 100644 lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineReagentServiceImpl.java diff --git a/lab-common/src/main/java/org/springblade/common/constant/LauncherConstant.java.mine b/lab-common/src/main/java/org/springblade/common/constant/LauncherConstant.java.mine deleted file mode 100644 index 4707fb3..0000000 --- a/lab-common/src/main/java/org/springblade/common/constant/LauncherConstant.java.mine +++ /dev/null @@ -1,254 +0,0 @@ - -package org.springblade.common.constant; - -import org.springblade.core.launch.constant.AppConstant; - -import static org.springblade.core.launch.constant.AppConstant.APPLICATION_NAME_PREFIX; - -/** - * 启动常量 - * - * @author Chill - */ -public interface LauncherConstant { - - /** - * 郵件服務 - */ - String APPLICATION_EMAIL_NAME = APPLICATION_NAME_PREFIX + "email"; - - - String APPLICATION_FLOW_NAME = APPLICATION_NAME_PREFIX + "workflow"; - - /** - * 资产 - */ - String APPLICATION_CAPITAL_NAME = APPLICATION_NAME_PREFIX + "capital"; - - /** - * lims - */ - String APPLICATION_LIMS_NAME = APPLICATION_NAME_PREFIX + "lims"; - - /** - * office - */ - String APPLICATION_OFFICE_NAME = APPLICATION_NAME_PREFIX + "office"; - /** - * repair - */ - String APPLICATION_REPAIR_NAME = APPLICATION_NAME_PREFIX + "repair"; - - /** - * monitor - */ - String APPLICATION_MONITOR_NAME = APPLICATION_NAME_PREFIX + "monitor"; - - /** - * iot - */ - String APPLICATION_IOT_NAME = APPLICATION_NAME_PREFIX + "iot"; - /** - * xxljob - */ - String APPLICATION_XXLJOB_NAME = APPLICATION_NAME_PREFIX + "xxljob"; - - /** - * xxljob - */ - String APPLICATION_XXLJOB_ADMIN_NAME = APPLICATION_NAME_PREFIX + "xxljob-admin"; - - /** - * nacos dev 地址 - */ -// String NACOS_DEV_ADDR = "172.29.14.103:8848"; - String NACOS_DEV_ADDR = "127.0.0.1:8848"; - - //String NACOS_DEV_ADDR = "172.29.14.103:8848"; - - /** - * nacos prod 地址 - */ - String NACOS_PROD_ADDR = "172.30.0.48:8848"; - - /** - * nacos test 地址 - */ - String NACOS_TEST_ADDR = "192.168.1.88:8848"; - - /** - * sentinel dev 地址 - */ - String SENTINEL_DEV_ADDR = "127.0.0.1:8848"; - - /** - * sentinel prod 地址 - */ - String SENTINEL_PROD_ADDR = "172.30.0.58:8858"; - - /** - * sentinel test 地址 - */ - String SENTINEL_TEST_ADDR = "172.30.0.58:8858"; - - /** - * seata dev 地址 - */ - String SEATA_DEV_ADDR = "127.0.0.1:8091"; - - /** - * seata prod 地址 - */ - String SEATA_PROD_ADDR = "172.30.0.68:8091"; - - /** - * seata test 地址 - */ - String SEATA_TEST_ADDR = "172.30.0.68:8091"; - - /** - * zipkin dev 地址 - */ - String ZIPKIN_DEV_ADDR = "http://127.0.0.1:9411"; - - /** - * zipkin prod 地址 - */ - String ZIPKIN_PROD_ADDR = "http://172.30.0.71:9411"; - - /** - * zipkin test 地址 - */ - String ZIPKIN_TEST_ADDR = "http://172.30.0.71:9411"; - - /** - * elk dev 地址 - */ - String ELK_DEV_ADDR = "127.0.0.1:9000"; - - /** - * elk prod 地址 - */ - String ELK_PROD_ADDR = "172.30.0.72:9000"; - - /** - * elk test 地址 - */ - String ELK_TEST_ADDR = "172.30.0.72:9000"; - - /** - * seata file模式 - */ - String FILE_MODE = "file"; - - /** - * seata nacos模式 - */ - String NACOS_MODE = "nacos"; - - /** - * seata default模式 - */ - String DEFAULT_MODE = "default"; - - /** - * seata group后缀 - */ - String GROUP_NAME = "-group"; - - /** - * seata 服务组格式 - * - * @param appName 服务名 - * @return group - */ - static String seataServiceGroup(String appName) { - return appName.concat(GROUP_NAME); - } - - /** - * 动态获取nacos地址 - * - * @param profile 环境变量 - * @return addr - */ - static String nacosAddr(String profile) { - switch (profile) { - case (AppConstant.PROD_CODE): - return NACOS_PROD_ADDR; - case (AppConstant.TEST_CODE): - return NACOS_TEST_ADDR; - default: - return NACOS_DEV_ADDR; - } - } - - /** - * 动态获取sentinel地址 - * - * @param profile 环境变量 - * @return addr - */ - static String sentinelAddr(String profile) { - switch (profile) { - case (AppConstant.PROD_CODE): - return SENTINEL_PROD_ADDR; - case (AppConstant.TEST_CODE): - return SENTINEL_TEST_ADDR; - default: - return SENTINEL_DEV_ADDR; - } - } - - /** - * 动态获取seata地址 - * - * @param profile 环境变量 - * @return addr - */ - static String seataAddr(String profile) { - switch (profile) { - case (AppConstant.PROD_CODE): - return SEATA_PROD_ADDR; - case (AppConstant.TEST_CODE): - return SEATA_TEST_ADDR; - default: - return SEATA_DEV_ADDR; - } - } - - /** - * 动态获取zipkin地址 - * - * @param profile 环境变量 - * @return addr - */ - static String zipkinAddr(String profile) { - switch (profile) { - case (AppConstant.PROD_CODE): - return ZIPKIN_PROD_ADDR; - case (AppConstant.TEST_CODE): - return ZIPKIN_TEST_ADDR; - default: - return ZIPKIN_DEV_ADDR; - } - } - - /** - * 动态获取elk地址 - * - * @param profile 环境变量 - * @return addr - */ - static String elkAddr(String profile) { - switch (profile) { - case (AppConstant.PROD_CODE): - return ELK_PROD_ADDR; - case (AppConstant.TEST_CODE): - return ELK_TEST_ADDR; - default: - return ELK_DEV_ADDR; - } - } - -} diff --git a/lab-common/src/main/java/org/springblade/common/constant/LauncherConstant.java.r1252 b/lab-common/src/main/java/org/springblade/common/constant/LauncherConstant.java.r1252 deleted file mode 100644 index e937cc2..0000000 --- a/lab-common/src/main/java/org/springblade/common/constant/LauncherConstant.java.r1252 +++ /dev/null @@ -1,254 +0,0 @@ - -package org.springblade.common.constant; - -import org.springblade.core.launch.constant.AppConstant; - -import static org.springblade.core.launch.constant.AppConstant.APPLICATION_NAME_PREFIX; - -/** - * 启动常量 - * - * @author Chill - */ -public interface LauncherConstant { - - /** - * 郵件服務 - */ - String APPLICATION_EMAIL_NAME = APPLICATION_NAME_PREFIX + "email"; - - - String APPLICATION_FLOW_NAME = APPLICATION_NAME_PREFIX + "workflow"; - - /** - * 资产 - */ - String APPLICATION_CAPITAL_NAME = APPLICATION_NAME_PREFIX + "capital"; - - /** - * lims - */ - String APPLICATION_LIMS_NAME = APPLICATION_NAME_PREFIX + "lims"; - - /** - * office - */ - String APPLICATION_OFFICE_NAME = APPLICATION_NAME_PREFIX + "office"; - /** - * repair - */ - String APPLICATION_REPAIR_NAME = APPLICATION_NAME_PREFIX + "repair"; - - /** - * monitor - */ - String APPLICATION_MONITOR_NAME = APPLICATION_NAME_PREFIX + "monitor"; - - /** - * iot - */ - String APPLICATION_IOT_NAME = APPLICATION_NAME_PREFIX + "iot"; - /** - * xxljob - */ - String APPLICATION_XXLJOB_NAME = APPLICATION_NAME_PREFIX + "xxljob"; - - /** - * xxljob - */ - String APPLICATION_XXLJOB_ADMIN_NAME = APPLICATION_NAME_PREFIX + "xxljob-admin"; - - /** - * nacos dev 地址 - */ - String NACOS_DEV_ADDR = "172.29.14.103:8848"; - //String NACOS_DEV_ADDR = "127.0.0.1:8848"; - - //String NACOS_DEV_ADDR = "172.29.14.103:8848"; - - /** - * nacos prod 地址 - */ - String NACOS_PROD_ADDR = "172.30.0.48:8848"; - - /** - * nacos test 地址 - */ - String NACOS_TEST_ADDR = "192.168.1.88:8848"; - - /** - * sentinel dev 地址 - */ - String SENTINEL_DEV_ADDR = "127.0.0.1:8848"; - - /** - * sentinel prod 地址 - */ - String SENTINEL_PROD_ADDR = "172.30.0.58:8858"; - - /** - * sentinel test 地址 - */ - String SENTINEL_TEST_ADDR = "172.30.0.58:8858"; - - /** - * seata dev 地址 - */ - String SEATA_DEV_ADDR = "127.0.0.1:8091"; - - /** - * seata prod 地址 - */ - String SEATA_PROD_ADDR = "172.30.0.68:8091"; - - /** - * seata test 地址 - */ - String SEATA_TEST_ADDR = "172.30.0.68:8091"; - - /** - * zipkin dev 地址 - */ - String ZIPKIN_DEV_ADDR = "http://127.0.0.1:9411"; - - /** - * zipkin prod 地址 - */ - String ZIPKIN_PROD_ADDR = "http://172.30.0.71:9411"; - - /** - * zipkin test 地址 - */ - String ZIPKIN_TEST_ADDR = "http://172.30.0.71:9411"; - - /** - * elk dev 地址 - */ - String ELK_DEV_ADDR = "127.0.0.1:9000"; - - /** - * elk prod 地址 - */ - String ELK_PROD_ADDR = "172.30.0.72:9000"; - - /** - * elk test 地址 - */ - String ELK_TEST_ADDR = "172.30.0.72:9000"; - - /** - * seata file模式 - */ - String FILE_MODE = "file"; - - /** - * seata nacos模式 - */ - String NACOS_MODE = "nacos"; - - /** - * seata default模式 - */ - String DEFAULT_MODE = "default"; - - /** - * seata group后缀 - */ - String GROUP_NAME = "-group"; - - /** - * seata 服务组格式 - * - * @param appName 服务名 - * @return group - */ - static String seataServiceGroup(String appName) { - return appName.concat(GROUP_NAME); - } - - /** - * 动态获取nacos地址 - * - * @param profile 环境变量 - * @return addr - */ - static String nacosAddr(String profile) { - switch (profile) { - case (AppConstant.PROD_CODE): - return NACOS_PROD_ADDR; - case (AppConstant.TEST_CODE): - return NACOS_TEST_ADDR; - default: - return NACOS_DEV_ADDR; - } - } - - /** - * 动态获取sentinel地址 - * - * @param profile 环境变量 - * @return addr - */ - static String sentinelAddr(String profile) { - switch (profile) { - case (AppConstant.PROD_CODE): - return SENTINEL_PROD_ADDR; - case (AppConstant.TEST_CODE): - return SENTINEL_TEST_ADDR; - default: - return SENTINEL_DEV_ADDR; - } - } - - /** - * 动态获取seata地址 - * - * @param profile 环境变量 - * @return addr - */ - static String seataAddr(String profile) { - switch (profile) { - case (AppConstant.PROD_CODE): - return SEATA_PROD_ADDR; - case (AppConstant.TEST_CODE): - return SEATA_TEST_ADDR; - default: - return SEATA_DEV_ADDR; - } - } - - /** - * 动态获取zipkin地址 - * - * @param profile 环境变量 - * @return addr - */ - static String zipkinAddr(String profile) { - switch (profile) { - case (AppConstant.PROD_CODE): - return ZIPKIN_PROD_ADDR; - case (AppConstant.TEST_CODE): - return ZIPKIN_TEST_ADDR; - default: - return ZIPKIN_DEV_ADDR; - } - } - - /** - * 动态获取elk地址 - * - * @param profile 环境变量 - * @return addr - */ - static String elkAddr(String profile) { - switch (profile) { - case (AppConstant.PROD_CODE): - return ELK_PROD_ADDR; - case (AppConstant.TEST_CODE): - return ELK_TEST_ADDR; - default: - return ELK_DEV_ADDR; - } - } - -} diff --git a/lab-common/src/main/java/org/springblade/common/constant/LauncherConstant.java.r1253 b/lab-common/src/main/java/org/springblade/common/constant/LauncherConstant.java.r1253 deleted file mode 100644 index 3a4739d..0000000 --- a/lab-common/src/main/java/org/springblade/common/constant/LauncherConstant.java.r1253 +++ /dev/null @@ -1,254 +0,0 @@ - -package org.springblade.common.constant; - -import org.springblade.core.launch.constant.AppConstant; - -import static org.springblade.core.launch.constant.AppConstant.APPLICATION_NAME_PREFIX; - -/** - * 启动常量 - * - * @author Chill - */ -public interface LauncherConstant { - - /** - * 郵件服務 - */ - String APPLICATION_EMAIL_NAME = APPLICATION_NAME_PREFIX + "email"; - - - String APPLICATION_FLOW_NAME = APPLICATION_NAME_PREFIX + "workflow"; - - /** - * 资产 - */ - String APPLICATION_CAPITAL_NAME = APPLICATION_NAME_PREFIX + "capital"; - - /** - * lims - */ - String APPLICATION_LIMS_NAME = APPLICATION_NAME_PREFIX + "lims"; - - /** - * office - */ - String APPLICATION_OFFICE_NAME = APPLICATION_NAME_PREFIX + "office"; - /** - * repair - */ - String APPLICATION_REPAIR_NAME = APPLICATION_NAME_PREFIX + "repair"; - - /** - * monitor - */ - String APPLICATION_MONITOR_NAME = APPLICATION_NAME_PREFIX + "monitor"; - - /** - * iot - */ - String APPLICATION_IOT_NAME = APPLICATION_NAME_PREFIX + "iot"; - /** - * xxljob - */ - String APPLICATION_XXLJOB_NAME = APPLICATION_NAME_PREFIX + "xxljob"; - - /** - * xxljob - */ - String APPLICATION_XXLJOB_ADMIN_NAME = APPLICATION_NAME_PREFIX + "xxljob-admin"; - - /** - * nacos dev 地址 - */ - //String NACOS_DEV_ADDR = "172.29.14.103:8848"; - String NACOS_DEV_ADDR = "127.0.0.1:8848"; - - //String NACOS_DEV_ADDR = "172.29.14.103:8848"; - - /** - * nacos prod 地址 - */ - String NACOS_PROD_ADDR = "172.30.0.48:8848"; - - /** - * nacos test 地址 - */ - String NACOS_TEST_ADDR = "192.168.1.88:8848"; - - /** - * sentinel dev 地址 - */ - String SENTINEL_DEV_ADDR = "127.0.0.1:8848"; - - /** - * sentinel prod 地址 - */ - String SENTINEL_PROD_ADDR = "172.30.0.58:8858"; - - /** - * sentinel test 地址 - */ - String SENTINEL_TEST_ADDR = "172.30.0.58:8858"; - - /** - * seata dev 地址 - */ - String SEATA_DEV_ADDR = "127.0.0.1:8091"; - - /** - * seata prod 地址 - */ - String SEATA_PROD_ADDR = "172.30.0.68:8091"; - - /** - * seata test 地址 - */ - String SEATA_TEST_ADDR = "172.30.0.68:8091"; - - /** - * zipkin dev 地址 - */ - String ZIPKIN_DEV_ADDR = "http://127.0.0.1:9411"; - - /** - * zipkin prod 地址 - */ - String ZIPKIN_PROD_ADDR = "http://172.30.0.71:9411"; - - /** - * zipkin test 地址 - */ - String ZIPKIN_TEST_ADDR = "http://172.30.0.71:9411"; - - /** - * elk dev 地址 - */ - String ELK_DEV_ADDR = "127.0.0.1:9000"; - - /** - * elk prod 地址 - */ - String ELK_PROD_ADDR = "172.30.0.72:9000"; - - /** - * elk test 地址 - */ - String ELK_TEST_ADDR = "172.30.0.72:9000"; - - /** - * seata file模式 - */ - String FILE_MODE = "file"; - - /** - * seata nacos模式 - */ - String NACOS_MODE = "nacos"; - - /** - * seata default模式 - */ - String DEFAULT_MODE = "default"; - - /** - * seata group后缀 - */ - String GROUP_NAME = "-group"; - - /** - * seata 服务组格式 - * - * @param appName 服务名 - * @return group - */ - static String seataServiceGroup(String appName) { - return appName.concat(GROUP_NAME); - } - - /** - * 动态获取nacos地址 - * - * @param profile 环境变量 - * @return addr - */ - static String nacosAddr(String profile) { - switch (profile) { - case (AppConstant.PROD_CODE): - return NACOS_PROD_ADDR; - case (AppConstant.TEST_CODE): - return NACOS_TEST_ADDR; - default: - return NACOS_DEV_ADDR; - } - } - - /** - * 动态获取sentinel地址 - * - * @param profile 环境变量 - * @return addr - */ - static String sentinelAddr(String profile) { - switch (profile) { - case (AppConstant.PROD_CODE): - return SENTINEL_PROD_ADDR; - case (AppConstant.TEST_CODE): - return SENTINEL_TEST_ADDR; - default: - return SENTINEL_DEV_ADDR; - } - } - - /** - * 动态获取seata地址 - * - * @param profile 环境变量 - * @return addr - */ - static String seataAddr(String profile) { - switch (profile) { - case (AppConstant.PROD_CODE): - return SEATA_PROD_ADDR; - case (AppConstant.TEST_CODE): - return SEATA_TEST_ADDR; - default: - return SEATA_DEV_ADDR; - } - } - - /** - * 动态获取zipkin地址 - * - * @param profile 环境变量 - * @return addr - */ - static String zipkinAddr(String profile) { - switch (profile) { - case (AppConstant.PROD_CODE): - return ZIPKIN_PROD_ADDR; - case (AppConstant.TEST_CODE): - return ZIPKIN_TEST_ADDR; - default: - return ZIPKIN_DEV_ADDR; - } - } - - /** - * 动态获取elk地址 - * - * @param profile 环境变量 - * @return addr - */ - static String elkAddr(String profile) { - switch (profile) { - case (AppConstant.PROD_CODE): - return ELK_PROD_ADDR; - case (AppConstant.TEST_CODE): - return ELK_TEST_ADDR; - default: - return ELK_DEV_ADDR; - } - } - -} 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 new file mode 100644 index 0000000..bc54684 --- /dev/null +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/IExamineReagentService.java @@ -0,0 +1,72 @@ + +package org.springblade.lims.service; + + +import org.springblade.lims.excel.ExamineExcel; + +import java.util.List; +import java.util.Map; + +/** + * 实验试剂 服务类 + * + * @author lqk + * @date 2026-01-13 9:20 + */ +public interface IExamineReagentService { + + /** + * 获取分组后的实验数据 + * + * @param group 分组数量 + * @param excelData 实验数据 + * @return key：分组号， value：分组数据 + */ + Map> getGroupExcelData(int group, List excelData); + + // 2010597883441655809 非洲猪瘟病毒阻断ELISA抗体检测试剂盒--青岛立见生物科技有限公司 + // 2010597883441655810 非洲猪瘟病毒(ASFV)阻断ELISA抗体检测试剂盒--北京鑫康生物技术开发有限公司 + // 2010597883441655811 非洲猪瘟病毒抗体阻断ELISA检测试剂盒--测易生物 + // 2010597883512958977 猪伪狂犬病病毒gE蛋白阻断ELISA抗体检测试剂盒--科前生物 + // 2010597883512958978 猪伪狂犬病病毒gB蛋自阻断ELIA抗体检测试剂盒--科前生物 + // 2010597883512958979 猪伪狂犬病毒gPI竞争ELISA抗体检测试剂盒--禾旭生物 + // 2010597883512958980 猪伪狂犬病毒gB竞争ELISA抗体检测试剂盒--禾旭生物 + // 2010597883512958981 猪瘟病毒ELISA抗体检测试剂盒--深圳市绿诗源生物技术有限公司 + // 2010597883512958982 猪瘟病毒阻断ELISA抗体检测试剂盒--科前生物 --有相同的 + // 2010597883512958983 猪瘟病毒间接ELISA抗体检测试剂盒--禾旭生物 --有相同的 + // 2010597883512958984 猪繁殖与呼吸综合征病毒ELISA抗体检测试剂盒（维伯鑫）--维伯鑫 + // 2010597883512958985 猪繁殖与呼吸综合征病毒ELISA抗体检测试剂盒（绿诗源）--深圳市绿诗源生物技术有限公司 + // 2010597883512958986 猪繁殖与呼吸综合征病毒间接ELISA抗体检测试剂盒--禾旭生物 --有相同的 + // 2010597883512958987 猪繁殖与呼吸综合征病毒ELISA抗体检测试剂盒（测易）--测易生物 + // 2010597883512958988 猪口蹄疫病毒O型VP1间接ELISA抗体检测试剂盒--洛阳莱普生信息科技有限公司 + + /** + * 数据库ID：2010597883512958989 + * 试剂名称：禽白血病病毒J亚群ELISA抗体检测试剂盒 + * 生产厂家：哈尔滨国生生物科技股份有限公司 + * + * @param group 填报实验结果的组数，每组9行，12列 + * @param groupExcelData + * @param map1 + * @param list + */ + void reagent2010597883512958989(int group, Map> groupExcelData, + Map>>> map1, + List> list); + + /** + * 数据库ID：2010597883512958990 + * 试剂名称：禽白血病病毒AB亚群ELISA抗体检测试剂盒 + * 生产厂家：哈尔滨国生生物科技股份有限公司 + * + * @param group 填报实验结果的组数，每组9行，12列 + * @param groupExcelData + * @param map1 + * @param list + */ + void reagent2010597883512958990(int group, Map> groupExcelData, + Map>>> map1, + List> list); + + +} 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 62de43f..e85e834 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 @@ -3292,6 +3292,21 @@ public class EntrustServiceImpl extends BaseServiceImpl // 2010597883512958990 禽白血病病毒AB亚群ELISA抗体检测试剂盒--哈尔滨国生生物科技股份有限公司 else if ("2010597883441655809".equals(reagentId) ||"2010597883441655810".equals(reagentId) + ||"2010597883441655811".equals(reagentId) + ||"2010597883512958977".equals(reagentId) + ||"2010597883512958978".equals(reagentId) + ||"2010597883512958979".equals(reagentId) + ||"2010597883512958980".equals(reagentId) + ||"2010597883512958981".equals(reagentId) + ||"2010597883512958982".equals(reagentId) + ||"2010597883512958983".equals(reagentId) + ||"2010597883512958984".equals(reagentId) + ||"2010597883512958985".equals(reagentId) + ||"2010597883512958986".equals(reagentId) + ||"2010597883512958987".equals(reagentId) + ||"2010597883512958988".equals(reagentId) + ||"2010597883512958989".equals(reagentId) + ||"2010597883512958990".equals(reagentId) ) { map1.put("2", "阴性对照OD平均值"); map1.put("3", format); 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 new file mode 100644 index 0000000..78b51a8 --- /dev/null +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/ExamineReagentServiceImpl.java @@ -0,0 +1,256 @@ +package org.springblade.lims.service.impl; + +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.springblade.core.log.exception.ServiceException; +import org.springblade.lims.excel.ExamineExcel; +import org.springblade.lims.service.IExamineReagentService; +import org.springframework.stereotype.Service; + +import java.text.DecimalFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author lqk + * @date 2026-01-13 9:20 + */ +@Service +@RequiredArgsConstructor +public class ExamineReagentServiceImpl implements IExamineReagentService { + private final static DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#0.000"); + + @Override + public Map> getGroupExcelData(int group, List excelData) { + Map> groupExcelData = new HashMap<>(); + + for (int i = 0; i < group; i++) { + List excels = new ArrayList<>(); + for (int j = i * 8 + i; j < (i + 1) * 8 + i; j++) { + ExamineExcel excel = excelData.get(j); + excels.add(excel); + } + groupExcelData.put((i + 1) + "", excels); + } + + return groupExcelData; + } + + /** + * 数据库ID：2010597883512958989 + * 试剂名称：禽白血病病毒J亚群ELISA抗体检测试剂盒 + * 生产厂家：哈尔滨国生生物科技股份有限公司 + *

+ * 1. 成立条件: 阳性对照血清OD450nm值均在0.55~1.25之间， 阴性对照血清OD450nm值均＜0.10 + * 2. 计算方法： S/P值=（待检样品OD450nm值－阴性对照血清平均OD450nm值)/(阳性对照血清平均OD450nm值－阴性对照血清平均OD450nm值) + * 3. 结果判定: S/P 值≥0.3 时，判为阳性； S/P 值＜0.3 时，判为阴性； + * + * @param group 填报实验结果的组数，每组9行，12列 + * @param groupExcelData + * @param map1 + * @param list + */ + @Override + public void reagent2010597883512958989(int group, Map> groupExcelData, Map>>> map1, List> list) { + for (int i = 0; i < group; i++) { + List>> mapList = new ArrayList<>(); + List excels = groupExcelData.get(i + 1 + ""); + double negativeVal1 = Double.parseDouble(excels.get(0).getCode1()); + double negativeVal2 = Double.parseDouble(excels.get(1).getCode1()); + double positiveVal1 = Double.parseDouble(excels.get(2).getCode1()); + double positiveVal2 = Double.parseDouble(excels.get(3).getCode1()); + // 阴性对照平均值 + double negativeAvg = (negativeVal1 + negativeVal2) / 2; + // 阳性对照平均值 + double positiveAvg = (positiveVal1 + positiveVal2) / 2; + + // 成立条件校验 + if (negativeVal1 < 0.10 && negativeVal2 < 0.10 && positiveVal1 >= 0.55 && positiveVal1 <= 1.25 && positiveVal2 >= 0.55 && positiveVal2 <= 1.25) { + throw new ServiceException("第" + (i + 1) + "板阴阳性对照OD值条件不成立，请修改后重新上传！"); + } + + for (int rowNum = 0; rowNum < excels.size(); rowNum++) { + // 行标头：前端渲染需要A、B、C.... + String a = String.valueOf((char) (rowNum + 65)); + + //取到一行记录 + ExamineExcel examineExcel = excels.get(rowNum); + int fieldsLength = examineExcel.getClass().getDeclaredFields().length - 1; + + Map> map2 = new HashMap<>(); + + String SP = "0.00"; + for (int colNum = 1; colNum <= fieldsLength; colNum++) { + String cellVal = getExamineCellData(examineExcel, colNum); + + Map mapResult = new HashMap<>(); + // colNum 是列，rowNum是行 ，我们定义index是一列列的定义 + int index = (colNum - 1) * 8 + rowNum + 1; + if (StringUtils.isNotBlank(cellVal)) { + if (rowNum > 5 || colNum > 1) { + if (positiveAvg != 0) { + SP = DECIMAL_FORMAT.format((Double.parseDouble(cellVal) - negativeAvg) / (positiveAvg - negativeAvg)); + } + mapResult.put("originResult", cellVal); + mapResult.put("value", SP); + mapResult.put("num", "1"); + if (Double.parseDouble(SP) < 0.3) { + mapResult.put("result", "阴性"); + } else { + mapResult.put("result", "阳性"); + } + } else { + mapResult.put("originResult", cellVal); + mapResult.put("num", ""); + } + } else { + mapResult.put("originResult", ""); + mapResult.put("num", ""); + } + mapResult.put("order", index + i * 96); + map2.put(a + colNum, mapResult); + list.add(mapResult); + } + mapList.add(map2); + } + + map1.put("g" + (i + 1), mapList); + } + } + + /** + * 数据库ID：2010597883512958990 + * 试剂名称：禽白血病病毒AB亚群ELISA抗体检测试剂盒 + * 生产厂家：哈尔滨国生生物科技股份有限公司 + *

+ * 1. 成立条件: 阳性对照血清OD450nm值均在0.6~1.3之间， 阴性对照血清OD450nm值均＜0.10 + * 2. 计算方法： S/P值=（待检样品OD450nm值－阴性对照血清平均OD450nm值)/(阳性对照血清平均OD450nm值－阴性对照血清平均OD450nm值) + * 3. 结果判定: S/P值≥0.2时，判为阳性； S/P值＜0.2时，判为阴性； + * + * @param group 填报实验结果的组数，每组9行，12列 + * @param groupExcelData + * @param map1 + * @param list + */ + @Override + public void reagent2010597883512958990(int group, Map> groupExcelData, Map>>> map1, List> list) { + for (int i = 0; i < group; i++) { + List>> mapList = new ArrayList<>(); + List excels = groupExcelData.get(i + 1 + ""); + double negativeVal1 = Double.parseDouble(excels.get(0).getCode1()); + double negativeVal2 = Double.parseDouble(excels.get(1).getCode1()); + double positiveVal1 = Double.parseDouble(excels.get(2).getCode1()); + double positiveVal2 = Double.parseDouble(excels.get(3).getCode1()); + // 阴性对照平均值 + double negativeAvg = (negativeVal1 + negativeVal2) / 2; + // 阳性对照平均值 + double positiveAvg = (positiveVal1 + positiveVal2) / 2; + + // 成立条件校验 + if (negativeVal1 < 0.10 && negativeVal2 < 0.10 && positiveVal1 >= 0.6 && positiveVal1 <= 1.3 && positiveVal2 >= 0.6 && positiveVal2 <= 1.3) { + throw new ServiceException("第" + (i + 1) + "板阴阳性对照OD值条件不成立，请修改后重新上传！"); + } + + for (int rowNum = 0; rowNum < excels.size(); rowNum++) { + // 行标头：前端渲染需要A、B、C.... + String a = String.valueOf((char) (rowNum + 65)); + + //取到一行记录 + ExamineExcel examineExcel = excels.get(rowNum); + int fieldsLength = examineExcel.getClass().getDeclaredFields().length - 1; + + Map> map2 = new HashMap<>(); + + String SP = "0.00"; + for (int colNum = 1; colNum <= fieldsLength; colNum++) { + String cellVal = getExamineCellData(examineExcel, colNum); + + Map mapResult = new HashMap<>(); + // colNum 是列，rowNum是行 ，我们定义index是一列列的定义 + int index = (colNum - 1) * 8 + rowNum + 1; + if (StringUtils.isNotBlank(cellVal)) { + if (rowNum > 5 || colNum > 1) { + if (positiveAvg != 0) { + SP = DECIMAL_FORMAT.format((Double.parseDouble(cellVal) - negativeAvg) / (positiveAvg - negativeAvg)); + } + mapResult.put("originResult", cellVal); + mapResult.put("value", SP); + mapResult.put("num", "1"); + if (Double.parseDouble(SP) < 0.2) { + mapResult.put("result", "阴性"); + } else { + mapResult.put("result", "阳性"); + } + } else { + mapResult.put("originResult", cellVal); + mapResult.put("num", ""); + } + } else { + mapResult.put("originResult", ""); + mapResult.put("num", ""); + } + mapResult.put("order", index + i * 96); + map2.put(a + colNum, mapResult); + list.add(mapResult); + } + mapList.add(map2); + } + + map1.put("g" + (i + 1), mapList); + } + } + + /** + * 获取实验填报数据单个单元格的数据 + * + * @param examineExcel 实验数据 + * @param colNum 列号 + * @return + */ + private String getExamineCellData(ExamineExcel examineExcel, int colNum) { + String code; + switch (colNum) { + case 1: + code = examineExcel.getCode1(); + break; + case 2: + code = examineExcel.getCode2(); + break; + case 3: + code = examineExcel.getCode3(); + break; + case 4: + code = examineExcel.getCode4(); + break; + case 5: + code = examineExcel.getCode5(); + break; + case 6: + code = examineExcel.getCode6(); + break; + case 7: + code = examineExcel.getCode7(); + break; + case 8: + code = examineExcel.getCode8(); + break; + case 9: + code = examineExcel.getCode9(); + break; + case 10: + code = examineExcel.getCode10(); + break; + case 11: + code = examineExcel.getCode11(); + break; + case 12: + code = examineExcel.getCode12(); + break; + default: + code = "0"; + } + return code; + } +} 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 a13c887..fba3748 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 @@ -60,6 +60,8 @@ public class ExamineResultServiceImpl extends BaseServiceImpl read = ExcelUtil.read(file, ExamineExcel.class); - Map> map = new HashMap<>(); + // 组数 int group = 0; // 除9是否有余数 @@ -1594,14 +1596,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl excels = new ArrayList<>(); - for (int j = i * 8 + i; j < (i + 1) * 8 + i; j++) { - ExamineExcel excel = read.get(j); - excels.add(excel); - } - map.put((i + 1) + "", excels); - } + Map> groupExcelData = examineReagentService.getGroupExcelData(group, read); Examine examine = examineService.getById(examineId); String experieNum = examine.getExperieNum(); @@ -1618,7 +1613,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -1719,7 +1714,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -1821,7 +1816,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -1925,7 +1920,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -2026,7 +2021,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(4).getCode1()); double code2 = Double.parseDouble(excels.get(5).getCode1()); double code3 = Double.parseDouble(excels.get(0).getCode1()); @@ -2127,7 +2122,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -2228,7 +2223,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -2331,7 +2326,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -2434,7 +2429,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -2536,7 +2531,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -2636,7 +2631,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -2738,7 +2733,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -2841,7 +2836,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -2944,7 +2939,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -3045,7 +3040,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -3148,7 +3143,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -3249,7 +3244,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -3350,7 +3345,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -3451,7 +3446,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -3553,7 +3548,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -3654,7 +3649,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -3754,7 +3749,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double yin1 = Double.parseDouble(excels.get(0).getCode1()); double yin2 = Double.parseDouble(excels.get(0).getCode2()); double yang1 = Double.parseDouble(excels.get(1).getCode1()); @@ -3924,7 +3919,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double yin1 = Double.parseDouble(excels.get(6).getCode10()); double yin2 = Double.parseDouble(excels.get(6).getCode11()); double yang1 = Double.parseDouble(excels.get(7).getCode10()); @@ -4101,7 +4096,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -4202,7 +4197,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -4303,7 +4298,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -4404,7 +4399,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -4505,7 +4500,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -4606,7 +4601,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -4707,7 +4702,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -4808,7 +4803,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -4909,7 +4904,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -5010,7 +5005,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -5111,7 +5106,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -5207,7 +5202,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -5309,7 +5304,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -5412,7 +5407,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -5513,7 +5508,7 @@ public class ExamineResultServiceImpl extends BaseServiceImpl>> mapList = new ArrayList<>(); - List excels = map.get(i + 1 + ""); + List excels = groupExcelData.get(i + 1 + ""); double code1 = Double.parseDouble(excels.get(0).getCode1()); double code2 = Double.parseDouble(excels.get(1).getCode1()); double code3 = Double.parseDouble(excels.get(2).getCode1()); @@ -5609,6 +5604,10 @@ public class ExamineResultServiceImpl extends BaseServiceImpl