检查报告优化

This commit is contained in:
余文财 2025-06-26 17:17:50 +08:00
parent c4f28853dd
commit 88a587e51f
3 changed files with 33 additions and 38 deletions

View File

@ -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")

View File

@ -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();

View File

@ -18,15 +18,15 @@
<table style="width: 100%;">
<!-- 第1行2个字段 -->
<tr>
<td style="width: 33%;">
<td style="width: 33%;font-weight: bold;">
<span>姓名:</span>
<span style="display: inline-block; min-width: 150px;" th:text="${baseInfo.patName}"></span>
<span th:text="${baseInfo.patName}"></span>
</td>
<td style="width: 33%;">
</td>
<td style="width: 33%;">
<td style="width: 33%;font-weight: bold;">
<span>标本编号:</span>
<span style="display: inline-block; min-width: 150px;" th:text="${baseInfo.reportId}"></span>
<span th:text="${baseInfo.reportId}"></span>
</td>
</tr>
@ -34,15 +34,15 @@
<tr>
<td style="width: 33%;">
<span>性别:</span>
<span style="display: inline-block;" th:text="${baseInfo.patSex}"></span>
<span th:text="${baseInfo.patSex}"></span>
</td>
<td style="width: 33%;">
<span>科室:</span>
<span style="display: inline-block;" th:text="${baseInfo.deptName}"></span>
<span th:text="${baseInfo.deptName}"></span>
</td>
<td style="width: 33%;">
<span>标本类型:</span>
<span style="display: inline-block;" th:text="${baseInfo.lspcmName}"></span>
<span th:text="${baseInfo.lspcmName}"></span>
</td>
</tr>
@ -50,15 +50,15 @@
<tr>
<td style="width: 33%;">
<span>年龄:</span>
<span style="display: inline-block;" th:text="${baseInfo.patAge}"></span>
<span th:text="${baseInfo.patAge}"></span>
</td>
<td style="width: 33%;">
<span>床号:</span>
<span style="display: inline-block;" th:text="${baseInfo.inpBedNo}"></span>
<span th:text="${baseInfo.inpBedNo}"></span>
</td>
<td style="width: 33%;">
<span>标本形态:</span>
<span style="display: inline-block;"></span>
<span></span>
</td>
</tr>
@ -66,47 +66,43 @@
<tr>
<td style="width: 33%;">
<span>患者电话:</span>
<span style="display: inline-block;" th:text="${baseInfo.patHomePhno}"></span>
<span th:text="${baseInfo.patHomePhno}"></span>
</td>
<td style="width: 33%;">
<span>申请医生:</span>
<span style="display: inline-block;" th:text="${baseInfo.placerName}"></span>
<span th:text="${baseInfo.placerName}"></span>
</td>
<td style="width: 33%;">
<span>采样者:</span>
<span style="display: inline-block;" th:text="${baseInfo.spcmClctor}"></span>
<span th:text="${baseInfo.spcmClctor}"></span>
</td>
</tr>
<!-- 第5行3个字段 -->
<tr>
<td style="width: 33%;">
<span>申请项目</span>
<span style="display: inline-block; min-width: 80px;" th:text="${baseInfo.citemContent}"></span>
<span>仪器</span>
<span></span>
</td>
<td style="width: 33%;">
<span>临床诊断:</span>
<span style="display: inline-block; min-width: 80px;"></span>
<span></span>
</td>
<td style="width: 33%;">
<span>采样人:</span>
<span style="display: inline-block; min-width: 80px;" th:text="${baseInfo.spcmClctor}"></span>
<span th:text="${baseInfo.spcmClctor}"></span>
</td>
</tr>
<!-- 第6行3个字段 -->
<!-- 第6行1个字段 -->
<tr>
<td style="width: 33%;">
<span>仪器:</span>
<span style="display: inline-block; min-width: 130px;"></span>
</td>
<td style="width: 33%;">
</td>
<td style="width: 33%;">
<td colspan="3" style="width: 100%;">
<span>申请项目:</span>
<span th:text="${baseInfo.citemContent}"></span>
</td>
</tr>
</table>
<div style="height: 10px;"></div>
<!-- 检测结果表格 -->
<table style="border-collapse:collapse;width: 100%;border:1px solid gray;">
<thead style="text-align: center;">
@ -120,8 +116,8 @@
</thead>
<tbody style="text-align: center;">
<!-- 动态行渲染+异常值红色高亮 -->
<tr th:each="item : ${items}"
th:style="${item.oaflag} ? '' : 'background-color: #f9f9f9;color: red;'">
<tr th:each="item, stat : ${items}"
th:style="${stat.index % 2 == 0} ? '' : 'background-color: #f0f0f0;'">
<td style="padding: 8px 5px;" th:text="${item.loitemCname}"></td>
<td style="padding: 8px 5px;">
<span th:text="${item.orderRptResult}"></span>
@ -133,13 +129,13 @@
<td style="padding: 8px 5px;" th:text="${item.inspectionMethod}"></td>
</tr>
<!-- 补齐空行 -->
<tr th:each="i : ${#numbers.sequence(1, 10 - items.size())}" th:if="${items.size()} < 10">
<td style="padding: 8px 5px;">&nbsp;</td>
<td style="padding: 8px 5px;">&nbsp;</td>
<td style="padding: 8px 5px;">&nbsp;</td>
<td style="padding: 8px 5px;">&nbsp;</td>
<td style="padding: 8px 5px;">&nbsp;</td>
</tr>
<!-- <tr th:each="i : ${#numbers.sequence(1, 10 - items.size())}" th:if="${items.size()} < 10">
<td style="padding: 8px 5px;">&nbsp;</td>
<td style="padding: 8px 5px;">&nbsp;</td>
<td style="padding: 8px 5px;">&nbsp;</td>
<td style="padding: 8px 5px;">&nbsp;</td>
<td style="padding: 8px 5px;">&nbsp;</td>
</tr>-->
</tbody>
</table>