From 5071d41398c102604d1bc428de6c4d4b44d0588a Mon Sep 17 00:00:00 2001 From: 赵文轩 <1652863494@qq.com> Date: 星期四, 06 六月 2024 21:12:38 +0800 Subject: [PATCH] 去除分页判断 --- ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java | 118 +++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 66 insertions(+), 52 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java index 3a4b0f8..54e33de 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java @@ -4,10 +4,14 @@ import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ltkj.common.core.domain.AjaxResult; +import com.ltkj.hosp.domain.HisApiConfig; +import com.ltkj.hosp.service.HisApiConfigService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; import java.io.FileInputStream; import java.io.IOException; @@ -30,13 +34,27 @@ private static final String CONFIG_PATH = "/Users/chacca/寮�鍙戠浉鍏�/浠g爜/ltkj_peis/ltkj-admin/src/main/resources/config.properties"; // 鏁版嵁搴撳悕 private static String DB_NAME = ""; + private static String HIS_URL = ""; @Autowired private HisApiMethodService controller; + @Autowired + private HisApiConfigService hisApiConfigService; static { try { Class.forName("com.mysql.cj.jdbc.Driver"); } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + try { + FileInputStream inputStream = new FileInputStream(CONFIG_PATH); + Properties props = new Properties(); + props.load(inputStream); + String url = props.getProperty("his_api_url"); + String port = props.getProperty("his_api_port"); + HIS_URL=url+":"+port+"/api/His/"; + } catch (IOException throwables) { + throwables.printStackTrace(); } } @@ -48,102 +66,98 @@ * @param params 璇锋眰鍙傛暟 * @return */ + @Transactional public AjaxResult getHISData(String type, Map<String, Object> params) { - // Getoutaccountrecord 鑾峰彇闂ㄨ瘖缁撶畻璁板綍 - // Getoutpatientcostinfo 鑾峰彇闂ㄨ瘖鎮h�呰垂鐢ㄦ竻鍗曚俊鎭� - // Getlaburgentinfo 鑾峰彇鍗辨�ュ�间俊鎭� - // Getlabgermdetailinfo 鑾峰彇寰敓鐗╄嵂鏁忎俊鎭� - // Getlabgermrepinfo 鑾峰彇寰敓鐗╂姤鍛婅褰曚俊鎭� - // Getlabreportinfo 鑾峰彇妫�楠屾姤鍛婅褰曚俊鎭� - // Getlabapplyinfo 鑾峰彇妫�楠岀敵璇蜂俊鎭� - // Getexamurgentinfo 鑾峰彇妫�鏌ュ嵄鎬ュ�间俊鎭� - // Getexamreportinfo 鑾峰彇妫�鏌ユ姤鍛婁俊鎭� - // Getexamapplyinfo 鑾峰彇妫�鏌ョ敵璇蜂俊鎭� +// LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>(); +// lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, type); +// HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper); + AjaxResult result = null; - // TODO 鍒涘缓琛� 寮勬垚鏁版嵁搴撳姩鎬佽幏鍙� 鎺ュ彛鍦板潃銆佷唬鐮併�佹槸鍚﹀垎椤� + // TODO 鍒涘缓琛� 寮勬垚鏁版嵁搴撳姩鎬佽幏鍙� 鎺ュ彛鍦板潃銆佷唬鐮併�佹槸鍚﹀垎椤点�佷富閿甶d銆佷富閿瓧娈� // TODO 浠�2.4.2鑾峰彇鍒版暟鎹� 鏍规嵁his_registration_id鍒犻櫎鏃ф暟鎹湪鎻掑叆鏂版暟鎹� 涓嬪眰涓氬姟鍧囦竴鏍锋牴鎹繑鍥炵殑JYBGID鍒犻櫎鏃ф暟鎹湪鎻掑叆鏂版暟鎹� switch (type) { case "Getoutaccountrecord": result = controller.Getoutaccountrecord(params); - result.put("limit", true); +// result.put("limit", true); break; case "Getoutpatientcostinfo": result = controller.Getoutpatientcostinfo(params); - result.put("limit", true); +// result.put("limit", true); break; case "Getlaburgentinfo": result = controller.Getlaburgentinfo(params); - result.put("limit", false); +// result.put("limit", false); break; case "Getlabgermdetailinfo": result = controller.Getlabgermdetailinfo(params); - result.put("limit", false); +// result.put("limit", false); break; case "Getlabgermrepinfo": result = controller.Getlabgermrepinfo(params); - result.put("limit", false); +// result.put("limit", false); break; case "Getlabreportinfo": result = controller.Getlabreportinfo(params); - result.put("limit", true); +// result.put("limit", true); break; case "Getlabapplyinfo": result = controller.Getlabapplyinfo(params); - result.put("limit", false); +// result.put("limit", false); break; case "Getexamurgentinfo": result = controller.Getexamurgentinfo(params); - result.put("limit", true); +// result.put("limit", true); break; case "Getexamreportinfo": result = controller.Getexamreportinfo(params); - result.put("limit", true); +// result.put("limit", true); break; case "Getexamapplyinfo": result = controller.Getexamapplyinfo(params); - result.put("limit", false); +// result.put("limit", false); break; case "Getlabdetailinfo": result = controller.Getlabdetailinfo(params); - result.put("limit", false); +// result.put("limit", false); break; } String json = result.get("data").toString(); JSONObject response = JSONUtil.parseObj(json).getJSONObject("Response"); if (response.getStr("ResultCode").toString().equals("0")) { AjaxResult ajaxResult = AjaxResult.success(); - if ((boolean) result.get("limit")) { - ajaxResult = saveArray(json, type); - JSONArray resultData = response.getJSONArray("ResultData"); - List<Map<String, String>> list = new ArrayList<>(); - for (Object resultDatum : resultData) { - JSONObject object = (JSONObject) resultDatum; - 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); +// if ((boolean) result.get("limit")) { +// ajaxResult = saveArray(json, type); + JSONArray resultData = response.getJSONArray("ResultData"); + List<Map<String, String>> list = new ArrayList<>(); + for (Object resultDatum : resultData) { + JSONObject object = (JSONObject) resultDatum; + ajaxResult = save(object, type); + 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); } - ajaxResult.put("data", list); - } else { - // 浠ラ泦鍚堣繑鍥� - JSONArray resultData = response.getJSONArray("ResultData"); - List<JSONObject> list = JSONUtil.toList(resultData, JSONObject.class); - ArrayList<Map<String, String>> maps = new ArrayList<>(); - for (JSONObject data : list) { - ajaxResult = save(data, type); - HashMap<String, String> map1 = new HashMap<>(); - for (String key : data.keySet()) { - String defaultVal = data.get(key).toString(); - String val = defaultVal.trim().replaceAll("\\s+", ""); - map1.put(key, val); - } - maps.add(map1); - } - ajaxResult.put("data", maps); + list.add(map); } + ajaxResult.put("data", list); +// } else { +// // 浠ラ泦鍚堣繑鍥� +// JSONArray resultData = response.getJSONArray("ResultData"); +// List<JSONObject> list = JSONUtil.toList(resultData, JSONObject.class); +// ArrayList<Map<String, String>> maps = new ArrayList<>(); +// for (JSONObject data : list) { +// ajaxResult = save(data, type); +// HashMap<String, String> map1 = new HashMap<>(); +// for (String key : data.keySet()) { +// String defaultVal = data.get(key).toString(); +// String val = defaultVal.trim().replaceAll("\\s+", ""); +// map1.put(key, val); +// } +// maps.add(map1); +// } +// ajaxResult.put("data", maps); +// } return ajaxResult; } else { return AjaxResult.error().put("result", JSONUtil.parseObj(json)); -- Gitblit v1.8.0