From 7e9ffbd3b45be78890442683b17742aa5bdccd2c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 25 七月 2025 17:55:26 +0800
Subject: [PATCH] zjh20250725-3
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 50 +++++++++++++++++++++++---------------------------
1 files changed, 23 insertions(+), 27 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 5ab0002..6e810b5 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
@@ -17,6 +17,7 @@
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.utils.DateUtils;
import com.ltkj.common.utils.SecurityUtils;
+import com.ltkj.common.utils.StringUtils;
import com.ltkj.db.DataSourceContextHolder;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
@@ -2927,9 +2928,9 @@
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 = new ArrayList<>(hybgds.stream()
+// .collect(Collectors.toMap(LtkjHybgd::getJcxm, p -> p, (existing, replacement) -> existing))
+// .values());
Map<String, List<LtkjHybgd>> listMap = hybgds.stream().collect(Collectors.groupingBy(LtkjHybgd::getJyjg));
@@ -2940,7 +2941,7 @@
LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SysDictData::getDictType,"qj_type");
wrapper.eq(SysDictData::getDictLabel,firstKey);
- List<SysDictData> dictList = sysDictDataService.list();
+ List<SysDictData> dictList = sysDictDataService.list(wrapper);
if (!dictList.isEmpty()) {
isGroupOnce = true;
groupOnceProResult = firstKey;
@@ -2976,32 +2977,27 @@
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 澶т簬鑼冨洿鏈�澶у�硷紝娣诲姞涓婄澶�
-// jyjg = jyjg + " 鈫�";
- ycbz = "鈫�";
+ String ycbz = hybgd.getYcbz() != null ? hybgd.getYcbz().trim() : null;
+ if(StringUtils.isBlank(ycbz)){
+ 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 灏忎簬鑼冨洿鏈�灏忓�硷紝娣诲姞涓嬬澶�
+ ycbz = "鈫�";
+ } else if (jyjgval.compareTo(max) > 0) {
+ // jyjg 澶т簬鑼冨洿鏈�澶у�硷紝娣诲姞涓婄澶�
+ 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);
--
Gitblit v1.8.0