From 4ccd96e52b9815ddfd5528fbebc6560042ec189b Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期五, 22 十二月 2023 10:49:13 +0800
Subject: [PATCH] zjh 本地 2023/12/22 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 39 ++++++++++++++++++-
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java | 13 ++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java | 10 ++++
3 files changed, 58 insertions(+), 4 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
index 87d2eba..9137ca6 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
@@ -75,6 +75,19 @@
private ITjOrderService orderService;
@Resource
private ISysDeptService deptService;
+
+
+ @GetMapping("/newGetTjPat")
+ @ApiOperation(value = "鏂扮殑鏌ヨ浣撴淇℃伅鎺ュ彛")
+ public AjaxResult newGetTjPat() {
+ List<Map<String, Object>> maps = testMapper.newGetTjPat();
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ return AjaxResult.success(maps);
+ }
+
+
+
+
@GetMapping("/getRedisValue")
@ApiOperation(value = "娴嬭瘯redis妯＄硦鏌ヨ")
public AjaxResult getRedisValue(@RequestParam int aa,
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 40e10f2..f49efda 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
@@ -10,8 +10,9 @@
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.TjReservation;
import com.ltkj.hosp.mapper.TestMapper;
-import com.ltkj.hosp.service.ITjReservationService;
-import com.ltkj.hosp.service.TjvLtkjvtjpatService;
+import com.ltkj.hosp.service.*;
+import com.ltkj.hosp.sqlDomain.LtkjMiddleDetail;
+import com.ltkj.hosp.sqlDomain.LtkjMiddleHead;
import com.ltkj.hosp.sqlDomain.LtkjTjPat;
import com.ltkj.system.service.ISysConfigService;
import io.swagger.annotations.Api;
@@ -25,13 +26,13 @@
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.enums.BusinessType;
import com.ltkj.hosp.domain.TjCustomer;
-import com.ltkj.hosp.service.ITjCustomerService;
import com.ltkj.common.utils.poi.ExcelUtil;
import com.ltkj.common.core.page.TableDataInfo;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
@@ -57,6 +58,18 @@
private TestMapper testMapper;
@Resource
private TjvLtkjvtjpatService tjvLtkjvtjpatService;
+ @Resource
+ private LtkjMiddleHeadService headService;
+ @Resource
+ private LtkjMiddleDetailService middleDetailService;
+
+ @GetMapping("/newGetTjPat")
+ @ApiOperation(value = "鏌ヨhis鏁版嵁搴撹繑鍥炴柊鐨勬暟鎹�")
+ public AjaxResult newGetTjPat() {
+ List<Map<String, Object>> maps = testMapper.newGetTjPat();
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ return AjaxResult.success(maps);
+ }
@@ -105,9 +118,11 @@
qw.eq(TjCustomer::getCusIdcard, cusIdcard);
TjCustomer customer = tjCustomerService.getOne(qw);
customer.setReservationId(customer.getCardId());
+ extracted(customer);
return success(customer);
}else {
tjCustomer.setReservationId(tjCustomer.getCardId());
+ extracted(tjCustomer);
return success(tjCustomer);
}
@@ -194,6 +209,24 @@
return error("韬唤璇佸彿涓嶅瓨鍦�");
}
+ private void extracted(TjCustomer customer) {
+ LtkjMiddleHead pat = testMapper.getMiddleHeadByPartId(customer.getCardId());
+ if (null != pat) {
+ List<LtkjMiddleDetail> list = testMapper.getMiddleDetailByFeadId(pat.getFeadId());
+ DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+ LtkjMiddleHead o = headService.getMiddleHeadByPartId(customer.getCardId());
+ if(o==null){
+ headService.save(pat);
+ for (LtkjMiddleDetail ltkjMiddleDetail : list) {
+ middleDetailService.save(ltkjMiddleDetail);
+ }
+ testMapper.saveTjProByCusId(customer.getCardId(), customer.getCusIdcard());
+ }
+ testMapper.saveTjProByCusId(customer.getCardId(), customer.getCusIdcard());
+ }
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ }
+
/**
* 鏌ヨ瀹㈡埛淇℃伅鍒楄〃
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
index 9e3c4c0..10961b3 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
@@ -9,6 +9,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
* @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
@@ -42,8 +43,15 @@
@Select("SELECT * FROM histjv_LTKJVTJPAT")
public List<LtkjTjPat> getTjPat();
+ @DataSource(value = DataSourceType.SLAVE_PACS)
+ @Select("select fcard_iD xh,fcard_no pacCode,pat_name pacName,\n" +
+ " (case when patsex_id='0' then '鐢�' when patsex_id='1' then '濂�' else '鏈煡' end )+';'+brnl detail,\n" +
+ " pat_id price , mobile pacRemark\n" +
+ " from histjv_ltkjvtjpat")
+ public List<Map<String,Object>> newGetTjPat();
+
@DataSource(value = DataSourceType.SLAVE_HIS)
- @Select("SELECT * FROM histjv_LTKJVTJPAT where Ltrim(Rtrim(fcard_no)) = #{id} ")
+ @Select("SELECT * FROM histjv_LTKJVTJPAT where Ltrim(Rtrim(fcard_no)) = #{id} or Ltrim(Rtrim(fcard_id))=#{id} ")
public LtkjTjPat getTjPatByIdCard(String id);
--
Gitblit v1.8.0