From 2c785c3d4513daea9deb5c7edbb17a9f17111d25 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 21 二月 2025 17:49:03 +0800
Subject: [PATCH] zjh20250221
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 1289 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 784 insertions(+), 505 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 7a42826..dd2f9cb 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
@@ -2,6 +2,7 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -45,6 +46,7 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.math.BigDecimal;
+import java.text.Collator;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.List;
@@ -113,6 +115,10 @@
private TjOrderDetailMapper tjOrderDetailMapper;
@Autowired
private SysDeptController sysDeptController;
+ @Autowired
+ private ITjProAdvicerulesService tjProAdvicerulesService;
+ @Autowired
+ private TjOrderYcxmService ycxmService;
private Integer pdfPage = 0;
@@ -136,7 +142,7 @@
return data;
}
- public void putData(JSONObject jsonObject, AjaxResult result, String key) {
+/* public void putData(JSONObject jsonObject, AjaxResult result, String key) {
if (Integer.parseInt(result.get("code").toString()) == 200) {
List<Map<String, Object>> data = (List<Map<String, Object>>) result.get("data");
jsonObject.putOpt(key, data);
@@ -149,7 +155,7 @@
// list.get(0).getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")
List<SysDictData> sysUserSex = sysDictDataService.list(new LambdaQueryWrapper<SysDictData>().eq(SysDictData::getDictType, "sys_user_sex"));
HashMap<String, Object> map = makeHisJianYan(tjOrder, customer);
- HashMap<String, Object> pdfChangGui = makePDFInfo(tjOrder, customer, tjReportTemplate,dictHosp,map);
+ HashMap<String, Object> pdfChangGui = makePDFInfo(tjOrder, customer, tjReportTemplate, dictHosp, map);
if (pdfChangGui == null)
return AjaxResult.error();
Document document = (Document) pdfChangGui.get("document");
@@ -162,7 +168,7 @@
try {
pdfWriter = PdfWriter.getInstance(document1, byteArrayOutputStream1);
// if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")){
- if (true){
+ if (true) {
String sex = "";
if (customer.getCusSex() != null) {
for (SysDictData userSex : sysUserSex) {
@@ -173,7 +179,7 @@
}
if (StrUtil.isBlank(sex)) sex = "鏈煡";
// pdfWriter.setPageEvent(new FooterHeaderPageEvent("婢勫悎鐭垮姟灞�涓績鍖婚櫌",customer.getCusName(),tjOrder.getTjNumber(),sex,String.valueOf(DateUtil.ageOfNow(customer.getCusBrithday())),null));
- pdfWriter.setPageEvent(new FooterHeaderPageEvent(dictHosp.getHospName(),customer.getCusName(),tjOrder.getTjNumber(),sex,String.valueOf(DateUtil.ageOfNow(customer.getCusBrithday())),null));
+ pdfWriter.setPageEvent(new FooterHeaderPageEvent(dictHosp.getHospName(), customer.getCusName(), tjOrder.getTjNumber(), sex, String.valueOf(DateUtil.ageOfNow(customer.getCusBrithday())), null));
pageSize = pdfWriter.getPageNumber();
}
} catch (DocumentException e) {
@@ -184,43 +190,43 @@
document1.open();
// if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")){
- if (true){
+ if (true) {
// 缁勮浣撴妫�鏌ラ」鐩姤鍛�
Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
notHuaYanData(tjOrder.getTjNumber(), printReport, tjOrder, customer);
try {
- notHuaYanTable(document1, printReport,dictHosp,color,false);
+ notHuaYanTable(document1, printReport, dictHosp, color, false);
} catch (DocumentException e) {
log.error("闈炲寲楠岄」鐩～鍏呰〃鏍煎紓甯�");
log.error(String.valueOf(e));
return AjaxResult.error();
}
// 缁勮妫�楠屾暟鎹�
- makeHisJianYanTable(document1, map,dictHosp,color);
+ makeHisJianYanTable(document1, map, dictHosp, color);
// 缁勮pacs妫�鏌ユ暟鎹�
printReport = new HashMap<>();
pacsJianChaData(tjOrder.getTjNumber(), printReport, tjOrder, customer);
try {
- notHuaYanTable(document1, printReport,dictHosp,color,true);
+ notHuaYanTable(document1, printReport, dictHosp, color, true);
} catch (DocumentException e) {
log.error("pacs椤圭洰濉厖琛ㄦ牸寮傚父");
log.error(String.valueOf(e));
return AjaxResult.error();
}
- }else {
+ } else {
// 闈炲寲楠岄」鐩姤鍛�
Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
notHuaYanData(tjOrder.getTjNumber(), printReport, tjOrder, customer);
try {
- notHuaYanTable(document1, printReport,dictHosp,color,true);
+ notHuaYanTable(document1, printReport, dictHosp, color, true);
} catch (DocumentException e) {
log.error("闈炲寲楠岄」鐩～鍏呰〃鏍煎紓甯�");
log.error(String.valueOf(e));
return AjaxResult.error();
}
// 缁勮妫�楠屾暟鎹�
- makeHisJianYanTable(document1, map,dictHosp,color);
+ makeHisJianYanTable(document1, map, dictHosp, color);
}
document1.close();
@@ -233,8 +239,8 @@
}
// if (!dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")){
- if (!true){
- List<ByteArrayOutputStream> jianchas = makeHisJianChaTable(tjOrder);
+ if (!true) {
+ List<ByteArrayOutputStream> jianchas = makeHisJianChaTable(tjOrder);
// List<ByteArrayOutputStream> jianchas = makeCcgcHisJianChaTable(tjOrder);
try {
for (ByteArrayOutputStream jiancha : jianchas) {
@@ -264,7 +270,7 @@
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
PdfStamper pdfStamper = new PdfStamper(pdfReader, outputStream);
// if (!dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")){
- if (!true){
+ if (!true) {
PdfContentByte contentByte;
BaseFont baseFont = PdfUtils.createBaseFont(null);
for (int i = 2; i <= pages; i++) {
@@ -306,13 +312,12 @@
if (StrUtil.isBlank(sex)) sex = "鏈煡";
-
// 鐢熸垚 document2 骞跺皢鍏跺唴瀹逛繚瀛樺埌 byteArrayOutputStream2 涓�
ByteArrayOutputStream byteArrayOutputStream2 = new ByteArrayOutputStream();
Document document2 = new Document(PageSize.A4);
PdfWriter writer2 = PdfWriter.getInstance(document2, byteArrayOutputStream2);
- writer2.setPageEvent(new FooterHeaderPageEvent(dictHosp.getHospName(), customer.getCusName(), tjOrder.getTjNumber(), sex, String.valueOf(DateUtil.ageOfNow(customer.getCusBrithday())),0));
+ writer2.setPageEvent(new FooterHeaderPageEvent(dictHosp.getHospName(), customer.getCusName(), tjOrder.getTjNumber(), sex, String.valueOf(DateUtil.ageOfNow(customer.getCusBrithday())), 0));
document2.setMargins(50, 70, 40, 50);
document2.open();
@@ -332,7 +337,7 @@
String[] titles = {"绉戝", "浣撴椤圭洰", "妫�鏌ョ姸鎬�", "妫�鏌ユ椂闂�"};
for (String head : titles) {
- table.addCell(PdfUtils.createCell(head, defaultFont, Rectangle.BOX, Element.ALIGN_CENTER,5f,5f));
+ table.addCell(PdfUtils.createCell(head, defaultFont, Rectangle.BOX, Element.ALIGN_CENTER, 5f, 5f));
}
Map<String, List<CsProVo>> listMap = list.stream().collect(Collectors.groupingBy(CsProVo::getDeptName));
for (Map.Entry<String, List<CsProVo>> entry : listMap.entrySet()) {
@@ -347,7 +352,7 @@
deptCell.setRowspan(proVos.size());
table.addCell(deptCell);
proVos.forEach(proVo -> {
- table.addCell(PdfUtils.createCell(proVo.getProName(), defaultFont,Rectangle.BOX,Element.ALIGN_CENTER,5f,5f));
+ table.addCell(PdfUtils.createCell(proVo.getProName(), defaultFont, Rectangle.BOX, Element.ALIGN_CENTER, 5f, 5f));
String tjType = "";
switch (proVo.getType()) {
case 0:
@@ -363,12 +368,12 @@
tjType = "寤舵湡";
break;
}
- table.addCell(PdfUtils.createCell(tjType, defaultFont,Rectangle.BOX,Element.ALIGN_CENTER,5f,5f));
+ table.addCell(PdfUtils.createCell(tjType, defaultFont, Rectangle.BOX, Element.ALIGN_CENTER, 5f, 5f));
String tjTime = "";
if (proVo.getQdcreateTime() != null) {
tjTime = new SimpleDateFormat("yyyy-MM-dd").format(proVo.getQdcreateTime());
}
- table.addCell(PdfUtils.createCell(tjTime, defaultFont,Rectangle.BOX,Element.ALIGN_CENTER,5f,5f));
+ table.addCell(PdfUtils.createCell(tjTime, defaultFont, Rectangle.BOX, Element.ALIGN_CENTER, 5f, 5f));
});
}
document2.add(table);
@@ -380,9 +385,8 @@
// List<TjOrderRemark> remarks = tjOrderRemarkMapper.getzongjianyishengchakanyichangxiangmu3( tjOrder.getTjNumber());
- List<TjOrderDetail> orderDetails = tjOrderDetailMapper.getzongjianyishengchakanyichangxiangmu4( tjOrder.getTjNumber());
+ List<TjOrderDetail> orderDetails = tjOrderDetailMapper.getzongjianyishengchakanyichangxiangmu4(tjOrder.getTjNumber());
// List<Map<String, Object>> jiancha = new ArrayList<>();
-
paragraph = PdfUtils.setParagraph(defaultTitleFont, "妫�鏌ョ患杩帮細");
@@ -397,7 +401,7 @@
boolean isXmWrite = false;
for (TjOrderDetail detail : details) {
if (!isXmWrite) {
- paragraph = new Paragraph(xmXh+". "+xmmc, defaultFont);
+ paragraph = new Paragraph(xmXh + ". " + xmmc, defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
isXmWrite = true;
@@ -405,11 +409,11 @@
String result = detail.getProResult();
if (StrUtil.isNotBlank(result)) {
int index = 1;
- result = result.replaceAll("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�","");
+ result = result.replaceAll("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�", "");
String[] split = result.split("\n");
StringBuilder builder = new StringBuilder();
for (String s : split) {
- if (StrUtil.isBlank(s.replaceAll("\n","").trim())) continue;
+ if (StrUtil.isBlank(s.replaceAll("\n", "").trim())) continue;
builder.append(" (").append(index).append(")").append(s).append("\n");
index++;
}
@@ -436,13 +440,13 @@
for (List<String> i : lists) {
if (i.contains("鈫�") || i.contains("鈫�")) {
if (!isXmWrite) {
- paragraph = new Paragraph(xmXh+". "+xmmc,defaultFont);
+ paragraph = new Paragraph(xmXh + ". " + xmmc, defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
isXmWrite = true;
}
- String content = " ("+index + ") " + i.get(0) + "锛�" + i.get(1) + " " + i.get(3) + " " + i.get(4) + " " + i.get(2);
- paragraph = new Paragraph(content,defaultFont);
+ String content = " (" + index + ") " + i.get(0) + "锛�" + i.get(1) + " " + i.get(3) + " " + i.get(4) + " " + i.get(2);
+ paragraph = new Paragraph(content, defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
index++;
@@ -456,19 +460,11 @@
}
-
-
-
-
paragraph = PdfUtils.setParagraph(defaultFont, "");
paragraph.setLeading(0f);
paragraph.setSpacingBefore(10f);
paragraph.setSpacingAfter(10f);
document2.add(paragraph);
-
-
-
-
paragraph = PdfUtils.setParagraph(defaultTitleFont, "鍖荤敓寤鸿锛�");
@@ -486,13 +482,13 @@
if (i.contains("鈫�") || i.contains("鈫�")) {
if (!isXmWrite) {
xmXh++;
- paragraph = new Paragraph("銆�"+xmXh+"."+xmmc+"銆�",defaultFont);
+ paragraph = new Paragraph("銆�" + xmXh + "." + xmmc + "銆�", defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
isXmWrite = true;
}
- String content = " ("+index + ")" + i.get(0) + "锛�" + i.get(1) + " " + i.get(3) + " " + i.get(4) + " " + i.get(2);
- paragraph = new Paragraph(content,defaultFont);
+ String content = " (" + index + ")" + i.get(0) + "锛�" + i.get(1) + " " + i.get(3) + " " + i.get(4) + " " + i.get(2);
+ paragraph = new Paragraph(content, defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
// 绗叚浣嶆槸lis椤圭洰id
@@ -507,9 +503,9 @@
//
// }
String str = " ";
- List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(i.get(5),"",i.get(2),tjOrder.getTjNumber());
- if (!maps.isEmpty()){
- for (Map<String, Object> objectMap : maps) {
+ List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(i.get(5), "", i.get(2), tjOrder.getTjNumber(), i.get(5), "");
+ if (!maps.isEmpty()) {
+ for (Map<String, Object> objectMap : maps) {
// paragraph = new Paragraph(str+"寤鸿鏍囬",defaultFont);
// paragraph.setAlignment(Element.ALIGN_LEFT);
// document2.add(paragraph);
@@ -525,18 +521,19 @@
// paragraph = new Paragraph(str+objectMap.get("nr").toString(),defaultFont);
// paragraph.setAlignment(Element.ALIGN_LEFT);
// document2.add(paragraph);
- String content1 = str+objectMap.get("bt").toString().trim()+objectMap.get("nr").toString().trim();
- if (StrUtil.isBlank(content1)) content1 = " 鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
+ String content1 = str + objectMap.get("bt").toString().trim() + objectMap.get("nr").toString().trim();
+ if (StrUtil.isBlank(content1))
+ content1 = " 鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
- paragraph = new Paragraph(content1,defaultFont);
- paragraph.setAlignment(Element.ALIGN_LEFT);
- document2.add(paragraph);
- }
- paragraph = PdfUtils.setParagraph(defaultFont, "");
- paragraph.setSpacingBefore(2f);
- paragraph.setSpacingAfter(5f);
+ paragraph = new Paragraph(content1, defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
}
+ paragraph = PdfUtils.setParagraph(defaultFont, "");
+ paragraph.setSpacingBefore(2f);
+ paragraph.setSpacingAfter(5f);
+ document2.add(paragraph);
+ }
// }
index++;
}
@@ -556,7 +553,7 @@
for (TjOrderDetail detail : details) {
if (!isXmWrite) {
xmXh++;
- paragraph = new Paragraph("銆�"+xmXh+"."+xmmc+"銆�", defaultFont);
+ paragraph = new Paragraph("銆�" + xmXh + "." + xmmc + "銆�", defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
isXmWrite = true;
@@ -571,12 +568,13 @@
boolean contains = result.contains("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�");
StringBuilder builder = new StringBuilder();
for (String s : split) {
- if (StrUtil.isBlank(s.replaceAll("\n","").trim())) continue;
+ if (StrUtil.isBlank(s.replaceAll("\n", "").trim())) continue;
builder.append(" (").append(index1).append(")").append(s).append("\n");
index1++;
}
- if (!contains) builder.append(" (").append(index1).append(")").append("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�");
- else builder.substring(0,builder.length() - 1);
+ if (!contains)
+ builder.append(" (").append(index1).append(")").append("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�");
+ else builder.substring(0, builder.length() - 1);
result = builder.toString();
}
// String content = " (" + index + ") " + detail.getProName() + "锛�" + result;
@@ -587,12 +585,13 @@
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
String str = " ";
- List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(entry.getKey().toString(),"","",tjOrder.getTjNumber());
+ List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(entry.getKey().toString(), "", "", tjOrder.getTjNumber(), detail.getProName(), "");
for (Map<String, Object> objectMap : maps) {
- String content1 = str+objectMap.get("bt").toString()+objectMap.get("nr").toString();
- if (StrUtil.isBlank(content1)) content1 = " 鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
+ String content1 = str + objectMap.get("bt").toString() + objectMap.get("nr").toString();
+ if (StrUtil.isBlank(content1))
+ content1 = " 鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
- paragraph = new Paragraph(content1,defaultFont);
+ paragraph = new Paragraph(content1, defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
}
@@ -604,9 +603,6 @@
document2.add(paragraph);
}
}
-
-
-
for (int i = 0; i < 1; i++) {
@@ -641,7 +637,7 @@
document2.add(paragraphNone);
- PdfPTable tableQz = new PdfPTable(new float[]{100f,100f,50f});
+ PdfPTable tableQz = new PdfPTable(new float[]{100f, 100f, 50f});
tableQz.setTotalWidth(PageSize.A4.getWidth() - 100);
tableQz.setLockedWidth(true);
tableQz.setHorizontalAlignment(Element.ALIGN_LEFT);
@@ -732,14 +728,13 @@
document2.close();
-
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
Document document = new Document(PageSize.A4);
PdfWriter pdfWriter = null;
// int pageSize = 0;
// try {
- pdfWriter = PdfWriter.getInstance(document, byteArrayOutputStream);
- pdfWriter.setPageEvent(new FooterHeaderPageEvent(dictHosp.getHospName(), customer.getCusName(), tjOrder.getTjNumber(), sex, String.valueOf(DateUtil.ageOfNow(customer.getCusBrithday())),null));
+ pdfWriter = PdfWriter.getInstance(document, byteArrayOutputStream);
+ pdfWriter.setPageEvent(new FooterHeaderPageEvent(dictHosp.getHospName(), customer.getCusName(), tjOrder.getTjNumber(), sex, String.valueOf(DateUtil.ageOfNow(customer.getCusBrithday())), null));
// pageSize = pdfWriter.getPageNumber();
// } catch (DocumentException e) {
// log.error(String.valueOf(e));
@@ -753,7 +748,7 @@
Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
notHuaYanData(tjOrder.getTjNumber(), printReport, tjOrder, customer);
try {
- notHuaYanTable(document, printReport, dictHosp, color,false);
+ notHuaYanTable(document, printReport, dictHosp, color, false);
} catch (DocumentException e) {
log.error("闈炲寲楠岄」鐩～鍏呰〃鏍煎紓甯�");
log.error(String.valueOf(e));
@@ -765,16 +760,13 @@
printReport = new HashMap<>();
pacsJianChaData(tjOrder.getTjNumber(), printReport, tjOrder, customer);
try {
- notHuaYanTable(document, printReport, dictHosp, color,true);
+ notHuaYanTable(document, printReport, dictHosp, color, true);
} catch (DocumentException e) {
log.error("pacs椤圭洰濉厖琛ㄦ牸寮傚父");
log.error(String.valueOf(e));
return AjaxResult.error();
}
document.close();
-
-
-
// 棣栭〉琛ㄥ崟
@@ -837,7 +829,6 @@
byte[] bytes = byteArrayOutputStream4.toByteArray();
-
ByteArrayOutputStream finalOutput = new ByteArrayOutputStream();
Document mergedDocument = new Document(PageSize.A4);
PdfCopy copy = new PdfCopy(mergedDocument, finalOutput);
@@ -869,9 +860,9 @@
String outputFileName1 = customer.getCusId() + tjOrder.getTjNumber() + customer.getCusName() + "_鎶ュ憡.pdf";
savePDFFile(outputFileName1, tjOrder, customer, finalOutput);
return AjaxResult.success();
- }
+ }*/
- public AjaxResult hisPDFNew2(TjOrder tjOrder, TjCustomer customer, TjReportTemplate tjReportTemplate,TjReportTemplate zongJianYiShiQianMing) throws Exception {
+ public AjaxResult hisPDFNew2(TjOrder tjOrder, TjCustomer customer, TjReportTemplate tjReportTemplate, TjReportTemplate zongJianYiShiQianMing) throws Exception {
String s1 = sysConfigService.selectConfigByKey("tjreport_font_size_second_page_info");
String s2 = sysConfigService.selectConfigByKey("tjreport_font_size_second_page_title");
String s3 = sysConfigService.selectConfigByKey("tjreport_font_size_result_title");
@@ -903,13 +894,12 @@
if (StrUtil.isBlank(sex)) sex = "鏈煡";
-
// 鐢熸垚 document2 骞跺皢鍏跺唴瀹逛繚瀛樺埌 byteArrayOutputStream2 涓�
ByteArrayOutputStream byteArrayOutputStream2 = new ByteArrayOutputStream();
Document document2 = new Document(PageSize.A4);
PdfWriter writer2 = PdfWriter.getInstance(document2, byteArrayOutputStream2);
- writer2.setPageEvent(new FooterHeaderPageEvent(dictHosp.getHospName(), customer.getCusName(), tjOrder.getTjNumber(), sex, String.valueOf(DateUtil.ageOfNow(customer.getCusBrithday())),0));
+ writer2.setPageEvent(new FooterHeaderPageEvent(dictHosp.getHospName(), customer.getCusName(), tjOrder.getTjNumber(), sex, String.valueOf(DateUtil.ageOfNow(customer.getCusBrithday())), 0));
document2.setMargins(50, 70, 40, 50);
document2.open();
@@ -929,9 +919,25 @@
String[] titles = {"绉戝", "浣撴椤圭洰", "妫�鏌ョ姸鎬�", "妫�鏌ユ椂闂�"};
for (String head : titles) {
- table.addCell(PdfUtils.createCell(head, defaultFont, Rectangle.BOX, Element.ALIGN_CENTER,5f,5f));
+ table.addCell(PdfUtils.createCell(head, defaultFont, Rectangle.BOX, Element.ALIGN_CENTER, 5f, 5f));
}
- Map<String, List<CsProVo>> listMap = list.stream().collect(Collectors.groupingBy(i -> i.getDeptId()+"_"+i.getDeptName()));
+// Map<String, List<CsProVo>> listMap = list.stream()
+// .collect(Collectors.groupingBy(i -> i.getDeptId() + "_" + i.getDeptName()));
+ Map<String, List<CsProVo>> listMap = list.stream()
+ .collect(Collectors.groupingBy(
+ i -> i.getDeptId() + "_" + i.getDeptName(),
+ TreeMap::new, // 鎸夐敭鎺掑簭
+ Collectors.mapping(
+ i -> i,
+ Collectors.collectingAndThen(
+ Collectors.toList(),
+ l -> l.stream()
+ .sorted(Comparator.comparing(CsProVo::getDeptId)) // 瀵� List 鎺掑簭
+ .collect(Collectors.toList())
+ )
+ )
+ ));
+
// List<CsProVo> sortedList = list.stream()
// .sorted(Comparator.comparingLong(CsProVo::getProId))
// .collect(Collectors.toList());
@@ -947,11 +953,11 @@
deptCell.setPhrase(new Phrase(dept, defaultFont));
deptCell.setPaddingTop(5f);
deptCell.setPaddingBottom(5f);
- if (proVos.size()>1)
+ if (proVos.size() > 1)
deptCell.setRowspan(proVos.size());
table.addCell(deptCell);
proVos.forEach(proVo -> {
- table.addCell(PdfUtils.createCell(proVo.getProName(), defaultFont,Rectangle.BOX,Element.ALIGN_CENTER,5f,5f));
+ table.addCell(PdfUtils.createCell(proVo.getProName(), defaultFont, Rectangle.BOX, Element.ALIGN_CENTER, 5f, 5f));
String tjType = "";
switch (proVo.getType()) {
case 0:
@@ -967,12 +973,12 @@
tjType = "寤舵湡";
break;
}
- table.addCell(PdfUtils.createCell(tjType, defaultFont,Rectangle.BOX,Element.ALIGN_CENTER,5f,5f));
+ table.addCell(PdfUtils.createCell(tjType, defaultFont, Rectangle.BOX, Element.ALIGN_CENTER, 5f, 5f));
String tjTime = "";
if (proVo.getQdcreateTime() != null) {
tjTime = new SimpleDateFormat("yyyy-MM-dd").format(proVo.getQdcreateTime());
}
- table.addCell(PdfUtils.createCell(tjTime, defaultFont,Rectangle.BOX,Element.ALIGN_CENTER,5f,5f));
+ table.addCell(PdfUtils.createCell(tjTime, defaultFont, Rectangle.BOX, Element.ALIGN_CENTER, 5f, 5f));
});
}
document2.add(table);
@@ -984,216 +990,224 @@
// List<TjOrderRemark> remarks = tjOrderRemarkMapper.getzongjianyishengchakanyichangxiangmu3( tjOrder.getTjNumber());
- List<TjOrderDetail> orderDetails = tjOrderDetailMapper.getzongjianyishengchakanyichangxiangmu4( tjOrder.getTjNumber());
+ List<TjOrderDetail> orderDetails = tjOrderDetailMapper.getzongjianyishengchakanyichangxiangmu4(tjOrder.getTjNumber());
// List<Map<String, Object>> jiancha = new ArrayList<>();
-
paragraph = PdfUtils.setParagraph(defaultTitleFont, "妫�鏌ョ患杩帮細");
paragraph.setSpacingBefore(3f);
paragraph.setSpacingAfter(2f);
document2.add(paragraph);
-
int xmXh = 1;
-
Map<Long, List<TjOrderDetail>> collect = orderDetails.stream().collect(Collectors.groupingBy(TjOrderDetail::getProId));
- for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) {
- List<CsProVo> proVos = deptEntry.getValue();
- if (proVos.size()>1){
- proVos = proVos.stream()
- .sorted(Comparator.comparingLong(CsProVo::getProId))
- .collect(Collectors.toList());
- }
- // 宸茬粡閬嶅巻杩囩殑
- ArrayList<String> jianYanYiDa = new ArrayList<>();
- for (CsProVo proVo : proVos) {
+ LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderYcxm::getTjh, tjOrder.getTjNumber());
+ List<TjOrderYcxm> ycxms = ycxmService.list(wq);
+ if (null != ycxms && !ycxms.isEmpty()) {
- // 妫�鏌�
- for (Map.Entry<Long, List<TjOrderDetail>> entry : collect.entrySet()) {
- if (!entry.getKey().equals(proVo.getProId())) continue;
- List<TjOrderDetail> details = entry.getValue();
- String xmmc = details.get(0).getProName();
- boolean isXmWrite = false;
- for (TjOrderDetail detail : details) {
- if (!isXmWrite) {
- paragraph = new Paragraph(xmXh + ". " + xmmc, defaultFont);
- paragraph.setAlignment(Element.ALIGN_LEFT);
- document2.add(paragraph);
- isXmWrite = true;
- }
- String result = detail.getProResult();
- if (StrUtil.isNotBlank(result)) {
- int index = 1;
- result = result.replaceAll("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�", "");
- String[] split = result.split("\n");
- StringBuilder builder = new StringBuilder();
- for (String s : split) {
- if (StrUtil.isBlank(s.replaceAll("\n", "").trim())) continue;
- builder.append(" (").append(index).append(")").append(s).append("\n");
- index++;
- }
- result = builder.toString();
- }
- paragraph = new Paragraph(result, defaultFont);
+ Map<String, List<TjOrderYcxm>> stringListMap = ycxms.stream().collect(Collectors.groupingBy(TjOrderYcxm::getParentName));
+
+ for (Map.Entry<String, List<TjOrderYcxm>> entry : stringListMap.entrySet()) {
+ List<TjOrderYcxm> details = entry.getValue();
+ String xmmc = entry.getKey();
+// String xmmc = details.get(0).getProName();
+ boolean isXmWrite = false;
+ int index = 1;
+ for (TjOrderYcxm detail : details) {
+// if (!entry.getKey().equals(detail.getProId())) continue;
+ if (!isXmWrite) {
+ paragraph = new Paragraph(xmXh + ". " + xmmc, defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
+ isXmWrite = true;
}
- if (isXmWrite) {
- paragraph = PdfUtils.setParagraph(defaultFont, "");
- paragraph.setLeading(0f);
- paragraph.setSpacingBefore(0f);
- paragraph.setSpacingAfter(5f);
- document2.add(paragraph);
- xmXh++;
- }
- }
+ String result = detail.getJcjg();
+ if (StrUtil.isNotBlank(result)) {
+ result = result.replaceAll("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�", "");
+ StringBuilder builder = new StringBuilder();
+ if (StrUtil.isBlank(result.replaceAll("\n", "").trim())) continue;
+ builder.append(" (").append(index).append(")").append(detail.getJcxm()).append(": ").append(result).append("\n");
+ index++;
- // 妫�楠�
- for (Map.Entry<String, Object> item : map.entrySet()) {
- String xmmc = item.getKey();
- HashMap<String, Object> entryValue = (HashMap<String, Object>) item.getValue();
- ArrayList<List<String>> lists = (ArrayList<List<String>>) entryValue.get("data");
- boolean isXmWrite = false;
- int index = 1;
- for (List<String> i : lists) {
- if (!i.get(6).contains(String.valueOf(proVo.getProId()))) continue;
- if (i.contains("鈫�") || i.contains("鈫�")) {
- if (jianYanYiDa.contains(i.get(5))) continue;
- jianYanYiDa.add(i.get(5));
+ result = builder.toString();
+ }
+ paragraph = new Paragraph(result, defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ }
+ if (isXmWrite) {
+ paragraph = PdfUtils.setParagraph(defaultFont, "");
+ paragraph.setLeading(0f);
+ paragraph.setSpacingBefore(0f);
+ paragraph.setSpacingAfter(5f);
+ document2.add(paragraph);
+ xmXh++;
+ }
+ }
+ }else {
+ for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) {
+ List<CsProVo> proVos = deptEntry.getValue();
+ if (proVos.size() > 1) {
+ proVos = proVos.stream()
+ .sorted(Comparator.comparingLong(CsProVo::getProId))
+ .collect(Collectors.toList());
+ }
+ // 宸茬粡閬嶅巻杩囩殑
+ ArrayList<String> jianYanYiDa = new ArrayList<>();
+ for (CsProVo proVo : proVos) {
+
+ // 妫�鏌�
+ for (Map.Entry<Long, List<TjOrderDetail>> entry : collect.entrySet()) {
+ if (!entry.getKey().equals(proVo.getProId())) continue;
+ List<TjOrderDetail> details = entry.getValue();
+ String xmmc = proVo.getProName();
+// String xmmc = details.get(0).getProName();
+ boolean isXmWrite = false;
+ int index = 1;
+ for (TjOrderDetail detail : details) {
+// if (!entry.getKey().equals(detail.getProId())) continue;
if (!isXmWrite) {
paragraph = new Paragraph(xmXh + ". " + xmmc, defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
isXmWrite = true;
}
- String content = " (" + index + ") " + i.get(0) + "锛�" + i.get(1) + " " + i.get(3) + " " + i.get(4) + " " + i.get(2);
- paragraph = new Paragraph(content, defaultFont);
+ String result = detail.getProResult();
+ if (StrUtil.isNotBlank(result)) {
+ result = result.replaceAll("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�", "");
+ StringBuilder builder = new StringBuilder();
+ if (StrUtil.isBlank(result.replaceAll("\n", "").trim())) continue;
+ builder.append(" (").append(index).append(")").append(detail.getProName()).append(": ").append(result).append("\n");
+ index++;
+
+ result = builder.toString();
+ }
+ paragraph = new Paragraph(result, defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
- index++;
+ }
+ if (isXmWrite) {
+ paragraph = PdfUtils.setParagraph(defaultFont, "");
+ paragraph.setLeading(0f);
+ paragraph.setSpacingBefore(0f);
+ paragraph.setSpacingAfter(5f);
+ document2.add(paragraph);
+ xmXh++;
}
}
- if(isXmWrite) {
- paragraph = PdfUtils.setParagraph(defaultFont, "");
- paragraph.setSpacingBefore(0f);
- paragraph.setSpacingAfter(5f);
- document2.add(paragraph);
- xmXh++;
+
+ // 妫�楠�
+ for (Map.Entry<String, Object> item : map.entrySet()) {
+ String xmmc = item.getKey();
+ HashMap<String, Object> entryValue = (HashMap<String, Object>) item.getValue();
+ ArrayList<List<String>> lists = (ArrayList<List<String>>) entryValue.get("data");
+ boolean isXmWrite = false;
+ int index = 1;
+ for (List<String> i : lists) {
+ if (!i.get(6).contains(String.valueOf(proVo.getProId()))) continue;
+ if (i.contains("鈫�") || i.contains("鈫�")) {
+ if (jianYanYiDa.contains(i.get(5))) continue;
+ jianYanYiDa.add(i.get(5));
+ if (!isXmWrite) {
+ paragraph = new Paragraph(xmXh + ". " + xmmc, defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ isXmWrite = true;
+ }
+ String content = " (" + index + ") " + i.get(0) + "锛�" + i.get(1) + " " + i.get(3) + " " + i.get(4) + " " + i.get(2);
+ paragraph = new Paragraph(content, defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ index++;
+ }
+ }
+ if (isXmWrite) {
+ paragraph = PdfUtils.setParagraph(defaultFont, "");
+ paragraph.setSpacingBefore(0f);
+ paragraph.setSpacingAfter(5f);
+ document2.add(paragraph);
+ xmXh++;
+ }
}
}
}
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
paragraph = PdfUtils.setParagraph(defaultFont, "");
paragraph.setLeading(0f);
paragraph.setSpacingBefore(10f);
paragraph.setSpacingAfter(10f);
document2.add(paragraph);
-
-
-
-
-
-
paragraph = PdfUtils.setParagraph(defaultTitleFont, "鍖荤敓寤鸿锛�");
paragraph.setSpacingBefore(3f);
paragraph.setSpacingAfter(2f);
document2.add(paragraph);
xmXh = 0;
+// LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
+// wq.eq(TjOrderYcxm::getTjh, tjOrder.getTjNumber());
+// List<TjOrderYcxm> ycxms = ycxmService.list(wq);
+ if (null != ycxms && !ycxms.isEmpty()) {
- for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) {
- List<CsProVo> proVos = deptEntry.getValue();
- if (proVos.size() > 1) {
- proVos = proVos.stream()
- .sorted(Comparator.comparingLong(CsProVo::getProId))
- .collect(Collectors.toList());
- }
- ArrayList<String> jianYanYiDa = new ArrayList<>();
- for (CsProVo proVo : proVos) {
- // 妫�鏌�
- for (Map.Entry<Long, List<TjOrderDetail>> entry : collect.entrySet()) {
- if (!entry.getKey().equals(proVo.getProId())) continue;
- List<TjOrderDetail> details = entry.getValue();
- String xmmc = details.get(0).getProName();
+ Map<String, List<TjOrderYcxm>> stringListMap = ycxms.stream().collect(Collectors.groupingBy(TjOrderYcxm::getParentName));
+
+ for (Map.Entry<String, List<TjOrderYcxm>> entry : stringListMap.entrySet()) {
+ List<TjOrderYcxm> details = entry.getValue();
+ if(null !=details && !details.isEmpty()){
+ details= details.stream()
+ .sorted(Comparator.comparing(TjOrderYcxm::getJcxm))
+ .collect(Collectors.toList());
boolean isXmWrite = false;
int index = 1;
- for (TjOrderDetail detail : details) {
+ int index1 = 1;
+ for (TjOrderYcxm detail : details) {
+ String xmmc = entry.getKey().toString();
if (!isXmWrite) {
xmXh++;
- paragraph = new Paragraph("銆�"+xmXh+"."+xmmc+"銆�", defaultFont);
+ paragraph = new Paragraph("銆�" + xmXh + "." + xmmc + "銆�", defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
isXmWrite = true;
}
- String result = detail.getProResult();
+ String result = detail.getJcjg();
if (StrUtil.isNotBlank(result)) {
-// result = result.replaceAll(" ","").replaceAll("\t","");
-// result = result.replaceAll("\n鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�", "");
-// result = "\n " + result.replaceAll("\n", "\n ");
- int index1 = 1;
- String[] split = result.split("\n");
- boolean contains = result.contains("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�");
StringBuilder builder = new StringBuilder();
- for (String s : split) {
- if (StrUtil.isBlank(s.replaceAll("\n","").trim())) continue;
- builder.append(" (").append(index1).append(")").append(s).append("\n");
- index1++;
- }
- if (!contains) builder.append(" (").append(index1).append(")").append("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�");
- else builder.substring(0,builder.length() - 1);
+ if (StrUtil.isBlank(result.replaceAll("\n", "").trim())) continue;
+ builder.append(" (").append(index1).append(")").append(detail.getJcxm()).append(": ").append(result).append("\n");
+ index1++;
+
result = builder.toString();
}
-// String content = " (" + index + ") " + detail.getProName() + "锛�" + result;
-// content = content.replaceAll("[\\n\\r]+$", "");
-// content = content.replaceAll("\\s+$", "");
-// paragraph = new Paragraph(content, defaultFont);
if (StrUtil.isNotBlank(result)) {
paragraph = new Paragraph(result, defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
- }else {
- paragraph = new Paragraph("寤鸿瀹氭湡澶嶆煡",defaultFont);
+ } else {
+ paragraph = new Paragraph("寤鸿瀹氭湡澶嶆煡", defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
}
String str = " ";
- List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(entry.getKey().toString(),"","",tjOrder.getTjNumber());
- for (Map<String, Object> objectMap : maps) {
- String content = str + objectMap.get("bt").toString() + objectMap.get("nr").toString();
- if (StrUtil.isBlank(content)) content = " 鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
- paragraph = new Paragraph(content,defaultFont);
- paragraph.setAlignment(Element.ALIGN_LEFT);
- document2.add(paragraph);
- }
+ List<Map<String, Object>> maps = new ArrayList<>();
+
+ String jynr = detail.getJynr();
+ JSONArray array = JSONUtil.parseArray(jynr);
+ for (Object object : array) {
+ Map<String,Object> objectMap=new HashMap<>();
+ JSONObject jsonObject = (JSONObject) object;
+ String bt = jsonObject.getStr("bt");
+ String nr = jsonObject.getStr("nr");
+ objectMap.put("bt",bt);
+ objectMap.put("nr",nr);
+ if(null !=bt || null !=nr) maps.add(objectMap);
+ }
+ List<Map<String, Object>> collect1 = maps.stream().distinct().collect(Collectors.toList());
+ for (Map<String, Object> objectMap : collect1) {
+ String content = str + objectMap.get("bt").toString() + objectMap.get("nr").toString();
+ if (StrUtil.isBlank(content)) content = " ";
+ paragraph = new Paragraph(content, defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ }
index++;
paragraph = PdfUtils.setParagraph(defaultFont, "");
paragraph.setLeading(0f);
@@ -1202,30 +1216,279 @@
document2.add(paragraph);
}
}
- // 妫�楠�
- for (Map.Entry<String, Object> item : map.entrySet()) {
- String xmmc = item.getKey();
- HashMap<String, Object> entryValue = (HashMap<String, Object>) item.getValue();
- ArrayList<List<String>> lists = (ArrayList<List<String>>) entryValue.get("data");
- boolean isXmWrite = false;
- int index = 1;
- for (List<String> i : lists) {
- if (!i.get(6).contains(String.valueOf(proVo.getProId()))) continue;
- if (i.contains("鈫�") || i.contains("鈫�")) {
- if (jianYanYiDa.contains(i.get(5))) continue;
- jianYanYiDa.add(i.get(5));
+ }
+
+ /*for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) {
+ List<CsProVo> proVos = deptEntry.getValue();
+ if (proVos.size() > 1) {
+ proVos = proVos.stream()
+ .sorted(Comparator.comparingLong(CsProVo::getProId))
+ .collect(Collectors.toList());
+ }
+ ArrayList<String> jianYanYiDa = new ArrayList<>();
+ for (CsProVo proVo : proVos) {
+ // 妫�鏌�
+ for (Map.Entry<Long, List<TjOrderDetail>> entry : collect.entrySet()) {
+ if (!entry.getKey().equals(proVo.getProId())) continue;
+ List<TjOrderDetail> details = entry.getValue();
+ if(null !=details && !details.isEmpty()){
+ details= details.stream()
+ .sorted(Comparator.comparing(TjOrderDetail::getProName))
+ .collect(Collectors.toList());
+ boolean isXmWrite = false;
+ int index = 1;
+ int index1 = 1;
+ for (TjOrderDetail detail : details) {
+ String xmmc = proVo.getProName();
+// String xmmc = detail.getProName();
+ if (!isXmWrite) {
+ xmXh++;
+ paragraph = new Paragraph("銆�" + xmXh + "." + xmmc + "銆�", defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ isXmWrite = true;
+ }
+ String result = detail.getProResult();
+ if (StrUtil.isNotBlank(result)) {
+ StringBuilder builder = new StringBuilder();
+// String[] split = result.split("\n");
+// for (String s : split) {
+// if (StrUtil.isBlank(s.replaceAll("\n", "").trim())) continue;
+// builder.append(" (").append(index1).append(")").append(s).append("\n");
+// index1++;
+// }
+
+ if (StrUtil.isBlank(result.replaceAll("\n", "").trim())) continue;
+ builder.append(" (").append(index1).append(")").append(detail.getProName()).append(": ").append(result).append("\n");
+ index1++;
+
+ result = builder.toString();
+ }
+ if (StrUtil.isNotBlank(result)) {
+ paragraph = new Paragraph(result, defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ } else {
+ paragraph = new Paragraph("寤鸿瀹氭湡澶嶆煡", defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ }
+ String str = " ";
+ List<Map<String, Object>> maps = new ArrayList<>();
+
+ LambdaQueryWrapper<TjOrderYcxm> ycwq=new LambdaQueryWrapper<>();
+ ycwq.eq(TjOrderYcxm::getTjh,tjOrder.getTjNumber());
+ ycwq.eq(TjOrderYcxm::getJcxm,detail.getProName());
+ TjOrderYcxm ycxm = ycxmService.getOne(ycwq);
+ if(null !=ycxm){
+ String jynr = ycxm.getJynr();
+ JSONArray array = JSONUtil.parseArray(jynr);
+ for (Object object : array) {
+ Map<String,Object> objectMap=new HashMap<>();
+ JSONObject jsonObject = (JSONObject) object;
+ String bt = jsonObject.getStr("bt");
+ String nr = jsonObject.getStr("nr");
+ objectMap.put("bt",bt);
+ objectMap.put("nr",nr);
+ if(null !=bt || null !=nr) maps.add(objectMap);
+ }
+ List<Map<String, Object>> collect1 = maps.stream().distinct().collect(Collectors.toList());
+ for (Map<String, Object> objectMap : collect1) {
+ String content = str + objectMap.get("bt").toString() + objectMap.get("nr").toString();
+ if (StrUtil.isBlank(content)) content = " ";
+ paragraph = new Paragraph(content, defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ }
+ }
+ index++;
+ paragraph = PdfUtils.setParagraph(defaultFont, "");
+ paragraph.setLeading(0f);
+ paragraph.setSpacingBefore(0f);
+ paragraph.setSpacingAfter(5f);
+ document2.add(paragraph);
+ }
+ }
+ }
+ // 妫�楠�
+ for (Map.Entry<String, Object> item : map.entrySet()) {
+ String xmmc = item.getKey();
+ HashMap<String, Object> entryValue = (HashMap<String, Object>) item.getValue();
+ ArrayList<List<String>> lists = (ArrayList<List<String>>) entryValue.get("data");
+ boolean isXmWrite = false;
+ int index = 1;
+ for (List<String> i : lists) {
+ if (!i.get(6).contains(String.valueOf(proVo.getProId()))) continue;
+ if (i.contains("鈫�") || i.contains("鈫�")) {
+ if (jianYanYiDa.contains(i.get(5))) continue;
+ jianYanYiDa.add(i.get(5));
+ if (!isXmWrite) {
+ xmXh++;
+ paragraph = new Paragraph("銆�" + xmXh + "." + xmmc + "銆�", defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ isXmWrite = true;
+ }
+ String content = " (" + index + ")" + i.get(0) + "锛�" + i.get(1) + " " + i.get(3) + " " + i.get(4) + " " + i.get(2);
+ paragraph = new Paragraph(content, defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ String str = " ";
+
+ LambdaQueryWrapper<TjOrderYcxm> ycwq=new LambdaQueryWrapper<>();
+ ycwq.eq(TjOrderYcxm::getTjh,tjOrder.getTjNumber());
+ ycwq.eq(TjOrderYcxm::getJcxm,i.get(0));
+ TjOrderYcxm ycxm = ycxmService.getOne(ycwq);
+ if(null !=ycxm){
+ String jynr = ycxm.getJynr();
+ JSONArray array = JSONUtil.parseArray(jynr);
+ for (Object object : array) {
+ JSONObject jsonObject = (JSONObject) object;
+ String bt = jsonObject.getStr("bt");
+ String nr = jsonObject.getStr("nr");
+ if(null !=bt || null !=nr) {
+ String content1 = str + bt + nr;
+ if (StrUtil.isBlank(content)) content1 = " ";
+ paragraph = new Paragraph(content1, defaultFont);
+ }
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ }
+ paragraph = PdfUtils.setParagraph(defaultFont, "");
+ paragraph.setSpacingBefore(2f);
+ paragraph.setSpacingAfter(5f);
+ document2.add(paragraph);
+ index++;
+ }
+ }
+ }
+ if (isXmWrite) {
+ paragraph = PdfUtils.setParagraph(defaultFont, "");
+ paragraph.setSpacingBefore(0f);
+ paragraph.setSpacingAfter(5f);
+ document2.add(paragraph);
+ }
+ }
+ }
+ }*/
+ } else {
+ for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) {
+ List<CsProVo> proVos = deptEntry.getValue();
+ if (proVos.size() > 1) {
+ proVos = proVos.stream()
+ .sorted(Comparator.comparingLong(CsProVo::getProId))
+ .collect(Collectors.toList());
+ }
+ ArrayList<String> jianYanYiDa = new ArrayList<>();
+ for (CsProVo proVo : proVos) {
+ // 妫�鏌�
+ for (Map.Entry<Long, List<TjOrderDetail>> entry : collect.entrySet()) {
+ if (!entry.getKey().equals(proVo.getProId())) continue;
+ List<TjOrderDetail> details = entry.getValue();
+ String xmmc = details.get(0).getProName();
+ boolean isXmWrite = false;
+ int index = 1;
+ for (TjOrderDetail detail : details) {
if (!isXmWrite) {
xmXh++;
- paragraph = new Paragraph("銆�"+xmXh+"."+xmmc+"銆�",defaultFont);
+ paragraph = new Paragraph("銆�" + xmXh + "." + xmmc + "銆�", defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
isXmWrite = true;
}
- String content = " ("+index + ")" + i.get(0) + "锛�" + i.get(1) + " " + i.get(3) + " " + i.get(4) + " " + i.get(2);
- paragraph = new Paragraph(content,defaultFont);
- paragraph.setAlignment(Element.ALIGN_LEFT);
+ String result = detail.getProResult();
+ if (StrUtil.isNotBlank(result)) {
+// result = result.replaceAll(" ","").replaceAll("\t","");
+// result = result.replaceAll("\n鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�", "");
+// result = "\n " + result.replaceAll("\n", "\n ");
+ int index1 = 1;
+ String[] split = result.split("\n");
+// boolean contains = result.contains("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�");
+ boolean contains = result.contains(" ");
+ StringBuilder builder = new StringBuilder();
+ for (String s : split) {
+ if (StrUtil.isBlank(s.replaceAll("\n", "").trim())) continue;
+ builder.append(" (").append(index1).append(")").append(s).append("\n");
+ index1++;
+ }
+// if (!contains) builder.append(" (").append(index1).append(")").append("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�");
+// if (!contains) builder.append(" (").append(index1).append(")").append(" ");
+// else builder.substring(0,builder.length() - 1);
+ result = builder.toString();
+ }
+// String content = " (" + index + ") " + detail.getProName() + "锛�" + result;
+// content = content.replaceAll("[\\n\\r]+$", "");
+// content = content.replaceAll("\\s+$", "");
+// paragraph = new Paragraph(content, defaultFont);
+ if (StrUtil.isNotBlank(result)) {
+ paragraph = new Paragraph(result, defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ } else {
+ paragraph = new Paragraph("寤鸿瀹氭湡澶嶆煡", defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ }
+ String str = " ";
+// List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(entry.getKey().toString(),"",
+// detail.getYcbz(),tjOrder.getTjNumber(),detail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+// .replaceAll("[ 娴嬪畾妫�娴媇",""),detail.getProResult());
+ List<Map<String, Object>> maps = new ArrayList<>();
+ if (detail.getDeptId().equals("2")) {
+ String[] split = result.split("銆倈,|锛�");
+ for (String s : split) {
+ s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "");
+// Map<String,Object> mapss= tjRulesService.getyichangxiangmujianyiguizeJianCha(s);
+ Map<String, Object> mapss = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(detail.getKs(), s, "0");
+ if (null != mapss) {
+ Object bt = mapss.get("bt");
+ Object nr = mapss.get("nr");
+ if (null != bt && null != nr) maps.add(mapss);
+ }
+ }
+ }
+ List<Map<String, Object>> collect1 = maps.stream().distinct().collect(Collectors.toList());
+
+ for (Map<String, Object> objectMap : collect1) {
+ String content = str + objectMap.get("bt").toString() + objectMap.get("nr").toString();
+// if (StrUtil.isBlank(content)) content = " 鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
+ if (StrUtil.isBlank(content)) content = " ";
+ paragraph = new Paragraph(content, defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ }
+ index++;
+ paragraph = PdfUtils.setParagraph(defaultFont, "");
+ paragraph.setLeading(0f);
+ paragraph.setSpacingBefore(0f);
+ paragraph.setSpacingAfter(5f);
document2.add(paragraph);
- // 绗叚浣嶆槸lis椤圭洰id
+ }
+ }
+ // 妫�楠�
+ for (Map.Entry<String, Object> item : map.entrySet()) {
+ String xmmc = item.getKey();
+ HashMap<String, Object> entryValue = (HashMap<String, Object>) item.getValue();
+ ArrayList<List<String>> lists = (ArrayList<List<String>>) entryValue.get("data");
+ boolean isXmWrite = false;
+ int index = 1;
+ for (List<String> i : lists) {
+ if (!i.get(6).contains(String.valueOf(proVo.getProId()))) continue;
+ if (i.contains("鈫�") || i.contains("鈫�")) {
+ if (jianYanYiDa.contains(i.get(5))) continue;
+ jianYanYiDa.add(i.get(5));
+ if (!isXmWrite) {
+ xmXh++;
+ paragraph = new Paragraph("銆�" + xmXh + "." + xmmc + "銆�", defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ isXmWrite = true;
+ }
+ String content = " (" + index + ")" + i.get(0) + "锛�" + i.get(1) + " " + i.get(3) + " " + i.get(4) + " " + i.get(2);
+ paragraph = new Paragraph(content, defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ // 绗叚浣嶆槸lis椤圭洰id
// LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(TjProject::getLisXmbm,i.get(5));
// TjProject project = projectService.getOne(wrapper);
@@ -1236,10 +1499,12 @@
// if (!rules.isEmpty()){
//
// }
- String str = " ";
- List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(i.get(5),"",i.get(2),tjOrder.getTjNumber());
- if (!maps.isEmpty()){
- for (Map<String, Object> objectMap : maps) {
+ String str = " ";
+ List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(i.get(5), "",
+ i.get(2), tjOrder.getTjNumber(), i.get(0).replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇", ""), i.get(1));
+ if (!maps.isEmpty()) {
+ for (Map<String, Object> objectMap : maps) {
// paragraph = new Paragraph(str+"寤鸿鏍囬",defaultFont);
// paragraph.setAlignment(Element.ALIGN_LEFT);
// document2.add(paragraph);
@@ -1255,49 +1520,48 @@
// paragraph = new Paragraph(str+objectMap.get("nr").toString(),defaultFont);
// paragraph.setAlignment(Element.ALIGN_LEFT);
// document2.add(paragraph);
-
- String content1 = str + objectMap.get("bt").toString() + objectMap.get("nr").toString().trim();
- if (StrUtil.isBlank(content)) content1 = " 鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
- paragraph = new Paragraph(content1,defaultFont);
- paragraph.setAlignment(Element.ALIGN_LEFT);
+ Object bt = objectMap.get("bt");
+ Object nr = objectMap.get("nr");
+ if (null != bt && null != nr) {
+ String content1 = str + bt.toString() + nr.toString().trim();
+ if (StrUtil.isBlank(content)) content1 = " ";
+ paragraph = new Paragraph(content1, defaultFont);
+ }
+// if (StrUtil.isBlank(content)) content1 = " 鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�";
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ }
+ paragraph = PdfUtils.setParagraph(defaultFont, "");
+ paragraph.setSpacingBefore(2f);
+ paragraph.setSpacingAfter(5f);
document2.add(paragraph);
}
- paragraph = PdfUtils.setParagraph(defaultFont, "");
- paragraph.setSpacingBefore(2f);
- paragraph.setSpacingAfter(5f);
- document2.add(paragraph);
- }
// }
- index++;
+ index++;
+ }
}
- }
- if (isXmWrite) {
- paragraph = PdfUtils.setParagraph(defaultFont, "");
- paragraph.setSpacingBefore(0f);
- paragraph.setSpacingAfter(5f);
- document2.add(paragraph);
+ if (isXmWrite) {
+ paragraph = PdfUtils.setParagraph(defaultFont, "");
+ paragraph.setSpacingBefore(0f);
+ paragraph.setSpacingAfter(5f);
+ document2.add(paragraph);
+ }
}
}
}
}
-
-
-
-
-
for (int i = 0; i < 1; i++) {
paragraph = PdfUtils.setParagraph(defaultFont, "");
document2.add(paragraph);
}
-
paragraph = PdfUtils.setParagraph(defaultTitleFont, "鎬绘鍖荤敓寤鸿锛�");
document2.add(paragraph);
if (tjOrder.getCheckAdvice() == null) {
paragraph = PdfUtils.setParagraph(defaultFont, "鏃�");
document2.add(paragraph);
} else {
- Paragraph paragraphs = new Paragraph(tjOrder.getCheckAdvice(),defaultFont);
+ Paragraph paragraphs = new Paragraph(tjOrder.getCheckAdvice(), defaultFont);
//璁剧疆鏂囧瓧灞呬腑
paragraphs.setAlignment(Element.ALIGN_LEFT);
//琛岄棿璺�
@@ -1327,7 +1591,7 @@
document2.add(paragraphNone);
- PdfPTable tableQz = new PdfPTable(new float[]{100f,100f,50f});
+ PdfPTable tableQz = new PdfPTable(new float[]{100f, 100f, 50f});
tableQz.setTotalWidth(PageSize.A4.getWidth() - 100);
tableQz.setLockedWidth(true);
tableQz.setHorizontalAlignment(Element.ALIGN_LEFT);
@@ -1366,15 +1630,25 @@
tableQz.addCell(cell);
+ File file = new File(value + File.separator + "yinzhang.png");
cell = new PdfPCell();
cell.setBorder(Rectangle.NO_BORDER);
cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
cell.setHorizontalAlignment(Element.ALIGN_RIGHT);
cell.setPaddingTop(10);
cell.setPaddingBottom(10);
- cell.setPhrase(new Phrase("", zongJianFont));
+ if (!file.exists()) {
+ cell.setPhrase(new Phrase("", zongJianFont));
+ }else {
+ FileInputStream fileInputStream = new FileInputStream(file);
+ byte[] fileBytes = new byte[(int) file.length()];
+ fileInputStream.read(fileBytes);
+ fileInputStream.close();
+ Image image = Image.getInstance(Base64.getDecoder().decode(Base64.getEncoder().encodeToString(fileBytes)));
+ image.scaleToFit(90, 90);
+ cell.addElement(image);
+ }
tableQz.addCell(cell);
-
cell = new PdfPCell();
cell.setBorder(Rectangle.NO_BORDER);
@@ -1393,10 +1667,10 @@
cell.setPaddingTop(10);
cell.setPaddingBottom(10);
String zongjianysname = sysConfigService.selectConfigByKey("pdf_report_zongjianysname");
- if (zongJianYiShiQianMing == null && StrUtil.isNotBlank(zongjianysname) && !zongjianysname.equals("鏃�")) {
+ if (zongJianYiShiQianMing == null && StrUtil.isNotBlank(zongjianysname) && !zongjianysname.equals("鏃�")) {
cell.setPhrase(new Phrase(zongjianysname, zongJianFont));
tableQz.addCell(cell);
- }else if(zongJianYiShiQianMing == null && zongjianysname.equals("鏃�")){
+ } else if (zongJianYiShiQianMing == null && zongjianysname.equals("鏃�")) {
String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
cell.setPhrase(new Phrase(nickName, zongJianFont));
tableQz.addCell(cell);
@@ -1431,14 +1705,13 @@
document2.close();
-
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
Document document = new Document(PageSize.A4);
PdfWriter pdfWriter = null;
// int pageSize = 0;
// try {
pdfWriter = PdfWriter.getInstance(document, byteArrayOutputStream);
- pdfWriter.setPageEvent(new FooterHeaderPageEvent(dictHosp.getHospName(), customer.getCusName(), tjOrder.getTjNumber(), sex, String.valueOf(DateUtil.ageOfNow(customer.getCusBrithday())),null));
+ pdfWriter.setPageEvent(new FooterHeaderPageEvent(dictHosp.getHospName(), customer.getCusName(), tjOrder.getTjNumber(), sex, String.valueOf(DateUtil.ageOfNow(customer.getCusBrithday())), null));
// pageSize = pdfWriter.getPageNumber();
// } catch (DocumentException e) {
// log.error(String.valueOf(e));
@@ -1452,7 +1725,7 @@
Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
notHuaYanData(tjOrder.getTjNumber(), printReport, tjOrder, customer);
try {
- notHuaYanTable(document, printReport, dictHosp, color,false);
+ notHuaYanTable(document, printReport, dictHosp, color, false);
} catch (DocumentException e) {
log.error("闈炲寲楠岄」鐩～鍏呰〃鏍煎紓甯�");
log.error(String.valueOf(e));
@@ -1464,16 +1737,13 @@
printReport = new HashMap<>();
pacsJianChaData(tjOrder.getTjNumber(), printReport, tjOrder, customer);
try {
- notHuaYanTable(document, printReport, dictHosp, color,true);
+ notHuaYanTable(document, printReport, dictHosp, color, true);
} catch (DocumentException e) {
log.error("pacs椤圭洰濉厖琛ㄦ牸寮傚父");
log.error(String.valueOf(e));
return AjaxResult.error();
}
document.close();
-
-
-
// 棣栭〉琛ㄥ崟
@@ -1514,9 +1784,9 @@
tjtype = "涓汉";
hashMap.put("tjtype", tjtype);
}
- if (StrUtil.isNotBlank(tjOrder.getFirmName())){
+ if (StrUtil.isNotBlank(tjOrder.getFirmName())) {
hashMap.put("work", tjOrder.getFirmName());
- }else {
+ } else {
// LambdaQueryWrapper<DictComp> wq111 = new LambdaQueryWrapper<>();
// wq111.eq(DictComp::getDrugManufacturerId, tjOrder.getFirmId());
// DictComp dictComp = dictCompService.getOne(wq111);
@@ -1530,7 +1800,7 @@
if (StrUtil.isBlank(tjOrder.getFirmDeptName())) {
hashMap.put("bumen", "鏃�");
} else {
- hashMap.put("bumen",tjOrder.getFirmDeptName());
+ hashMap.put("bumen", tjOrder.getFirmDeptName());
}
hashMap.put("sex", sex);
hashMap.put("tjnumber", tjNumber);
@@ -1545,7 +1815,6 @@
reader4.close();
// 灏嗕慨鏀瑰悗鐨凱DF鍐呭鍐欏叆
byte[] bytes = byteArrayOutputStream4.toByteArray();
-
ByteArrayOutputStream finalOutput = new ByteArrayOutputStream();
@@ -1646,23 +1915,23 @@
// makeYiShiInfoLine(phrase, doctorFonts, bgysqm, bgysbh," 鎶ュ憡鍖诲笀锛�");
// }
// }else {
- builder = new StringBuilder();
- if (null != sqrxm && StrUtil.isNotBlank(sqrxm)){
- builder.append("鐢宠浜猴細").append(sqrxm);
- }
- if (null != jcysqm && StrUtil.isNotBlank(jcysqm)){
- builder.append(" 妫�鏌ュ尰甯堬細").append(jcysqm);
- }
- if (null != shysqm && StrUtil.isNotBlank(shysqm)){
- builder.append(" 瀹℃牳鍖诲笀锛�").append(shysqm);
- }
- if (null != bgysqm && StrUtil.isNotBlank(bgysqm)){
- builder.append(" 鎶ュ憡鍖诲笀锛�").append(bgysqm);
- }
- footer = builder.toString().trim();
+ builder = new StringBuilder();
+ if (null != sqrxm && StrUtil.isNotBlank(sqrxm)) {
+ builder.append("鐢宠浜猴細").append(sqrxm);
+ }
+ if (null != jcysqm && StrUtil.isNotBlank(jcysqm)) {
+ builder.append(" 妫�鏌ュ尰甯堬細").append(jcysqm);
+ }
+ if (null != shysqm && StrUtil.isNotBlank(shysqm)) {
+ builder.append(" 瀹℃牳鍖诲笀锛�").append(shysqm);
+ }
+ if (null != bgysqm && StrUtil.isNotBlank(bgysqm)) {
+ builder.append(" 鎶ュ憡鍖诲笀锛�").append(bgysqm);
+ }
+ footer = builder.toString().trim();
// }
// elements.add(phrase);
- ByteArrayOutputStream outputStream = makeJcPDFByteArrayStream(xm, xb, nl, jcks, zyh, ch, sjks, jcsb, jch, jcxm, ms, ts, null, footer,elements);
+ ByteArrayOutputStream outputStream = makeJcPDFByteArrayStream(xm, xb, nl, jcks, zyh, ch, sjks, jcsb, jch, jcxm, ms, ts, null, footer, elements);
if (outputStream == null)
throw new Exception();
jianchas.add(outputStream);
@@ -1681,7 +1950,7 @@
TjCustomer customer = tjCustomerService.getById(tjOrder.getUserId());
- List<LtkjExamJcbgd> list=jcbgdService.getJianJcBaoGaoDanByTjh(tjOrder.getCardId());
+ List<LtkjExamJcbgd> list = jcbgdService.getJianJcBaoGaoDanByTjh(tjOrder.getCardId());
List<ByteArrayOutputStream> jianchas = new ArrayList<>();
Paragraph elements = new Paragraph();
@@ -1692,7 +1961,7 @@
for (LtkjExamJcbgd getexamreportinfo : list) {
String xm = customer.getCusName();
- String xb = customer.getCusSex()==2 ? "濂�" : "鐢�";
+ String xb = customer.getCusSex() == 2 ? "濂�" : "鐢�";
String nl = customer.getAge();
String jcks = "浣撴涓績";
String sjks = "";
@@ -1710,20 +1979,20 @@
StringBuilder builder;
String footer;
builder = new StringBuilder();
- if (null != sqrxm && StrUtil.isNotBlank(sqrxm)){
+ if (null != sqrxm && StrUtil.isNotBlank(sqrxm)) {
builder.append("鐢宠浜猴細").append(sqrxm);
}
- if (null != jcysqm && StrUtil.isNotBlank(jcysqm)){
+ if (null != jcysqm && StrUtil.isNotBlank(jcysqm)) {
builder.append(" 妫�鏌ュ尰甯堬細").append(jcysqm);
}
- if (null != shysqm && StrUtil.isNotBlank(shysqm)){
+ if (null != shysqm && StrUtil.isNotBlank(shysqm)) {
builder.append(" 瀹℃牳鍖诲笀锛�").append(shysqm);
}
- if (null != bgysqm && StrUtil.isNotBlank(bgysqm)){
+ if (null != bgysqm && StrUtil.isNotBlank(bgysqm)) {
builder.append(" 鎶ュ憡鍖诲笀锛�").append(bgysqm);
}
footer = builder.toString().trim();
- ByteArrayOutputStream outputStream = makeJcPDFByteArrayStream(xm, xb, nl, jcks, zyh, ch, sjks, jcsb, jch, jcxm, ms, ts, null, footer,elements);
+ ByteArrayOutputStream outputStream = makeJcPDFByteArrayStream(xm, xb, nl, jcks, zyh, ch, sjks, jcsb, jch, jcxm, ms, ts, null, footer, elements);
if (outputStream == null)
throw new Exception();
jianchas.add(outputStream);
@@ -1733,13 +2002,14 @@
/**
* 鍖诲笀淇℃伅琛�
+ *
* @param phrase
* @param doctorFonts
* @param sqrxm
* @param sqrbh
* @throws BadElementException
*/
- private void makeYiShiInfoLine(Phrase phrase, Font doctorFonts, String sqrxm, String sqrbh,String title) throws BadElementException {
+ private void makeYiShiInfoLine(Phrase phrase, Font doctorFonts, String sqrxm, String sqrbh, String title) throws BadElementException {
String qmImg = dictUserInfoMapper.selectQmImgInnerJoinUserByHisDictCode(sqrbh);
// String qmImg = dictUserInfoMapper.selectQmImgInnerJoinUserByUserId(sqrbh);
if (null != qmImg && StrUtil.isNotBlank(qmImg)) {
@@ -1748,13 +2018,13 @@
try {
image = Image.getInstance(decode);
image.scaleToFit(60, 25);
- phrase.add(new Chunk(title,doctorFonts));
- phrase.add(new Chunk(image,0,-10,true));
+ phrase.add(new Chunk(title, doctorFonts));
+ phrase.add(new Chunk(image, 0, -10, true));
} catch (IOException e) {
- phrase.add(new Chunk(title+sqrxm, doctorFonts));
+ phrase.add(new Chunk(title + sqrxm, doctorFonts));
}
- }else {
- phrase.add(new Chunk(title+sqrxm, doctorFonts));
+ } else {
+ phrase.add(new Chunk(title + sqrxm, doctorFonts));
}
}
@@ -1799,7 +2069,6 @@
}
-
/**
* 濉厖妫�楠岃〃鏍兼暟鎹�
*
@@ -1807,9 +2076,9 @@
* @param map
* @throws DocumentException
*/
- private void makeHisJianYanTable(Document document1, HashMap<String, Object> map,DictHosp dictHosp,String colorStr) throws DocumentException {
+ private void makeHisJianYanTable(Document document1, HashMap<String, Object> map, DictHosp dictHosp, String colorStr) throws DocumentException {
if (!map.isEmpty()) {
- String[] titles = new String[]{"浣撴椤圭洰", "浣撴缁撴灉","鎻愮ず", "鍗曚綅", "鍙傝�冭寖鍥�"};
+ String[] titles = new String[]{"浣撴椤圭洰", "浣撴缁撴灉", "鎻愮ず", "鍗曚綅", "鍙傝�冭寖鍥�"};
float[] titlesWidth = new float[]{280, 100, 40, 100, 120};
for (Map.Entry<String, Object> entry : map.entrySet()) {
String titleName = entry.getKey().trim();
@@ -1817,7 +2086,7 @@
HashSet<String> jyys = (HashSet<String>) entryValue.get("jyys");
ArrayList<List<String>> lists = (ArrayList<List<String>>) entryValue.get("data");
String shsj = entryValue.get("shsj").toString();
- addJianYanTable(document1, titleName, titles, titlesWidth, lists,dictHosp,colorStr);
+ addJianYanTable(document1, titleName, titles, titlesWidth, lists, dictHosp, colorStr);
if (!jyys.isEmpty()) {
Font doctorFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
String doctors = "";
@@ -1827,7 +2096,7 @@
elements.setSpacingAfter(10f);
elements.setAlignment(Element.ALIGN_RIGHT);
Phrase phrase = new Phrase();
- phrase.add(new Chunk("妫�鏌ユ棩鏈燂細"+shsj+" 瀹℃牳鍖诲笀锛�",doctorFonts));
+ phrase.add(new Chunk("妫�鏌ユ棩鏈燂細" + shsj + " 瀹℃牳鍖诲笀锛�", doctorFonts));
boolean flag = false;
for (String s : jyys) {
if (s.contains("|")) {
@@ -1840,12 +2109,12 @@
try {
image = Image.getInstance(decode);
image.scaleToFit(60, 25);
- phrase.add(new Chunk(image,0,-10,true));
+ phrase.add(new Chunk(image, 0, -10, true));
} catch (IOException e) {
- phrase.add(new Chunk(split[0].trim(),doctorFonts));
+ phrase.add(new Chunk(split[0].trim(), doctorFonts));
}
} else {
- phrase.add(new Chunk(split[0].trim(),doctorFonts));
+ phrase.add(new Chunk(split[0].trim(), doctorFonts));
}
} else {
doctors += s.trim() + "銆�";
@@ -1853,7 +2122,7 @@
}
if (!flag) {
String substring = doctors.substring(0, doctors.length() - 1).trim();
- Paragraph df = PdfUtils.setParagraph(doctorFonts, "妫�鏌ユ棩鏈燂細"+shsj+" 瀹℃牳鍖诲笀锛�" + substring);
+ Paragraph df = PdfUtils.setParagraph(doctorFonts, "妫�鏌ユ棩鏈燂細" + shsj + " 瀹℃牳鍖诲笀锛�" + substring);
df.setAlignment(Element.ALIGN_RIGHT);
document1.add(df);
} else {
@@ -1879,7 +2148,7 @@
* @param printReport
* @throws DocumentException
*/
- private void notHuaYanTable(Document document1, Map<TjOrderRemark, List<TjPdfVO>> printReport,DictHosp dictHosp,String colorStr,boolean isPacs) throws DocumentException {
+ private void notHuaYanTable(Document document1, Map<TjOrderRemark, List<TjPdfVO>> printReport, DictHosp dictHosp, String colorStr, boolean isPacs) throws DocumentException {
for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
LambdaQueryWrapper<TjProject> wqqq = new LambdaQueryWrapper<>();
wqqq.eq(TjProject::getProId, entry.getKey().getProId());
@@ -1889,7 +2158,7 @@
if (null != one11 && "Y".equals(one11.getNeedReport())) {
TjOrderRemark orderRemark = entry.getKey();
List<TjPdfVO> value = entry.getValue();
- if (StrUtil.isBlank(value.get(0).getProResult()) && (StrUtil.isBlank(value.get(0).getTs()) && StrUtil.isBlank(value.get(0).getSj()))){
+ if (StrUtil.isBlank(value.get(0).getProResult()) && (StrUtil.isBlank(value.get(0).getTs()) && StrUtil.isBlank(value.get(0).getSj()))) {
continue;
}
String titleName = null;
@@ -1913,7 +2182,7 @@
tableTitle.addCell(cellTitle);
// 灏嗚〃鏍兼坊鍔犲埌鏂囨。涓�
document1.add(tableTitle);
- }else {
+ } else {
document1.add(paragraph);
}
@@ -1925,9 +2194,9 @@
// document1.add(table);
// if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌") && !value.isEmpty()){
- if (true && !value.isEmpty()){
- if (value.size()>1){
- if (value.get(0).getPid().equals("1862852701533012001")){
+ if (!value.isEmpty()) {
+ if (value.size() > 1) {
+ if (value.get(0).getPid().equals("1862852701533012001")) {
Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
Paragraph ppp = new Paragraph("闃虫�у弬鑰冨�硷細", remarkFonts);
paragraph.setAlignment(Element.ALIGN_LEFT);
@@ -1945,7 +2214,7 @@
document1.add(ppp);
- ppp = new Paragraph("妫�娴嬬粨鏋滐細 DOB="+value.get(0).getProResult(), remarkFonts);
+ ppp = new Paragraph("妫�娴嬬粨鏋滐細 DOB=" + value.get(0).getProResult(), remarkFonts);
paragraph.setAlignment(Element.ALIGN_LEFT);
paragraph.setLeading(5f);
document1.add(ppp);
@@ -1964,17 +2233,17 @@
paragraph.setLeading(5f);
document1.add(ppp);
}
- }else {
+ } else {
String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
- PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value,isPacs,new float[]{240, 240,240});
+ PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value, isPacs, new float[]{240, 240, 240});
document1.add(table);
}
- }else {
+ } else {
Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
- if (isPacs){
+ if (isPacs) {
Paragraph pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
document1.add(pp);
Paragraph ppp = new Paragraph(value.get(0).getSj(), remarkFonts);
@@ -1987,8 +2256,8 @@
paragraph.setAlignment(Element.ALIGN_LEFT);
paragraph.setLeading(5f);
document1.add(ppp);
- }else {
- if (value.get(0).getPid().equals("1862852701533012001")){
+ } else {
+ if (value.get(0).getPid().equals("1862852701533012001")) {
remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
Paragraph ppp = new Paragraph("闃虫�у弬鑰冨�硷細", remarkFonts);
paragraph.setAlignment(Element.ALIGN_LEFT);
@@ -2006,7 +2275,7 @@
document1.add(ppp);
- ppp = new Paragraph("妫�娴嬬粨鏋滐細 DOB="+value.get(0).getProResult(), remarkFonts);
+ ppp = new Paragraph("妫�娴嬬粨鏋滐細 DOB=" + value.get(0).getProResult(), remarkFonts);
paragraph.setAlignment(Element.ALIGN_LEFT);
paragraph.setLeading(5f);
document1.add(ppp);
@@ -2025,20 +2294,20 @@
paragraph.setLeading(5f);
document1.add(ppp);
}
- }else {
+ } else {
String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉"};
Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
- PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value,false,new float[]{240, 300});
+ PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value, false, new float[]{240, 300});
document1.add(table);
}
}
}
- }else {
+ } else {
String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
- PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value,isPacs,new float[]{240, 240,240});
+ PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value, isPacs, new float[]{240, 240, 240});
document1.add(table);
}
//鍒ゆ柇澶囨敞鏄惁涓虹┖ 绌轰笉鑳芥樉绀簄ull
@@ -2046,7 +2315,7 @@
entry.getKey().setRemark("");
}
// if (!dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")){
- if (!true){
+ if (false) {
String remark = "澶囨敞锛�" + entry.getKey().getRemark();
if (entry.getKey().getRemark().length() > 50) {
int j = 0;
@@ -2070,45 +2339,37 @@
}
}
//鍒ゆ柇涓绘鍖诲笀鏄惁涓虹┖ 绌轰笉鑳芥樉绀簄ull
- zhuJianYiShi(document1, entry,orderRemark.getCreateTime(),dictHosp);
+ zhuJianYiShi(document1, entry, orderRemark.getCreateTime(), dictHosp);
//鍒嗗壊绾�
// if (!dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")) {
- if (!true) {
+ if (false) {
LineSeparator objectName = new LineSeparator();
document1.add(objectName);
}
} else {
- if (null != one11) {
- if (entry.getValue().get(0).getProName().contains(";"))
- titleName = entry.getValue().get(0).getProName();
- else titleName = one11.getProName();
- } else {
- titleName = entry.getKey().getProName();
- }
+ if (entry.getValue().get(0).getProName().contains(";"))
+ titleName = entry.getValue().get(0).getProName();
+ else titleName = one11.getProName();
// 璁剧疆鏍囬瀛椾綋鏍峰紡
Font titleFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
Paragraph paragraph = PdfUtils.setParagraph(titleFonts, titleName);
// if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")) {
- if (true) {
- if (StrUtil.isBlank(value.get(0).getProResult()) && (StrUtil.isBlank(value.get(0).getTs()) && StrUtil.isBlank(value.get(0).getSj()))){
- continue;
- }
- Font titleFont = PdfUtils.setFont(DEFAULT_TITLE_FONT_SIZE);
- titleFont.setStyle(Font.BOLD);
- PdfPCell cellTitle = new PdfPCell(PdfUtils.setParagraph(titleFont, titleName));
- cellTitle.setBorder(Rectangle.NO_BORDER);
- Color color = Color.decode("#B4CDCD");
- cellTitle.setBackgroundColor(new BaseColor(color.getRed(), color.getGreen(), color.getBlue())); // 璁剧疆鑳屾櫙棰滆壊锛堝崄鍏繘鍒� RGB锛�
- // 鍒涘缓琛ㄦ牸骞舵坊鍔犲崟鍏冩牸
- PdfPTable tableTitle = new PdfPTable(1);
- tableTitle.setWidthPercentage(100);
- tableTitle.addCell(cellTitle);
- // 灏嗚〃鏍兼坊鍔犲埌鏂囨。涓�
- document1.add(tableTitle);
- }else {
- document1.add(paragraph);
+ if (StrUtil.isBlank(value.get(0).getProResult()) && (StrUtil.isBlank(value.get(0).getTs()) && StrUtil.isBlank(value.get(0).getSj()))) {
+ continue;
}
+ Font titleFont = PdfUtils.setFont(DEFAULT_TITLE_FONT_SIZE);
+ titleFont.setStyle(Font.BOLD);
+ PdfPCell cellTitle = new PdfPCell(PdfUtils.setParagraph(titleFont, titleName));
+ cellTitle.setBorder(Rectangle.NO_BORDER);
+ Color color = Color.decode("#B4CDCD");
+ cellTitle.setBackgroundColor(new BaseColor(color.getRed(), color.getGreen(), color.getBlue())); // 璁剧疆鑳屾櫙棰滆壊锛堝崄鍏繘鍒� RGB锛�
+ // 鍒涘缓琛ㄦ牸骞舵坊鍔犲崟鍏冩牸
+ PdfPTable tableTitle = new PdfPTable(1);
+ tableTitle.setWidthPercentage(100);
+ tableTitle.addCell(cellTitle);
+ // 灏嗚〃鏍兼坊鍔犲埌鏂囨。涓�
+ document1.add(tableTitle);
// String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
// Font headFont = PdfUtils.setFont(9);
@@ -2117,9 +2378,9 @@
// document1.add(table);
// if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌") && !value.isEmpty()){
- if (true && !value.isEmpty()){
- if (value.size()>1){
- if (value.get(0).getPid().equals("1862852701533012001")){
+ if (!value.isEmpty()) {
+ if (value.size() > 1) {
+ if (value.get(0).getPid().equals("1862852701533012001")) {
Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
Paragraph ppp = new Paragraph("闃虫�у弬鑰冨�硷細", remarkFonts);
paragraph.setAlignment(Element.ALIGN_LEFT);
@@ -2137,7 +2398,7 @@
document1.add(ppp);
- ppp = new Paragraph("妫�娴嬬粨鏋滐細 DOB="+value.get(0).getProResult(), remarkFonts);
+ ppp = new Paragraph("妫�娴嬬粨鏋滐細 DOB=" + value.get(0).getProResult(), remarkFonts);
paragraph.setAlignment(Element.ALIGN_LEFT);
paragraph.setLeading(5f);
document1.add(ppp);
@@ -2156,18 +2417,18 @@
paragraph.setLeading(5f);
document1.add(ppp);
}
- }else {
+ } else {
String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
- PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value,isPacs,new float[]{240, 240,240});
+ PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value, isPacs, new float[]{240, 240, 240});
document1.add(table);
}
- }else {
+ } else {
Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
- if (isPacs){
+ if (isPacs) {
Paragraph pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
document1.add(pp);
Paragraph ppp = new Paragraph(value.get(0).getSj() != null ? value.get(0).getSj() : value.get(0).getProResult(), remarkFonts);
@@ -2180,8 +2441,8 @@
paragraph.setAlignment(Element.ALIGN_LEFT);
paragraph.setLeading(5f);
document1.add(ppp);
- }else {
- if (value.get(0).getPid().equals("1862852701533012001")){
+ } else {
+ if (value.get(0).getPid().equals("1862852701533012001")) {
remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
Paragraph ppp = new Paragraph("闃虫�у弬鑰冨�硷細", remarkFonts);
paragraph.setAlignment(Element.ALIGN_LEFT);
@@ -2199,7 +2460,7 @@
document1.add(ppp);
- ppp = new Paragraph("妫�娴嬬粨鏋滐細 DOB="+value.get(0).getProResult(), remarkFonts);
+ ppp = new Paragraph("妫�娴嬬粨鏋滐細 DOB=" + value.get(0).getProResult(), remarkFonts);
paragraph.setAlignment(Element.ALIGN_LEFT);
paragraph.setLeading(5f);
document1.add(ppp);
@@ -2218,21 +2479,21 @@
paragraph.setLeading(5f);
document1.add(ppp);
}
- }else {
+ } else {
String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉"};
Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
- PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value,false,new float[]{240, 300});
+ PdfPTable table = PdfUtils.setTable2(headFont, textFont, titles, value, false, new float[]{240, 300});
document1.add(table);
}
}
}
- }else {
+ } else {
String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
- PdfPTable table = PdfUtils.setTable(headFont, textFont, titles, value,isPacs);
+ PdfPTable table = PdfUtils.setTable(headFont, textFont, titles, value, isPacs);
document1.add(table);
}
@@ -2242,7 +2503,7 @@
entry.getKey().setRemark("");
}
// if (!dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")){
- if (!true){
+ if (!true) {
String remark = "澶囨敞锛�" + entry.getKey().getRemark();
if (entry.getKey().getRemark().length() > 50) {
int j = 0;
@@ -2266,7 +2527,7 @@
}
}
//鍒ゆ柇涓绘鍖诲笀鏄惁涓虹┖ 绌轰笉鑳芥樉绀簄ull
- zhuJianYiShi(document1, entry,orderRemark.getCreateTime(),dictHosp);
+ zhuJianYiShi(document1, entry, orderRemark.getCreateTime(), dictHosp);
// if (!dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")) {
if (!true) {
//鍒嗗壊绾�
@@ -2280,24 +2541,25 @@
/**
* 涓昏鍖诲笀琛屾樉绀鸿缃�
+ *
* @param document1
* @param entry
* @throws DocumentException
*/
- private void zhuJianYiShi(Document document1, Map.Entry<TjOrderRemark, List<TjPdfVO>> entry,Date createTime,DictHosp dictHosp) throws DocumentException {
+ private void zhuJianYiShi(Document document1, Map.Entry<TjOrderRemark, List<TjPdfVO>> entry, Date createTime, DictHosp dictHosp) throws DocumentException {
// if ((null != entry.getKey().getDoctorName() && null != userService.getById(entry.getKey().getDoctorName())) || dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌") ) {
- if ((null != entry.getKey().getDoctorName() && null != userService.getById(entry.getKey().getDoctorName())) || true ) {
+ if ((null != entry.getKey().getDoctorName() && null != userService.getById(entry.getKey().getDoctorName())) || true) {
//涓绘鍖诲笀
String key = sysConfigService.selectConfigByKey("is_report_pdf_use_ysqm");
SysUser sysUser = userService.getById(entry.getKey().getDoctorName());
String doctorNameDefault = "鏃�";
- if (sysUser != null)doctorNameDefault = sysUser.getNickName();
+ if (sysUser != null) doctorNameDefault = sysUser.getNickName();
// if (!entry.getValue().isEmpty() && StrUtil.isNotBlank(entry.getValue().get(0).getShys()) && dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")){
- if (!entry.getValue().isEmpty() && StrUtil.isNotBlank(entry.getValue().get(0).getShys()) && true){
+ if (!entry.getValue().isEmpty() && StrUtil.isNotBlank(entry.getValue().get(0).getShys()) && true) {
doctorNameDefault = entry.getValue().get(0).getShys();
}
Font doctorFonts = PdfUtils.setFont(9);
- if (key.equals("Y")){
+ if (key.equals("Y")) {
String qmImg = dictUserInfoMapper.selectQmImgInnerJoinUserByUserId(String.valueOf(sysUser.getUserId()));
if (null != qmImg && StrUtil.isNotBlank(qmImg)) {
Paragraph elements = new Paragraph();
@@ -2307,8 +2569,8 @@
elements.setAlignment(Element.ALIGN_RIGHT);
Phrase phrase = new Phrase();
if (createTime != null) {
- phrase.add(new Chunk("妫�鏌ユ椂闂达細"+new SimpleDateFormat("yyyy-MM-dd").format(createTime)+" 涓绘鍖诲笀锛�", doctorFonts));
- }else {
+ phrase.add(new Chunk("妫�鏌ユ椂闂达細" + new SimpleDateFormat("yyyy-MM-dd").format(createTime) + " 涓绘鍖诲笀锛�", doctorFonts));
+ } else {
phrase.add(new Chunk("涓绘鍖诲笀锛�", doctorFonts));
}
byte[] decode = Base64.getDecoder().decode(qmImg);
@@ -2316,33 +2578,37 @@
try {
image = Image.getInstance(decode);
image.scaleToFit(60, 25);
- phrase.add(new Chunk(image,0,-10,true));
+ phrase.add(new Chunk(image, 0, -10, true));
elements.add(phrase);
document1.add(elements);
} catch (IOException e) {
String doctorName = "涓绘鍖诲笀锛�" + doctorNameDefault;
- if (createTime != null) doctorName = "妫�鏌ユ椂闂达細"+new SimpleDateFormat("yyyy-MM-dd").format(createTime)+" 涓绘鍖诲笀锛�" + doctorNameDefault;
+ if (createTime != null)
+ doctorName = "妫�鏌ユ椂闂达細" + new SimpleDateFormat("yyyy-MM-dd").format(createTime) + " 涓绘鍖诲笀锛�" + doctorNameDefault;
Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
df.setAlignment(Element.ALIGN_RIGHT);
document1.add(df);
}
- }else {
+ } else {
String doctorName = "涓绘鍖诲笀锛�" + doctorNameDefault;
- if (createTime != null) doctorName = "妫�鏌ユ椂闂达細"+new SimpleDateFormat("yyyy-MM-dd").format(createTime)+" 涓绘鍖诲笀锛�" + doctorNameDefault;
+ if (createTime != null)
+ doctorName = "妫�鏌ユ椂闂达細" + new SimpleDateFormat("yyyy-MM-dd").format(createTime) + " 涓绘鍖诲笀锛�" + doctorNameDefault;
Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
df.setAlignment(Element.ALIGN_RIGHT);
document1.add(df);
}
- }else {
+ } else {
String doctorName = "涓绘鍖诲笀锛�" + doctorNameDefault;
- if (createTime != null) doctorName = "妫�鏌ユ椂闂达細"+new SimpleDateFormat("yyyy-MM-dd").format(createTime)+" 涓绘鍖诲笀锛�" + doctorNameDefault;
+ if (createTime != null)
+ doctorName = "妫�鏌ユ椂闂达細" + new SimpleDateFormat("yyyy-MM-dd").format(createTime) + " 涓绘鍖诲笀锛�" + doctorNameDefault;
Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
df.setAlignment(Element.ALIGN_RIGHT);
document1.add(df);
}
} else {
String doctorName = "涓绘鍖诲笀锛�" + "鏃�";
- if (createTime != null) doctorName = "妫�鏌ユ椂闂达細"+new SimpleDateFormat("yyyy-MM-dd").format(createTime)+" 涓绘鍖诲笀锛�" + "鏃�";
+ if (createTime != null)
+ doctorName = "妫�鏌ユ椂闂达細" + new SimpleDateFormat("yyyy-MM-dd").format(createTime) + " 涓绘鍖诲笀锛�" + "鏃�";
Font doctorFonts = PdfUtils.setFont(9);
Paragraph df = PdfUtils.setParagraph(doctorFonts, doctorName);
df.setAlignment(Element.ALIGN_RIGHT);
@@ -2359,78 +2625,87 @@
LambdaQueryWrapper<LtkjHybgd> ltkjHybgdLambdaQueryWrapper = new LambdaQueryWrapper<>();
ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh());
List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper);
- // 澶х被椤圭洰鍚嶇О
- String xmmc = hysqd.getXmmc();
- ArrayList<List<String>> lists = new ArrayList<>();
- HashSet<String> hashSet = new HashSet<>();
- String shsj = "";
- for (LtkjHybgd hybgd : hybgds) {
- shsj = hybgd.getShsj();
- // 妫�鏌ラ」鐩�
- String jcxm = hybgd.getJcxm() != null ? hybgd.getJcxm().trim() : null;
- // 妫�楠岀粨鏋�
- String jyjg = hybgd.getJyjg() != null ? hybgd.getJyjg().trim() : null;
- // 缁撴灉鍗曚綅
- String jgdw = hybgd.getJgdw() != null ? hybgd.getJgdw().trim() : null;
- // 鑼冨洿鍊�
- String fwz = hybgd.getFwz() != null ? hybgd.getFwz().trim() : null;
- // 妫�楠屽尰甯�
-// String jyys = hybgd.getJyys();
- //瀹℃牳鍖荤敓
- String shysmc = hybgd.getShysmc() != null ? hybgd.getShysmc().trim() : null;
- // 瀹℃牳鍖诲笀缂栫爜
- String shys = hybgd.getShys() != null ? hybgd.getShys().trim() : null;
- String ycbz = "";
+ if(null !=hybgds && !hybgds.isEmpty()){
+// hybgds=hybgds.stream().sorted(Comparator.comparing(LtkjHybgd::getJcxm, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
+// hybgds = hybgds.stream()
+// .sorted(Comparator.comparingInt(
+// a -> a.getJcxm().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
+// ))
+// .collect(Collectors.toList());
- if (jyjg != null && StrUtil.isNotBlank(jyjg) && fwz != null && StrUtil.isNotBlank(fwz)) {
- try {
- String[] fwzs = fwz.split("-");
- BigDecimal min = new BigDecimal(fwzs[0]);
- BigDecimal max = new BigDecimal(fwzs[1]);
- BigDecimal jyjgval = new BigDecimal(jyjg);
- // 姣旇緝妫�楠岀粨鏋滃拰鑼冨洿鍊�
- if (jyjgval.compareTo(min) < 0) {
- // jyjg 灏忎簬鑼冨洿鏈�灏忓�硷紝娣诲姞涓嬬澶�
+ // 澶х被椤圭洰鍚嶇О
+ String xmmc = hysqd.getXmmc();
+ ArrayList<List<String>> lists = new ArrayList<>();
+ HashSet<String> hashSet = new HashSet<>();
+ String shsj = "";
+ for (LtkjHybgd hybgd : hybgds) {
+ shsj = hybgd.getShsj();
+ // 妫�鏌ラ」鐩�
+ String jcxm = hybgd.getJcxm() != null ? hybgd.getJcxm().trim() : null;
+ // 妫�楠岀粨鏋�
+ String jyjg = hybgd.getJyjg() != null ? hybgd.getJyjg().trim() : null;
+ // 缁撴灉鍗曚綅
+ String jgdw = hybgd.getJgdw() != null ? hybgd.getJgdw().trim() : null;
+ // 鑼冨洿鍊�
+ String fwz = hybgd.getFwz() != null ? hybgd.getFwz().trim() : null;
+ // 妫�楠屽尰甯�
+// String jyys = hybgd.getJyys();
+ //瀹℃牳鍖荤敓
+ String shysmc = hybgd.getShysmc() != null ? hybgd.getShysmc().trim() : null;
+ // 瀹℃牳鍖诲笀缂栫爜
+ String shys = hybgd.getShys() != null ? hybgd.getShys().trim() : null;
+ String ycbz = "";
+
+ if (jyjg != null && StrUtil.isNotBlank(jyjg) && fwz != null && StrUtil.isNotBlank(fwz)) {
+ try {
+ String[] fwzs = fwz.split("-");
+ BigDecimal min = new BigDecimal(fwzs[0]);
+ BigDecimal max = new BigDecimal(fwzs[1]);
+ BigDecimal jyjgval = new BigDecimal(jyjg);
+ // 姣旇緝妫�楠岀粨鏋滃拰鑼冨洿鍊�
+ if (jyjgval.compareTo(min) < 0) {
+ // jyjg 灏忎簬鑼冨洿鏈�灏忓�硷紝娣诲姞涓嬬澶�
// jyjg = jyjg + " 鈫�";
- ycbz = "鈫�";
- } else if (jyjgval.compareTo(max) > 0) {
- // jyjg 澶т簬鑼冨洿鏈�澶у�硷紝娣诲姞涓婄澶�
+ ycbz = "鈫�";
+ } else if (jyjgval.compareTo(max) > 0) {
+ // jyjg 澶т簬鑼冨洿鏈�澶у�硷紝娣诲姞涓婄澶�
// jyjg = jyjg + " 鈫�";
- ycbz = "鈫�";
+ ycbz = "鈫�";
+ }
+ } catch (Exception ignored) {
}
- } catch (Exception ignored) {
}
- }
// LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
// queryWrapper.eq(SysUser::getUserName,jyys);
// List<SysUser> sysUsers = userService.list(queryWrapper);
// if (!sysUsers.isEmpty())
// hashSet.add(sysUsers.get(0).getNickName());
- String key = sysConfigService.selectConfigByKey("is_report_pdf_use_ysqm");
- if (null != shys && null != shysmc && key.equals("Y")) {
- hashSet.add(shysmc + "|" + shys);
- } else {
- if (null != shysmc) hashSet.add(shysmc);
+ String key = sysConfigService.selectConfigByKey("is_report_pdf_use_ysqm");
+ if (null != shys && null != shysmc && key.equals("Y")) {
+ hashSet.add(shysmc + "|" + shys);
+ } else {
+ if (null != shysmc) hashSet.add(shysmc);
+ }
+ ArrayList<String> strings = new ArrayList<>();
+ strings.add(jcxm);
+ strings.add(jyjg);
+ strings.add(ycbz);
+ strings.add(jgdw);
+ strings.add(fwz);
+ strings.add(hybgd.getJcxmid());
+ strings.add(hysqd.getXmid());
+ lists.add(strings);
}
- ArrayList<String> strings = new ArrayList<>();
- strings.add(jcxm);
- strings.add(jyjg);
- strings.add(ycbz);
- strings.add(jgdw);
- strings.add(fwz);
- strings.add(hybgd.getJcxmid());
- strings.add(hysqd.getXmid());
- lists.add(strings);
- }
- if (!lists.isEmpty()) {
- HashMap<String, Object> map = new HashMap<>();
- map.put("data", lists);
- map.put("jyys", hashSet);
- if (StrUtil.isNotBlank(shsj)){
- shsj = shsj.split(" ")[0];
+ if (!lists.isEmpty()) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("data", lists);
+ map.put("jyys", hashSet);
+ if (StrUtil.isNotBlank(shsj)) {
+ shsj = shsj.split(" ")[0];
+ }
+ map.put("shsj", shsj);
+ data.put(xmmc, map);
}
- map.put("shsj",shsj);
- data.put(xmmc, map);
}
}
return data;
@@ -2442,7 +2717,7 @@
* @param tjOrder
* @param reportTemplate
*/
- public HashMap<String, Object> makePDFInfo(TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate,DictHosp dictHosp,HashMap<String, Object> jianYanMap) {
+ public HashMap<String, Object> makePDFInfo(TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate, DictHosp dictHosp, HashMap<String, Object> jianYanMap) {
String tjNumber = tjOrder.getTjNumber();
String template = reportTemplate.getTemplate();
LambdaQueryWrapper<DictComp> wq111 = new LambdaQueryWrapper<>();
@@ -2519,7 +2794,7 @@
} else {
str.append(" 鏃狅紱\n");
}
- }else {
+ } else {
int maxProjectLength = 0;
for (Map.Entry<String, Object> item : jianYanMap.entrySet()) {
HashMap<String, Object> entryValue = (HashMap<String, Object>) item.getValue();
@@ -2557,7 +2832,7 @@
}
//寮傚父椤圭洰
data.put("yichang", str.toString());
- data.put("zjrq",new SimpleDateFormat("yyyy-MM-dd").format(tjOrder.getCheckTime()));
+ 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());
@@ -2585,7 +2860,7 @@
map.put("document", document);
map.put("copy", copy);
map.put("stream", finalOutPut);
- map.put("form",pdfStamper);
+ map.put("form", pdfStamper);
return map;
} catch (IOException | DocumentException e) {
e.printStackTrace();
@@ -2623,16 +2898,9 @@
for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
List<TjPdfVO> tjPdfVOS = new ArrayList<>();
List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.getDetailByOrderIdAndParId(one.getOrderId(), entry.getKey().getProId());
-// tjOrderDetails = new ArrayList<>(tjOrderDetails.stream()
-// .filter(i -> StrUtil.isNotBlank(i.getProResult()))
-// .collect(Collectors.toMap(
-// TjOrderDetail::getProId,
-// i -> i,
-// (existing, replacement) -> existing
-// ))
-// .values());
tjOrderDetails = tjOrderDetails.stream().filter(i -> StrUtil.isNotBlank(i.getProResult())).collect(Collectors.toList());
- tjOrderDetails = new ArrayList<>(tjOrderDetails.stream().collect(Collectors.toMap(TjOrderDetail::getProId, i -> i, (existing, replacement) -> existing)).values());
+ tjOrderDetails = new ArrayList<>(tjOrderDetails.stream()
+ .collect(Collectors.toMap(TjOrderDetail::getProId, i -> i, (existing, replacement) -> existing)).values());
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
TjProject tjProject = projectService.getById(String.valueOf(tjOrderDetail.getProId()));
if (null != tjProject && tjProject.getNeedReport().equals("Y")) {
@@ -2650,22 +2918,25 @@
}
tjPdfVO.setProId(String.valueOf(tjOrderDetail.getProject().getProId()));
tjPdfVO.setPid(String.valueOf(tjProject.getProParentId()));
- LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LtkjExamJcbgd::getTjh,tjNumber);
- wrapper.eq(LtkjExamJcbgd::getXmdm,String.valueOf(tjOrderDetail.getProject().getProParentId()));
-// LtkjExamJcbgd jcbgd = jcbgdService.getOne(wrapper);
-// if (jcbgd != null){
-// tjPdfVO.setTs(jcbgd.getYxbx());
-// tjPdfVO.setSj(jcbgd.getBgNr());
-// tjPdfVO.setShys(jcbgd.getShysxm());
-// }
+// LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(LtkjExamJcbgd::getTjh, tjNumber);
+// wrapper.eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()));
tjPdfVOS.add(tjPdfVO);
}
}
}
+ if(!tjPdfVOS.isEmpty()){
+ tjPdfVOS=tjPdfVOS.stream().sorted(Comparator.comparing(TjPdfVO::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
+ tjPdfVOS = tjPdfVOS.stream()
+ .sorted(Comparator.comparingInt(
+ tjPdfVO -> tjPdfVO.getProName().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
+ ))
+ .collect(Collectors.toList());
+ }
printReport.put(entry.getKey(), tjPdfVOS);
}
}
+
private void pacsJianChaData(String tjNumber, Map<TjOrderRemark, List<TjPdfVO>> printReport, TjOrder one, TjCustomer customer) {
// LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
// wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
@@ -2689,7 +2960,7 @@
if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId())
&& entry.getKey().getType() == 1
- && !ids.contains(String.valueOf(tjOrderDetail.getProject().getProParentId()))) {
+ && !ids.contains(String.valueOf(tjOrderDetail.getProject().getProParentId()))) {
TjPdfVO tjPdfVO = new TjPdfVO();
tjPdfVO.setProName(tjOrderDetail.getProject().getProName());
tjPdfVO.setProResult(tjOrderDetail.getProResult());
@@ -2701,24 +2972,32 @@
}
tjPdfVO.setProId(String.valueOf(tjOrderDetail.getProject().getProId()));
LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LtkjExamJcbgd::getTjh,tjNumber);
- wrapper.like(LtkjExamJcbgd::getXmdm,String.valueOf(tjOrderDetail.getProject().getProParentId()));
+ wrapper.eq(LtkjExamJcbgd::getTjh, tjNumber);
+ wrapper.like(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()));
wrapper.orderByDesc(LtkjExamJcbgd::getZdsj);
List<LtkjExamJcbgd> list = jcbgdService.list(wrapper);
- if(null !=list && !list.isEmpty()){
+ if (null != list && !list.isEmpty()) {
LtkjExamJcbgd jcbgd = list.get(0);
- if (jcbgd != null){
+ if (jcbgd != null) {
tjPdfVO.setTs(jcbgd.getYxbx());
tjPdfVO.setSj(jcbgd.getBgNr());
tjPdfVO.setShys(jcbgd.getShysxm());
tjPdfVO.setProName(jcbgd.getXmmc());
- ids+="|"+jcbgd.getXmdm();
+ ids += "|" + jcbgd.getXmdm();
}
}
tjPdfVOS.add(tjPdfVO);
}
}
}
+// if(!tjPdfVOS.isEmpty()){
+// tjPdfVOS=tjPdfVOS.stream().sorted(Comparator.comparing(TjPdfVO::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
+// tjPdfVOS = tjPdfVOS.stream()
+// .sorted(Comparator.comparingInt(
+// tjPdfVO -> tjPdfVO.getProName().length() // 鏍规嵁鍚嶅瓧鐨勯暱搴︽帓搴�
+// ))
+// .collect(Collectors.toList());
+// }
printReport.put(entry.getKey(), tjPdfVOS);
}
}
@@ -2844,7 +3123,7 @@
document.add(table);
}
- private static void addJianYanTable(Document document, String titleName, String[] titles, float[] titlesWidth, ArrayList<List<String>> lists,DictHosp dictHosp,String colorStr) throws DocumentException {
+ private static void addJianYanTable(Document document, String titleName, String[] titles, float[] titlesWidth, ArrayList<List<String>> lists, DictHosp dictHosp, String colorStr) throws DocumentException {
// 澶ч」鏍囬
Font titleFont = PdfUtils.setFont(DEFAULT_TITLE_FONT_SIZE);
// if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")) {
@@ -2880,7 +3159,7 @@
// 灏嗚〃鏍兼坊鍔犲埌鏂囨。涓�
document.add(tableTitle);
- }else {
+ } else {
document.add(paragraph);
}
// 鍒涘缓涓�涓〃鏍煎苟娣诲姞鍒版枃妗�
@@ -2908,8 +3187,8 @@
boolean isYc = false;
textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
// if (dictHosp.getHospName().equals("婢勫悎鐭垮姟灞�涓績鍖婚櫌")){
- if (true){
- if (list.contains("鈫�") || list.contains("鈫�")){
+ if (true) {
+ if (list.contains("鈫�") || list.contains("鈫�")) {
isYc = true;
}
}
@@ -2922,13 +3201,13 @@
nameCell.setHorizontalAlignment(Element.ALIGN_LEFT);
nameCell.setBorder(Rectangle.NO_BORDER); // 绉婚櫎鍗曞厓鏍艰竟妗�
- if (isYc){
+ if (isYc) {
textFont.setStyle(Font.BOLD);
nameCell.setPhrase(new Paragraph(s, textFont));
nameCell.setBorder(Rectangle.NO_BORDER);
// Color color = Color.decode("#0033cc");
// nameCell.setBackgroundColor(new BaseColor(color.getRed(), color.getGreen(), color.getBlue())); // 璁剧疆鑳屾櫙棰滆壊锛堝崄鍏繘鍒� RGB锛�
- }else {
+ } else {
nameCell.setPhrase(new Paragraph(s, textFont));
}
table.addCell(nameCell);
@@ -2958,7 +3237,7 @@
* @return bytearrayoutputstream
*/
public static ByteArrayOutputStream makeJcPDFByteArrayStream(String xm, String xb, String nl, String jcks, String zyh, String ch, String sjks, String jcsb, String jch
- , String jcxm, String ms, String ts, File[] files, String footer,Paragraph elements) {
+ , String jcxm, String ms, String ts, File[] files, String footer, Paragraph elements) {
try {
Document document = new Document(PageSize.A4);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -3245,7 +3524,7 @@
this.footerText = footerText;
}
- public Footer(Paragraph paragraph){
+ public Footer(Paragraph paragraph) {
this.paragraph = paragraph;
}
@@ -3274,7 +3553,7 @@
private String age;
private Integer page;
- public FooterHeaderPageEvent(String name,String tjName,String tjNumber,String sex,String age,Integer page) {
+ public FooterHeaderPageEvent(String name, String tjName, String tjNumber, String sex, String age, Integer page) {
this.name = name;
this.tjNumber = tjNumber;
this.tjName = tjName;
@@ -3352,7 +3631,7 @@
footerTable.setSpacingBefore(0); // 鍘婚櫎琛ㄦ牸椤堕儴鐨勯棿璺�
footerTable.setSpacingAfter(0); // 鍘婚櫎琛ㄦ牸搴曢儴鐨勯棿璺�
footerTable.getDefaultCell().setBorder(Rectangle.NO_BORDER); // 鍘婚櫎鎵�鏈夊崟鍏冩牸鐨勮竟妗�
- float[] columnWidths = { 2.5f, 2f }; // 绗竴鍒楀崰 1锛岀浜屽垪鍗� 2
+ float[] columnWidths = {2.5f, 2f}; // 绗竴鍒楀崰 1锛岀浜屽垪鍗� 2
footerTable.setWidths(columnWidths); // 璁剧疆鍒楀姣斾緥
// 绗竴琛岋細鍖婚櫌鍚嶅拰椤电爜
--
Gitblit v1.8.0