zjh20250611

zjh

2025-06-11 1931c00063f392f201ee5f9154e9a4826820ab49

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

@@ -93,8 +93,8 @@
    private LtkjHysqdService ltkjHysqdService;
    @Autowired
    private LtkjGetexamreportinfoService ltkjGetexamreportinfoService;
    @Value("${path.filePath}")
    private String value;
//    @Value("${path.filePath}")
//    private String value;
    @Value("${path.reportServer}")
    private String urlValue;
    @Autowired
@@ -875,6 +875,7 @@
        String s2 = sysConfigService.selectConfigByKey("tjreport_font_size_second_page_title");
        String s3 = sysConfigService.selectConfigByKey("tjreport_font_size_result_title");
        String s4 = sysConfigService.selectConfigByKey("tjreport_font_size_zongjian");
        String value = sysConfigService.selectConfigByKey("path_filePath");
//        String hospName = sysDeptController.getdangqiandengluyuanqu().get("msg").toString();
        if (StrUtil.isNotBlank(s1) && Integer.parseInt(s1) > 10) DEFAULT_FONT_SIZE = Integer.parseInt(s1);
        else DEFAULT_FONT_SIZE = 10;
@@ -1345,10 +1346,16 @@
        }


        LambdaQueryWrapper<TjXdtgmdjg> wqq=new LambdaQueryWrapper<>();
        wqq.eq(TjXdtgmdjg::getTjh,tjOrder.getTjNumber());
        wqq.isNotNull(TjXdtgmdjg::getUrl);
        List<TjXdtgmdjg> xdtgmdjgList = xdtgmdjgService.list(wqq);
        String isPdfFujianPro = sysConfigService.selectConfigByKey("is_pdf_fujian_pro");
        List<TjXdtgmdjg> xdtgmdjgList;
        if (StrUtil.isNotBlank(isPdfFujianPro) && isPdfFujianPro.equalsIgnoreCase("Y")){
            xdtgmdjgList = xdtgmdjgService.xdtGlAttProByTjNum(tjOrder.getTjNumber());
        }else {
            LambdaQueryWrapper<TjXdtgmdjg> wqq=new LambdaQueryWrapper<>();
            wqq.eq(TjXdtgmdjg::getTjh,tjOrder.getTjNumber());
            wqq.isNotNull(TjXdtgmdjg::getUrl);
            xdtgmdjgList = xdtgmdjgService.list(wqq);
        }

        int index=1;
        for (TjXdtgmdjg xdtgmdjg : xdtgmdjgList) {
@@ -1678,6 +1685,7 @@
     */
    private void savePDFFile(String outputFileName1, TjOrder tjOrder, TjCustomer customer, ByteArrayOutputStream finalOutPut) throws IOException, DocumentException, InterruptedException {
        // 第一步：生成文件并保存
        String value = sysConfigService.selectConfigByKey("path_filePath");
        String outputPath1 = value + File.separator;
        File file = new File(outputPath1 + outputFileName1);
        BufferedOutputStream outputStream = null;
@@ -1860,12 +1868,12 @@
                                if (StrUtil.isNotBlank(value.get(0).getSj())) {
                                    pp = PdfUtils.setParagraph(remarkFonts, "检查所见：");
                                    document1.add(pp);
                                    ppp = new Paragraph(value.get(0).getSj(), remarkFonts);
                                    ppp = new Paragraph(value.get(0).getSj().replaceAll("\n",""), remarkFonts);
                                    paragraph.setAlignment(Element.ALIGN_LEFT);
                                    paragraph.setLeading(5f);
                                    document1.add(ppp);
                                }
                                pp = PdfUtils.setParagraph(remarkFonts, "检查提示："+value.get(0).getTs());
                                pp = PdfUtils.setParagraph(remarkFonts, "检查提示："+value.get(0).getTs().replaceAll("\n",""));
                                document1.add(pp);
//                                ppp = new Paragraph(value.get(0).getTs(), remarkFonts);
//                                paragraph.setAlignment(Element.ALIGN_LEFT);
@@ -1939,7 +1947,8 @@
                    Paragraph paragraph = PdfUtils.setParagraph(titleFonts, titleName);

//                    if (dictHosp.getHospName().equals("澄合矿务局中心医院")) {
                    if (StrUtil.isBlank(value.get(0).getProResult()) && (StrUtil.isBlank(value.get(0).getTs()) && StrUtil.isBlank(value.get(0).getSj()))) {
                    if (StrUtil.isBlank(value.get(0).getProResult()) && (StrUtil.isBlank(value.get(0).getTs().replaceAll("\n",""))
                            && StrUtil.isBlank(value.get(0).getSj().replaceAll("\n","")))) {
                        continue;
                    }
                    Font titleFont = PdfUtils.setFont(DEFAULT_TITLE_FONT_SIZE);
@@ -2008,7 +2017,7 @@
                                if (StrUtil.isNotBlank(value.get(0).getSj()) || StrUtil.isNotBlank(value.get(0).getProResult())) {
                                    pp = PdfUtils.setParagraph(remarkFonts, "检查所见：");
                                    document1.add(pp);
                                    ppp = new Paragraph(value.get(0).getSj() != null ? value.get(0).getSj() : value.get(0).getProResult(), remarkFonts);
                                    ppp = new Paragraph(value.get(0).getSj() != null ? value.get(0).getSj().replaceAll("\n","") : value.get(0).getProResult().replaceAll("\n",""), remarkFonts);
                                    paragraph.setAlignment(Element.ALIGN_LEFT);
                                    paragraph.setLeading(5f);
                                    document1.add(ppp);
@@ -2016,7 +2025,7 @@

                                pp = PdfUtils.setParagraph(remarkFonts, "检查提示：");
                                document1.add(pp);
                                ppp = new Paragraph((value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult()), remarkFonts);
                                ppp = new Paragraph((value.get(0).getTs() != null ? value.get(0).getTs().replaceAll("\n","") : value.get(0).getProResult().replaceAll("\n","")), remarkFonts);
                                paragraph.setAlignment(Element.ALIGN_LEFT);
                                paragraph.setLeading(5f);
                                document1.add(ppp);