Merge remote-tracking branch 'origin/1.0' into 1.0
# Conflicts: # src/main/resources/templates/department.html
This commit is contained in:
commit
6755206d2e
14
pom.xml
14
pom.xml
|
|
@ -191,13 +191,13 @@
|
|||
</manifestEntries>
|
||||
</archive>
|
||||
<!-- 打包时从jar包里排除资源文件 -->
|
||||
<excludes>
|
||||
<exclude>*.yml</exclude>
|
||||
<exclude>*.xml</exclude>
|
||||
<exclude>templates/**</exclude>
|
||||
<exclude>win32-x86-64/**</exclude>
|
||||
<exclude>win32-x86/**</exclude>
|
||||
</excludes>
|
||||
<!-- <excludes>-->
|
||||
<!-- <exclude>*.yml</exclude>-->
|
||||
<!-- <exclude>*.xml</exclude>-->
|
||||
<!-- <exclude>templates/**</exclude>-->
|
||||
<!-- <exclude>win32-x86-64/**</exclude>-->
|
||||
<!-- <exclude>win32-x86/**</exclude>-->
|
||||
<!-- </excludes>-->
|
||||
<!-- 指定项目打成jar包输出位置 -->
|
||||
<outputDirectory>${project.build.directory}/output</outputDirectory>
|
||||
</configuration>
|
||||
|
|
|
|||
|
|
@ -136,8 +136,8 @@ public class RegisterServiceImpl implements PrintService {
|
|||
int pieceHeight = Math.min(MAX_HEIGHT, height - startY);
|
||||
|
||||
// 创建一个新的 BufferedImage 对象，用于存储切割的部分
|
||||
BufferedImage piece = new BufferedImage(FIXED_WIDTH, pieceHeight, BufferedImage.TYPE_INT_RGB);
|
||||
piece.getGraphics().drawImage(originalImage, 0, 0, FIXED_WIDTH, pieceHeight, 0, startY, FIXED_WIDTH, startY + pieceHeight, null);
|
||||
BufferedImage piece = new BufferedImage(width, pieceHeight, BufferedImage.TYPE_INT_RGB);
|
||||
piece.getGraphics().drawImage(originalImage, 0, 0, width, pieceHeight, 0, startY, width, startY + pieceHeight, null);
|
||||
|
||||
// 保存切割的图片块
|
||||
File outputFile = new File(saveDir + "/output_" + (i + 1) + ".jpg");
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org" lang="en">
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>门诊缴费凭证</title>
|
||||
|
|
@ -7,58 +7,45 @@
|
|||
<body>
|
||||
<div style="font-weight: 700;">
|
||||
<div style="text-align: center;margin-top: 40px;">
|
||||
<div><span style="font-size: 28px;">******<span th:text="${hospitalName}"></span>******</span></div>
|
||||
<div style="font-size: 38px; margin-top: 20px;"><span th:text="${registeTerminalName}"></span></div>
|
||||
<div><span style="font-size: 28px;">******<span th:text="${registeTerminalName}"></span>******</span></div>
|
||||
<div style="font-size: 38px; margin-top: 20px;"><span th:text="${hospitalName}"></span></div>
|
||||
<div style="font-size: 38px; margin-top: 10px;"><span th:text="${registeType}"></span></div>
|
||||
</div>
|
||||
<div style="text-align: center; font-size: 32px;">
|
||||
-----------------------------------------------------------------------------
|
||||
</div>
|
||||
<div style="font-size: 35px; margin: 10px 20px">
|
||||
<div style="display: flex;">
|
||||
<div style="flex: 1;">姓名：<span th:text="${name}"></span></div>
|
||||
<div style="flex: 1;">性别：<span th:text="${gender}"></span></div>
|
||||
<div style="flex: 1;">年龄：<span th:text="${age}"></span></div>
|
||||
<div style="text-align: center; font-weight: 700; font-size: 32px;">-----------------------------------------------------------------------------</div>
|
||||
<div style="margin-left: 20px; font-size: 35px; margin-bottom: 10px; display: flex">
|
||||
<div style="flex: 1; margin-top: 10px; ">
|
||||
姓名：<span style="margin-right: 25px;" th:text="${name}"></span><br>
|
||||
性别：<span style="margin-right: 25px;" th:text="${gender}"></span>
|
||||
年龄：<span style="margin-right: 25px;" th:text="${age}"></span>
|
||||
</div>
|
||||
<div style="display: flex;margin-top: 10px;">
|
||||
<div style="flex: 1;" th:if="${outpatientNumber}">门诊号：<span th:text="${outpatientNumber}"></span></div>
|
||||
<div style="flex: 1;" th:if="${doctor}">就诊医生：<span th:text="${doctor}"></span></div>
|
||||
</div>
|
||||
<div style="margin-top: 10px;" th:if="${department}">就诊科室：<span th:text="${department}"></span></div>
|
||||
<div th:if="${outpatientNumber}" style="flex: 1; margin-top: 10px; margin-right: 15px;">门诊号：<span th:text="${outpatientNumber}"></span></div>
|
||||
<div th:if="${doctor}" style="flex: 1; margin-top: 10px; margin-right: 15px;">就诊医生：<span th:text="${doctor}"></span></div>
|
||||
<div th:if="${department}" style="flex: 1; margin-top: 10px;">就诊科室：<span th:text="${department}"></span></div>
|
||||
</div>
|
||||
<div style="text-align: center; font-size: 32px;">
|
||||
-----------------------------------------------------------------------------
|
||||
<div style="text-align: center; font-weight: 700; font-size: 32px;">-----------------------------------------------------------------------------</div>
|
||||
<div style="margin-left: 20px; font-size: 35px; margin-bottom: 20px; ">
|
||||
<div style="margin-top: 20px; ">费用总额：<span style="margin-right: 20px;" th:text="${totalFee}"></span> 个人支付：<span th:text="${personalPayment}"></span></div>
|
||||
<div style="margin-top: 10px;">实收金额：<span style="font-weight: 700;" th:text="${actualReceiptAmount}"></span></div>
|
||||
<div style="margin-top: 10px;">实收金额：<span style="font-weight: 700;" th:text="${actualReceiptAmountChinese}"></span></div>
|
||||
</div>
|
||||
<div style="font-size: 35px; margin: 10px 20px">
|
||||
<div style="display: flex;">
|
||||
<div style="flex: 1;">费用总额：<span th:text="${totalFee}"></span></div>
|
||||
<div style="flex: 1;">个人支付：<span th:text="${personalPayment}"></span></div>
|
||||
</div>
|
||||
<div style="margin-top: 10px;">实收金额：<span th:text="${actualReceiptAmount}"></span></div>
|
||||
<div style="margin-top: 10px;">实收金额：<span th:text="${actualReceiptAmountChinese}"></span></div>
|
||||
</div>
|
||||
<div style="text-align: center; font-size: 32px;">
|
||||
-----------------------------------------------------------------------------
|
||||
</div>
|
||||
<div style="margin: 10px 20px">
|
||||
<table style="width: 100%; table-layout: fixed; border-collapse: collapse;">
|
||||
<tr style="font-size: 35px;">
|
||||
<th style="width: 300px;text-align: left;">项目名称</th>
|
||||
<th style="width: calc(25% - 5px);text-align: center;">数量</th>
|
||||
<th style="width: calc(25% - 5px);text-align: center;">单价</th>
|
||||
<th style="width: calc(25% - 5px);text-align: center;">小计</th>
|
||||
<div style="text-align: center; font-weight: 700; font-size: 32px;">-----------------------------------------------------------------------------</div>
|
||||
<div style="margin-left: 20px; margin-top: 10px; ">
|
||||
<table border="0" style="font-size: 30px;">
|
||||
<tr style="font-size: 34px; ">
|
||||
<th >项目名称</th>
|
||||
<th >数量</th>
|
||||
<th >单价</th>
|
||||
<th >小计</th>
|
||||
</tr>
|
||||
<tr style="font-size: 30px;" th:each="item : ${items}">
|
||||
<td style="text-align: left;width: 300px;word-break: break-all;" th:text="${item.name}"></td>
|
||||
<td style="text-align: center;" th:text="${item.quantity}"></td>
|
||||
<td style="text-align: center;" th:text="${item.unitPrice}"></td>
|
||||
<td style="text-align: center;" th:text="${item.subtotal}"></td>
|
||||
<tr th:each="item : ${items}" style="height: 50px;">
|
||||
<td style=" width: 310px; word-break: break-all; margin-right: 20px;" th:text="${item.name}"></td>
|
||||
<td style="margin-left: 5px;" th:text="${item.quantity}"></td>
|
||||
<td th:text="${item.unitPrice}"></td>
|
||||
<td th:text="${item.subtotal}"></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div style="text-align: center; font-weight: 700; font-size: 32px;">
|
||||
-----------------------------------------------------------------------------
|
||||
</div>
|
||||
<div style="text-align: center; font-weight: 700; font-size: 32px;">-----------------------------------------------------------------------------</div>
|
||||
<div style="margin-left: 20px; font-weight: 700; font-size: 35px;">
|
||||
<div>终端编号：<span th:text="${terminalNumber}"></span></div>
|
||||
<div>打印时间：<span th:text="${printTime}"></span></div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue