2025-03-13

zhaowenxuan

2025-03-13 b47fac6e8cd4a40c6261b26bc753f46bff112206

 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java

@@ -1050,9 +1050,10 @@
                    xmXh++;
                }
            }
        }else {
        }
        /* else {

            if (!collect.isEmpty() && !map.isEmpty()){
            if (!collect.isEmpty() || !map.isEmpty()){
                paragraph = PdfUtils.setParagraph(defaultTitleFont, "检查综述：");
                paragraph.setSpacingBefore(3f);
                paragraph.setSpacingAfter(2f);
@@ -1146,7 +1147,7 @@
                    }
                }
            }
        }
        } */



@@ -1390,9 +1391,10 @@
                    }
                }
            }*/
        } else {
        }
        /* else {

            if (!collect.isEmpty() && !map.isEmpty()){
            if (!collect.isEmpty() || !map.isEmpty()){
                paragraph = PdfUtils.setParagraph(defaultTitleFont, "医生建议：");
                paragraph.setSpacingBefore(3f);
                paragraph.setSpacingAfter(2f);
@@ -1536,7 +1538,7 @@
                    }
                }
            }
        }
        } */

        for (int i = 0; i < 1; i++) {
            paragraph = PdfUtils.setParagraph(defaultFont, "");
@@ -2614,9 +2616,10 @@
        List<LtkjHysqd> list = ltkjHysqdService.list(ltkjHysqdLambdaQueryWrapper);
        HashMap<String, Object> data = new HashMap<>();
        for (LtkjHysqd hysqd : list) {
            LambdaQueryWrapper<LtkjHybgd> ltkjHybgdLambdaQueryWrapper = new LambdaQueryWrapper<>();
            ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh());
            List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper);
//            LambdaQueryWrapper<LtkjHybgd> ltkjHybgdLambdaQueryWrapper = new LambdaQueryWrapper<>();
//            ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh());
//            List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper);
            List<LtkjHybgd> hybgds = ltkjHybgdService.getReportJianYanBaoGaoDanList(hysqd.getTmh());
            if(null !=hybgds && !hybgds.isEmpty()){
//                hybgds = hybgds.stream().distinct().collect(Collectors.toList());
                hybgds = new ArrayList<>(hybgds.stream()