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/TjCheckController.java

@@ -14,6 +14,7 @@
import com.ltkj.common.annotation.RepeatSubmit;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.core.domain.entity.SysDept;
import com.ltkj.common.core.domain.entity.SysDictData;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.enums.DataSourceType;
@@ -33,6 +34,7 @@
import com.ltkj.mall.mallOrderUtils.TjConstants;
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import com.ltkj.system.service.ISysDictDataService;
import com.ltkj.system.service.ISysUserService;
import com.ltkj.web.controller.his.HisApiGetMethodService;
import com.ltkj.web.controller.his.HisApiMethodService;
@@ -134,6 +136,8 @@
    private ITjProAdvicerulesService tjProAdvicerulesService;
    @Autowired
    private TjOrderYcxmService ycxmService;
    @Autowired
    private ISysDictDataService sysDictDataService;


    @GetMapping("/ceshicc")
@@ -1409,60 +1413,85 @@
                parent.put("", remark.getXmlb());
                List<TjOrderDetail> dels = new ArrayList<>();
                if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
                    for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                        if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
                            String ckfw = tjOrderDetail.getStanId();
                            if (null != ckfw && StrUtil.isNotBlank(tjOrderDetail.getProAdvice())) {
                                ckfw = ckfw.replace(tjOrderDetail.getProAdvice().trim(), "");
                            }
                            if (StrUtil.isNotBlank(ckfw)) {
                                try {
                                    if (ckfw != null && ckfw.contains("-")) {
                                        Integer.parseInt(tjOrderDetail.getYcbz());
                                        String[] split = ckfw.split("-");
                                        BigDecimal min = new BigDecimal(split[0]);
                                        BigDecimal max = new BigDecimal(split[1]);
                                        String proResult = tjOrderDetail.getProResult();
                                        if (null != proResult) {
                                            BigDecimal jyjgval = new BigDecimal(proResult);
                                            if (jyjgval.compareTo(min) < 0) {
                                                tjOrderDetail.setYcbz("↓");
                                            } else if (jyjgval.compareTo(max) > 0) {
                                                tjOrderDetail.setYcbz("↑");
                                            } else if (proResult.contains("阴")) {
                                                tjOrderDetail.setYcbz("");
                    Map<String, List<TjOrderDetail>> listMap = tjOrderDetails.stream()
                            .filter(i -> StrUtil.isNotBlank(i.getProResult()) && remark.getProsId().equals(i.getProsId()))
                            .collect(Collectors.groupingBy(TjOrderDetail::getProResult));
                    boolean isGroupOnce = false;
                    String groupOnceProResult = "";
                    if (listMap.size() == 1){
                        String firstKey = listMap.keySet().stream().findFirst().orElse(null);
                        LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<>();
                        wrapper.eq(SysDictData::getDictType,"qj_type");
                        wrapper.eq(SysDictData::getDictLabel,firstKey);
                        List<SysDictData> dictList = sysDictDataService.list();
                        if (!dictList.isEmpty()) {
                            isGroupOnce = true;
                            groupOnceProResult = firstKey;
                        }
                    }
                    if (isGroupOnce){
                        TjOrderDetail tjOrderDetail = new TjOrderDetail();
                        tjOrderDetail.setProName(remark.getProName());
                        tjOrderDetail.setProResult(groupOnceProResult);
                        dels.add(tjOrderDetail);
                    }else{
                        for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                            if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
                                String ckfw = tjOrderDetail.getStanId();
                                if (null != ckfw && StrUtil.isNotBlank(tjOrderDetail.getProAdvice())) {
                                    ckfw = ckfw.replace(tjOrderDetail.getProAdvice().trim(), "");
                                }
                                if (StrUtil.isNotBlank(ckfw)) {
                                    try {
                                        if (ckfw != null && ckfw.contains("-")) {
                                            Integer.parseInt(tjOrderDetail.getYcbz());
                                            String[] split = ckfw.split("-");
                                            BigDecimal min = new BigDecimal(split[0]);
                                            BigDecimal max = new BigDecimal(split[1]);
                                            String proResult = tjOrderDetail.getProResult();
                                            if (null != proResult) {
                                                BigDecimal jyjgval = new BigDecimal(proResult);
                                                if (jyjgval.compareTo(min) < 0) {
                                                    tjOrderDetail.setYcbz("↓");
                                                } else if (jyjgval.compareTo(max) > 0) {
                                                    tjOrderDetail.setYcbz("↑");
                                                } else if (proResult.contains("阴")) {
                                                    tjOrderDetail.setYcbz("");
                                                } else {
                                                    tjOrderDetail.setYcbz("");
                                                }
                                                if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().isEmpty()) {
                                                    tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
                                                }
                                            } else {
                                                tjOrderDetail.setYcbz("");
                                            }
                                            if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().isEmpty()) {
                                                tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
                                            }
                                        } else {
                                            tjOrderDetail.setYcbz("");
                                            if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("阴"))
                                                tjOrderDetail.setYcbz("");

                                            if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("阳"))
                                                tjOrderDetail.setYcbz("↑");
                                        }
                                    } else {
                                        if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("阴"))
                                            tjOrderDetail.setYcbz("");

                                        if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("阳"))
                                            tjOrderDetail.setYcbz("↑");
                                    } catch (NumberFormatException ignored) {
                                    }
                                } catch (NumberFormatException ignored) {
                                } else {
                                    if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("阴"))
                                        tjOrderDetail.setYcbz("");

                                    if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("阳"))
                                        tjOrderDetail.setYcbz("↑");
                                    tjOrderDetail.setProResult(tjOrderDetail.getProResult());
                                }
                            } else {
                                if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("阴"))
                                    tjOrderDetail.setYcbz("");

                                if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("阳"))
                                    tjOrderDetail.setYcbz("↑");
                                tjOrderDetail.setProResult(tjOrderDetail.getProResult());
                            }

                            if (remark.getOrgType().equals(tjOrderDetail.getOrgType())) {
                                dels.add(tjOrderDetail);
                                if (remark.getOrgType().equals(tjOrderDetail.getOrgType())) {
                                    dels.add(tjOrderDetail);
                                }
                            }
                        }
                    }


                    String summary = remark.getSummary();
                    if (null != summary) {
                        String[] split = summary.split(";");

 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-admin/src/main/resources/sql/index.sql

@@ -18,11 +18,18 @@
# æŸ¥çœ‹æœ€å¤§çš„连接数
SHOW VARIABLES LIKE 'max_connections';

INSERT INTO sys_user(dept_id,user_name,nick_name,phonenumber,sex,password)

# ä¸å†ä½¿ç”¨
#INSERT INTO sys_user(dept_id,user_name,nick_name,phonenumber,sex,password)
# é™•å¥åŒ»åŒæ­¥èŒå·¥
SELECT 100 as dept,a.zhigonggh,a.zhigongxm,b.dianhua1,
       CASE WHEN b.xingbie = 1 THEN 0 WHEN b.xingbie = 2 THEN 1 ELSE 2 END,
#SELECT 100 as dept,a.zhigonggh,a.zhigongxm,b.dianhua1,
#       CASE WHEN b.xingbie = 1 THEN 0 WHEN b.xingbie = 2 THEN 1 ELSE 2 END,
#       '$2a$10$Uxk6FG0EkaGhCGPfMd4qLezLO5RKKCEfwcHA7ppjgGYNgCjTsd5Iy' as pass
#FROM `ltkj_shanxiqinsqyy_getzhigongpagezd` a JOIN ltkj_shanxiqinsqyy_getlistyishengzd b
#    ON a.zhigongid = b.zhigongid;

# ä¸å†å…³è”医生表
INSERT INTO sys_user(dept_id,user_name,nick_name,password)
# é™•å¥åŒ»åŒæ­¥èŒå·¥
SELECT 100 as dept,a.zhigonggh,a.zhigongxm,
       '$2a$10$Uxk6FG0EkaGhCGPfMd4qLezLO5RKKCEfwcHA7ppjgGYNgCjTsd5Iy' as pass
FROM `ltkj_shanxiqinsqyy_getzhigongpagezd` a JOIN ltkj_shanxiqinsqyy_getlistyishengzd b
    ON a.zhigongid = b.zhigongid;
FROM `ltkj_shanxiqinxatlgcyy_getzhigongpagezd` a

 ltkj-admin/src/main/resources/sql/ɽ¡Ò½.sql

@@ -66,6 +66,7 @@
TRUNCATE TABLE tj_ask_historys;
TRUNCATE TABLE tj_ask_medical_history;
TRUNCATE TABLE tj_ask_work_log;
TRUNCATE TABLE dict_user_info;

# æŸ¥è¯¢å‰ç¼€å€¼
SELECT * FROM (

 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,