zjh
2025-02-28 1e91dc33009cfdc951b2642877f40280b51c3089
zjh20250228
2个文件已修改
66 ■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java 64 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
@@ -217,36 +217,42 @@
//    @Transactional
    public AjaxResult getHISDataNew(String type, Map<String, Object> params){
        LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
        lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, type);
        HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
        String responseJson = HttpClientUtils.sendPost(HIS_URL + hisApiConfig.getApiUrl(), params);
        Integer isResponse = hisApiConfig.getIsResponse();
        JSONObject response = null;
        if (isResponse == 1) {
            response = JSONUtil.parseObj(responseJson).getJSONObject("Response");
        } else{
            response = JSONUtil.parseObj(responseJson);
        }
        if (response.getStr(hisApiConfig.getResultCodeKey()).equals("0")) {
            AjaxResult ajaxResult = AjaxResult.success();
            JSONArray resultData = response.getJSONArray(hisApiConfig.getResultDataKey());
            List<Map<String, String>> list = new ArrayList<>();
            for (Object resultDatum : resultData) {
                JSONObject object = (JSONObject) resultDatum;
                ajaxResult = save(object, type,hisApiConfig,JSONUtil.toJsonStr(params));
                Map<String, String> map = new HashMap<>();
                for (String key : object.keySet()) {
                    String defaultVal = object.get(key).toString();
                    String val = defaultVal.trim().replaceAll("\\s+", "");
                    map.put(key, val);
                }
                list.add(map);
        try {
            LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
            lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, type);
            HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
            String responseJson = HttpClientUtils.sendPost(HIS_URL + hisApiConfig.getApiUrl(), params);
            Integer isResponse = hisApiConfig.getIsResponse();
            JSONObject response = null;
            if (isResponse == 1) {
                response = JSONUtil.parseObj(responseJson).getJSONObject("Response");
            } else{
                response = JSONUtil.parseObj(responseJson);
            }
            ajaxResult.put("data", list);
            return ajaxResult;
        } else {
            return AjaxResult.error().put("result", JSONUtil.parseObj(responseJson));
            if (response.getStr(hisApiConfig.getResultCodeKey()).equals("0")) {
                AjaxResult ajaxResult = AjaxResult.success();
                JSONArray resultData = response.getJSONArray(hisApiConfig.getResultDataKey());
                List<Map<String, String>> list = new ArrayList<>();
                for (Object resultDatum : resultData) {
                    JSONObject object = (JSONObject) resultDatum;
                    ajaxResult = save(object, type,hisApiConfig,JSONUtil.toJsonStr(params));
                    Map<String, String> map = new HashMap<>();
                    for (String key : object.keySet()) {
                        String defaultVal = object.get(key).toString();
                        String val = defaultVal.trim().replaceAll("\\s+", "");
                        map.put(key, val);
                    }
                    list.add(map);
                }
                ajaxResult.put("data", list);
                return ajaxResult;
            } else {
                return AjaxResult.error().put("result", JSONUtil.parseObj(responseJson));
            }
        } catch (Exception e) {
//            throw new RuntimeException(e);
            log.error(String.valueOf(e));
            return AjaxResult.error();
        }
    }
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -817,8 +817,8 @@
                                results = service.getHISDataNew("Getexamreportinfo", maps);
                            }else{
                                results = jcsqdService.getTjJcProByHisCall("体检中心", order.getCardId(), "''", 100, 1, "'1'");
                                DynamicDataSourceContextHolder.clearDataSourceType();
                            }
                            DynamicDataSourceContextHolder.clearDataSourceType();
                            log.info("检查项目查询返回值:      " + results.toString());
                            if (Integer.parseInt(results.get("code").toString()) == 200) {
                                List<Map<String, Object>> datas = (List<Map<String, Object>>) results.get("data");