Compare commits

..

No commits in common. "bd99a1e915864edb2c841a9f9110ae5c0199a23c" and "97aa3efef66bd575130f14b831d9b3a510a1ef78" have entirely different histories.

4 changed files with 55 additions and 262 deletions

View File

@ -43,8 +43,8 @@ public class MS439Controller {
String path = ms439PrintService.getJYPDFPath(); String path = ms439PrintService.getJYPDFPath();
ms439Request.setPagesource("A5"); ms439Request.setPagesource("A5");
ms439Request.setFileDir(path); ms439Request.setFileDir(path);
// LexMarkResultDTO<?> result = ms439PrintService.printImage(ms439Request); LexMarkResultDTO<?> result = ms439PrintService.printImage(ms439Request);
return Result.ok(null); return Result.ok(result);
} }
@PostMapping("/getStatus") @PostMapping("/getStatus")

View File

@ -243,8 +243,8 @@ public class MS439PrintServiceImpl implements MS439PrintService {
private void createPdfFromHtml(String html, String outputPath) private void createPdfFromHtml(String html, String outputPath)
throws IOException, DocumentException { throws IOException, DocumentException {
// 大小为A4 // 大小为A5
Document document = new Document(PageSize.A4); Document document = new Document(PageSize.A5);
try (OutputStream os = Files.newOutputStream(Paths.get(outputPath))) { try (OutputStream os = Files.newOutputStream(Paths.get(outputPath))) {
PdfWriter writer = PdfWriter.getInstance(document, os); PdfWriter writer = PdfWriter.getInstance(document, os);
document.open(); document.open();

View File

@ -27,8 +27,8 @@ spring:
dpkj: dpkj:
#后端项目访问地址 #后端项目访问地址
# 改为正式的地址 http://www.lczyyy.com/api/ http://127.0.0.1:5946/api/ http://www.lczyyy.com/apitest/ http://10.121.1.44:15946/apitest # 改为正式的地址 http://www.lczyyy.com/api/ http://127.0.0.1:5946/api/ http://www.lczyyy.com/apitest/
serverurl: http://10.121.1.44:5946/api/ serverurl: http://www.lczyyy.com/api/
# 医保配置 # 医保配置
chs: chs:
# 医保机构编码 # 医保机构编码

View File

@ -2,274 +2,67 @@
<html xmlns:th="http://www.thymeleaf.org"> <html xmlns:th="http://www.thymeleaf.org">
<head> <head>
<meta charset="UTF-8"/> <meta charset="UTF-8"/>
<title>粪便检测报告单</title> <title>检验报告单</title>
</head> </head>
<body> <body>
<div style="font-size: 14px;"> <div>
<!-- 医院标题 --> <!-- 标题区域 -->
<div style="text-align: center;"> <div style="text-align:center; margin-bottom:20px;">
<div style="font-size: 18px; font-weight: bold;"> <h2 style="color:#003366;">澜沧拉祜族自治县中医医院血常规检验报告单</h2>
澜沧拉祜族自治县中医医院粪便常规检验报告单 <p>报告时间: <span th:text="${#dates.format(reportTime, 'yyyy-MM-dd HH:mm')}"></span></p>
</div>
</div> </div>
<div style="height: 10px;"></div>
<div style="background-color: #000;height: 1px;"></div>
<!-- 患者基本信息区域 - 使用表格布局以确保兼容 -->
<table style="width: 100%;">
<!-- 第1行2个字段 -->
<tr>
<td style="width: 33%;">
<span>姓名:</span>
<span style="display: inline-block; min-width: 150px; ">张某某</span>
</td>
<td style="width: 33%;">
</td>
<td style="width: 33%;">
<span>标本编号:</span>
<span style="display: inline-block; min-width: 150px; ">FS20230615008</span>
</td>
</tr>
<!-- 第2行3个字段 --> <!-- 患者信息表格 -->
<tr> <div>
<td style="width: 33%;"> <table style="width:100%; border-collapse:collapse;">
<span>性别:</span> <tr>
<span style="display: inline-block;"></span> <td style="width:15%; padding:5px; border:1px solid #ddd;">姓名</td>
</td> <td style="width:35%; padding:5px; border:1px solid #ddd;" th:text="${patient.name}"></td>
<td style="width: 33%;"> <td style="width:15%; padding:5px; border:1px solid #ddd;">性别</td>
<span>科室:</span> <td style="width:35%; padding:5px; border:1px solid #ddd;" th:text="${patient.gender}"></td>
<span style="display: inline-block;">消化内科</span> </tr>
</td> <tr>
<td style="width: 33%;"> <td style="padding:5px; border:1px solid #ddd;">年龄</td>
<span>标本类型:</span> <td style="padding:5px; border:1px solid #ddd;" th:text="${patient.age}"></td>
<span style="display: inline-block;">粪便</span> <td style="padding:5px; border:1px solid #ddd;">病历号</td>
</td> <td style="padding:5px; border:1px solid #ddd;" th:text="${patient.medicalRecord}"></td>
</tr> </tr>
<tr>
<!-- 第3行3个字段 --> <td style="padding:5px; border:1px solid #ddd;">科室</td>
<tr> <td style="padding:5px; border:1px solid #ddd;" th:text="${patient.department}"></td>
<td style="width: 33%;"> <td style="padding:5px; border:1px solid #ddd;">床号</td>
<span>年龄:</span> <td style="padding:5px; border:1px solid #ddd;" th:text="${patient.bedNumber}"></td>
<span style="display: inline-block;">42岁</span> </tr>
</td> </table>
<td style="width: 33%;"> </div>
<span>床号:</span>
<span style="display: inline-block;">15</span>
</td>
<td style="width: 33%;">
<span>标本形态:</span>
<span style="display: inline-block; ">新鲜</span>
</td>
</tr>
<!-- 第4行3个字段 -->
<tr>
<td style="width: 33%;">
<span>患者电话:</span>
<span style="display: inline-block;">138****5678</span>
</td>
<td style="width: 33%;">
<span>申请医生:</span>
<span style="display: inline-block;">李医生</span>
</td>
<td style="width: 33%;">
<span>采样者:</span>
<span style="display: inline-block; ">护士A</span>
</td>
</tr>
<!-- 第5行3个字段 -->
<tr>
<td style="width: 33%;">
<span>申请项目:</span>
<span style="display: inline-block; min-width: 80px; ">粪便常规</span>
</td>
<td style="width: 33%;">
<span>临床诊断:</span>
<span style="display: inline-block; min-width: 100px; ">腹痛待查</span>
</td>
<td style="width: 33%;">
<span>采样人:</span>
<span style="display: inline-block; min-width: 80px; ">检验科</span>
</td>
</tr>
<!-- 第6行3个字段 -->
<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>
</tr>
</table>
<!-- 检测结果表格 --> <!-- 检测结果表格 -->
<table style="border-collapse:collapse;width: 100%;border:1px solid gray;"> <table style="width:100%; border-collapse:collapse; margin-top:20px;">
<thead style="text-align: center;"> <thead>
<tr style="background-color: #f0f0f0;height:30px;"> <tr>
<th style="padding: 8px 5px; width: 25%;">项目名称</th> <th style="border:1px solid #ddd; padding:8px; text-align:center; background-color:#f2f2f2;">检测项目</th>
<th style="padding: 8px 5px; width: 20%;">结果</th> <th style="border:1px solid #ddd; padding:8px; text-align:center; background-color:#f2f2f2;">结果</th>
<th style="padding: 8px 5px; width: 10%;">单位</th> <th style="border:1px solid #ddd; padding:8px; text-align:center; background-color:#f2f2f2;">参考范围</th>
<th style="padding: 8px 5px; width: 25%;">参考区间</th> <th style="border:1px solid #ddd; padding:8px; text-align:center; background-color:#f2f2f2;">单位</th>
<th style="padding: 8px 5px; width: 20%;">测试方法</th>
</tr> </tr>
</thead> </thead>
<tbody style="text-align: center;"> <tbody>
<tr> <!-- 动态行渲染+异常值红色高亮 -->
<td style="padding: 8px 5px;">颜色</td> <tr th:each="item : ${items}"
<td style="padding: 8px 5px;">黄褐色</td> th:style="${item.isAbnormal} ? 'color:red;' : ''">
<td style="padding: 8px 5px;"></td> <td style="border:1px solid #ddd; padding:8px; text-align:center;" th:text="${item.name}"></td>
<td style="padding: 8px 5px;">黄褐色</td> <td style="border:1px solid #ddd; padding:8px; text-align:center;" th:text="${item.result}"></td>
<td style="padding: 8px 5px;">目测法</td> <td style="border:1px solid #ddd; padding:8px; text-align:center;" th:text="${item.referenceRange}"></td>
</tr> <td style="border:1px solid #ddd; padding:8px; text-align:center;" th:text="${item.unit}"></td>
<tr style="background-color: #f9f9f9;">
<td style="padding: 8px 5px;">性状</td>
<td style="padding: 8px 5px;">软便</td>
<td style="padding: 8px 5px;"></td>
<td style="padding: 8px 5px;">软便</td>
<td style="padding: 8px 5px;">目测法</td>
</tr>
<tr>
<td style="padding: 8px 5px;">红细胞</td>
<td style="padding: 8px 5px;">未见</td>
<td style="padding: 8px 5px;">/HP</td>
<td style="padding: 8px 5px;">未见</td>
<td style="padding: 8px 5px;">镜检法</td>
</tr>
<tr style="background-color: #f9f9f9;">
<td style="padding: 8px 5px;">白细胞</td>
<td style="padding: 8px 5px;">0-2</td>
<td style="padding: 8px 5px;">/HP</td>
<td style="padding: 8px 5px;">0-3</td>
<td style="padding: 8px 5px;">镜检法</td>
</tr>
<tr>
<td style="padding: 8px 5px;">吞噬细胞</td>
<td style="padding: 8px 5px;">未见</td>
<td style="padding: 8px 5px;"></td>
<td style="padding: 8px 5px;">未见</td>
<td style="padding: 8px 5px;">镜检法</td>
</tr>
<tr style="background-color: #f9f9f9;">
<td style="padding: 8px 5px;">寄生虫卵</td>
<td style="padding: 8px 5px;">未找到</td>
<td style="padding: 8px 5px;"></td>
<td style="padding: 8px 5px;">未找到</td>
<td style="padding: 8px 5px;">镜检法</td>
</tr>
<tr>
<td style="padding: 8px 5px;">脂肪球</td>
<td style="padding: 8px 5px;">少量</td>
<td style="padding: 8px 5px;"></td>
<td style="padding: 8px 5px;">未见</td>
<td style="padding: 8px 5px;">苏丹III染色</td>
</tr>
<tr>
<td style="padding: 8px 5px;">颜色</td>
<td style="padding: 8px 5px;">黄褐色</td>
<td style="padding: 8px 5px;"></td>
<td style="padding: 8px 5px;">黄褐色</td>
<td style="padding: 8px 5px;">目测法</td>
</tr>
<tr style="background-color: #f9f9f9;">
<td style="padding: 8px 5px;">性状</td>
<td style="padding: 8px 5px;">软便</td>
<td style="padding: 8px 5px;"></td>
<td style="padding: 8px 5px;">软便</td>
<td style="padding: 8px 5px;">目测法</td>
</tr>
<tr>
<td style="padding: 8px 5px;">红细胞</td>
<td style="padding: 8px 5px;">未见</td>
<td style="padding: 8px 5px;">/HP</td>
<td style="padding: 8px 5px;">未见</td>
<td style="padding: 8px 5px;">镜检法</td>
</tr>
<tr style="background-color: #f9f9f9;">
<td style="padding: 8px 5px;">白细胞</td>
<td style="padding: 8px 5px;">0-2</td>
<td style="padding: 8px 5px;">/HP</td>
<td style="padding: 8px 5px;">0-3</td>
<td style="padding: 8px 5px;">镜检法</td>
</tr>
<tr>
<td style="padding: 8px 5px;">吞噬细胞</td>
<td style="padding: 8px 5px;">未见</td>
<td style="padding: 8px 5px;"></td>
<td style="padding: 8px 5px;">未见</td>
<td style="padding: 8px 5px;">镜检法</td>
</tr>
<tr style="background-color: #f9f9f9;">
<td style="padding: 8px 5px;">寄生虫卵</td>
<td style="padding: 8px 5px;">未找到</td>
<td style="padding: 8px 5px;"></td>
<td style="padding: 8px 5px;">未找到</td>
<td style="padding: 8px 5px;">镜检法</td>
</tr>
<tr>
<td style="padding: 8px 5px;">脂肪球</td>
<td style="padding: 8px 5px;">少量</td>
<td style="padding: 8px 5px;"></td>
<td style="padding: 8px 5px;">未见</td>
<td style="padding: 8px 5px;">苏丹III染色</td>
</tr>
<tr>
<td style="padding: 8px 5px;">颜色</td>
<td style="padding: 8px 5px;">黄褐色</td>
<td style="padding: 8px 5px;"></td>
<td style="padding: 8px 5px;">黄褐色</td>
<td style="padding: 8px 5px;">目测法</td>
</tr>
<tr style="background-color: #f9f9f9;">
<td style="padding: 8px 5px;">性状</td>
<td style="padding: 8px 5px;">软便</td>
<td style="padding: 8px 5px;"></td>
<td style="padding: 8px 5px;">软便</td>
<td style="padding: 8px 5px;">目测法</td>
</tr>
<tr>
<td style="padding: 8px 5px;">红细胞</td>
<td style="padding: 8px 5px;">未见</td>
<td style="padding: 8px 5px;">/HP</td>
<td style="padding: 8px 5px;">未见</td>
<td style="padding: 8px 5px;">镜检法</td>
</tr>
<tr style="background-color: #f9f9f9;">
<td style="padding: 8px 5px;">白细胞</td>
<td style="padding: 8px 5px;">0-2</td>
<td style="padding: 8px 5px;">/HP</td>
<td style="padding: 8px 5px;">0-3</td>
<td style="padding: 8px 5px;">镜检法</td>
</tr>
<tr>
<td style="padding: 8px 5px;">吞噬细胞</td>
<td style="padding: 8px 5px;">未见</td>
<td style="padding: 8px 5px;"></td>
<td style="padding: 8px 5px;">未见</td>
<td style="padding: 8px 5px;">镜检法</td>
</tr>
<tr style="background-color: #f9f9f9;">
<td style="padding: 8px 5px;">寄生虫卵</td>
<td style="padding: 8px 5px;">未找到</td>
<td style="padding: 8px 5px;"></td>
<td style="padding: 8px 5px;">未找到</td>
<td style="padding: 8px 5px;">镜检法</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<!-- 建议与解释 --> <!-- 页脚声明 -->
<div> <div style="margin-top:30px; text-align:right;">
<div style="padding-top: 10px;"> <div>检验医生: <span th:text="${doctor}"></span></div>
建议与解释:您的粪便检查结果显示存在轻度脂肪滴和少量未消化食物残渣。建议: <div>审核医生: <span th:text="${reviewer}"></span></div>
1注意饮食结构调整避免高脂、高蛋白饮食 <div>声明: 本报告仅对此标本负责如有疑问请3日内联系检验科</div>
2可补充消化酶类药物
3一周后复查。如有持续腹痛或腹泻症状请及时复诊。
</div>
</div> </div>
</div> </div>
</body> </body>