From fd05507e8595739c80f485d67fdeeed91708f746 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期四, 21 十二月 2023 16:32:14 +0800
Subject: [PATCH] zjh 本地 2023/12/21 -1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java |   47 ++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 40 insertions(+), 7 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 caeb0e6..4031f4c 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
@@ -1,11 +1,14 @@
 package com.ltkj.web.controller.sqlserver;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ltkj.common.core.controller.BaseController;
 import com.ltkj.common.core.domain.AjaxResult;
 import com.ltkj.common.core.redis.RedisCache;
 import com.ltkj.common.enums.DataSourceType;
 import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
+import com.ltkj.hosp.domain.TjCustomer;
 import com.ltkj.hosp.domain.TjOrder;
 import com.ltkj.hosp.domain.TjOrderRemark;
 import com.ltkj.hosp.service.*;
@@ -61,6 +64,8 @@
     @Autowired
     public RedisTemplate<Object,Object> redisTemplate;
     @Resource
+    private ITjCustomerService tjCustomerService;
+    @Resource
     private RedisCache redisCache;
     @Resource
     private TjAsyncService asyncService;
@@ -77,7 +82,7 @@
                                     @RequestParam(defaultValue = "10") Integer pageSize,
                                     @RequestParam(required = false) String deptId,
                                     @RequestParam(required = false) String tjName,
-                                    @RequestParam(required = false) String tjNum) throws SQLException {
+                                    @RequestParam(required = false) String tjNum) throws SQLException, JsonProcessingException {
 //        long start = System.currentTimeMillis();
 //        //闇�瑕佸尮閰嶇殑key
 //        ScanOptions options = ScanOptions.scanOptions()
@@ -112,12 +117,14 @@
 
 //        List<Map<String, Object>> map = deptService.getSysDeptYjWjCustomerList(deptId, tjName, tjNum, aa, page, pageSize);
 //        List<ResultSet> map = deptService.getSysDeptYjWjCustomerList1(deptId, tjName, tjNum, aa, page, pageSize);
-        ResultSet resultSet = deptService.getSysDeptYjWjCustomerList12(deptId, tjName, tjNum, aa, page, pageSize);
-        while (resultSet.next()){
-            String anInt = resultSet.getString(1);
-            System.out.println(anInt);
-        }
-        return AjaxResult.success();
+//        ResultSet resultSet = deptService.getSysDeptYjWjCustomerList12(deptId, tjName, tjNum, aa, page, pageSize);
+//        while (resultSet.next()){
+//            String anInt = resultSet.getString(1);
+//            System.out.println(anInt);
+//        }
+
+        Map<String,Object> map = deptService.getSysDeptYjWjCustomerList13(deptId, tjName, tjNum, aa, page, pageSize);
+        return AjaxResult.success(map);
     }
 
 
@@ -153,6 +160,7 @@
 
 
     @GetMapping("/getTjPat")
+    @ApiOperation(value = "娴嬭瘯getTjPat")
     public AjaxResult getTjPat() {
         List<LtkjTjPat> list = testMapper.getTjPat();
         DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
@@ -163,6 +171,31 @@
         return AjaxResult.success(list);
     }
 
+
+    @GetMapping("/getTjPatByIdCard")
+    @ApiOperation(value = "鏍规嵁韬唤璇佸彿娴嬭瘯getTjPat")
+    public AjaxResult getTjPatByIdCard(@RequestParam String idCard) {
+        LtkjTjPat tjPatByIdCard = testMapper.getTjPatByIdCard(idCard.trim());
+        if(null != tjPatByIdCard){
+            String fcardNo = tjPatByIdCard.getFcardNo();
+            if(null !=fcardNo){
+                fcardNo=fcardNo.trim();
+                tjPatByIdCard.setFcardNo(fcardNo);
+            }
+            LtkjTjPat ltkjTjPat = tjvLtkjvtjpatService.getLtkjTjPatByCusIdCard(idCard);
+            if(null==ltkjTjPat){
+                tjvLtkjvtjpatService.save(tjPatByIdCard);
+            }
+        }
+        DynamicDataSourceContextHolder.clearDataSourceType();
+        //鍐嶆牴鎹韩浠借瘉鍙峰啓customer琛�
+        TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(idCard);
+        if(null == tjCustomer){
+            testMapper.getTjPatByCusId(idCard);
+        }
+        return AjaxResult.success(tjPatByIdCard);
+    }
+
     @GetMapping("/getExamJcbgd")
     public AjaxResult getExamJcbgd() {
         List<LtkjExamJcbgd> list = testMapper.getExamJcbgd();

--
Gitblit v1.8.0