From 394b1a4263efc433b7b76149904bf9ac0b73ffb5 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 26 二月 2025 18:46:09 +0800
Subject: [PATCH] 修改查询
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java | 4 +++-
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 2 +-
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java | 22 ++--------------------
3 files changed, 6 insertions(+), 22 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 1b55c18..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
@@ -179,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+"鍦ㄤ綋妫�绯荤粺涓笉瀛樺湪");
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 5e22811..5f4306b 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,16 +219,7 @@
@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}" +
- "and (mzh = #{mzh} or name like CONCAT('%', #{name}, '%') )" +
-// "</when>" +
-// "<when test='start != null and end != null'>" +
-// "and examinationDate between #{start} and #{end}" +
-// "</when>" +
+ "and (mzh = #{mzh} or name like '%' + #{name} + '%' )" +
"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);
@@ -236,16 +227,7 @@
@DataSource(value = DataSourceType.SLAVE_HIS)
@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}" +
- "and (mzh = #{mzh} or name like CONCAT('%', #{name}, '%') )" +
-// "</when>" +
-// "<when test='start != null and end != null'>" +
-// "and examinationDate between #{start} and #{end}" +
-// "</when>" +
+ "and (mzh = #{mzh} or name like '%' + #{name} + '%' )" +
"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);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
index 397ea96..e94236c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -133,7 +133,7 @@
" LEFT JOIN sys_user us ON us.user_id = re.doctor_name\n" +
" WHERE\n" +
// " re.type != 2 AND\n" +
- " re.tj_number = #{tjNumber} and re.dept_id !=532 and pro.pro_name not like '%璐�%' and pro.need_report='Y'" +
+ " re.tj_number = #{tjNumber} and pro.need_report='Y'" +
" <when test='sfzpacs == true'> " +
" AND dep.org_type = 2"+
" </when>"+
--
Gitblit v1.8.0