zjh
昨天 504ea6aa7d68491ee3a7d751e4c750d9e22600e9
zjh20250725-2
2个文件已修改
10 ■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -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;
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -1644,7 +1644,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;