From cc25bc0eec2d50da39d62f9896ed4d5e66805366 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 11 七月 2025 18:04:05 +0800
Subject: [PATCH] zjh20250711
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 135 +++++++++++++++++++++++++++++++++++---------
1 files changed, 107 insertions(+), 28 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 8555946..7244ec4 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
@@ -155,20 +155,19 @@
if (!"".equals(cusIdcard) && cusIdcard != null) {
String sfjysfzh = sysConfigService.selectConfigByKey("sfjysfzh");
-// String sfjysjh = configService.selectConfigByKey("sfjysjh");
//鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝ｇ‘
if(sfjysfzh.equalsIgnoreCase("Y")){
if(cusIdcard.length()==18){
- if (! MatchUtils.isIdCard(cusIdcard)) {
+ if (!MatchUtils.isIdCard(cusIdcard)) {
return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
}
}
- if(cusIdcard.length()==9){
- if (!MatchUtils.cardValidates(cusIdcard)) {
- return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
- }
- }
+// if(cusIdcard.length()==9){
+// if (!MatchUtils.cardValidates(cusIdcard)) {
+// return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
+// }
+// }
}
@@ -270,6 +269,7 @@
// if(null !=tjReservation.getCompanyId())tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
if(null !=tjReservation.getCompany())tjCustomer1.setCompName(tjReservation.getCompany());
+ if(null !=tjReservation.getDepartment())tjCustomer1.setDepartment(tjReservation.getDepartment());
// tjCustomerService.updateById(tjCustomer1);
@@ -305,7 +305,7 @@
tjCustomer.setPym(PinyinUtil.getFirstLetter(tjReservation.getName(),""));
if(null !=tjReservation.getCompanyId())tjCustomer.setCompId(tjReservation.getCompanyId());
if(null !=tjReservation.getCompany())tjCustomer.setCompName(tjReservation.getCompany());
-
+ if(null !=tjReservation.getDepartment())tjCustomer.setDepartment(tjReservation.getDepartment());
if (null != key && key.equals("Y")) {
AjaxResult result = controller.Outpincreateapply(tjCustomer);
String result1 = getAjaxResult(result);
@@ -493,24 +493,24 @@
if(sfjysfzh.equalsIgnoreCase("Y")){
if(cusIdcard.length()==18){
b = MatchUtils.isIdCard(cusIdcard);
+ }else {
+ return AjaxResult.error("璇疯緭鍏ュ崄鍏綅鍙风殑璇佷欢鍙�!");
}
}
}
-// else {
-// if(cusIdcard.length()==9){
-// b = MatchUtils.cardValidate(cusIdcard, tjCustomer.getIdType());
-// }
-//
-// }
} else {
return AjaxResult.error("璇烽�夋嫨璇佷欢绫诲瀷");
}
- if (!b) return AjaxResult.error("璇佷欢鍙锋湁璇�");
+ if (!b) return AjaxResult.error("璇佷欢鍙锋湁璇�,璇锋鏌ヨ瘉浠跺彿鏄惁鏈夋晥!");
+
//鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝ｇ‘
+ if (tjCustomer.getCusPhone().length() != 11)
+ return AjaxResult.error("璇疯緭鍏ュ崄涓�浣嶅彿鐨勬墜鏈哄彿!");
+
if(sfjysjh.equalsIgnoreCase("Y")){
if (!(MatchUtils.isMobileNO(tjCustomer.getCusPhone())))
- return AjaxResult.error("鎵嬫満鍙烽敊璇�");
+ return AjaxResult.error("鎵嬫満鍙烽敊璇�,璇锋鏌ユ墜鏈哄彿鏄惁鏈夋晥!");
}
LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
@@ -569,11 +569,19 @@
return tjCustomer;
}else {
HashMap<String, Object> map = new HashMap<>();
- map.put("cardId","");
+ // 1鏄韩浠借瘉
+ // 鏍规嵁鍑屼簯his鎺ュ彛鍙涓嶆槸鍥藉唴韬唤璇佸彿 韬唤璇佸瓧娈典笉浼� 灏嗗彿鐮佷紶閫掑埌鍗″彿瀛楁骞跺崟浣嶇紪鍙峰繀濉� 鍗曚綅缂栧彿闅忎究鍐�
+ if (!tjCustomer.getIdType().equals("1")){
+ map.put("cardId",tjCustomer.getCusIdcard());
+ map.put("compId",tjCustomer.getCusIdcard());
+ map.put("cusIdCard", "");
+ }else {
+ map.put("cardId","");
+ map.put("cusIdCard", tjCustomer.getCusIdcard());
+ map.put("compId","");
+ }
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());
@@ -647,16 +655,16 @@
//鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝ｇ‘
if(sfjysfzh.equalsIgnoreCase("Y")){
- if(tjCustomer.getCusIdcard().length()==18){
+ if(customer.getIdType().equals("1")){
if (!(MatchUtils.isIdCard(tjCustomer.getCusIdcard())))
return AjaxResult.error("韬唤璇佸彿閿欒");
}
- if(tjCustomer.getCusIdcard().length()==9){
- if (!MatchUtils.cardValidates(tjCustomer.getCusIdcard())) {
- return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
- }
- }
+// if(tjCustomer.getCusIdcard().length()==9){
+// if (!MatchUtils.cardValidates(tjCustomer.getCusIdcard())) {
+// return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
+// }
+// }
}
@@ -686,8 +694,8 @@
String apiUrl = sysConfigService.selectConfigByKey("common_api_url");
String hospbm = sysConfigService.selectConfigByKey("common_api_service_hospbm");
HashMap<String, Object> map = new HashMap<>();
- map.put("pationId",tjCustomer.getPationId());
- map.put("cardId",tjCustomer.getCardId());
+ map.put("pationId",customer.getPationId());
+ map.put("cardId",customer.getHisJzkh());
map.put("cusName",tjCustomer.getCusName());
map.put("cusSex",tjCustomer.getCusSex());
map.put("cusIdCard",tjCustomer.getCusIdcard());
@@ -713,11 +721,82 @@
return AjaxResult.success();
}
}
- return AjaxResult.error();
+ return AjaxResult.success();
} catch (Exception e) {
log.error(e.toString());
throw new RuntimeException(e);
+
}
+
+ }
+
+
+
+ @Log(title = "娉ㄥ唽his瀹㈡埛淇℃伅", businessType = BusinessType.UPDATE)
+ @PostMapping(value = "/zhuceTjCustomer")
+ @ApiOperation(value = "娉ㄥ唽his瀹㈡埛淇℃伅")
+ @Transactional
+ @RepeatSubmit
+ public AjaxResult zhuceTjCustomer(@RequestBody @ApiParam(value = "瀹㈡埛瀵硅薄") TjCustomer tjCustomer) {
+
+ try {
+ TjCustomer customer = tjCustomerService.getById(tjCustomer.getCusId());
+ if(null==customer){
+ return AjaxResult.error("璇ヤ汉鍛樹笉瀛樺湪!");
+ }
+
+ if(!customer.getPationId().equals("0")){
+ return AjaxResult.error("璇ヤ汉鍛樺凡缁忔敞鍐�!");
+ }
+ String config = sysConfigService.selectConfigByKey("sfkqdyhis");
+ if (null != config && config.equals("Y")) {
+ AjaxResult result = controller.Outpincreateapply(customer);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if (code.equals("0")) {
+ JSONArray resultDatass = object.getJSONArray("ResultData");
+ Map<String, Object> resultData = (Map<String, Object>) resultDatass.get(0);
+ if (null != resultData && !resultData.isEmpty()) {
+ String pationid = resultData.get("PationId").toString();
+ if (null != pationid) {
+ customer.setPationId(pationid);
+ //淇濆瓨娉ㄥ唽鍏ュ弬鍑哄弬
+ resultData.put("cardId",pationid);
+ JSONObject object4 = JSONUtil.parseObj(resultData);
+ LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpincreateapply");
+ HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
+ hisApiGetMethodService.save(object4, "Outpincreateapply", hisApiConfig, JSONUtil.toJsonStr(BeanUtil.beanToMap(tjCustomer)));
+ }
+
+ }
+ if (tjCustomerService.updateById(customer)) {
+ return AjaxResult.success("娉ㄥ唽鎴愬姛");
+ }
+ }else{
+ return AjaxResult.error("娉ㄥ唽澶辫触");
+ }
+ }
+
+ String s = sysConfigService.selectConfigByKey("is_request_common_his_api");
+ if (null != s && s.equals("Y")){
+ TjCustomer requestCommonHisApi = isRequestCommonHisApi(customer);
+ if (null !=requestCommonHisApi){
+ if (tjCustomerService.updateById(customer)) {
+ return AjaxResult.success("娉ㄥ唽鎴愬姛");
+ }
+ }else {
+ return AjaxResult.error("娉ㄥ唽澶辫触");
+ }
+ }
+ return AjaxResult.error("璇峰厛杩炴帴his鏈嶅姟");
+ } catch (Exception e) {
+ log.error(e.toString());
+ throw new RuntimeException(e);
+
+ }
+
}
/**
--
Gitblit v1.8.0