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++));