From e874e10f4f741abd8eaa453c92602420aa5155fa Mon Sep 17 00:00:00 2001 From: yangmaofu Date: Fri, 22 May 2026 09:30:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0=E7=A9=BA?= =?UTF-8?q?=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ExamineReagentServiceImpl.java | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) 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 54ddfa0..fad696a 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 @@ -27,11 +27,29 @@ public class ExamineReagentServiceImpl implements IExamineReagentService { 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); +// } + + // 有效数据最大索引 + int maxIndex = excelData.size() - 1; 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); + //每组起始、结束索引（你的原逻辑） + int start = i * 8 + i; + int end = (i + 1) * 8 + i; + + for (int j = start; j < end; j++) { + //超出数据范围就停止，不报错 + if (j > maxIndex) { + break; + } + excels.add(excelData.get(j)); } groupExcelData.put((i + 1) + "", excels); } -- 2.36.1.windows.1