From 5c7ea7346d77ab1c8be660c65e721ce3e46328f5 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 21 二月 2025 17:56:26 +0800
Subject: [PATCH] 小程序报告接口以及his项目查询接口分页修复
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 31 +++++++------------------------
1 files changed, 7 insertions(+), 24 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 7e548cf..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
@@ -1015,17 +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;
- String szyssy="";
- StringBuilder builders = new StringBuilder();
for (TjOrderYcxm detail : details) {
-// if(detail.getJcxm().contains("鑸掑紶鍘�")||detail.getJcxm().contains("鏀剁缉鍘�")){
-// builders.append(detail.getJcxm()).append(detail.getJcjg()).append(" ");
-// szyssy+=builders.toString();
-// continue;
-// }
if (!isXmWrite) {
paragraph = new Paragraph(xmXh + ". " + xmmc, defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
@@ -1047,22 +1039,6 @@
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
}
-
-// if(StringUtil.isNotBlank(szyssy)){
-// if (!isXmWrite) {
-// paragraph = new Paragraph(xmXh + ". " + xmmc, defaultFont);
-// paragraph.setAlignment(Element.ALIGN_LEFT);
-// document2.add(paragraph);
-// isXmWrite = true;
-// }
-// StringBuilder builder = new StringBuilder();
-// builder.append(" (").append(index).append(")").append(szyssy).append("\n");
-// szyssy = builder.toString();
-// paragraph = new Paragraph(szyssy, defaultFont);
-// paragraph.setAlignment(Element.ALIGN_LEFT);
-// document2.add(paragraph);
-// }
-
if (isXmWrite) {
paragraph = PdfUtils.setParagraph(defaultFont, "");
paragraph.setLeading(0f);
@@ -2618,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