zjh
2025-05-19 f108728043f84f623a028fcbb60101fdc8648399
zjh20250519
5个文件已修改
150 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/dto/PutAskMedicalHistoryDto.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskMedicalHistory.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java 88 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/dto/PutAskMedicalHistoryDto.java
@@ -257,6 +257,13 @@
    @ApiModelProperty(value = "接害工龄")
    private String jhgl;
    @ApiModelProperty(value = "体检危害因素")
    private String tjwhys;
    @ApiModelProperty(value = "接触危害因素")
    private String jcwhys;
    /**
     * 单位名称
     */
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -337,6 +337,46 @@
    }
    @GetMapping ("/chaxunjyjcwsxmjg")
    @ApiOperation(value = "查询检验检查项目结果接口")
    public AjaxResult chaxunjyjcwsxmjg(@RequestParam @ApiParam(value = "jy检验 jc检查 jyjc检验和检查") String tblx,
                                           @ApiParam(value = "体检号")@RequestParam String tjh, HttpServletRequest request) {
        String hospId = request.getHeader("hospId");
        log.info("手动查询检验或检查结果开始->{}{}",hospId,DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
        try {
            switch (tblx){
                case "jy":
                    List<Map<String, Object>> hysqdList = testMapper.sysgetCcXZxYyLtkjHysqdByLisVi(tjh,hospId);
                    if (null != hysqdList && !hysqdList.isEmpty()) {
                        for (Map<String, Object> map : hysqdList) {
                            List<Map<String, Object>> hybgdList = testMapper.sysgetCcXZxYyLtkjHybgdByLisVi(map.get("条码号").toString());
                            map.put("jybgd",hybgdList);
                        }
                        DynamicDataSourceContextHolder.clearDataSourceType();
                    }
                    log.info("当前查询的是->{} 结果","检验");
                  return AjaxResult.success(hysqdList);
                case "jc":
                    List<Map<String, Object>> jcsqdList = testMapper.sysgetCcXZxYyPacsLtkjExamJcsqd(tjh,hospId);
                    DynamicDataSourceContextHolder.clearDataSourceType();
                    log.info("当前查询的是->{} 结果","检查");
                    return AjaxResult.success(jcsqdList);
                default:
                    log.info("没有找到所匹配的同步类型");
//                    return AjaxResult.error("没有找到所匹配的同步类型!");
            }
            log.info("手动查询检验或检查结果开始->{}",DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
            return AjaxResult.error("没有找到所匹配的同步类型!");
        } catch (Exception e) {
            log.error(String.valueOf(e));
            return AjaxResult.error();
        }
    }
    @GetMapping ("/zxsq")//执行
@@ -390,7 +430,7 @@
    @GetMapping ("/tjjcycxm")//同步his项目单价信息
    @ApiOperation (value = "tjjcycxm")
    public AjaxResult tjjcycxm(@ApiParam("体检号") @RequestParam(required = false)String tjh) {
        String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
        String yqbm = configService.selectConfigByKey("dqyyyqbm");
        if(StringUtil.isNotBlank(tjh)){
            extracted(tjh, yqbm);
        }else {
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAskMedicalHistory.java
@@ -252,9 +252,18 @@
    private String gongZhong;
    @ApiModelProperty(value = "工龄")
    private String gongLing;
    @ApiModelProperty(value = "接害工龄")
    private String jhgl;
    @ApiModelProperty(value = "体检危害因素")
    private String tjwhys;
    @ApiModelProperty(value = "接触危害因素")
    private String jcwhys;
    /**
     * 既往病史 ids
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
@@ -302,6 +302,30 @@
    @DataSource(value = DataSourceType.SLAVE_LIS)
    @Select("SELECT\n" +
            "  a.GH_PATIENTNO '体检号',\n" +
            "  a.SAMPLEID '条码号',\n" +
            "  a.SFXMID '项目ID',\n" +
            "  REPLACE(a.SFXMNAME,'tj_','') '项目名',\n" +
            "  a.SENDDATE '申请时间',\n" +
            "  a.SENDDOCTOR '申请医生',\n" +
            "  a.CHECKDATE '报告时间',\n" +
            "  a.TXM '申请单号',\n" +
            "  a.SENDDOCTOR '申请人姓名',\n" +
            "  '8001' '申请人代码',\n" +
            "  a.AUDITDOCTOR '审核人姓名',\n" +
            "  '已审' '检验报告结果'\n" +
            "  \n" +
            "FROM\n" +
            "  vi_his_patientinfo a\n" +
            "WHERE  a.PATIENTTYPE=3 AND a.GH_PATIENTNO =#{tjNum} AND a.HOSPITALID = #{hosp}")
    List<Map<String, Object>> sysgetCcXZxYyLtkjHysqdByLisVi(@Param("tjNum") String tjNum,@Param("hosp") String hosp);
    @DataSource(value = DataSourceType.SLAVE_LIS)
    @Select("SELECT\n" +
@@ -327,6 +351,28 @@
            "WHERE  b.PATIENTTYPE=3 AND\n" +
            "  a.SAMPLEID = #{tmh}")
    List<LtkjHybgd> getCcXZxYyLtkjHybgdByLisVi(String tmh);
    @DataSource(value = DataSourceType.SLAVE_LIS)
    @Select("SELECT\n" +
            "  a.SAMPLEID '条码号',\n" +
            "  a.ITEMCODE '检查项目ID',\n" +
            "  a.ITEMNAME '检查项目',\n" +
            "  a.RESULT '检验结果',\n" +
            "  a.UNIT '结果单位',\n" +
            "  a.RANGEDOWN '范围最小值',\n" +
            "  a.RANGEUP '范围最大值',\n" +
            "  CONCAT(a.RANGEDOWN,'-',a.RANGEUP) '范围值',\n" +
            "  b.CHECKDATE '检验时间',\n" +
            "  b.CHECKER '检验医生',\n" +
            "  b.AUDITDATE '审核时间',\n" +
            "  b.AUDITDOCTOR '审核医生',\n" +
            "  a.JUDGE '异常标志'\n" +
            "FROM\n" +
            "  vi_his_patientresult a JOIN vi_his_patientinfo b ON b.SAMPLEID=a.SAMPLEID\n" +
            "WHERE  b.PATIENTTYPE=3 AND\n" +
            "  a.SAMPLEID = #{tmh}")
    List<Map<String, Object>> sysgetCcXZxYyLtkjHybgdByLisVi(String tmh);
//    @DataSource(value = DataSourceType.SLAVE_WS)
@@ -407,22 +453,42 @@
    @DataSource(value = DataSourceType.SLAVE_PACS)
    @Select(" SELECT\n" +
            "  trim(a.HIS_ID) 体检号,\n" +
            "  trim(a.HIS_ID) 条码号,\n" +
            "  trim(a.JCMID) 项目代码,\n" +
            "  a.JCMC 项目名称,\n" +
            "  TRIM(a.JCSJ) 报告内容,\n" +
            "  a.SHYS 审核医生代码,\n" +
            "  a.SHYS 审核医生姓名,\n" +
            "  TRIM(a.JCJL) 异常表现,\n" +
            "  a.BGSJ 诊断时间,\n" +
            "  a.SQRJ 申请时间,\n" +
            "  a.JCBW 检查部位\n" +
            "FROM\n" +
            "V_TJ_JCBGXX_NEWTJ a  WHERE a.HIS_ID=#{tjNum} AND a.HOSTPITALID = #{hosp}")
    List<Map<String, Object>> sysgetCcXZxYyPacsLtkjExamJcsqd(@Param("tjNum") String tjNum,@Param("hosp") String hosp);
    @DataSource(value = DataSourceType.SLAVE_PACS)
    @Select("SELECT\n" +
            "  trim(a.HIS_ID) tjh,\n" +
            "  trim(a.HIS_ID) tmh,\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.JCLX jclx,\n" +
            "  NULL jczlx,\n" +
            "  a.BGYS bgys,\n" +
            "  NULL bgysid,\n" +
            "  a.SQRJ sqsj,\n" +
            "  a.JCBW jcbw,\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 a.HIS_ID=#{tjNum} AND a.HOSTPITALID = #{hosp}")
            "  ris.V_TJ_JCBGXX_NEWTJ a  WHERE trim(a.HIS_ID)=#{tjNum} AND a.HOSTPITALID = #{hosp}")
    List<LtkjExamJcbgd> getCcXZxYyPacsLtkjExamJcbgd(@Param("tjNum") String tjNum,@Param("hosp") String hosp);
ltkj-hosp/src/main/resources/mapper/hosp/TjAskMedicalHistoryMapper.xml
@@ -104,7 +104,9 @@
            gong_ling,
            jhgl,
            dwmc,
            ygdw
            ygdw,
            tjwhys,
            jcwhys,yjsfyc
        from tj_ask_medical_history
    </sql>