From 43727df73e52cc00a1f1aee3c20a1aec8db1b92f Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 27 二月 2025 08:45:25 +0800
Subject: [PATCH] 修改查询

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
index f8b2008..ff106ec 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
@@ -10,6 +10,7 @@
 import com.ltkj.common.core.domain.AjaxResult;
 import com.ltkj.framework.config.UserHoder;
 import com.ltkj.hosp.domain.LtkjJianchajianyanTree;
+import com.ltkj.hosp.domain.TjCustomer;
 import com.ltkj.hosp.domain.TjOrder;
 import com.ltkj.hosp.domain.TjProject;
 import com.ltkj.hosp.hisDto.*;
@@ -59,6 +60,8 @@
     private LtkjHysqdService hysqdService;
     @Autowired
     private LtkjHybgdService hybgdService;
+    @Autowired
+    private ITjCustomerService tjCustomerService;
 
     /**
      * 鑾峰彇pacs妫�鏌ユ暟鎹�
@@ -81,6 +84,10 @@
             wrapper.eq(TjOrder::getTjNumber,tjNum);
             TjOrder order = tjOrderService.getOne(wrapper);
             mzh = order.getCardId();
+            LambdaQueryWrapper<TjCustomer> wrapper1 = new LambdaQueryWrapper<>();
+            wrapper1.eq(TjCustomer::getCusId,order.getUserId());
+            TjCustomer tjCustomer = tjCustomerService.getOne(wrapper1);
+            name = tjCustomer.getCusName();
         }
         List<Map<String, Object>> jcList = testMapper.getPacsJcList(name, mzh, start, end);
         if (jcList.isEmpty()){
@@ -123,6 +130,10 @@
             wrapper.eq(TjOrder::getTjNumber,tjNum);
             TjOrder order = tjOrderService.getOne(wrapper);
             mzh = order.getCardId();
+            LambdaQueryWrapper<TjCustomer> wrapper1 = new LambdaQueryWrapper<>();
+            wrapper1.eq(TjCustomer::getCusId,order.getUserId());
+            TjCustomer tjCustomer = tjCustomerService.getOne(wrapper1);
+            name = tjCustomer.getCusName();
         }
         List<Map<String, Object>> jcList = testMapper.getPacsJcList(name, mzh, start, end);
         return AjaxResult.success(jcList);
@@ -153,6 +164,10 @@
             wrapper.eq(TjOrder::getTjNumber,tjNum);
             TjOrder order = tjOrderService.getOne(wrapper);
             mzh = order.getCardId();
+            LambdaQueryWrapper<TjCustomer> wrapper1 = new LambdaQueryWrapper<>();
+            wrapper1.eq(TjCustomer::getCusId,order.getUserId());
+            TjCustomer tjCustomer = tjCustomerService.getOne(wrapper1);
+            name = tjCustomer.getCusName();
         }
         List<Map<String, Object>> jcList = testMapper.getLisJyList(name, mzh, start, end);
         return AjaxResult.success(jcList);
@@ -164,7 +179,9 @@
     public AjaxResult getTjList(@RequestParam("code")String code){
 //        log.info("tjList鎺ュ彛鍙傛暟->{}",code);
         LambdaQueryWrapper<TjOrder> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TjOrder::getCardId,code);
+        queryWrapper.eq(TjOrder::getCardId, code)
+                .or()
+                .eq(TjOrder::getTjNumber, code);
         TjOrder order = tjOrderService.getOne(queryWrapper);
         if (order == null){
             return AjaxResult.error("闂ㄨ瘖鍙�:"+code+"鍦ㄤ綋妫�绯荤粺涓笉瀛樺湪");

--
Gitblit v1.8.0