From 4c3dee61da422e98ec1b9d798a77f47d8d45f7b6 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 11 十二月 2024 12:01:00 +0800
Subject: [PATCH] pacs检查去重
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index 22897b4..183ec38 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -1190,6 +1190,7 @@
strings.add(ycbz);
strings.add(jgdw);
strings.add(fwz);
+ strings.add(hybgd.getJcxmid());
lists.add(strings);
}
if (!lists.isEmpty()) {
@@ -1398,11 +1399,9 @@
// i -> i,
// (existing, replacement) -> existing
// ))
-// .values()); // 鑾峰彇鍘婚噸鍚庣殑 List
+// .values());
tjOrderDetails = tjOrderDetails.stream().filter(i -> StrUtil.isNotBlank(i.getProResult())).collect(Collectors.toList());
- System.out.println("tjOrderDetails = " + JSONUtil.toJsonStr(tjOrderDetails));
- tjOrderDetails = new ArrayList<>(tjOrderDetails.stream().collect(Collectors.toMap(TjOrderDetail::getProId, i -> i, (existing, replacement) -> existing)).values()); // 鑾峰彇鍘婚噸鍚庣殑 List
- System.out.println("tjOrderDetails = " + JSONUtil.toJsonStr(tjOrderDetails));
+ tjOrderDetails = new ArrayList<>(tjOrderDetails.stream().collect(Collectors.toMap(TjOrderDetail::getProId, i -> i, (existing, replacement) -> existing)).values());
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
TjProject tjProject = projectService.getById(String.valueOf(tjOrderDetail.getProId()));
if (null != tjProject && tjProject.getNeedReport().equals("Y")) {
@@ -1449,6 +1448,7 @@
for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
List<TjPdfVO> tjPdfVOS = new ArrayList<>();
List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.getDetailByOrderIdAndParId(one.getOrderId(), entry.getKey().getProId());
+ tjOrderDetails = new ArrayList<>(tjOrderDetails.stream().collect(Collectors.toMap(TjOrderDetail::getProId, i -> i, (existing, replacement) -> existing)).values());
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
TjProject tjProject = projectService.getById(tjOrderDetail.getProId());
if (null != tjProject && tjProject.getNeedReport().equals("Y")) {
@@ -1669,7 +1669,10 @@
isYc = true;
}
}
+ int index = 1;
for (String s : list) {
+ // 璺宠繃椤圭洰id
+ if (index == 6) continue;
PdfPCell nameCell = new PdfPCell();
nameCell.setVerticalAlignment(Element.ALIGN_MIDDLE);
nameCell.setHorizontalAlignment(Element.ALIGN_LEFT);
@@ -1685,6 +1688,7 @@
nameCell.setPhrase(new Paragraph(s, textFont));
}
table.addCell(nameCell);
+ index++;
}
}
document.add(table);
--
Gitblit v1.8.0