diff --git a/src/main/java/com/dpkj/modules/print/controller/MS439Controller.java b/src/main/java/com/dpkj/modules/print/controller/MS439Controller.java index e289436..1d67332 100644 --- a/src/main/java/com/dpkj/modules/print/controller/MS439Controller.java +++ b/src/main/java/com/dpkj/modules/print/controller/MS439Controller.java @@ -41,12 +41,11 @@ public class MS439Controller { // 获取检验报告PDF String path = ms439PrintService.getJYPDFPath(params); MS439Request ms439Request = new MS439Request(); - ms439Request.setPagesource("A4"); ms439Request.setFileDir(path); LexMarkResultDTO result = ms439PrintService.printImage(ms439Request); // 打印完成后删除临时PDF文件 ms439PrintService.deleteSysFileByPath(path); - return Result.ok(result); + return Result.ok(null); } @PostMapping("/getStatus") diff --git a/src/main/java/com/dpkj/modules/print/service/impl/MS439PrintServiceImpl.java b/src/main/java/com/dpkj/modules/print/service/impl/MS439PrintServiceImpl.java index 6214e5f..8595d7c 100644 --- a/src/main/java/com/dpkj/modules/print/service/impl/MS439PrintServiceImpl.java +++ b/src/main/java/com/dpkj/modules/print/service/impl/MS439PrintServiceImpl.java @@ -218,7 +218,7 @@ public class MS439PrintServiceImpl implements MS439PrintService { @Override public String getJYPDFPath(JSONObject params) { // 1. 准备输出路径 - String dirPath = "D:/TempJYPDF/"; + String dirPath = "D://TempJYPDF//"; File dir = new File(dirPath);// 确保目录存在 if (!dir.exists()) { dir.mkdirs(); diff --git a/src/main/resources/templates/reportJY.html b/src/main/resources/templates/reportJY.html index 97f34b5..5a8b300 100644 --- a/src/main/resources/templates/reportJY.html +++ b/src/main/resources/templates/reportJY.html @@ -18,15 +18,15 @@ - - @@ -34,15 +34,15 @@ @@ -50,15 +50,15 @@ @@ -66,47 +66,43 @@ - + - - -
+ 姓名: - + + 标本编号: - +
性别: - + 科室: - + 标本类型: - +
年龄: - + 床号: - + 标本形态: - +
患者电话: - + 申请医生: - + 采样者: - +
- 申请项目: - + 仪器: + 临床诊断: - + 采样人: - +
- 仪器: - - - + + 申请项目: +
- +
@@ -120,8 +116,8 @@ - + - - - - - - - +
@@ -133,13 +129,13 @@