zjh
2 天以前 c303c7714c80816fd6c12d0ccb3ed32936e4e8d7
zjh20250723
3个文件已修改
45 ■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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.*;
@@ -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);
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
@@ -254,7 +254,7 @@
            for (CsProVo vo : list) {
                LambdaQueryWrapper<TjXdtgmdjg> wq=new LambdaQueryWrapper<>();
                wq.eq(TjXdtgmdjg::getTjh,tjNumber);
                wq.eq(TjXdtgmdjg::getProId,vo.getProId());
                wq.eq(TjXdtgmdjg::getProId,vo.getProId().toString());
                TjXdtgmdjg xdtgmdjg = xdtgmdjgService.getOne(wq);
                if(null !=xdtgmdjg){
                    if(StringUtil.isNotBlank(xdtgmdjg.getUrl())){
ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
@@ -57,6 +57,7 @@
               pro_ids,
               pac_id,
               company,
               company_id,
               job_no,
               department,
               department_id,