From 504ea6aa7d68491ee3a7d751e4c750d9e22600e9 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 25 七月 2025 13:55:03 +0800
Subject: [PATCH] zjh20250725-2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 21aac68..0302b0b 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
@@ -1446,8 +1446,8 @@
PdfPCell cell;
String pdfQzgzpailie = sysConfigService.selectConfigByKey("pdf_qzgzpailie");
if (StrUtil.isNotBlank(pdfQzgzpailie) && pdfQzgzpailie.equalsIgnoreCase("h")){
- zongJianFont = PdfUtils.setFont(DEFAULT_ZONGJIAN_FONT_SIZE - 2);
- zongJianTitleFont = PdfUtils.setFont(DEFAULT_ZONGJIAN_FONT_SIZE - 2);
+ zongJianFont = PdfUtils.setFont(DEFAULT_ZONGJIAN_FONT_SIZE - 6);
+ zongJianTitleFont = PdfUtils.setFont(DEFAULT_ZONGJIAN_FONT_SIZE -4);
zongJianTitleFont.setStyle(Font.BOLD);
PdfPTable tableQz = new PdfPTable(new float[]{90f, 90f, 60f, 60f, 60f, 60f});
tableQz.setTotalWidth(PageSize.A4.getWidth() - 100);
@@ -2554,9 +2554,9 @@
List<LtkjHybgd> hybgds = ltkjHybgdService.getReportJianYanBaoGaoDanList(hysqd.getTmh());
if(null !=hybgds && !hybgds.isEmpty()){
- hybgds = new ArrayList<>(hybgds.stream()
- .collect(Collectors.toMap(LtkjHybgd::getJcxm, p -> p, (existing, replacement) -> existing))
- .values());
+// hybgds = new ArrayList<>(hybgds.stream()
+// .collect(Collectors.toMap(LtkjHybgd::getJcxm, p -> p, (existing, replacement) -> existing))
+// .values());
Map<String, List<LtkjHybgd>> listMap = hybgds.stream().collect(Collectors.groupingBy(LtkjHybgd::getJyjg));
@@ -2567,7 +2567,7 @@
LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SysDictData::getDictType,"qj_type");
wrapper.eq(SysDictData::getDictLabel,firstKey);
- List<SysDictData> dictList = sysDictDataService.list();
+ List<SysDictData> dictList = sysDictDataService.list(wrapper);
if (!dictList.isEmpty()) {
isGroupOnce = true;
groupOnceProResult = firstKey;
--
Gitblit v1.8.0