From bda1ce873514c0848c4ad76bdd2274f01ab5dcc1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 11 八月 2025 08:48:08 +0800
Subject: [PATCH] zjh202500811
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 81 +++++++++++++++++++++-------------------
1 files changed, 42 insertions(+), 39 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..49cf923 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.*;
@@ -2858,7 +2859,10 @@
doctorNameDefault = entry.getValue().get(0).getShys();
}
Font doctorFonts = PdfUtils.setFont(9);
- if (key.equals("Y")) {
+ if (entry.getValue().get(0).getIsShowYiShi() == null){
+ entry.getValue().get(0).setIsShowYiShi(true);
+ }
+ if (key.equals("Y") && entry.getValue().get(0).getIsShowYiShi()) {
String qmImg = dictUserInfoMapper.selectQmImgInnerJoinUserByUserId(String.valueOf(sysUser.getUserId()));
if (null != qmImg && StrUtil.isNotBlank(qmImg)) {
Paragraph elements = new Paragraph();
@@ -2896,7 +2900,7 @@
df.setAlignment(Element.ALIGN_RIGHT);
document1.add(df);
}
- } else {
+ } else if (entry.getValue().get(0).getIsShowYiShi()) {
String doctorName = "涓绘鍖诲笀锛�" + doctorNameDefault;
if (createTime != null)
doctorName = "妫�鏌ユ椂闂达細" + new SimpleDateFormat("yyyy-MM-dd").format(createTime) + " 涓绘鍖诲笀锛�" + doctorNameDefault;
@@ -2927,9 +2931,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 +2944,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 +2980,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);
@@ -3054,12 +3053,13 @@
} catch (Exception ignored) {
}
}
- 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(xmmc);
strings.add(groupOnceProResult);
@@ -3072,10 +3072,11 @@
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);
+// if (StrUtil.isNotBlank(shsj)) {
+// shsj = shsj.split(" ")[0];
+// }
+// map.put("shsj", shsj);
+ map.put("shsj","");
data.put(xmmc, map);
}
}
@@ -3317,6 +3318,7 @@
// LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(LtkjExamJcbgd::getTjh, tjNumber);
// wrapper.eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()));
+ tjPdfVO.setIsShowYiShi(true);
tjPdfVOS.add(tjPdfVO);
}
}
@@ -3333,6 +3335,7 @@
tjPdfVO.setProId(String.valueOf(orderRemark.getProId()));
tjPdfVO.setPid(String.valueOf(orderRemark.getProId()));
tjPdfVO.setXh(1);
+ tjPdfVO.setIsShowYiShi(false);
tjPdfVOS.add(tjPdfVO);
}
}
--
Gitblit v1.8.0