From 53d149f491dba554ee035599059a1bf65ea92df2 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 12 二月 2025 17:36:13 +0800
Subject: [PATCH] 增加手动同步lis接口
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 128 ++++++++++++++++++++++--------------------
1 files changed, 66 insertions(+), 62 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
index c474214..0f5846d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -218,7 +218,7 @@
}
String key = sysConfigService.selectConfigByKey("sfkqdyhis");
-
+ String s = sysConfigService.selectConfigByKey("is_request_common_his_api");
LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
wq.eq(TjReservation::getIdCard, cusIdcard);
wq.eq(TjReservation::getIsExpire, 2);
@@ -235,9 +235,9 @@
qw.eq(TjCustomer::getCusIdcard, cusIdcard);
TjCustomer tjCustomer1 = tjCustomerService.getOne(qw);
if (tjCustomer1 != null) {
- if (null != tjReservation.getCompanyId()) tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
- if (null != tjReservation.getCompany()) tjCustomer1.setCompName(tjReservation.getCompany());
- tjCustomerService.updateById(tjCustomer1);
+// if (null != tjReservation.getCompanyId()) tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
+// if (null != tjReservation.getCompany()) tjCustomer1.setCompName(tjReservation.getCompany());
+// tjCustomerService.updateById(tjCustomer1);
tjCustomer1.setTjType(tjReservation.getTjType());
tjCustomer1.setCusName(tjReservation.getName());
tjCustomer1.setCusSex(Long.valueOf(tjReservation.getSex()));
@@ -260,7 +260,7 @@
tjCustomer1.setDiscount(tjReservation.getDiscount());
tjCustomer1.setGroupingId(tjReservation.getGroupingId());
- if(null !=tjReservation.getCompanyId())tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
+// if(null !=tjReservation.getCompanyId())tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
if(null !=tjReservation.getCompany())tjCustomer1.setCompName(tjReservation.getCompany());
// tjCustomerService.updateById(tjCustomer1);
@@ -291,10 +291,10 @@
tjCustomer.setCusPassword(substring);
tjCustomer.setTjType(tjReservation.getTjType());
tjCustomer.setPym(PinyinUtil.getFirstLetter(tjReservation.getName(),""));
- if(null !=tjReservation.getCompanyId())tjCustomer.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
+ if(null !=tjReservation.getCompanyId())tjCustomer.setCompId(tjReservation.getCompanyId());
if(null !=tjReservation.getCompany())tjCustomer.setCompName(tjReservation.getCompany());
- if (null != key && key.equals("Y"))
- {
+
+ if (null != key && key.equals("Y")) {
AjaxResult result = controller.Outpincreateapply(tjCustomer);
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
@@ -316,6 +316,11 @@
hisApiGetMethodService.save(object4, "Outpincreateapply", hisApiConfig, JSONUtil.toJsonStr(BeanUtil.beanToMap(tjCustomer)));
}
}
+ }
+ } else if(null != s && s.equalsIgnoreCase("Y")) {
+ TjCustomer requestCommonHisApi = isRequestCommonHisApi(tjCustomer);
+ if (null !=requestCommonHisApi){
+ tjCustomerService.save(requestCommonHisApi);
}
}else {
tjCustomerService.save(tjCustomer);
@@ -340,10 +345,10 @@
// if (null != key && key.equals("Y")) {
String cardId = tjCustomerServiceOne.getCardId();
if (null != cardId && !cardId.equals("0")) {
- int i = tjOrderService.selectTjOrderByCardId(cardId);
- if (i > 0) {
- return AjaxResult.error("涓嶅彲閲嶅绛惧埌");
- }
+// int i = tjOrderService.selectTjOrderByCardId(cardId);
+// if (i > 0) {
+// return AjaxResult.error("涓嶅彲閲嶅绛惧埌");
+// }
}
// }
@@ -478,12 +483,13 @@
b = MatchUtils.isIdCard(cusIdcard);
}
}
- } else {
- if(cusIdcard.length()==9){
- b = MatchUtils.cardValidate(cusIdcard, tjCustomer.getIdType());
- }
-
}
+// else {
+// if(cusIdcard.length()==9){
+// b = MatchUtils.cardValidate(cusIdcard, tjCustomer.getIdType());
+// }
+//
+// }
} else {
return AjaxResult.error("璇烽�夋嫨璇佷欢绫诲瀷");
}
@@ -499,20 +505,12 @@
wq.eq(TjCustomer::getCusIdcard, cusIdcard);
TjCustomer customer = tjCustomerService.getOne(wq);
if (customer != null) {
-// BeanUtils.copyBeanProp(tjCustomer, customer);
-// String substring = cusIdcard.substring(cusIdcard.length() - 6);
-// substring = DigestUtils.md5DigestAsHex(substring.getBytes());
-// customer.setCusPassword(substring);
-// customer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd"));
-// return AjaxResult.success(tjCustomerService.updateById(customer));
return AjaxResult.error("璇ヤ汉鍛樺凡瀛樺湪");
}
String substring = cusIdcard.substring(cusIdcard.length() - 6);
substring = DigestUtils.md5DigestAsHex(substring.getBytes());
tjCustomer.setCusPassword(substring);
-// if (tjCustomer.getIdType().equals("1")) {
- tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd"));
-// }
+ if(cusIdcard.length()==18)tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd"));
tjCustomer.setCusNumber(0L);
tjCustomer.setPym(PinyinUtil.getFirstLetter(tjCustomer.getCusName(),""));
String config = sysConfigService.selectConfigByKey("sfkqdyhis");
@@ -522,43 +520,11 @@
} else {
String s = sysConfigService.selectConfigByKey("is_request_common_his_api");
if (null != s && s.equals("Y")){
- String apiUrl = sysConfigService.selectConfigByKey("common_api_url");
- String hospbm = sysConfigService.selectConfigByKey("common_api_service_hospbm");
- HashMap<String, Object> isjd = new HashMap<>();
- isjd.put("cusIdCard",tjCustomer.getCusIdcard());
- isjd.put("compId","");
- String isCreat = HttpClientUtils.sendPost(apiUrl+"/api/his/"+hospbm+"/isCreat", isjd);
- JSONObject isCreatjsonObject = JSONUtil.parseObj(isCreat);
- if (isCreatjsonObject.getStr("code").equals("200")){
- JSONObject data = isCreatjsonObject.getJSONObject("data");
- tjCustomer.setPationId(data.getStr("pationId"));
- tjCustomer.setCardId(data.getStr("cardId"));
- tjCustomer.setHisJzkh(data.getStr("cardId"));
- if (tjCustomerService.save(tjCustomer)) {
- return AjaxResult.success(tjCustomer);
+ TjCustomer requestCommonHisApi = isRequestCommonHisApi(tjCustomer);
+ if (null !=requestCommonHisApi){
+ if (tjCustomerService.save(requestCommonHisApi)) {
+ return AjaxResult.success(requestCommonHisApi);
}
- }else {
- HashMap<String, Object> map = new HashMap<>();
- map.put("cardId","");
- map.put("cusName",tjCustomer.getCusName());
- map.put("cusSex",tjCustomer.getCusSex());
- map.put("cusIdCard",tjCustomer.getCusIdcard());
- map.put("compId","");
- map.put("cusBrithday",tjCustomer.getCusBrithday() != null ? DateUtil.format(tjCustomer.getCusBrithday(), "yyyy-MM-dd") : "");
- map.put("cusAddr",tjCustomer.getCusAddr());
- map.put("cusPhone",tjCustomer.getCusPhone());
- map.put("compName","");
- String post = HttpClientUtils.sendPost(apiUrl+"/api/his/"+hospbm+"/creat", map);
- JSONObject jsonObject = JSONUtil.parseObj(post);
- if (jsonObject.getStr("code").equals("200")){
- JSONObject data = jsonObject.getJSONObject("data");
- tjCustomer.setPationId(data.getStr("pationId"));
- tjCustomer.setCardId(data.getStr("cardId"));
- tjCustomer.setHisJzkh(data.getStr("cardId"));
- if (tjCustomerService.save(tjCustomer)) {
- return AjaxResult.success(tjCustomer);
- }
- }else return AjaxResult.error();
}
}else {
if (tjCustomerService.save(tjCustomer)) {
@@ -569,6 +535,44 @@
return AjaxResult.error();
}
+ private TjCustomer isRequestCommonHisApi(TjCustomer tjCustomer) {
+ String apiUrl = sysConfigService.selectConfigByKey("common_api_url");
+ String hospbm = sysConfigService.selectConfigByKey("common_api_service_hospbm");
+ HashMap<String, Object> isjd = new HashMap<>();
+ isjd.put("cusIdCard", tjCustomer.getCusIdcard());
+ isjd.put("compId","");
+ String isCreat = HttpClientUtils.sendPost(apiUrl+"/api/his/"+hospbm+"/isCreat", isjd);
+ JSONObject isCreatjsonObject = JSONUtil.parseObj(isCreat);
+ if (isCreatjsonObject.getStr("code").equals("200")){
+ JSONObject data = isCreatjsonObject.getJSONObject("data");
+ tjCustomer.setPationId(data.getStr("pationId"));
+ tjCustomer.setCardId(data.getStr("cardId"));
+ tjCustomer.setHisJzkh(data.getStr("cardId"));
+ return tjCustomer;
+ }else {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("cardId","");
+ map.put("cusName", tjCustomer.getCusName());
+ map.put("cusSex", tjCustomer.getCusSex());
+ map.put("cusIdCard", tjCustomer.getCusIdcard());
+ map.put("compId","");
+ map.put("cusBrithday", tjCustomer.getCusBrithday() != null ? DateUtil.format(tjCustomer.getCusBrithday(), "yyyy-MM-dd") : "");
+ map.put("cusAddr", tjCustomer.getCusAddr());
+ map.put("cusPhone", tjCustomer.getCusPhone());
+ map.put("compName","");
+ String post = HttpClientUtils.sendPost(apiUrl+"/api/his/"+hospbm+"/creat", map);
+ JSONObject jsonObject = JSONUtil.parseObj(post);
+ if (jsonObject.getStr("code").equals("200")){
+ JSONObject data = jsonObject.getJSONObject("data");
+ tjCustomer.setPationId(data.getStr("pationId"));
+ tjCustomer.setCardId(data.getStr("cardId"));
+ tjCustomer.setHisJzkh(data.getStr("cardId"));
+ return tjCustomer;
+ }
+ }
+ return null;
+ }
+
private AjaxResult suijieHisXinXi(TjCustomer tjCustomer, String date) {
AjaxResult result = controller.Outpincreateapply(tjCustomer);
String result1 = getAjaxResult(result);
--
Gitblit v1.8.0