From 6f31a7ec7b9c1d7d8190900b22e861eae2851200 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 11 六月 2025 09:31:01 +0800
Subject: [PATCH] 0611
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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..af8ff5f 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;
--
Gitblit v1.8.0