From a3341bde43642fa146f97522ec327ef397998991 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 13 六月 2025 14:17:28 +0800
Subject: [PATCH] zjh20250613
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index 2b89aaf..0d233c5 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/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);
--
Gitblit v1.8.0