From 3d2ad7197cbf8dee74132a8020907f1437dc5aba Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 13 五月 2025 14:14:37 +0800
Subject: [PATCH] zjh20250513
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 1
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 69 ++++++++++++++++++++++++++++++++++
2 files changed, 69 insertions(+), 1 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 fae6edb..def672b 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
@@ -729,6 +729,75 @@
}
+
+
+ @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);
+
+ }
+
+ }
+
/**
* 鍒犻櫎瀹㈡埛淇℃伅
*/
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index a30992f..f3b9555 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1554,7 +1554,6 @@
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
isRequestCommonHisApi(tjOrder, tjCustomer, tjFlowingWater);
} catch (Exception e) {
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
log.error("processOrderWithTransaction 鏂规硶寮傚父"+e.getMessage());
throw new RuntimeException("璋冪敤鍏叡鏂规硶澶辫触 寮哄埗瑙﹀彂鍥炴粴");
// return AjaxResult.error();
--
Gitblit v1.8.0