zjh20250725-3

zjh

2 天以前 7e9ffbd3b45be78890442683b17742aa5bdccd2c

 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);