From 3c4c9d16fbe7f36203f4a6ad5f3726e4cca48663 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 12 十二月 2024 00:09:01 +0800
Subject: [PATCH] 2024-12-12
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index ad4efb3..145f86b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -366,7 +366,9 @@
document2.add(paragraph);
}
- paragraph = PdfUtils.setParagraph(defaultTitleFont, "浣撴寮傚父椤圭洰涓庡垎鏋�");
+ paragraph = PdfUtils.setParagraph(defaultTitleFont, "妫�鏌ョ患杩帮細");
+ paragraph.setSpacingBefore(3f);
+ paragraph.setSpacingAfter(2f);
document2.add(paragraph);
for (Map.Entry<String, Object> item : map.entrySet()) {
String xmmc = item.getKey();
@@ -398,7 +400,7 @@
//
// }
String str = " ";
- List<Map<String, Object>> maps = tjRulesMapper.getyichangxiangmujianyiguize(i.get(5),null,i.get(2));
+ List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(i.get(5),null,i.get(2),tjOrder.getTjNumber());
if (!maps.isEmpty()){
for (Map<String, Object> objectMap : maps) {
// paragraph = new Paragraph(str+"寤鸿鏍囬",defaultFont);
@@ -427,6 +429,8 @@
}
}
paragraph = PdfUtils.setParagraph(defaultFont, "");
+ paragraph.setSpacingBefore(0f);
+ paragraph.setSpacingAfter(5f);
document2.add(paragraph);
}
@@ -442,25 +446,28 @@
int index = 1;
for (TjOrderDetail detail : details) {
if (!isXmWrite) {
- paragraph = new Paragraph(xmmc,defaultFont);
+ paragraph = new Paragraph(xmmc, defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
isXmWrite = true;
}
String result = detail.getProResult();
- if (StrUtil.isNotBlank(result)){
- result = result.replaceAll("\n鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�","");
- result = "\n "+result.replaceAll("\n","\n ");
+ if (StrUtil.isNotBlank(result)) {
+ result = result.replaceAll(" ","").replaceAll("\t","");
+ result = result.replaceAll("\n鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�", "");
+ result = "\n " + result.replaceAll("\n", "\n ");
}
- String content = " ("+index + ") " + detail.getProName() + "锛�" + result;
- paragraph = new Paragraph(content,defaultFont);
+ String content = " (" + index + ") " + detail.getProName() + "锛�" + result;
+ content = content.replaceAll("[\\n\\r]+$", "");
+ content = content.replaceAll("\\s+$", "");
+ paragraph = new Paragraph(content, defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
String str = " ";
List<Map<String, Object>> advices = detail.getAdvices();
- if (advices != null && !advices.isEmpty()){
+ if (advices != null && !advices.isEmpty()) {
for (Map<String, Object> m : advices) {
- paragraph = new Paragraph(str+m.get("bt").toString()+"锛�"+m.get("nr").toString(),defaultFont);
+ paragraph = new Paragraph(str + m.get("bt").toString() + "锛�" + m.get("nr").toString(), defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
}
@@ -468,6 +475,9 @@
index++;
}
paragraph = PdfUtils.setParagraph(defaultFont, "");
+ paragraph.setLeading(0f);
+ paragraph.setSpacingBefore(0f);
+ paragraph.setSpacingAfter(5f);
document2.add(paragraph);
}
@@ -475,7 +485,7 @@
- for (int i = 0; i < 2; i++) {
+ for (int i = 0; i < 1; i++) {
paragraph = PdfUtils.setParagraph(defaultFont, "");
document2.add(paragraph);
}
--
Gitblit v1.8.0