From 6f087e2556738f994fe3e92753d8512a64f52e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=B5=B7=E8=88=AA?= <11918452+yang-haihang@user.noreply.gitee.com> Date: Tue, 25 Mar 2025 16:41:53 +0800 Subject: [PATCH] update --- .../inspection/service/impl/InspectRecordServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/InspectRecordServiceImpl.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/InspectRecordServiceImpl.java index a823f22..bc71205 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/InspectRecordServiceImpl.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/InspectRecordServiceImpl.java @@ -218,13 +218,17 @@ public class InspectRecordServiceImpl implements InspectRecordService { } } // 重新命名样品 - vo.setName((dataList.size() == 1) ? "检材样品" : (i + 1) + "号检材样品"); + vo.setName((dataList + .stream() + .collect(Collectors.groupingBy(TestRecordSampleData::getSampleNo)) + .keySet() + .size() == 1) ? "检材样品" : (i + 1) + "号检材样品"); dataVOS.add(vo); } dataDtos.addAll(dataVOS); } } - + // 加入图谱序号值 int indexNum = 1; for (int i = 0; i < dataDtos.size(); i++) { dataDtos.get(i).setIndexNum(String.valueOf(indexNum++));