zjh
2025-06-05 2eb40036e885988fbf93ebcb98a339b197fb6340
zjh20250605
11个文件已修改
146 ■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjJcycxmMapper.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjJcycxmService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjJcycxmServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
@@ -18,6 +18,7 @@
import com.ltkj.hosp.sqlDomain.LtkjHybgd;
import com.ltkj.hosp.sqlDomain.LtkjHysqd;
import com.ltkj.hosp.vodomain.CsProVo;
import com.ltkj.web.controller.system.SysConfigController;
import com.ltkj.web.controller.system.TjCheckController;
import io.swagger.annotations.Api;
import jodd.util.StringUtil;
@@ -63,6 +64,8 @@
    private ITjCustomerService tjCustomerService;
    @Autowired
    private TjJcycxmService jcycxmService;
    @Autowired
    private SysConfigController configController;
    /**
     * 获取pacs检查数据
@@ -285,28 +288,36 @@
                ltkjExamJcsqdService.deletedLtkjJcsqdByTjhAndXmId(ltkjExamJcsqd.getTjh(), ltkjExamJcsqd.getJcxmid());
                boolean save1 = ltkjExamJcsqdService.save(ltkjExamJcsqd);
                log.info("手动同步检查结果状态 ->{}", ltkjExamJcsqd.getJgzt());
          /*      log.info("手动同步检查结果状态 ->{}", ltkjExamJcsqd.getJgzt());
                if (StringUtil.isNotBlank(ltkjExamJcsqd.getJgzt())) {
                    jcycxmService.deletedByTjh(order.getTjNumber());
//                    jcycxmService.deletedByTjh(order.getTjNumber());
                    jcycxmService.deletedByTjhAndXmm(order.getTjNumber(),ltkjExamJcsqd.getJcxmmc());
                    String[] split = ltkjExamJcsqd.getJgzt().replaceAll("\n", "").split("。|;|;|,|,");
                    log.info("进入检查结果异常提取分割方法体 ->{}->{}", order.getTjNumber(), split);
                    for (String jg : split) {
                        if (StringUtil.isNotBlank(jg) && !jg.contains("未见异常")
                                && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见")
                                && !jg.contains("未见明显") && !jg.contains("正常") && !jg.contains("双侧椎间孔无狭窄")) {
                            TjJcycxm jcycxm = new TjJcycxm();
                            jcycxm.setTjh(order.getTjNumber());
                            jcycxm.setYqid("jczyy");
                            String[] split1 = ltkjExamJcsqd.getJcxmid().split(";");
                            jcycxm.setProId(split1[0]);
                            jcycxm.setProName(ltkjExamJcsqd.getJcxmmc());
                            jcycxm.setCreateTime(new Date());
                            jcycxm.setJcjg(jg);
                            jcycxmService.save(jcycxm);
                            log.info("进入检查结果异常提取  即将保存检查异常结果->{}->{}", order.getTjNumber(), jg);
                            try {
                                TjJcycxm jcycxm = new TjJcycxm();
                                jcycxm.setTjh(order.getTjNumber());
                                jcycxm.setYqid("jczyy");
                                String[] split1 = ltkjExamJcsqd.getJcxmid().split(";");
                                jcycxm.setProId(split1[0]);
                                jcycxm.setProName(ltkjExamJcsqd.getJcxmmc());
                                jcycxm.setCreateTime(new Date());
                                jcycxm.setJcjg(jg);
                                jcycxmService.save(jcycxm);
                            } catch (Exception e) {
                                logger.error("保存检查异常结果失败",e);
                                throw new RuntimeException(e);
                            }
                            log.info("进入检查结果异常提取  保存检查异常结果完毕");
                        }
                    }
                }
*/
                LtkjExamJcbgd ltkjExamJcbgd = new LtkjExamJcbgd();
                ltkjExamJcbgd.setTjh(ltkjExamJcsqd.getTjh());
                ltkjExamJcbgd.setTmh(ltkjExamJcsqd.getTmh());
@@ -333,7 +344,10 @@
                boolean save2 = ltkjExamJcbgdService.save(ltkjExamJcbgd);
                if (save1 && save2) {
                    try {
                        testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                        configController.tjjcycxm(tjNum,  "0");
//                        testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                        orderRemarkService.updateTjOrderRemarkByTjzt(order.getTjNumber(),project.getProId().toString());
                    } catch (Exception e) {
                        log.error(String.valueOf(e));
                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -441,8 +455,10 @@
                    hybgdService.save(hybgd);
                }
                try {
                    testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
//                    testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                    orderRemarkService.updateTjOrderRemarkByTjzt(order.getTjNumber(),project.getProId().toString());
                } catch (Exception e) {
                    log.error(String.valueOf(e));
                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                    return AjaxResult.error("同步失败请重试");
@@ -540,27 +556,35 @@
//                        ltkjExamJcsqdService.deletedLtkjJcsqdByTjhAndXmId(ltkjExamJcsqd.getTjh(), ltkjExamJcsqd.getJcxmid());
                        ltkjExamJcsqdService.sdtbdeletedLtkjJcsqdByTjhandtmh(ltkjExamJcsqd.getTjh(), ltkjExamJcsqd.getTmh());
                        boolean save1 = ltkjExamJcsqdService.save(ltkjExamJcsqd);
                        log.info("手动同步检查结果状态 ->{}", ltkjExamJcsqd.getJgzt());
          /*              log.info("手动同步检查结果状态 ->{}", ltkjExamJcsqd.getJgzt());
                        if (StringUtil.isNotBlank(ltkjExamJcsqd.getJgzt())) {
                            jcycxmService.deletedByTjh(order.getTjNumber());
//                            jcycxmService.deletedByTjh(order.getTjNumber());
                            jcycxmService.deletedByTjhAndXmm(order.getTjNumber(),ltkjExamJcsqd.getJcxmmc());
                            String[] split = ltkjExamJcsqd.getJgzt().replaceAll("\n", "").split("。|;|;|,|,");
                            log.info("进入检查结果异常提取分割方法体 ->{}->{}", order.getTjNumber(), split);
                            for (String jg : split) {
                                if (StringUtil.isNotBlank(jg) && !jg.contains("未见异常")
                                        && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见")
                                        && !jg.contains("未见明显") && !jg.contains("正常") && !jg.contains("双侧椎间孔无狭窄")) {
                                    TjJcycxm jcycxm = new TjJcycxm();
                                    jcycxm.setTjh(order.getTjNumber());
                                    jcycxm.setYqid("jczyy");
                                    String[] split1 = ltkjExamJcsqd.getJcxmid().split(";");
                                    jcycxm.setProId(split1[0]);
                                    jcycxm.setProName(ltkjExamJcsqd.getJcxmmc());
                                    jcycxm.setCreateTime(new Date());
                                    jcycxm.setJcjg(jg);
                                    jcycxmService.save(jcycxm);
                                     log.info("进入检查结果异常提取  即将保存检查异常结果->{}->{}", order.getTjNumber(), jg);
                                    try {
                                        TjJcycxm jcycxm = new TjJcycxm();
                                        jcycxm.setTjh(order.getTjNumber());
                                        jcycxm.setYqid("jczyy");
                                        String[] split1 = ltkjExamJcsqd.getJcxmid().split(";");
                                        jcycxm.setProId(split1[0]);
                                        jcycxm.setProName(ltkjExamJcsqd.getJcxmmc());
                                        jcycxm.setCreateTime(new Date());
                                        jcycxm.setJcjg(jg);
                                        jcycxmService.save(jcycxm);
                                    } catch (Exception e) {
                                        log.error("保存检查异常结果失败",e);
                                        throw new RuntimeException(e);
                                    }
                                    log.info("进入检查结果异常提取  保存检查异常结果完毕");
                                }
                            }
                        }
                        }*/
                        LtkjExamJcbgd ltkjExamJcbgd = new LtkjExamJcbgd();
                        ltkjExamJcbgd.setTjh(ltkjExamJcsqd.getTjh());
@@ -588,7 +612,9 @@
                        boolean save2 = ltkjExamJcbgdService.save(ltkjExamJcbgd);
                        if (save1 && save2) {
                            try {
                                testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                                configController.tjjcycxm(tjNum,  "0");
//                                testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                                orderRemarkService.updateTjOrderRemarkByTjzt(order.getTjNumber(),project.getProId().toString());
                            } catch (Exception e) {
                                log.error(String.valueOf(e));
                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -698,7 +724,8 @@
                    hybgdService.save(hybgd);
                }
                try {
                    testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
//                    testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                    orderRemarkService.updateTjOrderRemarkByTjzt(order.getTjNumber(),project.getProId().toString());
                } catch (Exception e) {
                    log.error(String.valueOf(e));
                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -412,20 +412,28 @@
    @GetMapping ("/tjjcycxm")//同步his项目单价信息
//    @PreAuthorize("@ss.hasPermi('system:config:tbhisproprice')")
    @ApiOperation (value = "tjjcycxm")
    public AjaxResult tjjcycxm(@RequestParam(required = false)@ApiParam(value = "体检号") String tjh) {
    public AjaxResult tjjcycxm(@RequestParam(required = false)@ApiParam(value = "体检号") String tjh,
                               @RequestParam(defaultValue = "0",required = false)@ApiParam(value = "0 仅同步未审核人员 1所有人") String lx) {
        String yqbm = configService.selectConfigByKey("dqyyyqbm");
        if(StringUtil.isNotBlank(tjh)){
            zongjianshengchengyichangxiangmu(tjh, yqbm);
            return AjaxResult.success();
        }
        List<String> jc = orderService.getJianChaTjNum();
        if (null != jc && !jc.isEmpty()) {
            for (String s : jc) {
                zongjianshengchengyichangxiangmu(s, yqbm);
        }else {
            List<String> jc =null;
            if(lx.equals("0")){
                jc = orderService.getJianChaTjNumWsh();
            }else {
                jc = orderService.getJianChaTjNum();
            }
            if (null != jc && !jc.isEmpty()) {
                for (String s : jc) {
                    zongjianshengchengyichangxiangmu(s, yqbm);
                }
            }
            return AjaxResult.success();
        }
        return AjaxResult.success();
    }
    public void zongjianshengchengyichangxiangmu(String s, String yqbm) {
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjJcycxmMapper.java
@@ -4,6 +4,7 @@
import com.ltkj.hosp.domain.TjJcycxm;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
 * ClassName: TjJcycxmMapper <br/>
@@ -16,4 +17,8 @@
public interface TjJcycxmMapper extends BaseMapper<TjJcycxm> {
    @Delete("DELETE FROM tj_jcycxm  WHERE tjh=#{s}")
    void deletedByTjh(String s);
    @Delete("DELETE FROM tj_jcycxm  WHERE tjh= #{s} AND pro_name=#{xmmc}")
    void deletedByTjhAndXmm(@Param("s") String s,@Param("xmmc") String xmmc);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
@@ -388,6 +388,14 @@
    List<String> getJianChaTjNum();
    @Select("SELECT a.tj_number FROM tj_order a WHERE a.deleted=0 AND a.check_status=0 AND\n" +
            "ISNULL(a.report_time)")
    List<String> getJianChaTjNumWsh();
    List<List<?>> getYxJcList(Map<String,Object> map);
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -312,4 +312,9 @@
    @Select("call tj_yxjcymxx(#{tjh,mode=IN},#{ks,mode=IN})")
    List<CsProVo> getYxJcXx(@Param("tjh")String tjNumber,@Param("ks")String ks);
    @Update("UPDATE tj_order_remark a " +
            "SET a.type=1 WHERE a.tj_number=#{tjNumber} and a.pro_id=#{proId}")
    int updateTjOrderRemarkByTjzt(@Param("tjNumber") String tjNumber,@Param("proId") String proId);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
@@ -102,4 +102,6 @@
    List<TjOrderRemark> shoufeiyemianweishoufei(String tjNumber,String jxbz);
    List<CsProVo> getYxJcXx(String tjNumber,String ks);
    int updateTjOrderRemarkByTjzt(String tjNumber,String proId);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -185,6 +185,8 @@
    List<String> getJianChaTjNum();
    List<String> getJianChaTjNumWsh();
    void tjQiandaodengji(String tjNum);
    void tjLispacstongbujianyi(String tjNumber, Long deptId,String nickName, Long userId);
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjJcycxmService.java
@@ -14,4 +14,6 @@
public interface TjJcycxmService extends IService<TjJcycxm> {
    void deletedByTjh(String s);
    void deletedByTjhAndXmm(String s,String xmmc);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjJcycxmServiceImpl.java
@@ -24,4 +24,9 @@
    public void deletedByTjh(String s) {
        mapper.deletedByTjh(s);
    }
    @Override
    public void deletedByTjhAndXmm(String s, String xmmc) {
        mapper.deletedByTjhAndXmm(s,xmmc);
    }
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
@@ -209,4 +209,9 @@
        return yxJcXx;
    }
    @Override
    public int updateTjOrderRemarkByTjzt(String tjNumber,String proId) {
        return mapper.updateTjOrderRemarkByTjzt(tjNumber, proId);
    }
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -422,6 +422,11 @@
    }
    @Override
    public List<String> getJianChaTjNumWsh() {
        return tjOrderMapper.getJianChaTjNumWsh();
    }
    @Override
    public void tjQiandaodengji(String tjNum) {
        Map<String, Object> map = new HashMap<>();
        map.put("tjNum",tjNum);