From 04941f68821b7a0121485e566a641d3b5906a52c Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 03 六月 2025 18:10:52 +0800
Subject: [PATCH] 中间层修改读取配置到数据库动态加载
---
src/main/resources/mapper/DictCommonHisConfigMapper.xml | 3
src/main/java/com/example/constant/ApiParamsConstants.java | 2
src/main/java/com/example/service/shanjianyi/shanxiqin/xian/xamjyy/MeiJiHisService.java | 86 +++++----
src/main/java/com/example/service/shanjianyi/shanxiqin/baoji/bjxjyy/BjxjyyHisService.java | 2
src/main/java/com/example/service/shanjianyi/shanxiqin/weinan/pbkwyy/PbkwyyHisService.java | 86 +++++----
src/main/java/com/example/service/shanjianyi/shanxiqin/weinan/wbzxyy/WbzxyyHisService.java | 86 +++++----
src/main/java/com/example/service/shanjianyi/shanxiqin/xian/sqyy/ShanQiHisService.java | 86 +++++----
src/main/java/com/example/service/shanjianyi/shanxiqin/weinan/jdczgzyy/JdczgzyyHisService.java | 90 ++++++----
src/main/java/com/example/domain/DictCommonHisConfig.java | 5
9 files changed, 248 insertions(+), 198 deletions(-)
diff --git a/src/main/java/com/example/constant/ApiParamsConstants.java b/src/main/java/com/example/constant/ApiParamsConstants.java
index bc46641..932603c 100644
--- a/src/main/java/com/example/constant/ApiParamsConstants.java
+++ b/src/main/java/com/example/constant/ApiParamsConstants.java
@@ -71,7 +71,7 @@
/**
* 寮�鍗曠瀹�
*/
- public static final String kaiDanKeShi = "kaiDanKs";
+// public static final String kaiDanKeShi = "kaiDanKs";
/**
* 璐圭敤绫诲埆鏍囧織 1浠ｆ敹璐� 2寰呴��璐�
diff --git a/src/main/java/com/example/domain/DictCommonHisConfig.java b/src/main/java/com/example/domain/DictCommonHisConfig.java
index f675256..b66186e 100644
--- a/src/main/java/com/example/domain/DictCommonHisConfig.java
+++ b/src/main/java/com/example/domain/DictCommonHisConfig.java
@@ -78,6 +78,11 @@
/**
*
*/
+ private String kdks;
+
+ /**
+ *
+ */
private String dbIp;
/**
diff --git a/src/main/java/com/example/service/shanjianyi/shanxiqin/baoji/bjxjyy/BjxjyyHisService.java b/src/main/java/com/example/service/shanjianyi/shanxiqin/baoji/bjxjyy/BjxjyyHisService.java
index 71ad7f9..76e29b5 100644
--- a/src/main/java/com/example/service/shanjianyi/shanxiqin/baoji/bjxjyy/BjxjyyHisService.java
+++ b/src/main/java/com/example/service/shanjianyi/shanxiqin/baoji/bjxjyy/BjxjyyHisService.java
@@ -238,7 +238,7 @@
map.put ("caoZuoYuan",config.getCzyId());
map.put ("yuanQuId","1");
map.put ("yingYongId","870101");
- map.put ("kaiDanKs",params.get(ApiParamsConstants.kaiDanKeShi));
+ map.put ("kaiDanKs",config.getKdks());
map.put ("dengJiLsh",params.get(ApiParamsConstants.Tj_NUM));
map.put ("shouTuiBz",params.get(ApiParamsConstants.SHOU_TUI_STATUS));
map.put ("feiYongMxList",params.get(ApiParamsConstants.FEI_YONG_INFO_LIST));
diff --git a/src/main/java/com/example/service/shanjianyi/shanxiqin/weinan/jdczgzyy/JdczgzyyHisService.java b/src/main/java/com/example/service/shanjianyi/shanxiqin/weinan/jdczgzyy/JdczgzyyHisService.java
index ba9c365..8a0b32b 100644
--- a/src/main/java/com/example/service/shanjianyi/shanxiqin/weinan/jdczgzyy/JdczgzyyHisService.java
+++ b/src/main/java/com/example/service/shanjianyi/shanxiqin/weinan/jdczgzyy/JdczgzyyHisService.java
@@ -8,8 +8,10 @@
import cn.hutool.json.JSONUtil;
import com.example.config.ConfigValue;
import com.example.constant.ApiParamsConstants;
+import com.example.domain.DictCommonHisConfig;
import com.example.domain.HisSyncDict;
import com.example.domain.TjFlowingWaterHis;
+import com.example.service.DictCommonHisConfigService;
import com.example.service.HisService;
import com.example.utils.AjaxResult;
import com.example.utils.FieldNameConverter;
@@ -44,23 +46,24 @@
// client_secret:05a192176c21edfcc9cf5fa26fc5a9e0c5b131ad
// http://oapi.xamjyy.com/OAPI
- @Autowired
- public JdczgzyyHisService(ApplicationContext applicationContext, ConfigValue configValue) {
- this.applicationContext = applicationContext;
- this.configValue = configValue;
- HIS_URL = configValue.getConfigValue("ShanXi_Qin_WeiNan_Jdczgzyy.his_api_url") + ":" + configValue.getConfigValue("ShanXi_Qin_WeiNan_Jdczgzyy.his_api_port") + configValue.getConfigValue("ShanXi_Qin_WeiNan_Jdczgzyy.hisapiappend");
- TJ_URL = configValue.getConfigValue("tjUrl");
- CZY = configValue.getConfigValue("ShanXi_Qin_WeiNan_Jdczgzyy.czy");
- }
+// @Autowired
+// public JdczgzyyHisService(ApplicationContext applicationContext, ConfigValue configValue) {
+// this.applicationContext = applicationContext;
+// this.configValue = configValue;
+// HIS_URL = configValue.getConfigValue("ShanXi_Qin_WeiNan_Jdczgzyy.his_api_url") + ":" + configValue.getConfigValue("ShanXi_Qin_WeiNan_Jdczgzyy.his_api_port") + configValue.getConfigValue("ShanXi_Qin_WeiNan_Jdczgzyy.hisapiappend");
+// TJ_URL = configValue.getConfigValue("tjUrl");
+// CZY = configValue.getConfigValue("ShanXi_Qin_WeiNan_Jdczgzyy.czy");
+// }
@Autowired
private RedisTemplate<Object ,Object> redisTemplate;
+ @Autowired
+ private DictCommonHisConfigService dictCommonHisConfigService;
- private final ApplicationContext applicationContext;
-
- private final String HIS_URL;
- private final String TJ_URL;
- private final String CZY;
+// private final ApplicationContext applicationContext;
+// private final String HIS_URL;
+// private final String TJ_URL;
+// private final String CZY;
//鑾峰彇token
private JSONObject getToken () {
@@ -74,7 +77,8 @@
map.put("client_secret", CLIENT_SECRET);
// map.put("scope",SCOP);
// String post = sendPostTokenFormUrlencoded (HIS_URL+"/oauth/token", map);
- String post = HttpClientUtils.sendPostTokenFormUrlencoded(HIS_URL + "/oauth/token", map, null);
+ String his_url = dictCommonHisConfigService.getConfigValByHospitalAndKey("jdczgzyy", "HIS_URL");
+ String post = HttpClientUtils.sendPostTokenFormUrlencoded(his_url + "/oauth/token", map, null);
if (StrUtil.isBlank(post)) return null;
return JSONUtil.parseObj(post);
}
@@ -101,7 +105,8 @@
map.put ("feiYongLb","");
map.put ("feiYongXz","");
map.put ("jiLuLy","3");
- map.put ("caoZuoYuan",CZY);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("jdczgzyy");
+ map.put ("caoZuoYuan",config.getCzyId());
map.put ("chongZhiJe","");
map.put ("yiBaoKh","");
map.put ("geRenBh","");
@@ -114,7 +119,7 @@
map.put ("minZuDm","");
map.put ("minZuMc","");
// 鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/menZhenJz/jianDang", map);
+ String post = sendPost(config.getHisUrl() + "/menZhenJz/jianDang", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getStr("returnCode").equals("1")) {
JSONObject obj = JSONUtil.createObj();
@@ -130,12 +135,13 @@
@Override
public String getBingRenXxByShengFenZheng(Map<String, Object> params) {
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("jdczgzyy");
Map<String, Object> map = new HashMap<> ();
- map.put ("caoZuoYuan",CZY);
+ map.put ("caoZuoYuan",config.getCzyId());
map.put ("shenFenZh", params.get(ApiParamsConstants.CUS_ID_CARD));
map.put ("danWeiBh",params.get(ApiParamsConstants.COMP_ID));
//鑱屼笟缂栫爜
- String string = sendPostTokenFormUrlencoded(HIS_URL + "/menZhenJz/getBingRenXxByShengFenZheng", map);
+ String string = sendPostTokenFormUrlencoded(config.getHisUrl() + "/menZhenJz/getBingRenXxByShengFenZheng", map);
JSONObject object = JSONUtil.createObj();
if (StrUtil.isBlank(string)){
object.putOpt("code",500);
@@ -183,9 +189,10 @@
map.put ("feiYongLb","");
map.put ("feiYongXz","");
map.put ("jiLuLy","3");
- map.put ("caoZuoYuan",CZY);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("jdczgzyy");
+ map.put ("caoZuoYuan",config.getCzyId());
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/menZhenJz/saveBingRenXx", map);
+ String post = sendPost(config.getHisUrl() + "/menZhenJz/saveBingRenXx", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getStr("returnCode").equals("1")) {
JSONObject obj = JSONUtil.createObj();
@@ -205,8 +212,10 @@
map.put ("bingRenId",params.get(ApiParamsConstants.PATIONID));
map.put ("jiuZhenKh",params.get(ApiParamsConstants.CARD_ID));
map.put ("yuanQuId","1");
+
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("jdczgzyy");
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/shouFei/getListDaiShouFei", map);
+ String post = sendPost(config.getHisUrl() + "/shouFei/getListDaiShouFei", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getStr("returnCode").equals("1")) {
JSONObject data = jsonObject.getJSONObject("returnData");
@@ -226,15 +235,16 @@
Map<String, Object> map = new HashMap<> ();
map.put ("bingRenId",params.get(ApiParamsConstants.PATIONID));
map.put ("jiuZhenKh",params.get(ApiParamsConstants.CARD_ID));
- map.put ("caoZuoYuan",CZY);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("jdczgzyy");
+ map.put ("caoZuoYuan",config.getCzyId());
map.put ("yuanQuId","1");
map.put ("yingYongId","870101");
- map.put ("kaiDanKs",params.get(ApiParamsConstants.kaiDanKeShi));
+ map.put ("kaiDanKs",config.getKdks());
map.put ("dengJiLsh",params.get(ApiParamsConstants.Tj_NUM));
map.put ("shouTuiBz",params.get(ApiParamsConstants.SHOU_TUI_STATUS));
map.put ("feiYongMxList",params.get(ApiParamsConstants.FEI_YONG_INFO_LIST));
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/shouFei/createMenZhenFy", map);
+ String post = sendPost(config.getHisUrl() + "/shouFei/createMenZhenFy", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getInt("returnCode") != 1) return AjaxResult.error(post);
JSONObject data = jsonObject.getJSONObject("returnData");
@@ -272,8 +282,9 @@
ids.add(object);
});
map.put ("feiYongIdList",ids);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("jdczgzyy");
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/shouFei/cheXiaoMzFy", map);
+ String post = sendPost(config.getHisUrl() + "/shouFei/cheXiaoMzFy", map);
JSONObject entries = JSONUtil.parseObj(post);
if (entries.getStr("returnCode").equals("1"))
return AjaxResult.success();
@@ -288,7 +299,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getKeShi", map);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("jdczgzyy", "HIS_URL")+"/zhuShuJu/getKeShi", map);
}
@Override
@@ -299,8 +310,9 @@
map.put ("bianGengSj","");
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
+
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getListYiShengZd", map);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("jdczgzyy", "HIS_URL")+"/zhuShuJu/getListYiShengZd", map);
}
@Override
@@ -311,7 +323,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getShouFeiXm", map);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("jdczgzyy", "HIS_URL")+"/zhuShuJu/getShouFeiXm", map);
}
@Override
@@ -324,7 +336,7 @@
map.put ("keShiIds",params.get(ApiParamsConstants.DEPT_IDS));
map.put ("ifPlus","");
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getKeShiByConditions", map);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("jdczgzyy", "HIS_URL")+"/zhuShuJu/getKeShiByConditions", map);
}
@Override
@@ -334,7 +346,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getYangBen", map);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("jdczgzyy", "HIS_URL")+"/zhuShuJu/getYangBen", map);
}
@Override
@@ -345,7 +357,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getListBingQuZd", map);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("jdczgzyy", "HIS_URL")+"/zhuShuJu/getListBingQuZd", map);
}
@Override
@@ -355,7 +367,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getZhiGongPage", map);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("jdczgzyy", "HIS_URL")+"/zhuShuJu/getZhiGongPage", map);
}
@Override
@@ -366,7 +378,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getJianChaXm", map);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("jdczgzyy", "HIS_URL")+"/zhuShuJu/getJianChaXm", map);
}
@Override
@@ -375,7 +387,7 @@
hashMap.put("queryCode",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("page",map.get(ApiParamsConstants.PAGE_INDEX));
hashMap.put("size",map.get(ApiParamsConstants.PAGE_SIZE));
- return sendPost(HIS_URL+"/zhuShuJu/getJianYanXm", hashMap);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("jdczgzyy", "HIS_URL")+"/zhuShuJu/getJianYanXm", hashMap);
}
@Override
@@ -383,7 +395,7 @@
HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("shouFeiXmId",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("jiaGeTx",map.get(ApiParamsConstants.COMMON_QUERY_KEY2));
- return sendPost(HIS_URL+"/zhuShuJu/getShouFeiXmJg", hashMap);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("jdczgzyy", "HIS_URL")+"/zhuShuJu/getShouFeiXmJg", hashMap);
}
@Override
@@ -392,7 +404,7 @@
hashMap.put("queryString",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("pageIndex",map.get(ApiParamsConstants.PAGE_INDEX));
hashMap.put("pageSize",map.get(ApiParamsConstants.PAGE_SIZE));
- return sendPost(HIS_URL+"/zhuShuJu/getRongQi", hashMap);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("jdczgzyy", "HIS_URL")+"/zhuShuJu/getRongQi", hashMap);
}
@Override
@@ -401,7 +413,7 @@
hashMap.put("queryString",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("pageIndex",map.get(ApiParamsConstants.PAGE_INDEX));
hashMap.put("pageSize",map.get(ApiParamsConstants.PAGE_SIZE));
- return sendPost(HIS_URL+"/zhuShuJu/getYangBen", hashMap);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("jdczgzyy", "HIS_URL")+"/zhuShuJu/getYangBen", hashMap);
}
@Override
@@ -418,7 +430,7 @@
map.put("type","1");
HashMap<String, Object> headers = new HashMap<>();
headers.put("hospId","jdczgzyy");
- String post = HttpClientUtils.sendPost(TJ_URL + "/callBack/pushZhiFuMsg", map,headers);
+ String post = HttpClientUtils.sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("jdczgzyy", "TJ_URL") + "/callBack/pushZhiFuMsg", map,headers);
JSONObject jsonObject = JSONUtil.parseObj(post);
JSONObject obj = JSONUtil.createObj();
if (jsonObject.getStr("code").equals("200")) {
@@ -549,7 +561,7 @@
map.put("hosp","shanxiqinjdczgzyy");
HashMap<String, Object> headers = new HashMap<>();
headers.put("hospId","jdczgzyy");
- String post = HttpClientUtils.sendPost(TJ_URL + "/callBack/getZdList", map,headers);
+ String post = HttpClientUtils.sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("jdczgzyy", "TJ_URL") + "/callBack/getZdList", map,headers);
JSONArray jsonArray = JSONUtil.parseObj(post).getJSONArray("data");
if (jsonArray != null && !jsonArray.isEmpty()) {
List<HisSyncDict> list = jsonArray.toList(HisSyncDict.class);
diff --git a/src/main/java/com/example/service/shanjianyi/shanxiqin/weinan/pbkwyy/PbkwyyHisService.java b/src/main/java/com/example/service/shanjianyi/shanxiqin/weinan/pbkwyy/PbkwyyHisService.java
index 1940bee..6d15119 100644
--- a/src/main/java/com/example/service/shanjianyi/shanxiqin/weinan/pbkwyy/PbkwyyHisService.java
+++ b/src/main/java/com/example/service/shanjianyi/shanxiqin/weinan/pbkwyy/PbkwyyHisService.java
@@ -8,8 +8,10 @@
import cn.hutool.json.JSONUtil;
import com.example.config.ConfigValue;
import com.example.constant.ApiParamsConstants;
+import com.example.domain.DictCommonHisConfig;
import com.example.domain.HisSyncDict;
import com.example.domain.TjFlowingWaterHis;
+import com.example.service.DictCommonHisConfigService;
import com.example.service.HisService;
import com.example.utils.AjaxResult;
import com.example.utils.FieldNameConverter;
@@ -44,23 +46,25 @@
// client_secret:05a192176c21edfcc9cf5fa26fc5a9e0c5b131ad
// http://oapi.xamjyy.com/OAPI
- @Autowired
- public PbkwyyHisService(ApplicationContext applicationContext, ConfigValue configValue) {
- this.applicationContext = applicationContext;
- this.configValue = configValue;
- HIS_URL = configValue.getConfigValue("ShanXi_Qin_WeiNan_Pbkwyy.his_api_url") + ":" + configValue.getConfigValue("ShanXi_Qin_WeiNan_Pbkwyy.his_api_port") + configValue.getConfigValue("ShanXi_Qin_WeiNan_Pbkwyy.hisapiappend");
- TJ_URL = configValue.getConfigValue("tjUrl");
- CZY = configValue.getConfigValue("ShanXi_Qin_WeiNan_Pbkwyy.czy");
- }
+// @Autowired
+// public PbkwyyHisService(ApplicationContext applicationContext, ConfigValue configValue) {
+// this.applicationContext = applicationContext;
+// this.configValue = configValue;
+// HIS_URL = configValue.getConfigValue("ShanXi_Qin_WeiNan_Pbkwyy.his_api_url") + ":" + configValue.getConfigValue("ShanXi_Qin_WeiNan_Pbkwyy.his_api_port") + configValue.getConfigValue("ShanXi_Qin_WeiNan_Pbkwyy.hisapiappend");
+// TJ_URL = configValue.getConfigValue("tjUrl");
+// CZY = configValue.getConfigValue("ShanXi_Qin_WeiNan_Pbkwyy.czy");
+// }
@Autowired
private RedisTemplate<Object ,Object> redisTemplate;
+ @Autowired
+ private DictCommonHisConfigService dictCommonHisConfigService;
- private final ApplicationContext applicationContext;
-
- private final String HIS_URL;
- private final String TJ_URL;
- private final String CZY;
+// private final ApplicationContext applicationContext;
+//
+// private final String HIS_URL;
+// private final String TJ_URL;
+// private final String CZY;
//鑾峰彇token
private JSONObject getToken () {
@@ -74,13 +78,14 @@
map.put("client_secret", CLIENT_SECRET);
// map.put("scope",SCOP);
// String post = sendPostTokenFormUrlencoded (HIS_URL+"/oauth/token", map);
- String post = HttpClientUtils.sendPostTokenFormUrlencoded(HIS_URL + "/oauth/token", map, null);
+ String post = HttpClientUtils.sendPostTokenFormUrlencoded(dictCommonHisConfigService.getConfigByHospital("pbkwyy").getHisUrl() + "/oauth/token", map, null);
if (StrUtil.isBlank(post)) return null;
return JSONUtil.parseObj(post);
}
@Override
public String jianDang(Map<String, Object> params) {
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("pbkwyy");
Map<String, Object> map = new HashMap<> ();
map.put ("jiuZhenKh", params.get(ApiParamsConstants.CARD_ID));
map.put ("kaiLeiXing","4");
@@ -101,7 +106,7 @@
map.put ("feiYongLb","");
map.put ("feiYongXz","");
map.put ("jiLuLy","3");
- map.put ("caoZuoYuan",CZY);
+ map.put ("caoZuoYuan",config.getCzyId());
map.put ("chongZhiJe","");
map.put ("yiBaoKh","");
map.put ("geRenBh","");
@@ -114,7 +119,7 @@
map.put ("minZuDm","");
map.put ("minZuMc","");
// 鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/menZhenJz/jianDang", map);
+ String post = sendPost(config.getHisUrl() + "/menZhenJz/jianDang", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getStr("returnCode").equals("1")) {
JSONObject obj = JSONUtil.createObj();
@@ -130,12 +135,13 @@
@Override
public String getBingRenXxByShengFenZheng(Map<String, Object> params) {
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("pbkwyy");
Map<String, Object> map = new HashMap<> ();
- map.put ("caoZuoYuan",CZY);
+ map.put ("caoZuoYuan",config.getCzyId());
map.put ("shenFenZh", params.get(ApiParamsConstants.CUS_ID_CARD));
map.put ("danWeiBh",params.get(ApiParamsConstants.COMP_ID));
//鑱屼笟缂栫爜
- String string = sendPostTokenFormUrlencoded(HIS_URL + "/menZhenJz/getBingRenXxByShengFenZheng", map);
+ String string = sendPostTokenFormUrlencoded(config.getHisUrl() + "/menZhenJz/getBingRenXxByShengFenZheng", map);
JSONObject object = JSONUtil.createObj();
if (StrUtil.isBlank(string)){
object.putOpt("code",500);
@@ -183,9 +189,10 @@
map.put ("feiYongLb","");
map.put ("feiYongXz","");
map.put ("jiLuLy","3");
- map.put ("caoZuoYuan",CZY);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("pbkwyy");
+ map.put ("caoZuoYuan",config.getCzyId());
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/menZhenJz/saveBingRenXx", map);
+ String post = sendPost(config.getHisUrl() + "/menZhenJz/saveBingRenXx", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getStr("returnCode").equals("1")) {
JSONObject obj = JSONUtil.createObj();
@@ -206,7 +213,7 @@
map.put ("jiuZhenKh",params.get(ApiParamsConstants.CARD_ID));
map.put ("yuanQuId","1");
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/shouFei/getListDaiShouFei", map);
+ String post = sendPost(dictCommonHisConfigService.getConfigByHospital("pbkwyy").getHisUrl() + "/shouFei/getListDaiShouFei", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getStr("returnCode").equals("1")) {
JSONObject data = jsonObject.getJSONObject("returnData");
@@ -223,18 +230,19 @@
@Override
public String createMenZhenFy(Map<String, Object> params) {
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("pbkwyy");
Map<String, Object> map = new HashMap<> ();
map.put ("bingRenId",params.get(ApiParamsConstants.PATIONID));
map.put ("jiuZhenKh",params.get(ApiParamsConstants.CARD_ID));
- map.put ("caoZuoYuan",CZY);
+ map.put ("caoZuoYuan",config.getCzyId());
map.put ("yuanQuId","1");
map.put ("yingYongId","870101");
- map.put ("kaiDanKs",params.get(ApiParamsConstants.kaiDanKeShi));
+ map.put ("kaiDanKs",config.getKdks());
map.put ("dengJiLsh",params.get(ApiParamsConstants.Tj_NUM));
map.put ("shouTuiBz",params.get(ApiParamsConstants.SHOU_TUI_STATUS));
map.put ("feiYongMxList",params.get(ApiParamsConstants.FEI_YONG_INFO_LIST));
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/shouFei/createMenZhenFy", map);
+ String post = sendPost(config.getHisUrl() + "/shouFei/createMenZhenFy", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getInt("returnCode") != 1) return AjaxResult.error(post);
JSONObject data = jsonObject.getJSONObject("returnData");
@@ -273,7 +281,7 @@
});
map.put ("feiYongIdList",ids);
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/shouFei/cheXiaoMzFy", map);
+ String post = sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("pbkwyy", "HIS_URL") + "/shouFei/cheXiaoMzFy", map);
JSONObject entries = JSONUtil.parseObj(post);
if (entries.getStr("returnCode").equals("1"))
return AjaxResult.success();
@@ -288,7 +296,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getKeShi", map);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("pbkwyy", "HIS_URL")+"/zhuShuJu/getKeShi", map);
}
@Override
@@ -300,7 +308,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getListYiShengZd", map);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("pbkwyy", "HIS_URL")+"/zhuShuJu/getListYiShengZd", map);
}
@Override
@@ -311,7 +319,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getShouFeiXm", map);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("pbkwyy", "HIS_URL")+"/zhuShuJu/getShouFeiXm", map);
}
@Override
@@ -324,7 +332,7 @@
map.put ("keShiIds",params.get(ApiParamsConstants.DEPT_IDS));
map.put ("ifPlus","");
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getKeShiByConditions", map);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("pbkwyy", "HIS_URL")+"/zhuShuJu/getKeShiByConditions", map);
}
@Override
@@ -334,7 +342,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getYangBen", map);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("pbkwyy", "HIS_URL")+"/zhuShuJu/getYangBen", map);
}
@Override
@@ -345,7 +353,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getListBingQuZd", map);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("pbkwyy", "HIS_URL")+"/zhuShuJu/getListBingQuZd", map);
}
@Override
@@ -355,7 +363,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getZhiGongPage", map);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("pbkwyy", "HIS_URL")+"/zhuShuJu/getZhiGongPage", map);
}
@Override
@@ -366,7 +374,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getJianChaXm", map);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("pbkwyy", "HIS_URL")+"/zhuShuJu/getJianChaXm", map);
}
@Override
@@ -375,7 +383,7 @@
hashMap.put("queryCode",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("page",map.get(ApiParamsConstants.PAGE_INDEX));
hashMap.put("size",map.get(ApiParamsConstants.PAGE_SIZE));
- return sendPost(HIS_URL+"/zhuShuJu/getJianYanXm", hashMap);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("pbkwyy", "HIS_URL")+"/zhuShuJu/getJianYanXm", hashMap);
}
@Override
@@ -383,7 +391,7 @@
HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("shouFeiXmId",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("jiaGeTx",map.get(ApiParamsConstants.COMMON_QUERY_KEY2));
- return sendPost(HIS_URL+"/zhuShuJu/getShouFeiXmJg", hashMap);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("pbkwyy", "HIS_URL")+"/zhuShuJu/getShouFeiXmJg", hashMap);
}
@Override
@@ -392,7 +400,7 @@
hashMap.put("queryString",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("pageIndex",map.get(ApiParamsConstants.PAGE_INDEX));
hashMap.put("pageSize",map.get(ApiParamsConstants.PAGE_SIZE));
- return sendPost(HIS_URL+"/zhuShuJu/getRongQi", hashMap);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("pbkwyy", "HIS_URL")+"/zhuShuJu/getRongQi", hashMap);
}
@Override
@@ -401,7 +409,7 @@
hashMap.put("queryString",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("pageIndex",map.get(ApiParamsConstants.PAGE_INDEX));
hashMap.put("pageSize",map.get(ApiParamsConstants.PAGE_SIZE));
- return sendPost(HIS_URL+"/zhuShuJu/getYangBen", hashMap);
+ return sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("pbkwyy", "HIS_URL")+"/zhuShuJu/getYangBen", hashMap);
}
@Override
@@ -418,7 +426,7 @@
map.put("type","1");
HashMap<String, Object> headers = new HashMap<>();
headers.put("hospId","pbkwyy");
- String post = HttpClientUtils.sendPost(TJ_URL + "/callBack/pushZhiFuMsg", map,headers);
+ String post = HttpClientUtils.sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("pbkwyy", "TJ_URL") + "/callBack/pushZhiFuMsg", map,headers);
JSONObject jsonObject = JSONUtil.parseObj(post);
JSONObject obj = JSONUtil.createObj();
if (jsonObject.getStr("code").equals("200")) {
@@ -549,7 +557,7 @@
map.put("hosp","shanxiqinpbkwyy");
HashMap<String, Object> headers = new HashMap<>();
headers.put("hospId","pbkwyy");
- String post = HttpClientUtils.sendPost(TJ_URL + "/callBack/getZdList", map,headers);
+ String post = HttpClientUtils.sendPost(dictCommonHisConfigService.getConfigValByHospitalAndKey("pbkwyy", "TJ_URL") + "/callBack/getZdList", map,headers);
JSONArray jsonArray = JSONUtil.parseObj(post).getJSONArray("data");
if (jsonArray != null && !jsonArray.isEmpty()) {
List<HisSyncDict> list = jsonArray.toList(HisSyncDict.class);
diff --git a/src/main/java/com/example/service/shanjianyi/shanxiqin/weinan/wbzxyy/WbzxyyHisService.java b/src/main/java/com/example/service/shanjianyi/shanxiqin/weinan/wbzxyy/WbzxyyHisService.java
index 4577af5..21e9762 100644
--- a/src/main/java/com/example/service/shanjianyi/shanxiqin/weinan/wbzxyy/WbzxyyHisService.java
+++ b/src/main/java/com/example/service/shanjianyi/shanxiqin/weinan/wbzxyy/WbzxyyHisService.java
@@ -8,8 +8,10 @@
import cn.hutool.json.JSONUtil;
import com.example.config.ConfigValue;
import com.example.constant.ApiParamsConstants;
+import com.example.domain.DictCommonHisConfig;
import com.example.domain.HisSyncDict;
import com.example.domain.TjFlowingWaterHis;
+import com.example.service.DictCommonHisConfigService;
import com.example.service.HisService;
import com.example.utils.AjaxResult;
import com.example.utils.FieldNameConverter;
@@ -44,23 +46,25 @@
// client_secret:05a192176c21edfcc9cf5fa26fc5a9e0c5b131ad
// http://oapi.xamjyy.com/OAPI
- @Autowired
- public WbzxyyHisService(ApplicationContext applicationContext, ConfigValue configValue) {
- this.applicationContext = applicationContext;
- this.configValue = configValue;
- HIS_URL = configValue.getConfigValue("ShanXi_Qin_WeiNan_Wbzxyy.his_api_url") + ":" + configValue.getConfigValue("ShanXi_Qin_WeiNan_Wbzxyy.his_api_port") + configValue.getConfigValue("ShanXi_Qin_WeiNan_Wbzxyy.hisapiappend");
- TJ_URL = configValue.getConfigValue("tjUrl");
- CZY = configValue.getConfigValue("ShanXi_Qin_WeiNan_Wbzxyy.czy");
- }
+// @Autowired
+// public WbzxyyHisService(ApplicationContext applicationContext, ConfigValue configValue) {
+// this.applicationContext = applicationContext;
+// this.configValue = configValue;
+// HIS_URL = configValue.getConfigValue("ShanXi_Qin_WeiNan_Wbzxyy.his_api_url") + ":" + configValue.getConfigValue("ShanXi_Qin_WeiNan_Wbzxyy.his_api_port") + configValue.getConfigValue("ShanXi_Qin_WeiNan_Wbzxyy.hisapiappend");
+// TJ_URL = configValue.getConfigValue("tjUrl");
+// CZY = configValue.getConfigValue("ShanXi_Qin_WeiNan_Wbzxyy.czy");
+// }
@Autowired
private RedisTemplate<Object ,Object> redisTemplate;
+ @Autowired
+ private DictCommonHisConfigService dictCommonHisConfigService;
- private final ApplicationContext applicationContext;
-
- private final String HIS_URL;
- private final String TJ_URL;
- private final String CZY;
+// private final ApplicationContext applicationContext;
+//
+// private final String HIS_URL;
+// private final String TJ_URL;
+// private final String CZY;
//鑾峰彇token
private JSONObject getToken () {
@@ -74,13 +78,14 @@
map.put("client_secret", CLIENT_SECRET);
// map.put("scope",SCOP);
// String post = sendPostTokenFormUrlencoded (HIS_URL+"/oauth/token", map);
- String post = HttpClientUtils.sendPostTokenFormUrlencoded(HIS_URL + "/oauth/token", map, null);
+ String post = HttpClientUtils.sendPostTokenFormUrlencoded(dictCommonHisConfigService.getConfigByHospital("wbzxyy").getHisUrl() + "/oauth/token", map, null);
if (StrUtil.isBlank(post)) return null;
return JSONUtil.parseObj(post);
}
@Override
public String jianDang(Map<String, Object> params) {
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("wbzxyy");
Map<String, Object> map = new HashMap<> ();
map.put ("jiuZhenKh", params.get(ApiParamsConstants.CARD_ID));
map.put ("kaiLeiXing","4");
@@ -101,7 +106,7 @@
map.put ("feiYongLb","");
map.put ("feiYongXz","");
map.put ("jiLuLy","3");
- map.put ("caoZuoYuan",CZY);
+ map.put ("caoZuoYuan",config.getCzyId());
map.put ("chongZhiJe","");
map.put ("yiBaoKh","");
map.put ("geRenBh","");
@@ -114,7 +119,7 @@
map.put ("minZuDm","");
map.put ("minZuMc","");
// 鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/menZhenJz/jianDang", map);
+ String post = sendPost(config.getHisUrl() + "/menZhenJz/jianDang", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getStr("returnCode").equals("1")) {
JSONObject obj = JSONUtil.createObj();
@@ -130,12 +135,13 @@
@Override
public String getBingRenXxByShengFenZheng(Map<String, Object> params) {
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("wbzxyy");
Map<String, Object> map = new HashMap<> ();
- map.put ("caoZuoYuan",CZY);
+ map.put ("caoZuoYuan",config.getCzyId());
map.put ("shenFenZh", params.get(ApiParamsConstants.CUS_ID_CARD));
map.put ("danWeiBh",params.get(ApiParamsConstants.COMP_ID));
//鑱屼笟缂栫爜
- String string = sendPostTokenFormUrlencoded(HIS_URL + "/menZhenJz/getBingRenXxByShengFenZheng", map);
+ String string = sendPostTokenFormUrlencoded(config.getHisUrl() + "/menZhenJz/getBingRenXxByShengFenZheng", map);
JSONObject object = JSONUtil.createObj();
if (StrUtil.isBlank(string)){
object.putOpt("code",500);
@@ -183,9 +189,10 @@
map.put ("feiYongLb","");
map.put ("feiYongXz","");
map.put ("jiLuLy","3");
- map.put ("caoZuoYuan",CZY);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("wbzxyy");
+ map.put ("caoZuoYuan",config.getCzyId());
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/menZhenJz/saveBingRenXx", map);
+ String post = sendPost(config.getHisUrl() + "/menZhenJz/saveBingRenXx", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getStr("returnCode").equals("1")) {
JSONObject obj = JSONUtil.createObj();
@@ -206,7 +213,7 @@
map.put ("jiuZhenKh",params.get(ApiParamsConstants.CARD_ID));
map.put ("yuanQuId","1");
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/shouFei/getListDaiShouFei", map);
+ String post = sendPost(dictCommonHisConfigService.getConfigByHospital("wbzxyy").getHisUrl() + "/shouFei/getListDaiShouFei", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getStr("returnCode").equals("1")) {
JSONObject data = jsonObject.getJSONObject("returnData");
@@ -223,18 +230,19 @@
@Override
public String createMenZhenFy(Map<String, Object> params) {
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("wbzxyy");
Map<String, Object> map = new HashMap<> ();
map.put ("bingRenId",params.get(ApiParamsConstants.PATIONID));
map.put ("jiuZhenKh",params.get(ApiParamsConstants.CARD_ID));
- map.put ("caoZuoYuan",CZY);
+ map.put ("caoZuoYuan",config.getCzyId());
map.put ("yuanQuId","1");
map.put ("yingYongId","870101");
- map.put ("kaiDanKs",params.get(ApiParamsConstants.kaiDanKeShi));
+ map.put ("kaiDanKs",config.getKdks());
map.put ("dengJiLsh",params.get(ApiParamsConstants.Tj_NUM));
map.put ("shouTuiBz",params.get(ApiParamsConstants.SHOU_TUI_STATUS));
map.put ("feiYongMxList",params.get(ApiParamsConstants.FEI_YONG_INFO_LIST));
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/shouFei/createMenZhenFy", map);
+ String post = sendPost(config.getHisUrl() + "/shouFei/createMenZhenFy", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getInt("returnCode") != 1) return AjaxResult.error(post);
JSONObject data = jsonObject.getJSONObject("returnData");
@@ -273,7 +281,7 @@
});
map.put ("feiYongIdList",ids);
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/shouFei/cheXiaoMzFy", map);
+ String post = sendPost(dictCommonHisConfigService.getConfigByHospital("wbzxyy").getHisUrl() + "/shouFei/cheXiaoMzFy", map);
JSONObject entries = JSONUtil.parseObj(post);
if (entries.getStr("returnCode").equals("1"))
return AjaxResult.success();
@@ -288,7 +296,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getKeShi", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("wbzxyy").getHisUrl()+"/zhuShuJu/getKeShi", map);
}
@Override
@@ -300,7 +308,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getListYiShengZd", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("wbzxyy").getHisUrl()+"/zhuShuJu/getListYiShengZd", map);
}
@Override
@@ -311,7 +319,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getShouFeiXm", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("wbzxyy").getHisUrl()+"/zhuShuJu/getShouFeiXm", map);
}
@Override
@@ -324,7 +332,7 @@
map.put ("keShiIds",params.get(ApiParamsConstants.DEPT_IDS));
map.put ("ifPlus","");
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getKeShiByConditions", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("wbzxyy").getHisUrl()+"/zhuShuJu/getKeShiByConditions", map);
}
@Override
@@ -334,7 +342,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getYangBen", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("wbzxyy").getHisUrl()+"/zhuShuJu/getYangBen", map);
}
@Override
@@ -345,7 +353,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getListBingQuZd", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("wbzxyy").getHisUrl()+"/zhuShuJu/getListBingQuZd", map);
}
@Override
@@ -355,7 +363,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getZhiGongPage", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("wbzxyy").getHisUrl()+"/zhuShuJu/getZhiGongPage", map);
}
@Override
@@ -366,7 +374,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getJianChaXm", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("wbzxyy").getHisUrl()+"/zhuShuJu/getJianChaXm", map);
}
@Override
@@ -375,7 +383,7 @@
hashMap.put("queryCode",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("page",map.get(ApiParamsConstants.PAGE_INDEX));
hashMap.put("size",map.get(ApiParamsConstants.PAGE_SIZE));
- return sendPost(HIS_URL+"/zhuShuJu/getJianYanXm", hashMap);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("wbzxyy").getHisUrl()+"/zhuShuJu/getJianYanXm", hashMap);
}
@Override
@@ -383,7 +391,7 @@
HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("shouFeiXmId",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("jiaGeTx",map.get(ApiParamsConstants.COMMON_QUERY_KEY2));
- return sendPost(HIS_URL+"/zhuShuJu/getShouFeiXmJg", hashMap);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("wbzxyy").getHisUrl()+"/zhuShuJu/getShouFeiXmJg", hashMap);
}
@Override
@@ -392,7 +400,7 @@
hashMap.put("queryString",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("pageIndex",map.get(ApiParamsConstants.PAGE_INDEX));
hashMap.put("pageSize",map.get(ApiParamsConstants.PAGE_SIZE));
- return sendPost(HIS_URL+"/zhuShuJu/getRongQi", hashMap);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("wbzxyy").getHisUrl()+"/zhuShuJu/getRongQi", hashMap);
}
@Override
@@ -401,7 +409,7 @@
hashMap.put("queryString",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("pageIndex",map.get(ApiParamsConstants.PAGE_INDEX));
hashMap.put("pageSize",map.get(ApiParamsConstants.PAGE_SIZE));
- return sendPost(HIS_URL+"/zhuShuJu/getYangBen", hashMap);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("wbzxyy").getHisUrl()+"/zhuShuJu/getYangBen", hashMap);
}
@Override
@@ -418,7 +426,7 @@
map.put("type","1");
HashMap<String, Object> headers = new HashMap<>();
headers.put("hospId","wbzxyy");
- String post = HttpClientUtils.sendPost(TJ_URL + "/callBack/pushZhiFuMsg", map,headers);
+ String post = HttpClientUtils.sendPost(dictCommonHisConfigService.getConfigByHospital("wbzxyy").getTjUrl() + "/callBack/pushZhiFuMsg", map,headers);
JSONObject jsonObject = JSONUtil.parseObj(post);
JSONObject obj = JSONUtil.createObj();
if (jsonObject.getStr("code").equals("200")) {
@@ -549,7 +557,7 @@
map.put("hosp","shanxiqinwbzxyy");
HashMap<String, Object> headers = new HashMap<>();
headers.put("hospId","wbzxyy");
- String post = HttpClientUtils.sendPost(TJ_URL + "/callBack/getZdList", map,headers);
+ String post = HttpClientUtils.sendPost(dictCommonHisConfigService.getConfigByHospital("wbzxyy").getTjUrl() + "/callBack/getZdList", map,headers);
JSONArray jsonArray = JSONUtil.parseObj(post).getJSONArray("data");
if (jsonArray != null && !jsonArray.isEmpty()) {
List<HisSyncDict> list = jsonArray.toList(HisSyncDict.class);
diff --git a/src/main/java/com/example/service/shanjianyi/shanxiqin/xian/sqyy/ShanQiHisService.java b/src/main/java/com/example/service/shanjianyi/shanxiqin/xian/sqyy/ShanQiHisService.java
index 4863552..473d8d0 100644
--- a/src/main/java/com/example/service/shanjianyi/shanxiqin/xian/sqyy/ShanQiHisService.java
+++ b/src/main/java/com/example/service/shanjianyi/shanxiqin/xian/sqyy/ShanQiHisService.java
@@ -8,8 +8,10 @@
import cn.hutool.json.JSONUtil;
import com.example.config.ConfigValue;
import com.example.constant.ApiParamsConstants;
+import com.example.domain.DictCommonHisConfig;
import com.example.domain.HisSyncDict;
import com.example.domain.TjFlowingWaterHis;
+import com.example.service.DictCommonHisConfigService;
import com.example.service.HisService;
import com.example.utils.AjaxResult;
import com.example.utils.FieldNameConverter;
@@ -44,23 +46,25 @@
// client_secret:05a192176c21edfcc9cf5fa26fc5a9e0c5b131ad
// http://oapi.xamjyy.com/OAPI
- @Autowired
- public ShanQiHisService(ApplicationContext applicationContext, ConfigValue configValue) {
- this.applicationContext = applicationContext;
- this.configValue = configValue;
- HIS_URL = configValue.getConfigValue("ShanXi_Qin_XiAn_Sqyy.his_api_url") + ":" + configValue.getConfigValue("ShanXi_Qin_XiAn_Sqyy.his_api_port") + configValue.getConfigValue("ShanXi_Qin_XiAn_Sqyy.hisapiappend");
- TJ_URL = configValue.getConfigValue("tjUrl");
- CZY = configValue.getConfigValue("ShanXi_Qin_XiAn_Sqyy.czy");
- }
+// @Autowired
+// public ShanQiHisService(ApplicationContext applicationContext, ConfigValue configValue) {
+// this.applicationContext = applicationContext;
+// this.configValue = configValue;
+// HIS_URL = configValue.getConfigValue("ShanXi_Qin_XiAn_Sqyy.his_api_url") + ":" + configValue.getConfigValue("ShanXi_Qin_XiAn_Sqyy.his_api_port") + configValue.getConfigValue("ShanXi_Qin_XiAn_Sqyy.hisapiappend");
+// TJ_URL = configValue.getConfigValue("tjUrl");
+// CZY = configValue.getConfigValue("ShanXi_Qin_XiAn_Sqyy.czy");
+// }
@Autowired
private RedisTemplate<Object ,Object> redisTemplate;
+ @Autowired
+ private DictCommonHisConfigService dictCommonHisConfigService;
- private final ApplicationContext applicationContext;
-
- private final String HIS_URL;
- private final String TJ_URL;
- private final String CZY;
+// private final ApplicationContext applicationContext;
+//
+// private final String HIS_URL;
+// private final String TJ_URL;
+// private final String CZY;
//鑾峰彇token
private JSONObject getToken () {
@@ -74,13 +78,14 @@
map.put("client_secret", CLIENT_SECRET);
// map.put("scope",SCOP);
// String post = sendPostTokenFormUrlencoded (HIS_URL+"/oauth/token", map);
- String post = HttpClientUtils.sendPostTokenFormUrlencoded(HIS_URL + "/oauth/token", map, null);
+ String post = HttpClientUtils.sendPostTokenFormUrlencoded(dictCommonHisConfigService.getConfigByHospital("sqyy").getHisUrl() + "/oauth/token", map, null);
if (StrUtil.isBlank(post)) return null;
return JSONUtil.parseObj(post);
}
@Override
public String jianDang(Map<String, Object> params) {
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("sqyy");
Map<String, Object> map = new HashMap<> ();
map.put ("jiuZhenKh", params.get(ApiParamsConstants.CARD_ID));
map.put ("kaiLeiXing","4");
@@ -101,7 +106,7 @@
map.put ("feiYongLb","");
map.put ("feiYongXz","");
map.put ("jiLuLy","3");
- map.put ("caoZuoYuan",CZY);
+ map.put ("caoZuoYuan",config.getCzyId());
map.put ("chongZhiJe","");
map.put ("yiBaoKh","");
map.put ("geRenBh","");
@@ -114,7 +119,7 @@
map.put ("minZuDm","");
map.put ("minZuMc","");
// 鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/menZhenJz/jianDang", map);
+ String post = sendPost(config.getHisUrl() + "/menZhenJz/jianDang", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getStr("returnCode").equals("1")) {
JSONObject obj = JSONUtil.createObj();
@@ -130,12 +135,13 @@
@Override
public String getBingRenXxByShengFenZheng(Map<String, Object> params) {
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("sqyy");
Map<String, Object> map = new HashMap<> ();
- map.put ("caoZuoYuan",CZY);
+ map.put ("caoZuoYuan",config.getCzyId());
map.put ("shenFenZh", params.get(ApiParamsConstants.CUS_ID_CARD));
map.put ("danWeiBh",params.get(ApiParamsConstants.COMP_ID));
//鑱屼笟缂栫爜
- String string = sendPostTokenFormUrlencoded(HIS_URL + "/menZhenJz/getBingRenXxByShengFenZheng", map);
+ String string = sendPostTokenFormUrlencoded(config.getHisUrl() + "/menZhenJz/getBingRenXxByShengFenZheng", map);
JSONObject object = JSONUtil.createObj();
if (StrUtil.isBlank(string)){
object.putOpt("code",500);
@@ -183,9 +189,10 @@
map.put ("feiYongLb","");
map.put ("feiYongXz","");
map.put ("jiLuLy","3");
- map.put ("caoZuoYuan",CZY);
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("sqyy");
+ map.put ("caoZuoYuan",config.getCzyId());
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/menZhenJz/saveBingRenXx", map);
+ String post = sendPost(config.getHisUrl() + "/menZhenJz/saveBingRenXx", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getStr("returnCode").equals("1")) {
JSONObject obj = JSONUtil.createObj();
@@ -206,7 +213,7 @@
map.put ("jiuZhenKh",params.get(ApiParamsConstants.CARD_ID));
map.put ("yuanQuId","1");
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/shouFei/getListDaiShouFei", map);
+ String post = sendPost(dictCommonHisConfigService.getConfigByHospital("sqyy").getHisUrl() + "/shouFei/getListDaiShouFei", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getStr("returnCode").equals("1")) {
JSONObject data = jsonObject.getJSONObject("returnData");
@@ -223,18 +230,19 @@
@Override
public String createMenZhenFy(Map<String, Object> params) {
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("sqyy");
Map<String, Object> map = new HashMap<> ();
map.put ("bingRenId",params.get(ApiParamsConstants.PATIONID));
map.put ("jiuZhenKh",params.get(ApiParamsConstants.CARD_ID));
- map.put ("caoZuoYuan",CZY);
+ map.put ("caoZuoYuan",config.getCzyId());
map.put ("yuanQuId","1");
map.put ("yingYongId","870101");
- map.put ("kaiDanKs",params.get(ApiParamsConstants.kaiDanKeShi));
+ map.put ("kaiDanKs",config.getKdks());
map.put ("dengJiLsh",params.get(ApiParamsConstants.Tj_NUM));
map.put ("shouTuiBz",params.get(ApiParamsConstants.SHOU_TUI_STATUS));
map.put ("feiYongMxList",params.get(ApiParamsConstants.FEI_YONG_INFO_LIST));
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/shouFei/createMenZhenFy", map);
+ String post = sendPost(config.getHisUrl() + "/shouFei/createMenZhenFy", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getInt("returnCode") != 1) return AjaxResult.error(post);
JSONObject data = jsonObject.getJSONObject("returnData");
@@ -273,7 +281,7 @@
});
map.put ("feiYongIdList",ids);
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/shouFei/cheXiaoMzFy", map);
+ String post = sendPost(dictCommonHisConfigService.getConfigByHospital("sqyy").getHisUrl() + "/shouFei/cheXiaoMzFy", map);
JSONObject entries = JSONUtil.parseObj(post);
if (entries.getStr("returnCode").equals("1"))
return AjaxResult.success();
@@ -288,7 +296,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getKeShi", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("sqyy").getHisUrl()+"/zhuShuJu/getKeShi", map);
}
@Override
@@ -300,7 +308,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getListYiShengZd", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("sqyy").getHisUrl()+"/zhuShuJu/getListYiShengZd", map);
}
@Override
@@ -311,7 +319,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getShouFeiXm", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("sqyy").getHisUrl()+"/zhuShuJu/getShouFeiXm", map);
}
@Override
@@ -324,7 +332,7 @@
map.put ("keShiIds",params.get(ApiParamsConstants.DEPT_IDS));
map.put ("ifPlus","");
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getKeShiByConditions", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("sqyy").getHisUrl()+"/zhuShuJu/getKeShiByConditions", map);
}
@Override
@@ -334,7 +342,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getYangBen", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("sqyy").getHisUrl()+"/zhuShuJu/getYangBen", map);
}
@Override
@@ -345,7 +353,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getListBingQuZd", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("sqyy").getHisUrl()+"/zhuShuJu/getListBingQuZd", map);
}
@Override
@@ -355,7 +363,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getZhiGongPage", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("sqyy").getHisUrl()+"/zhuShuJu/getZhiGongPage", map);
}
@Override
@@ -366,7 +374,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getJianChaXm", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("sqyy").getHisUrl()+"/zhuShuJu/getJianChaXm", map);
}
@Override
@@ -375,7 +383,7 @@
hashMap.put("queryCode",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("page",map.get(ApiParamsConstants.PAGE_INDEX));
hashMap.put("size",map.get(ApiParamsConstants.PAGE_SIZE));
- return sendPost(HIS_URL+"/zhuShuJu/getJianYanXm", hashMap);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("sqyy").getHisUrl()+"/zhuShuJu/getJianYanXm", hashMap);
}
@Override
@@ -383,7 +391,7 @@
HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("shouFeiXmId",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("jiaGeTx",map.get(ApiParamsConstants.COMMON_QUERY_KEY2));
- return sendPost(HIS_URL+"/zhuShuJu/getShouFeiXmJg", hashMap);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("sqyy").getHisUrl()+"/zhuShuJu/getShouFeiXmJg", hashMap);
}
@Override
@@ -392,7 +400,7 @@
hashMap.put("queryString",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("pageIndex",map.get(ApiParamsConstants.PAGE_INDEX));
hashMap.put("pageSize",map.get(ApiParamsConstants.PAGE_SIZE));
- return sendPost(HIS_URL+"/zhuShuJu/getRongQi", hashMap);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("sqyy").getHisUrl()+"/zhuShuJu/getRongQi", hashMap);
}
@Override
@@ -401,7 +409,7 @@
hashMap.put("queryString",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("pageIndex",map.get(ApiParamsConstants.PAGE_INDEX));
hashMap.put("pageSize",map.get(ApiParamsConstants.PAGE_SIZE));
- return sendPost(HIS_URL+"/zhuShuJu/getYangBen", hashMap);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("sqyy").getHisUrl()+"/zhuShuJu/getYangBen", hashMap);
}
@Override
@@ -418,7 +426,7 @@
map.put("type","1");
HashMap<String, Object> headers = new HashMap<>();
headers.put("hospId","sqyy");
- String post = HttpClientUtils.sendPost(TJ_URL + "/callBack/pushZhiFuMsg", map,headers);
+ String post = HttpClientUtils.sendPost(dictCommonHisConfigService.getConfigByHospital("sqyy").getTjUrl() + "/callBack/pushZhiFuMsg", map,headers);
JSONObject jsonObject = JSONUtil.parseObj(post);
JSONObject obj = JSONUtil.createObj();
if (jsonObject.getStr("code").equals("200")) {
@@ -549,7 +557,7 @@
map.put("hosp","shanxiqinsqyy");
HashMap<String, Object> headers = new HashMap<>();
headers.put("hospId","sqyy");
- String post = HttpClientUtils.sendPost(TJ_URL + "/callBack/getZdList", map,headers);
+ String post = HttpClientUtils.sendPost(dictCommonHisConfigService.getConfigByHospital("sqyy").getTjUrl() + "/callBack/getZdList", map,headers);
JSONArray jsonArray = JSONUtil.parseObj(post).getJSONArray("data");
if (jsonArray != null && !jsonArray.isEmpty()) {
List<HisSyncDict> list = jsonArray.toList(HisSyncDict.class);
diff --git a/src/main/java/com/example/service/shanjianyi/shanxiqin/xian/xamjyy/MeiJiHisService.java b/src/main/java/com/example/service/shanjianyi/shanxiqin/xian/xamjyy/MeiJiHisService.java
index 5cdc26c..00e9c67 100644
--- a/src/main/java/com/example/service/shanjianyi/shanxiqin/xian/xamjyy/MeiJiHisService.java
+++ b/src/main/java/com/example/service/shanjianyi/shanxiqin/xian/xamjyy/MeiJiHisService.java
@@ -8,8 +8,10 @@
import cn.hutool.json.JSONUtil;
import com.example.config.ConfigValue;
import com.example.constant.ApiParamsConstants;
+import com.example.domain.DictCommonHisConfig;
import com.example.domain.HisSyncDict;
import com.example.domain.TjFlowingWaterHis;
+import com.example.service.DictCommonHisConfigService;
import com.example.service.HisService;
import com.example.utils.AjaxResult;
import com.example.utils.FieldNameConverter;
@@ -44,23 +46,25 @@
// client_secret:05a192176c21edfcc9cf5fa26fc5a9e0c5b131ad
// http://oapi.xamjyy.com/OAPI
- @Autowired
- public MeiJiHisService(ApplicationContext applicationContext, ConfigValue configValue) {
- this.applicationContext = applicationContext;
- this.configValue = configValue;
- HIS_URL = configValue.getConfigValue("ShanXi_Qin_XiAn_MeiJi.his_api_url") + ":" + configValue.getConfigValue("ShanXi_Qin_XiAn_MeiJi.his_api_port") + configValue.getConfigValue("ShanXi_Qin_XiAn_MeiJi.hisapiappend");
- TJ_URL = configValue.getConfigValue("ShanXi_Qin_XiAn_MeiJi.tjUrl");
- CZY = configValue.getConfigValue("ShanXi_Qin_XiAn_MeiJi.czy");
- }
+// @Autowired
+// public MeiJiHisService(ApplicationContext applicationContext, ConfigValue configValue) {
+// this.applicationContext = applicationContext;
+// this.configValue = configValue;
+// HIS_URL = configValue.getConfigValue("ShanXi_Qin_XiAn_MeiJi.his_api_url") + ":" + configValue.getConfigValue("ShanXi_Qin_XiAn_MeiJi.his_api_port") + configValue.getConfigValue("ShanXi_Qin_XiAn_MeiJi.hisapiappend");
+// TJ_URL = configValue.getConfigValue("ShanXi_Qin_XiAn_MeiJi.tjUrl");
+// CZY = configValue.getConfigValue("ShanXi_Qin_XiAn_MeiJi.czy");
+// }
@Autowired
private RedisTemplate<Object ,Object> redisTemplate;
+ @Autowired
+ private DictCommonHisConfigService dictCommonHisConfigService;
- private final ApplicationContext applicationContext;
-
- private final String HIS_URL;
- private final String TJ_URL;
- private final String CZY;
+// private final ApplicationContext applicationContext;
+//
+// private final String HIS_URL;
+// private final String TJ_URL;
+// private final String CZY;
//鑾峰彇token
private JSONObject getToken () {
@@ -74,13 +78,14 @@
map.put("client_secret", CLIENT_SECRET);
// map.put("scope",SCOP);
// String post = sendPostTokenFormUrlencoded (HIS_URL+"/oauth/token", map);
- String post = HttpClientUtils.sendPostTokenFormUrlencoded(HIS_URL + "/oauth/token", map, null);
+ String post = HttpClientUtils.sendPostTokenFormUrlencoded(dictCommonHisConfigService.getConfigByHospital("xamjyy").getHisUrl() + "/oauth/token", map, null);
if (StrUtil.isBlank(post)) return null;
return JSONUtil.parseObj(post);
}
@Override
public String jianDang(Map<String, Object> params) {
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("xamjyy");
Map<String, Object> map = new HashMap<> ();
map.put ("jiuZhenKh", params.get(ApiParamsConstants.CARD_ID));
map.put ("kaiLeiXing","4");
@@ -101,7 +106,7 @@
map.put ("feiYongLb","");
map.put ("feiYongXz","");
map.put ("jiLuLy","3");
- map.put ("caoZuoYuan",CZY);
+ map.put ("caoZuoYuan",config.getCzyId());
map.put ("chongZhiJe","");
map.put ("yiBaoKh","");
map.put ("geRenBh","");
@@ -114,7 +119,7 @@
map.put ("minZuDm","");
map.put ("minZuMc","");
// 鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/menZhenJz/jianDang", map);
+ String post = sendPost(config.getHisUrl() + "/menZhenJz/jianDang", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getStr("returnCode").equals("1")) {
JSONObject obj = JSONUtil.createObj();
@@ -130,12 +135,13 @@
@Override
public String getBingRenXxByShengFenZheng(Map<String, Object> params) {
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("xamjyy");
Map<String, Object> map = new HashMap<> ();
- map.put ("caoZuoYuan",CZY);
+ map.put ("caoZuoYuan",config.getCzyId());
map.put ("shenFenZh", params.get(ApiParamsConstants.CUS_ID_CARD));
map.put ("danWeiBh",params.get(ApiParamsConstants.COMP_ID));
//鑱屼笟缂栫爜
- String string = sendPostTokenFormUrlencoded(HIS_URL + "/menZhenJz/getBingRenXxByShengFenZheng", map);
+ String string = sendPostTokenFormUrlencoded(config.getHisUrl() + "/menZhenJz/getBingRenXxByShengFenZheng", map);
JSONObject object = JSONUtil.createObj();
if (StrUtil.isBlank(string)){
object.putOpt("code",500);
@@ -161,6 +167,7 @@
@Override
public String saveBingRenXx(Map<String, Object> params) {
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("xamjyy");
Map<String, Object> map = new HashMap<> ();
map.put ("bingRenId", params.get(ApiParamsConstants.PATIONID));
map.put ("kaiLeiXing","4");
@@ -183,9 +190,9 @@
map.put ("feiYongLb","");
map.put ("feiYongXz","");
map.put ("jiLuLy","3");
- map.put ("caoZuoYuan",CZY);
+ map.put ("caoZuoYuan",config.getCzyId());
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/menZhenJz/saveBingRenXx", map);
+ String post = sendPost(config.getHisUrl() + "/menZhenJz/saveBingRenXx", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getStr("returnCode").equals("1")) {
JSONObject obj = JSONUtil.createObj();
@@ -206,7 +213,7 @@
map.put ("jiuZhenKh",params.get(ApiParamsConstants.CARD_ID));
map.put ("yuanQuId","1");
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/shouFei/getListDaiShouFei", map);
+ String post = sendPost(dictCommonHisConfigService.getConfigByHospital("xamjyy").getHisUrl() + "/shouFei/getListDaiShouFei", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getStr("returnCode").equals("1")) {
JSONObject data = jsonObject.getJSONObject("returnData");
@@ -223,18 +230,19 @@
@Override
public String createMenZhenFy(Map<String, Object> params) {
+ DictCommonHisConfig config = dictCommonHisConfigService.getConfigByHospital("xamjyy");
Map<String, Object> map = new HashMap<> ();
map.put ("bingRenId",params.get(ApiParamsConstants.PATIONID));
map.put ("jiuZhenKh",params.get(ApiParamsConstants.CARD_ID));
- map.put ("caoZuoYuan",CZY);
+ map.put ("caoZuoYuan",config.getCzyId());
map.put ("yuanQuId","1");
map.put ("yingYongId","870101");
- map.put ("kaiDanKs",params.get(ApiParamsConstants.kaiDanKeShi));
+ map.put ("kaiDanKs",config.getKdks());
map.put ("dengJiLsh",params.get(ApiParamsConstants.Tj_NUM));
map.put ("shouTuiBz",params.get(ApiParamsConstants.SHOU_TUI_STATUS));
map.put ("feiYongMxList",params.get(ApiParamsConstants.FEI_YONG_INFO_LIST));
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/shouFei/createMenZhenFy", map);
+ String post = sendPost(config.getHisUrl() + "/shouFei/createMenZhenFy", map);
JSONObject jsonObject = JSONUtil.parseObj(post);
if (jsonObject.getInt("returnCode") != 1) return AjaxResult.error(post);
JSONObject data = jsonObject.getJSONObject("returnData");
@@ -273,7 +281,7 @@
});
map.put ("feiYongIdList",ids);
//鑱屼笟缂栫爜
- String post = sendPost(HIS_URL + "/shouFei/cheXiaoMzFy", map);
+ String post = sendPost(dictCommonHisConfigService.getConfigByHospital("xamjyy").getHisUrl() + "/shouFei/cheXiaoMzFy", map);
JSONObject entries = JSONUtil.parseObj(post);
if (entries.getStr("returnCode").equals("1"))
return AjaxResult.success();
@@ -288,7 +296,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getKeShi", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("xamjyy").getHisUrl()+"/zhuShuJu/getKeShi", map);
}
@Override
@@ -300,7 +308,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getListYiShengZd", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("xamjyy").getHisUrl()+"/zhuShuJu/getListYiShengZd", map);
}
@Override
@@ -311,7 +319,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getShouFeiXm", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("xamjyy").getHisUrl()+"/zhuShuJu/getShouFeiXm", map);
}
@Override
@@ -324,7 +332,7 @@
map.put ("keShiIds",params.get(ApiParamsConstants.DEPT_IDS));
map.put ("ifPlus","");
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getKeShiByConditions", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("xamjyy").getHisUrl()+"/zhuShuJu/getKeShiByConditions", map);
}
@Override
@@ -334,7 +342,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getYangBen", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("xamjyy").getHisUrl()+"/zhuShuJu/getYangBen", map);
}
@Override
@@ -345,7 +353,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getListBingQuZd", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("xamjyy").getHisUrl()+"/zhuShuJu/getListBingQuZd", map);
}
@Override
@@ -355,7 +363,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getZhiGongPage", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("xamjyy").getHisUrl()+"/zhuShuJu/getZhiGongPage", map);
}
@Override
@@ -366,7 +374,7 @@
map.put ("pageIndex",params.get(ApiParamsConstants.PAGE_INDEX));
map.put ("pageSize",params.get(ApiParamsConstants.PAGE_SIZE));
//鑱屼笟缂栫爜
- return sendPost(HIS_URL+"/zhuShuJu/getJianChaXm", map);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("xamjyy").getHisUrl()+"/zhuShuJu/getJianChaXm", map);
}
@Override
@@ -375,7 +383,7 @@
hashMap.put("queryCode",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("page",map.get(ApiParamsConstants.PAGE_INDEX));
hashMap.put("size",map.get(ApiParamsConstants.PAGE_SIZE));
- return sendPost(HIS_URL+"/zhuShuJu/getJianYanXm", hashMap);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("xamjyy").getHisUrl()+"/zhuShuJu/getJianYanXm", hashMap);
}
@Override
@@ -383,7 +391,7 @@
HashMap<String, Object> hashMap = new HashMap<>();
hashMap.put("shouFeiXmId",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("jiaGeTx",map.get(ApiParamsConstants.COMMON_QUERY_KEY2));
- return sendPost(HIS_URL+"/zhuShuJu/getShouFeiXmJg", hashMap);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("xamjyy").getHisUrl()+"/zhuShuJu/getShouFeiXmJg", hashMap);
}
@Override
@@ -392,7 +400,7 @@
hashMap.put("queryString",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("pageIndex",map.get(ApiParamsConstants.PAGE_INDEX));
hashMap.put("pageSize",map.get(ApiParamsConstants.PAGE_SIZE));
- return sendPost(HIS_URL+"/zhuShuJu/getRongQi", hashMap);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("xamjyy").getHisUrl()+"/zhuShuJu/getRongQi", hashMap);
}
@Override
@@ -401,7 +409,7 @@
hashMap.put("queryString",map.get(ApiParamsConstants.COMMON_QUERY_KEY));
hashMap.put("pageIndex",map.get(ApiParamsConstants.PAGE_INDEX));
hashMap.put("pageSize",map.get(ApiParamsConstants.PAGE_SIZE));
- return sendPost(HIS_URL+"/zhuShuJu/getYangBen", hashMap);
+ return sendPost(dictCommonHisConfigService.getConfigByHospital("xamjyy").getHisUrl()+"/zhuShuJu/getYangBen", hashMap);
}
@Override
@@ -418,7 +426,7 @@
map.put("type","1");
HashMap<String, Object> headers = new HashMap<>();
headers.put("hospId","xamjyy");
- String post = HttpClientUtils.sendPost(TJ_URL + "/callBack/pushZhiFuMsg", map,headers);
+ String post = HttpClientUtils.sendPost(dictCommonHisConfigService.getConfigByHospital("xamjyy").getTjUrl() + "/callBack/pushZhiFuMsg", map,headers);
JSONObject jsonObject = JSONUtil.parseObj(post);
JSONObject obj = JSONUtil.createObj();
if (jsonObject.getStr("code").equals("200")) {
@@ -549,7 +557,7 @@
map.put("hosp","shanxiqinxamjyy");
HashMap<String, Object> headers = new HashMap<>();
headers.put("hospId","xamjyy");
- String post = HttpClientUtils.sendPost(TJ_URL + "/callBack/getZdList", map,headers);
+ String post = HttpClientUtils.sendPost(dictCommonHisConfigService.getConfigByHospital("xamjyy").getTjUrl() + "/callBack/getZdList", map,headers);
JSONArray jsonArray = JSONUtil.parseObj(post).getJSONArray("data");
if (jsonArray != null && !jsonArray.isEmpty()) {
List<HisSyncDict> list = jsonArray.toList(HisSyncDict.class);
diff --git a/src/main/resources/mapper/DictCommonHisConfigMapper.xml b/src/main/resources/mapper/DictCommonHisConfigMapper.xml
index 9188325..f857b0a 100644
--- a/src/main/resources/mapper/DictCommonHisConfigMapper.xml
+++ b/src/main/resources/mapper/DictCommonHisConfigMapper.xml
@@ -17,6 +17,7 @@
<result property="hisApiAppend" column="his_api_append" jdbcType="VARCHAR"/>
<result property="czy" column="czy" jdbcType="VARCHAR"/>
<result property="czyId" column="czy_id" jdbcType="VARCHAR"/>
+ <result property="kdks" column="kdks" jdbcType="VARCHAR"/>
<result property="dbIp" column="db_ip" jdbcType="VARCHAR"/>
<result property="dbPort" column="db_port" jdbcType="SMALLINT"/>
<result property="dbName" column="db_name" jdbcType="VARCHAR"/>
@@ -28,7 +29,7 @@
id,full_key,province,
region,city,hospital,
tj_url,his_api_url,his_api_port,
- his_api_append,czy,czy_id,
+ his_api_append,czy,czy_id,kdks,
db_ip,db_port,db_name,
db_user,db_password
</sql>
--
Gitblit v1.8.0