From 14ecea8537d5b29ca64c75aad4ff49265018415d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 02 七月 2025 08:51:22 +0800
Subject: [PATCH] zjh20250702
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 fd78485..a7c993f 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
@@ -1817,7 +1817,7 @@
//鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
if (null != one11 && "Y".equals(one11.getNeedReport())) {
TjOrderRemark orderRemark = entry.getKey();
- List<TjPdfVO> value = entry.getValue();
+ List<TjPdfVO> value = entry.getValue().stream().distinct().collect(Collectors.toList());
if (StrUtil.isBlank(value.get(0).getProResult()) && (StrUtil.isBlank(value.get(0).getTs()) && StrUtil.isBlank(value.get(0).getSj()))) {
continue;
}
@@ -2602,12 +2602,13 @@
TjProject tjProject = projectService.getById(tjOrderDetail.getProId());
if (null != tjProject && tjProject.getNeedReport().equals("Y")) {
tjOrderDetail.setProject(tjProject);
+ TjProject tjProjectq = projectService.getById(tjOrderDetail.getProject().getProParentId());
if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId())
&& entry.getKey().getType() == 1
- && !ids.contains(String.valueOf(tjOrderDetail.getProject().getProParentId()))) {
+ && (!ids.contains(String.valueOf(tjOrderDetail.getProject().getProParentId())) &&
+ !ids.contains(tjProjectq.getHisXmbm()))) {
- TjProject tjProjectq = projectService.getById(tjOrderDetail.getProject().getProParentId());
TjPdfVO tjPdfVO = new TjPdfVO();
tjPdfVO.setProName(tjOrderDetail.getProject().getProName());
tjPdfVO.setProResult(tjOrderDetail.getProResult());
--
Gitblit v1.8.0