From c42f62b32bac302a7ac9fcde7489f7c5fc6e11aa Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 06 十二月 2024 15:35:17 +0800
Subject: [PATCH] zjh20241205-3
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 24 +++++++++++++-----------
1 files changed, 13 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 1315849..e1955ac 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
@@ -31,6 +31,7 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.List;
@@ -212,7 +213,7 @@
elements.setSpacingAfter(10f);
elements.setAlignment(Element.ALIGN_RIGHT);
Phrase phrase = new Phrase();
- Font doctorFonts = PdfUtils.setFont(9);
+ Font doctorFonts = PdfUtils.setFont(11);
for (LtkjGetexamreportinfo getexamreportinfo : list) {
String xm = getexamreportinfo.getHzxm();
String xb = getexamreportinfo.getHzxb().equals("2") ? "濂�" : "鐢�";
@@ -380,7 +381,7 @@
private void savePDFFile(String outputFileName1, TjOrder tjOrder, TjCustomer customer, ByteArrayOutputStream finalOutPut) throws IOException {
// 鏂囦欢閰嶇疆
// String outputPath1 = "/Users/chacca/寮�鍙戠浉鍏�/浠ｇ爜/";
- String outputPath1 = value + "\\";
+ String outputPath1 = value + File.separator;
File file = new File(outputPath1 + outputFileName1);
BufferedOutputStream outputStream = null;
outputStream = new BufferedOutputStream(new FileOutputStream(file));
@@ -408,7 +409,7 @@
ArrayList<List<String>> lists = (ArrayList<List<String>>) entryValue.get("data");
addJianYanTable(document1, titleName, titles, titlesWidth, lists);
if (!jyys.isEmpty()) {
- Font doctorFonts = PdfUtils.setFont(9);
+ Font doctorFonts = PdfUtils.setFont(11);
String doctors = "";
Paragraph elements = new Paragraph();
elements.setLeading(5f);
@@ -634,7 +635,6 @@
LambdaQueryWrapper<LtkjHysqd> ltkjHysqdLambdaQueryWrapper = new LambdaQueryWrapper<>();
ltkjHysqdLambdaQueryWrapper.eq(LtkjHysqd::getTjh, tjOrder.getCardId());
List<LtkjHysqd> list = ltkjHysqdService.list(ltkjHysqdLambdaQueryWrapper);
-// List<LtkjHysqd> list = ltkjHysqdService.list();
HashMap<String, Object> data = new HashMap<>();
for (LtkjHysqd hysqd : list) {
LambdaQueryWrapper<LtkjHybgd> ltkjHybgdLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -784,6 +784,7 @@
}
//寮傚父椤圭洰
data.put("yichang", str.toString());
+ data.put("zjrq",new SimpleDateFormat("yyyy-MM-dd").format(tjOrder.getCheckTime()));
// 閬嶅巻data 缁檖df琛ㄥ崟琛ㄦ牸璧嬪��
for (String key : data.keySet()) {
acroFields.setField(key, data.get(key).toString());
@@ -827,12 +828,13 @@
* @param customer
*/
private void notHuaYanData(String tjNumber, Map<TjOrderRemark, List<TjPdfVO>> printReport, TjOrder one, TjCustomer customer) {
- LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
- wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
- wqq.ne(TjOrderRemark::getDeptId, "241");
- wqq.in(TjOrderRemark::getDeptId, "269", "270", "253", "254", "255", "257");
- wqq.notIn(TjOrderRemark::getProId, projectService.getNneedReprotProId());
- List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
+// LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
+// wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
+// wqq.ne(TjOrderRemark::getDeptId, "241");
+// wqq.in(TjOrderRemark::getDeptId, "269", "270", "253", "254", "255", "257");
+// wqq.notIn(TjOrderRemark::getProId, projectService.getNneedReprotProId());
+// List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
+ List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.notHuaYanData(tjNumber);
for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
printReport.put(tjOrderRemark, null);
}
@@ -1064,7 +1066,7 @@
table1.setSpacingAfter(10f);
Font titleFont = PdfUtils.setFont(12);
- PdfPCell mergedCell = new PdfPCell(new Phrase("娉� 宸� 鍘� 浜� 姘� 鍖� 闄�", titleFont));
+ PdfPCell mergedCell = new PdfPCell(new Phrase("闄曞仴鍖绘緞鍚堢熆鍔″眬涓績鍖婚櫌", titleFont));
mergedCell.setBorder(Rectangle.NO_BORDER);
mergedCell.setColspan(10);
mergedCell.setHorizontalAlignment(Element.ALIGN_CENTER);
--
Gitblit v1.8.0