xiaodaozi
/
yinyitong-zhongyuyuan-dll-hang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.0' into 1.0

This commit is contained in:
萧道子 2025-05-21 18:50:48 +08:00
parent e4c879e429 6a5056bbc8
commit 58d381f3b1
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/dpkj/modules/autoReplyPrint/controller/ReceiptPrintController.java
View File

@ -75,7 +75,7 @@ public class ReceiptPrintController {
int dinyHeight = 0; int dinyHeight = 0;
if (templateName.equals("department")) { if (templateName.equals("department")) {
// 由于是使用的门诊小票-T2，那么默认的高度为1100，强行设置，通过动态修改渲染的图片的高度 // 由于是使用的门诊小票-T2，那么默认的高度为1100，强行设置，通过动态修改渲染的图片的高度
height = 1100; height = 800;//根据实际情况800较为合适
// 单行最大长度为10 // 单行最大长度为10
int singleLineMaxLength = 10; int singleLineMaxLength = 10;
@ -128,7 +128,7 @@ public class ReceiptPrintController {
} }
usbImagePrintService.imagePrintFromPath(devName, usbImagePrintService.imagePrintFromPath(devName,
request.getWidth(), request.getWidth(),
request.getHeight(), height,
filePath.toString(), filePath.toString(),
1, 1,
0); 0);

2
src/main/resources/templates/department.html
View File

@ -64,7 +64,7 @@
<div style="margin-left: 20px;font-size: 29px;">终端编号：<span th:text="${terminalNumber}"></span></div> <div style="margin-left: 20px;font-size: 29px;">终端编号：<span th:text="${terminalNumber}"></span></div>
<div style="margin-left: 20px;font-size: 29px;">打印时间：<span th:text="${printTime}"></span></div> <div style="margin-left: 20px;font-size: 29px;">打印时间：<span th:text="${printTime}"></span></div>
<div style="margin-left: 20px; margin-top: 10px;font-size: 27px;"> <div style="margin-left: 20px; margin-top: 10px;font-size: 27px;">
<span>温馨提示：请取走缴费凭证，并妥善保管，如果对缴费存在疑问，请到人工窗口咨询！</span> <span>温馨提示：请取走缴费凭证，并妥善保管。<br/>如果对缴费存在疑问，请到人工窗口咨询！</span>
</div> </div>
</div> </div>
</body> </body>

2
src/main/resources/templates/hospitalPayment.html
View File

@ -32,7 +32,7 @@
<div style="margin-left: 20px;font-size: 29px;">终端编号：<span th:text="${terminalNumber}"></span></div> <div style="margin-left: 20px;font-size: 29px;">终端编号：<span th:text="${terminalNumber}"></span></div>
<div style="margin-left: 20px;font-size: 29px;">打印时间：<span th:text="${printTime}"></span></div> <div style="margin-left: 20px;font-size: 29px;">打印时间：<span th:text="${printTime}"></span></div>
<div style="margin-left: 20px; margin-top: 10px;font-size: 27px;"> <div style="margin-left: 20px; margin-top: 10px;font-size: 27px;">
<span>温馨提示：请取走缴费凭证，并妥善保管，如果对缴费存在疑问，请到人工窗口咨询！</span> <span>温馨提示：请取走缴费凭证，并妥善保管。<br/>如果对缴费存在疑问，请到人工窗口咨询！</span>
</div> </div>
</div> </div>
</body> </body>

2
src/main/resources/templates/outpatientPayment.html
View File

@ -30,7 +30,7 @@
<div style="margin-left: 20px;font-size: 29px;">终端编号：<span th:text="${terminalNumber}"></span></div> <div style="margin-left: 20px;font-size: 29px;">终端编号：<span th:text="${terminalNumber}"></span></div>
<div style="margin-left: 20px;font-size: 29px;">打印时间：<span th:text="${printTime}"></span></div> <div style="margin-left: 20px;font-size: 29px;">打印时间：<span th:text="${printTime}"></span></div>
<div style="margin-left: 20px; margin-top: 10px;font-size: 27px;"> <div style="margin-left: 20px; margin-top: 10px;font-size: 27px;">
<span>温馨提示：请取走缴费凭证，并妥善保管，如果对缴费存在疑问，请到人工窗口咨询！</span> <span>温馨提示：请取走缴费凭证，并妥善保管。<br/>如果对缴费存在疑问，请到人工窗口咨询！</span>
</div> </div>
</div> </div>
</body> </body>

2
src/main/resources/templates/register.html
View File

@ -40,7 +40,7 @@
<div style="margin-left: 20px;font-size: 29px;">终端编号：<span th:text="${terminalNumber}"></span></div> <div style="margin-left: 20px;font-size: 29px;">终端编号：<span th:text="${terminalNumber}"></span></div>
<div style="margin-left: 20px;font-size: 29px;">打印时间：<span th:text="${printTime}"></span></div> <div style="margin-left: 20px;font-size: 29px;">打印时间：<span th:text="${printTime}"></span></div>
<div style="margin-left: 20px; margin-top: 10px;font-size: 27px;"> <div style="margin-left: 20px; margin-top: 10px;font-size: 27px;">
<span>温馨提示：请取走挂号凭证，并妥善保管，如果对缴费存在疑问，请到人工窗口咨询！</span> <span>温馨提示：请取走缴费凭证，并妥善保管。<br/>如果对缴费存在疑问，请到人工窗口咨询！</span>
</div> </div>
</div> </div>
</body> </body>