zjh
2025-05-23 ea91e62004a5a86be6c7a5fda852995e1bf3e3a0
zjh20250523
8个文件已修改
91 ■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
@@ -295,13 +295,15 @@
        try {
            List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s,hospId);
            log.info("自动同步检查申请单数据:"+jcsqdList);
            if (null != jcsqdList && !jcsqdList.isEmpty()) {
                DynamicDataSourceContextHolder.clearDataSourceType();
                jcsqdService.deletedLtkjJcsqdByTjhAndTmh(s);
                jcbgdService.deletedLtkjJcbgdByTjhAndTmh(s);
                jcsqdService.saveBatch(jcsqdList);
                List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s,hospId);
                DynamicDataSourceContextHolder.clearDataSourceType();
//                DynamicDataSourceContextHolder.clearDataSourceType();
                log.info("自动同步检查报告单数据:"+jcbgdList);
                if (null != jcbgdList && !jcbgdList.isEmpty()) jcbgdService.saveBatch(jcbgdList);
                DynamicDataSourceContextHolder.clearDataSourceType();
            }
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -298,13 +298,15 @@
        String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
        try {
            List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s,hosp);
            log.info("手动同步检查申请单数据:"+jcsqdList);
            if (null != jcsqdList && !jcsqdList.isEmpty()) {
                DynamicDataSourceContextHolder.clearDataSourceType();
                jcsqdService.deletedLtkjJcsqdByTjhAndTmh(s);
                jcbgdService.deletedLtkjJcbgdByTjhAndTmh(s);
                jcsqdService.saveBatch(jcsqdList);
                List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s,hosp);
                DynamicDataSourceContextHolder.clearDataSourceType();
//                DynamicDataSourceContextHolder.clearDataSourceType();
                log.info("手动同步检查报告单数据:"+jcbgdList);
                if (null != jcbgdList && !jcbgdList.isEmpty()) jcbgdService.saveBatch(jcbgdList);
                jcycxmService.deletedByTjh(s);
                for (LtkjExamJcsqd jcsqd : jcsqdList) {
@@ -475,4 +477,28 @@
        }
    }
    @GetMapping ("/shoudongtbjcbgdsj")
    @ApiOperation(value = "手动同步检查报告单结果接口")
    public AjaxResult shoudongtbjcbgdsj(HttpServletRequest request) {
        String hospId = request.getHeader("hospId");
        log.info("手动同步检验或检查结果开始->{}{}",hospId,DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
        try {
            List<String> jc = orderService.shoudongtbjcbgdsj();
            for (String s : jc) {
                jcbgdService.deletedLtkjJcbgdByTjhAndTmh(s);
                List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s,hospId);
                log.info("手动同步检查报告单数据:"+jcbgdList);
                if (null != jcbgdList && !jcbgdList.isEmpty()) jcbgdService.saveBatch(jcbgdList);
            }
             log.info("当前同步的是->{} 结果","检查");
            return AjaxResult.success("同步成功");
        } catch (Exception e) {
            log.error(String.valueOf(e));
        }
        return AjaxResult.success();
    }
}
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcbgdMapper.java
@@ -21,7 +21,7 @@
//@DataSource(value = DataSourceType.MASTER)
public interface LtkjExamJcbgdMapper extends BaseMapper<LtkjExamJcbgd> {
    @Delete("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tmh} ")
    @Delete("DELETE FROM ltkj_exam_jcbgd WHERE tjh=#{tmh} and lx='1' ")
    void deletedLtkjJcbgdByTjhAndTmh(String tmh);
    @Select("SELECT  a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='检查' GROUP BY a.sqdh")
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjExamJcsqdMapper.java
@@ -25,7 +25,7 @@
    @Select ("SELECT * FROM ltkj_exam_jcsqd a WHERE a.tjh=#{tjh} AND a.tmh=#{tmh} ")
    LtkjExamJcsqd getLtkjJcsqdByTjhAndTmh(@Param("tjh") String tjh,@Param("tmh") String tmh);
    @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh}")
    @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} and lx='1' ")
    void  deletedLtkjJcsqdByTjhAndTmh(@Param("tjh")String tjh);
    @Select("SELECT * FROM ltkj_exam_jcsqd a WHERE a.tjh=#{tjh}")
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
@@ -471,24 +471,41 @@
    @DataSource(value = DataSourceType.SLAVE_PACS)
    @Select("SELECT\n" +
//    @Select("SELECT\n" +
//            "  trim(a.HIS_ID) tjh,\n" +
//            "  trim(a.HIS_ID) tmh,\n" +
//            "  a.JCLX jclx,\n" +
//            "  NULL jczlx,\n" +
//            "  a.BGYS bgys,\n" +
//            "  NULL bgysid,\n" +
//            "  a.SQRJ sqsj,\n" +
//            "  a.BGSJ jgsj,\n" +
//            "  REPLACE(a.JCMC,'tj_','') jcxmmc,\n" +
//            "  trim(a.JCMID) jcxmid,\n" +
//            "  a.JCBW bw,\n" +
//            "  TRIM(a.JCJL) jgzt,\n" +
//            "  TRIM(a.JCSJ) jgbx,\n" +
//            "  SYSDATE create_time\n" +
//            "   \n" +
//            "FROM\n" +
//            "  ris.V_TJ_JCBGXX_NEWTJ a  WHERE trim(a.HIS_ID)=#{tjNum} AND a.HOSTPITALID = #{hosp}")
    @Select(" SELECT\n" +
            "  trim(a.HIS_ID) tjh,\n" +
            "  trim(a.HIS_ID) tmh,\n" +
            "  a.JCLX jclx,\n" +
            "  NULL jczlx,\n" +
            "  a.BGYS bgys,\n" +
            "  NULL bgysid,\n" +
            "  trim(a.JCMID) xmdm,\n" +
            "  a.JCMC xmmc,\n" +
            "  NULL bg_mig,\n" +
            "  NULL bg_url,\n" +
            "  TRIM(a.JCSJ) bg_nr,\n" +
            "  a.SHYS shysdm,\n" +
            "  a.SHYS shysxm,\n" +
            "  TRIM(a.JCJL) yxbx,\n" +
            "  a.BGSJ zdsj,\n" +
            "  a.SQRJ sqsj,\n" +
            "  a.BGSJ jgsj,\n" +
            "  REPLACE(a.JCMC,'tj_','') jcxmmc,\n" +
            "  trim(a.JCMID) jcxmid,\n" +
            "  a.JCBW bw,\n" +
            "  TRIM(a.JCJL) jgzt,\n" +
            "  TRIM(a.JCSJ) jgbx,\n" +
            "  a.JCBW jcbw,\n" +
            "  SYSDATE create_time\n" +
            "   \n" +
            "FROM\n" +
            "  ris.V_TJ_JCBGXX_NEWTJ a  WHERE trim(a.HIS_ID)=#{tjNum} AND a.HOSTPITALID = #{hosp}")
            "  ris.V_TJ_JCBGXX_NEWTJ a  WHERE a.HIS_ID=#{tjNum}  AND a.HOSTPITALID = #{hosp} ")
    List<LtkjExamJcbgd> getCcXZxYyPacsLtkjExamJcbgd(@Param("tjNum") String tjNum,@Param("hosp") String hosp);
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
@@ -393,4 +393,8 @@
    List<List<?>> getYxJcList(Map<String,Object> map);
    @Select("SELECT DISTINCT a.tjh FROM ltkj_exam_jcbgd a WHERE ISNULL(a.xmdm)")
    List<String> shoudongtbjcbgdsj();
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -194,4 +194,7 @@
    //存储过程专用接口(初审)
    Map<String,Object> getYxJcList(Integer checkStatus ,String tjNumber,Integer page,Integer pageSize,
                                   String compId, String beginTime, String endTime,String tjname,String tcm,String deptId);
    List<String> shoudongtbjcbgdsj();
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -476,4 +476,9 @@
        map1.put("total",map.get("total"));
        return map1;
    }
    @Override
    public List<String> shoudongtbjcbgdsj() {
        return tjOrderMapper.shoudongtbjcbgdsj();
    }
}