From 801e0c1ca3a38f2a5cdc540bc2c14649c04edd56 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 11:57:26 +0800 Subject: [PATCH] update --- .../service/impl/InspectRecordServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 2156f99..a823f22 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 @@ -117,9 +117,11 @@ public class InspectRecordServiceImpl implements InspectRecordService { data.put("instrumentName", CollectionUtils.isEmpty(instruments) ? "未找到仪器设备数据!" - : instruments.stream().map(TestRecordInstrument::getInstrumentName) + : instruments.stream() + .map(i -> "\u3000\u3000" + i.getInstrumentName()) // 使用 Unicode 全角空格 .collect(Collectors.joining("\n"))); + // 获取样品数据 List dataList = testRecordSampleDataService.list( Wrappers.lambdaQuery().eq(TestRecordSampleData::getTestId, testRecord.getId())); @@ -199,6 +201,10 @@ public class InspectRecordServiceImpl implements InspectRecordService { TestRecordSampleData item = analyte.get(i); TestRecordSampleDataVO vo = new TestRecordSampleDataVO(); BeanUtils.copyProperties(item, vo); + vo.setPTargetRtTime(vo.getTargetRtTime().toString()); + vo.setPRtTimeError(vo.getRtTimeError().toString()); + vo.setPRtTimeWithinError(vo.getRtTimeWithinError().toString()); + vo.setPIsDetected(item.getIsDetected() == 1 ? "是" : "否"); List expandList = dataExpandMap.get(item.getId()); if (expandList != null) { @@ -248,6 +254,7 @@ public class InspectRecordServiceImpl implements InspectRecordService { } else { templatePath = "/template" + "/贵阳生物样本尿液检验记录模板.docx"; } + System.out.println(data); LoopRowTableRenderPolicy policy = new LoopRowTableRenderPolicy(); Configure config = Configure.builder(). bind("dataDtos", policy).build();