From 6e15fdc74abb44be1cedb2f71b6b25bec9c269d0 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 28 二月 2025 11:11:04 +0800
Subject: [PATCH] zjh20250228
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java | 36 +++++++++++++-----------------------
1 files changed, 13 insertions(+), 23 deletions(-)
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 b12c3f2..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,31 +219,15 @@
@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>" +
+ "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);
- @DataSource(value = DataSourceType.SLAVE_LIS)
+ @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}" +
- "</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);
@@ -310,7 +294,7 @@
// @DataSource(value = DataSourceType.SLAVE_WS)
- @Select("SELECT aa.tjh,ws.pro_id tmh,aa.bbbh,aa.bbmc,ws.pro_id xmid,aa.xmmc,aa.sqsj,aa.sqys,aa.jgsj,aa.sqdh,aa.sqrxm,aa.sqrdm,aa.jybgjg,aa.create_time FROM tj_wsxm ws LEFT JOIN (\n" +
+ @Select("SELECT aa.tjh,CONCAT(aa.tjh,RIGHT(ws.pro_id, 6)) tmh,aa.bbbh,aa.bbmc,ws.pro_id xmid,aa.xmmc,aa.sqsj,aa.sqys,aa.jgsj,aa.sqdh,aa.sqrxm,aa.sqrdm,aa.jybgjg,aa.create_time FROM tj_wsxm ws LEFT JOIN (\n" +
" SELECT\n" +
" a.brid tjh,\n" +
" a.brid tmh,\n" +
@@ -333,7 +317,7 @@
List<LtkjHysqd> getWsxmLtkjHysqdByLisVi(String tjNum);
// @DataSource(value = DataSourceType.SLAVE_WS)
- @Select("SELECT ws.pro_id tmh,aa.jcxmid,aa.jcxm,NULL tdh,aa.jyjg,null jgdw,null fwzdz,null fwzgz,aa.jysj,aa.shsj,NULL shys,aa.shysmc,NULL tpurl,NULL ycbz,aa.create_time\n" +
+ @Select("SELECT CONCAT(aa.tmh,RIGHT(ws.pro_id, 6)) tmh,aa.jcxmid,aa.jcxm,NULL tdh,aa.jyjg,null jgdw,null fwzdz,null fwzgz,aa.jysj,aa.shsj,NULL shys,aa.shysmc,NULL tpurl,NULL ycbz,aa.create_time\n" +
" FROM tj_wsxm ws \n" +
" LEFT JOIN (\n" +
" SELECT distinct a.brid tmh,a.xmbm jcxmid,a.xmmc jcxm,NULL tdh,a.result jyjg,null jgdw,null fwzdz,null fwzgz,null fwz,a.bgsj jysj,a.bgys jyys,a.bgsj shsj," +
@@ -343,8 +327,14 @@
- @DataSource(value = DataSourceType.SLAVE_WS)
- @Select("SELECT * from lis_result a where a.brid=#{tjNum}")
+// @DataSource(value = DataSourceType.SLAVE_WS)
+// @Select("SELECT * from lis_result a where a.brid=#{tjNum}")
+// List<Aws> getWsxmLtkjHysqdByLisViBySLAVEWS(String tjNum);
+
+ @DataSource(value = DataSourceType.SLAVE_WS)
+ @Select("select t.brid,t.xmbm,t.xmmc,t.result,t.gdpd ,t.xmckz,t.dw,t.bgys,max(bgsj) bgsj\n" +
+ " from lis_result t WHERE t.brid=#{tjNum} \n" +
+ " group by t.brid,t.xmbm,t.xmmc,t.result,t.gdpd,t.xmckz,t.dw,t.bgys")
List<Aws> getWsxmLtkjHysqdByLisViBySLAVEWS(String tjNum);
--
Gitblit v1.8.0