小程序报告接口以及his项目查询接口分页修复

zhaowenxuan

2025-02-21 5c7ea7346d77ab1c8be660c65e721ce3e46328f5

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

@@ -1015,17 +1015,9 @@
            for (Map.Entry<String, List<TjOrderYcxm>> entry : stringListMap.entrySet()) {
                List<TjOrderYcxm> details = entry.getValue();
                String xmmc = entry.getKey();
//                    String xmmc = details.get(0).getProName();
                boolean isXmWrite = false;
                int index = 1;
                String szyssy="";
                StringBuilder builders = new StringBuilder();
                for (TjOrderYcxm detail : details) {
//                    if(detail.getJcxm().contains("舒张压")||detail.getJcxm().contains("收缩压")){
//                        builders.append(detail.getJcxm()).append(detail.getJcjg()).append(" ");
//                        szyssy+=builders.toString();
//                        continue;
//                    }
                    if (!isXmWrite) {
                        paragraph = new Paragraph(xmXh + ".  " + xmmc, defaultFont);
                        paragraph.setAlignment(Element.ALIGN_LEFT);
@@ -1047,22 +1039,6 @@
                    paragraph.setAlignment(Element.ALIGN_LEFT);
                    document2.add(paragraph);
                }

//                if(StringUtil.isNotBlank(szyssy)){
//                    if (!isXmWrite) {
//                        paragraph = new Paragraph(xmXh + ".  " + xmmc, defaultFont);
//                        paragraph.setAlignment(Element.ALIGN_LEFT);
//                        document2.add(paragraph);
//                        isXmWrite = true;
//                    }
//                    StringBuilder builder = new StringBuilder();
//                    builder.append("    (").append(index).append(")").append(szyssy).append("\n");
//                    szyssy = builder.toString();
//                    paragraph = new Paragraph(szyssy, defaultFont);
//                    paragraph.setAlignment(Element.ALIGN_LEFT);
//                    document2.add(paragraph);
//                }

                if (isXmWrite) {
                    paragraph = PdfUtils.setParagraph(defaultFont, "");
                    paragraph.setLeading(0f);
@@ -2618,6 +2594,13 @@
            ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh());
            List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper);
            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=hybgds.stream().sorted(Comparator.comparing(LtkjHybgd::getJcxm, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
//                hybgds = hybgds.stream()
//                        .sorted(Comparator.comparingInt(