zjh20250725-3

zjh

2 天以前 7e9ffbd3b45be78890442683b17742aa5bdccd2c

 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;