From 6b52b67e8ea269bc61a47251c2bca5c432e94672 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 20 二月 2025 17:36:36 +0800
Subject: [PATCH] 修改lis、pacs查询sql

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java |   15 +++++++++++++++
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java               |   38 ++++++++++++++++++++------------------
 2 files changed, 35 insertions(+), 18 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..1b55c18 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);
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 c577c8a..c2d3dd9 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
@@ -219,15 +219,16 @@
     @DataSource(value = DataSourceType.SLAVE_PACS)
     @Select({"<script>" +
                 "select * from V_JCBGLBHIS where mzh is not null " +
-                "<when test='name != null'>" +
-                "and name = #{name}" +
-                "</when>" +
-                "<when test='mzh != null'>" +
-                "and mzh = #{mzh}" +
-                "</when>" +
-                "<when test='start != null and end != null'>" +
-                "and examinationDate between #{start} and #{end}" +
-                "</when>" +
+//                "<when test='name != null'>" +
+//                "and name = #{name}" +
+//                "</when>" +
+//                "<when test='mzh != null'>" +
+//                "and mzh = #{mzh}" +
+                "and (mzh = #{mzh} or name like CONCAT('%', #{name}, '%') )" +
+//                "</when>" +
+//                "<when test='start != null and end != null'>" +
+//                "and examinationDate between #{start} and #{end}" +
+//                "</when>" +
                 "order by examinationDate" +
             "</script>"})
     List<Map<String ,Object>> getPacsJcList(@Param("name")String name,@Param("mzh")String mzh,@Param("start")String start,@Param("end")String end);
@@ -235,15 +236,16 @@
     @DataSource(value = DataSourceType.SLAVE_LIS)
     @Select({"<script>" +
             "select * from V_JYBGHIS where mzh is not null " +
-            "<when test='name != null'>" +
-            "and name = #{name}" +
-            "</when>" +
-            "<when test='mzh != null'>" +
-            "and mzh = #{mzh}" +
-            "</when>" +
-            "<when test='start != null and end != null'>" +
-            "and examinationDate between #{start} and #{end}" +
-            "</when>" +
+//            "<when test='name != null'>" +
+//            "and name = #{name}" +
+//            "</when>" +
+//            "<when test='mzh != null'>" +
+//            "and mzh = #{mzh}" +
+            "and (mzh = #{mzh} or name like CONCAT('%', #{name}, '%') )" +
+//            "</when>" +
+//            "<when test='start != null and end != null'>" +
+//            "and examinationDate between #{start} and #{end}" +
+//            "</when>" +
             "order by examinationDate" +
             "</script>"})
     List<Map<String ,Object>> getLisJyList(@Param("name")String name,@Param("mzh")String mzh,@Param("start")String start,@Param("end")String end);

--
Gitblit v1.8.0