From 1c19d6c06e5d829ed7907c375530247ca8ce2203 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 25 二月 2025 18:02:51 +0800
Subject: [PATCH] zjh20250225
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 2284879..1ebb89f 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
@@ -34,8 +34,10 @@
import com.ltkj.system.service.ISysUserService;
import com.ltkj.web.config.pdfutils.PdfUtils;
import com.ltkj.web.controller.system.SysDeptController;
+import jodd.util.StringUtil;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
+import net.sf.ehcache.search.aggregator.Count;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -1013,11 +1015,9 @@
for (Map.Entry<String, List<TjOrderYcxm>> entry : stringListMap.entrySet()) {
List<TjOrderYcxm> details = entry.getValue();
String xmmc = entry.getKey();
-// String xmmc = details.get(0).getProName();
boolean isXmWrite = false;
int index = 1;
for (TjOrderYcxm detail : details) {
-// if (!entry.getKey().equals(detail.getProId())) continue;
if (!isXmWrite) {
paragraph = new Paragraph(xmXh + ". " + xmmc, defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
@@ -1029,6 +1029,7 @@
result = result.replaceAll("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�", "");
StringBuilder builder = new StringBuilder();
if (StrUtil.isBlank(result.replaceAll("\n", "").trim())) continue;
+
builder.append(" (").append(index).append(")").append(detail.getJcxm()).append(": ").append(result).append("\n");
index++;
@@ -2593,6 +2594,13 @@
ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh());
List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper);
if(null !=hybgds && !hybgds.isEmpty()){
+// hybgds = hybgds.stream().distinct().collect(Collectors.toList());
+ hybgds = new ArrayList<>(hybgds.stream()
+ .collect(Collectors.toMap(LtkjHybgd::getJcxm, p -> p, (existing, replacement) -> existing))
+ .values());
+
+
+
// hybgds=hybgds.stream().sorted(Comparator.comparing(LtkjHybgd::getJcxm, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
// hybgds = hybgds.stream()
// .sorted(Comparator.comparingInt(
--
Gitblit v1.8.0