From 1794429446df460995c5db95729258e922710338 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 30 七月 2025 09:27:20 +0800
Subject: [PATCH] 结算价格处理

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java |    8 ++++----
 1 files changed, 4 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 fde1dfe..6e810b5 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
@@ -2928,9 +2928,9 @@
             List<LtkjHybgd> hybgds = ltkjHybgdService.getReportJianYanBaoGaoDanList(hysqd.getTmh());
             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 = 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));
@@ -2941,7 +2941,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