From 21ce50faebc1acb413f5bcb722daf817cce69f33 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 26 三月 2025 14:51:00 +0800
Subject: [PATCH] zjh20250326
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 156 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 110 insertions(+), 46 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 7e548cf..8821a60 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -997,35 +997,29 @@
// 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));
LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
wq.eq(TjOrderYcxm::getTjh, tjOrder.getTjNumber());
List<TjOrderYcxm> ycxms = ycxmService.list(wq);
+ boolean isBr = false;
if (null != ycxms && !ycxms.isEmpty()) {
+
+ paragraph = PdfUtils.setParagraph(defaultTitleFont, "妫�鏌ョ患杩帮細");
+ paragraph.setSpacingBefore(3f);
+ paragraph.setSpacingAfter(2f);
+ document2.add(paragraph);
+ isBr = true;
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;
- String szyssy="";
- StringBuilder builders = new StringBuilder();
for (TjOrderYcxm detail : details) {
-// if(detail.getJcxm().contains("鑸掑紶鍘�")||detail.getJcxm().contains("鏀剁缉鍘�")){
-// builders.append(detail.getJcxm()).append(detail.getJcjg()).append(" ");
-// szyssy+=builders.toString();
-// continue;
-// }
if (!isXmWrite) {
paragraph = new Paragraph(xmXh + ". " + xmmc, defaultFont);
paragraph.setAlignment(Element.ALIGN_LEFT);
@@ -1047,22 +1041,6 @@
paragraph.setAlignment(Element.ALIGN_LEFT);
document2.add(paragraph);
}
-
-// if(StringUtil.isNotBlank(szyssy)){
-// if (!isXmWrite) {
-// paragraph = new Paragraph(xmXh + ". " + xmmc, defaultFont);
-// paragraph.setAlignment(Element.ALIGN_LEFT);
-// document2.add(paragraph);
-// isXmWrite = true;
-// }
-// StringBuilder builder = new StringBuilder();
-// builder.append(" (").append(index).append(")").append(szyssy).append("\n");
-// szyssy = builder.toString();
-// paragraph = new Paragraph(szyssy, defaultFont);
-// paragraph.setAlignment(Element.ALIGN_LEFT);
-// document2.add(paragraph);
-// }
-
if (isXmWrite) {
paragraph = PdfUtils.setParagraph(defaultFont, "");
paragraph.setLeading(0f);
@@ -1072,7 +1050,17 @@
xmXh++;
}
}
- }else {
+ }
+ /* else {
+
+ if (!collect.isEmpty() || !map.isEmpty()){
+ paragraph = PdfUtils.setParagraph(defaultTitleFont, "妫�鏌ョ患杩帮細");
+ paragraph.setSpacingBefore(3f);
+ paragraph.setSpacingAfter(2f);
+ document2.add(paragraph);
+ isBr = true;
+ }
+
for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) {
List<CsProVo> proVos = deptEntry.getValue();
if (proVos.size() > 1) {
@@ -1159,21 +1147,26 @@
}
}
}
+ } */
+
+
+
+ if(isBr) {
+ paragraph = PdfUtils.setParagraph(defaultFont, "");
+ paragraph.setLeading(0f);
+ paragraph.setSpacingBefore(10f);
+ paragraph.setSpacingAfter(10f);
+ document2.add(paragraph);
}
-
- 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;
if (null != ycxms && !ycxms.isEmpty()) {
+
+ paragraph = PdfUtils.setParagraph(defaultTitleFont, "鍖荤敓寤鸿锛�");
+ paragraph.setSpacingBefore(3f);
+ paragraph.setSpacingAfter(2f);
+ document2.add(paragraph);
Map<String, List<TjOrderYcxm>> stringListMap = ycxms.stream().collect(Collectors.groupingBy(TjOrderYcxm::getParentName));
@@ -1398,7 +1391,16 @@
}
}
}*/
- } else {
+ }
+ /* else {
+
+ if (!collect.isEmpty() || !map.isEmpty()){
+ paragraph = PdfUtils.setParagraph(defaultTitleFont, "鍖荤敓寤鸿锛�");
+ paragraph.setSpacingBefore(3f);
+ paragraph.setSpacingAfter(2f);
+ document2.add(paragraph);
+ }
+
for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) {
List<CsProVo> proVos = deptEntry.getValue();
if (proVos.size() > 1) {
@@ -1536,7 +1538,7 @@
}
}
}
- }
+ } */
for (int i = 0; i < 1; i++) {
paragraph = PdfUtils.setParagraph(defaultFont, "");
@@ -2225,7 +2227,61 @@
paragraph.setLeading(5f);
document1.add(ppp);
}
- } else {
+ }
+ // 纰�14
+// else if (value.get(0).getPid().equals("1870371396991955967")){
+// Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
+// Paragraph ppp = new Paragraph("闃虫�у弬鑰冨��(Delta Over Baseline(DPM))锛�", remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
+//
+// LineSeparator objectName = new LineSeparator();
+// objectName.setOffset(-5);
+// document1.add(objectName);
+//
+// ppp = new Paragraph("DPM鍊硷細 > 149 闃虫��", remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
+//
+// ppp = new Paragraph(" 猢� 99 闃存��", remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
+//
+// objectName.setOffset(-5);
+// document1.add(objectName);
+//
+//
+// int result = Integer.parseInt(value.get(0).getProResult());
+// String after = "";
+// if (result > 149){
+// after = "闃虫��";
+// }else {
+// after = "闃存��";
+// }
+// ppp = new Paragraph("妫�娴嬬粨鏋滐細 DPM=" + result, remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
+//
+// ppp = new Paragraph("", remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
+// ppp = new Paragraph("", remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
+// if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
+// ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark(), remarkFonts);
+// paragraph.setAlignment(Element.ALIGN_LEFT);
+// paragraph.setLeading(5f);
+// document1.add(ppp);
+// }
+// }
+ else {
String[] titles = {"浣撴椤圭洰", "浣撴缁撴灉", "鍗曚綅"};
Font headFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
Font textFont = PdfUtils.setFont(DEFAULT_FONT_SIZE);
@@ -2614,10 +2670,18 @@
List<LtkjHysqd> list = ltkjHysqdService.list(ltkjHysqdLambdaQueryWrapper);
HashMap<String, Object> data = new HashMap<>();
for (LtkjHysqd hysqd : list) {
- LambdaQueryWrapper<LtkjHybgd> ltkjHybgdLambdaQueryWrapper = new LambdaQueryWrapper<>();
- ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh());
- List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper);
+// LambdaQueryWrapper<LtkjHybgd> ltkjHybgdLambdaQueryWrapper = new LambdaQueryWrapper<>();
+// ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh());
+// List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper);
+ List<LtkjHybgd> hybgds = ltkjHybgdService.getReportJianYanBaoGaoDanList(hysqd.getTmh());
if(null !=hybgds && !hybgds.isEmpty()){
+// hybgds = hybgds.stream().distinct().collect(Collectors.toList());
+ hybgds = new ArrayList<>(hybgds.stream()
+ .collect(Collectors.toMap(LtkjHybgd::getJcxm, p -> p, (existing, replacement) -> existing))
+ .values());
+
+
+
// hybgds=hybgds.stream().sorted(Comparator.comparing(LtkjHybgd::getJcxm, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
// hybgds = hybgds.stream()
// .sorted(Comparator.comparingInt(
--
Gitblit v1.8.0