From 971162978842f8cf87d34f99da8c529e2e945da8 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 15 四月 2025 08:46:57 +0800
Subject: [PATCH] zjh20250415
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 379 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 271 insertions(+), 108 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 a3fbce1..5ad75ef 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
@@ -994,117 +994,249 @@
// 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);
+ boolean isBr = false;
+ 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("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�", "");
-// 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);
+ 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;
+ 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 {
+ 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) {
+ 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++;
+ }
}
}
}
+ }*/
+
+ 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;
- LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrderYcxm::getTjh, tjOrder.getTjNumber());
- List<TjOrderYcxm> ycxms = ycxmService.list(wq);
+// 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()) {
+
+ 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));
+
+ 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;
+ int index1 = 1;
+ for (TjOrderYcxm detail : details) {
+ String xmmc = entry.getKey().toString();
+ if (!isXmWrite) {
+ xmXh++;
+ paragraph = new Paragraph("銆�" + xmXh + "." + xmmc + "銆�", defaultFont);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ document2.add(paragraph);
+ isXmWrite = true;
+ }
+ String result = detail.getJcjg();
+ if (StrUtil.isNotBlank(result)) {
+ StringBuilder builder = new StringBuilder();
+ 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();
+ }
+ 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<>();
+
+ 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);
+ paragraph.setSpacingBefore(0f);
+ paragraph.setSpacingAfter(5f);
+ document2.add(paragraph);
+ }
+ }
+ }
+
+ /*for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) {
List<CsProVo> proVos = deptEntry.getValue();
if (proVos.size() > 1) {
proVos = proVos.stream()
@@ -1125,7 +1257,8 @@
int index = 1;
int index1 = 1;
for (TjOrderDetail detail : details) {
- String xmmc = detail.getProName();
+ String xmmc = proVo.getProName();
+// String xmmc = detail.getProName();
if (!isXmWrite) {
xmXh++;
paragraph = new Paragraph("銆�" + xmXh + "." + xmmc + "銆�", defaultFont);
@@ -1135,13 +1268,18 @@
}
String result = detail.getProResult();
if (StrUtil.isNotBlank(result)) {
- String[] split = result.split("\n");
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");
+// 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)) {
@@ -1158,7 +1296,7 @@
LambdaQueryWrapper<TjOrderYcxm> ycwq=new LambdaQueryWrapper<>();
ycwq.eq(TjOrderYcxm::getTjh,tjOrder.getTjNumber());
- ycwq.eq(TjOrderYcxm::getJcxm,xmmc);
+ ycwq.eq(TjOrderYcxm::getJcxm,detail.getProName());
TjOrderYcxm ycxm = ycxmService.getOne(ycwq);
if(null !=ycxm){
String jynr = ycxm.getJynr();
@@ -1250,8 +1388,17 @@
}
}
}
+ }*/
+ }
+ /** else {
+
+ if (!collect.isEmpty() || !map.isEmpty()){
+ paragraph = PdfUtils.setParagraph(defaultTitleFont, "鍖荤敓寤鸿锛�");
+ paragraph.setSpacingBefore(3f);
+ paragraph.setSpacingAfter(2f);
+ document2.add(paragraph);
}
- } else {
+
for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) {
List<CsProVo> proVos = deptEntry.getValue();
if (proVos.size() > 1) {
@@ -1430,6 +1577,7 @@
}
}
}
+ */
for (int i = 0; i < 1; i++) {
paragraph = PdfUtils.setParagraph(defaultFont, "");
@@ -2502,10 +2650,16 @@
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 = 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(
@@ -2805,14 +2959,14 @@
}
}
}
-// 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());
-// }
+ 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);
}
}
@@ -2841,6 +2995,8 @@
if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId())
&& entry.getKey().getType() == 1
&& !ids.contains(String.valueOf(tjOrderDetail.getProject().getProParentId()))) {
+
+ TjProject tjProjectq = projectService.getById(tjOrderDetail.getProject().getProParentId());
TjPdfVO tjPdfVO = new TjPdfVO();
tjPdfVO.setProName(tjOrderDetail.getProject().getProName());
tjPdfVO.setProResult(tjOrderDetail.getProResult());
@@ -2851,10 +3007,17 @@
tjPdfVO.setCompany("/");
}
tjPdfVO.setProId(String.valueOf(tjOrderDetail.getProject().getProId()));
+// LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(LtkjExamJcbgd::getTjh, one.getCardId());
+// wrapper.like(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()))
+// .or().eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjProjectq.getHisXmbm()));
+// wrapper.orderByDesc(LtkjExamJcbgd::getZdsj);
LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(LtkjExamJcbgd::getTjh, tjNumber);
- wrapper.like(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()));
- wrapper.orderByDesc(LtkjExamJcbgd::getZdsj);
+ wrapper.eq(LtkjExamJcbgd::getTjh, one.getCardId())
+ .and(w -> w.like(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()))
+ .or()
+ .eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjProjectq.getHisXmbm()))).orderByDesc(LtkjExamJcbgd::getZdsj);
+
List<LtkjExamJcbgd> list = jcbgdService.list(wrapper);
if (null != list && !list.isEmpty()) {
LtkjExamJcbgd jcbgd = list.get(0);
--
Gitblit v1.8.0