From c97dc49bea0ec489dfd5d1ae05d709c2523813e4 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 19 三月 2025 08:37:12 +0800
Subject: [PATCH] 2025-03-19
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 6 ++-
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 56 +++++++++++++++++++++++++++
2 files changed, 59 insertions(+), 3 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 e192d46..8821a60 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
@@ -2227,7 +2227,61 @@
paragraph.setLeading(5f);
document1.add(ppp);
}
- } else {
+ }
+ // 纰�14
+// else if (value.get(0).getPid().equals("1870371396991955967")){
+// Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+// Paragraph ppp = new Paragraph("闃虫�у弬鑰冨��(Delta Over Baseline(DPM))锛�", remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
+//
+// LineSeparator objectName = new LineSeparator();
+// objectName.setOffset(-5);
+// document1.add(objectName);
+//
+// ppp = new Paragraph("DPM鍊硷細 > 149 闃虫��", remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
+//
+// ppp = new Paragraph(" 猢� 99 闃存��", remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
+//
+// objectName.setOffset(-5);
+// document1.add(objectName);
+//
+//
+// int result = Integer.parseInt(value.get(0).getProResult());
+// String after = "";
+// if (result > 149){
+// after = "闃虫��";
+// }else {
+// after = "闃存��";
+// }
+// ppp = new Paragraph("妫�娴嬬粨鏋滐細 DPM=" + result, remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
+//
+// ppp = new Paragraph("", remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
+// ppp = new Paragraph("", remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
+// if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
+// ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark(), remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
+// }
+// }
+ else {
String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index aed5c62..de3f337 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1106,7 +1106,8 @@
// if(StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber=makeLisTmhPrefix+tjNumber;
- String tjNumber = (SecurityUtils.getUsername() + idUtils.getTjNumber());
+// String tjNumber = (SecurityUtils.getUsername() + idUtils.getTjNumber());
+ String tjNumber = idUtils.getTjNumber();
if (StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber = makeLisTmhPrefix + tjNumber;
tjOrder.setTjNumber(tjNumber);
@@ -1899,7 +1900,8 @@
//鑾峰彇鎷兼帴鍓嶇紑
String makeLisTmhPrefix = configService.selectConfigByKey("make_lis_tmh_prefix");
- String tjNumber = (sysUser.getUserName() + idUtils.getTjNumber());
+// String tjNumber = (sysUser.getUserName() + idUtils.getTjNumber());
+ String tjNumber = idUtils.getTjNumber();
if (StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber = makeLisTmhPrefix + tjNumber;
--
Gitblit v1.8.0