From 0d50919da24bda3b51e2c19a75d71bdfee36de98 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期三, 06 三月 2024 11:41:05 +0800
Subject: [PATCH] 小程序绑定查看就诊人、查看报告问题
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index e0aade3..210b2f4 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -77,6 +77,8 @@
private ITjReportTemplateService reportTemplateService;
@Value("${path.filePath}")
private String value;
+ @Value("${path.reportServer}")
+ private String urlValue;
@Resource
private ISysUserService userService;
@Resource
@@ -702,7 +704,7 @@
TjReport tjReport = new TjReport();
tjReport.setTjNumber(String.valueOf(tjNumber));
- tjReport.setPath(outputPath1 + outputFileName1);
+ tjReport.setPath(urlValue + outputFileName1);
String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
tjReport.setReport(pdfBinary);
tjReport.setType("浣撴鎶ュ憡");
@@ -774,7 +776,7 @@
LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
wqq.ne(TjOrderRemark::getDeptId,"241");
- wqq.in(TjOrderRemark::getDeptId,"269","270","253","254","255","257");
+ wqq.in(TjOrderRemark::getDeptId,"269","270","253","254","255","257","251","271");
wqq.notIn(TjOrderRemark::getProId,projectService.getNneedReprotProId());
List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);
@@ -826,13 +828,18 @@
for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
printReport.put(tjOrderRemark,null);
}
+ List<Object> toRemoveKeys = new ArrayList<>();
for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
List<TjPdfVO> tjPdfVOS = new ArrayList<>();
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
if(entry.getKey().getProId().equals(tjOrderDetail.getProId())){
TjPdfVO tjPdfVO = new TjPdfVO();
tjPdfVO.setProName(tjOrderDetail.getProName());
- tjPdfVO.setProResult(tjOrderDetail.getProResult());
+ if(null !=tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")){
+ tjPdfVO.setProResult(tjOrderDetail.getProResult()+" ["+tjOrderDetail.getYcbz()+"]");
+ }else {
+ tjPdfVO.setProResult(tjOrderDetail.getProResult());
+ }
tjPdfVO.setExc(tjOrderDetail.getExceptionDesc());
tjPdfVO.setStandardValue(tjOrderDetail.getStanId());
tjPdfVO.setCompany(tjOrderDetail.getProAdvice());
@@ -840,7 +847,10 @@
}
}
printReport.put(entry.getKey(), tjPdfVOS);
+ if(tjPdfVOS.size()==0)
+ {toRemoveKeys.add(entry.getKey());}
}
+ toRemoveKeys.forEach(printReport::remove);
return printReport;
}
--
Gitblit v1.8.0