zjh 2024/07/25-1

zjh

2024-07-25 fc568216a671c79c9fdf8cd12b827898cae84b27

zjh 2024/07/25-1

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java

@@ -327,8 +327,6 @@
//    @Transactional
    public AjaxResult dataSynchronization(@RequestParam String tjNumber) {



        //根据配置调取存储过程 将临时表数据存入预约表2023.12.12
        final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");

@@ -365,8 +363,9 @@
            if (null != sfkqdyhis && sfkqdyhis.equals("Y")) {

                List<String> baoGaoDans = ltkjHybgdService.getJianYanBaoGaoDan(order.getCardId());
                if (null != baoGaoDans && baoGaoDans.size() > 0) {
                List<String> jianChaBaoGaoDan = ltkjHybgdService.getJianChaBaoGaoDan(order.getCardId());
                    //同步检验
                if (null != baoGaoDans && baoGaoDans.size() > 0) {
                    Date dates = new Date();
                    Map<String, Object> map = new HashMap<>();
                    map.put("his_registration_id", order.getCardId());
@@ -381,7 +380,7 @@
                    JSONObject object = getJSONObject(result1);
                    String code = object.getStr("ResultCode");
                    if (null == code || !code.equals("0")) {
                        return AjaxResult.error("化验项目暂时无结果,请稍后同步!!!");
                        return AjaxResult.error("化验项目暂时未出结果,请稍后同步!!!");
                    }
                    JSONArray data = object.getJSONArray("ResultData");

@@ -472,9 +471,12 @@

                        }
                    }
                    //同步化验项目
                    testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                }

                    /*同步检查 his接口*/

                if (null != jianChaBaoGaoDan && jianChaBaoGaoDan.size() > 0) {
                    Map<String, Object> maps = new HashMap<>();
                    maps.put("his_registration_id", order.getCardId());
                    maps.put("ksbm", "体检中心");
@@ -549,20 +551,27 @@
                                jcbgdService.save(jcbgd);
                            }
                            jcsqdService.saveLtkjExamJcsqd(order.getCardId());
                            testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                        }else {
                            return AjaxResult.error("检查项目暂时未出结果,请稍后同步!!!");
                        }
                    }
                }

                //同步化验项目
                testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                //同步检查项目
                testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                asyncService.updateCheckType(order.getTjNumber());
            }

            return AjaxResult.success("同步成功");
//            return AjaxResult.error("化验项目暂时无结果,请稍后同步!!!");


                //同步检查项目给redis缓存现在不用了
//                asyncService.updateCheckType(order.getTjNumber());
        }
        return AjaxResult.error();
            //化验
            testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
            //检查
            jcsqdService.saveLtkjExamJcsqd(order.getCardId());
            return AjaxResult.success("同步成功");
        }
        return AjaxResult.error("未查到该人员体检记录");
    }

    //将方法返回值解析成json格式

 ltkj-framework/src/main/java/com/ltkj/framework/web/exception/GlobalExceptionHandler.java

@@ -53,8 +53,8 @@
    public AjaxResult handleServiceException(ServiceException e, HttpServletRequest request) {
        log.error(e.getMessage(), e);
        Integer code = e.getCode();
//        return StringUtils.isNotNull(code) ? AjaxResult.error(code, e.getMessage()) : AjaxResult.error(e.getMessage());
        return AjaxResult.error("数据处理异常，请联系管理员!");
        return StringUtils.isNotNull(code) ? AjaxResult.error(code, e.getMessage()) : AjaxResult.error(e.getMessage());
//        return AjaxResult.error("数据处理异常，请联系管理员!");
    }

    /**

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java

@@ -25,9 +25,12 @@
    void  deletedLtkjHybgdByTjhAndTmh(String tmh);


    @Select("SELECT  a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND (a.type='检验' OR a.type='检查') GROUP BY a.sqdh")
    @Select("SELECT  a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='检验' GROUP BY a.sqdh")
    List<String> getJianYanBaoGaoDan(String cardId);

    @Select("SELECT * FROM ltkj_hybgd WHERE tmh=#{tmh}")
    List<LtkjHybgd> getJianYanBaoGaoDanList(String tmh);

    @Select("SELECT  a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='检查' GROUP BY a.sqdh")
    List<String> getJianChaBaoGaoDan(String cardId);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHybgdService.java

@@ -18,4 +18,6 @@
    List<String> getJianYanBaoGaoDan(String cardId);

    List<LtkjHybgd> getJianYanBaoGaoDanList(String tmh);

    List<String> getJianChaBaoGaoDan(String cardId);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHybgdServiceImpl.java

@@ -37,4 +37,9 @@
    public List<LtkjHybgd> getJianYanBaoGaoDanList(String tmh) {
        return mapper.getJianYanBaoGaoDanList(tmh);
    }

    @Override
    public List<String> getJianChaBaoGaoDan(String cardId) {
        return mapper.getJianChaBaoGaoDan(cardId);
    }
}