From 15f8d75b658de41d33b3432eb262ee33300c2133 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 17 三月 2025 13:45:26 +0800
Subject: [PATCH] 折扣计费处理
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 abe7b43..9c8d43c 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
@@ -16,6 +16,7 @@
import com.ltkj.common.enums.BusinessType;
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.common.utils.SecurityUtils;
+import com.ltkj.db.DataSourceContextHolder;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.HisApiConfig;
@@ -261,7 +262,7 @@
tjCustomer1.setGroupingId(tjReservation.getGroupingId());
// if(null !=tjReservation.getCompanyId())tjCustomer1.setDictCompId(Long.valueOf(tjReservation.getCompanyId()));
-// if(null !=tjReservation.getCompany())tjCustomer1.setCompName(tjReservation.getCompany());
+ if(null !=tjReservation.getCompany())tjCustomer1.setCompName(tjReservation.getCompany());
// tjCustomerService.updateById(tjCustomer1);
@@ -291,8 +292,8 @@
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.getCompany())tjCustomer.setCompName(tjReservation.getCompany());
+ if(null !=tjReservation.getCompanyId())tjCustomer.setCompId(tjReservation.getCompanyId());
+ if(null !=tjReservation.getCompany())tjCustomer.setCompName(tjReservation.getCompany());
if (null != key && key.equals("Y")) {
AjaxResult result = controller.Outpincreateapply(tjCustomer);
@@ -514,11 +515,15 @@
tjCustomer.setCusNumber(0L);
tjCustomer.setPym(PinyinUtil.getFirstLetter(tjCustomer.getCusName(),""));
String config = sysConfigService.selectConfigByKey("sfkqdyhis");
+ logger.info("config ->{}",config);
+ String dataSourceType = DataSourceContextHolder.getDataSourceKey();
+ logger.info("鐧昏褰撳墠鏁版嵁婧� ->{}",dataSourceType);
if (null != config && config.equals("Y")) {
AjaxResult tjCustomer1 = suijieHisXinXi(tjCustomer, date);
if (tjCustomer1 != null) return tjCustomer1;
} else {
String s = sysConfigService.selectConfigByKey("is_request_common_his_api");
+ logger.info("s ->{}",s);
if (null != s && s.equals("Y")){
TjCustomer requestCommonHisApi = isRequestCommonHisApi(tjCustomer);
if (null !=requestCommonHisApi){
--
Gitblit v1.8.0