From 971162978842f8cf87d34f99da8c529e2e945da8 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 15 四月 2025 08:46:57 +0800
Subject: [PATCH] zjh20250415
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java | 76 ++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 36 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..1575abc 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
@@ -217,38 +217,36 @@
@Param("nn")String nn);
@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>" +
- "order by examinationDate" +
+// @Select({"<script>" +
+// "select * from V_JCBGLBHIS where mzh is not null " +
+// "and (mzh = #{mzh} or name = #{name} )" +
+// "order by examinationDate" +
+// "</script>"})
+ @Select({"<script>",
+ "SELECT * FROM V_JCBGLBHIS ",
+ "WHERE name = #{name} ",
+ "<if test='mzh != null and mzh != \"\"'>",
+ " OR mzh = #{mzh} ",
+ "</if>",
+ "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);
+ 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)
- @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>" +
- "order by examinationDate" +
+
+ @DataSource(value = DataSourceType.SLAVE_HIS)
+// @Select({"<script>" +
+// "select * from V_JYBGHIS where mzh is not null " +
+// "and (mzh = #{mzh} or name = #{name} )" +
+// "order by examinationDate" +
+// "</script>"})
+ @Select({"<script>",
+ "select * from V_JYBGHIS where name = #{name}",
+ "<if test='mzh != null and mzh != \"\"'>",
+ " OR mzh = #{mzh} ",
+ "</if>",
+ "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);
-
-
@DataSource(value = DataSourceType.SLAVE_LIS)
@Select("select t.* from vi_his_patientresult t \n" +
@@ -276,8 +274,8 @@
" \n" +
"FROM\n" +
" vi_his_patientinfo a\n" +
- "WHERE a.PATIENTTYPE=3 AND a.GH_PATIENTNO =#{tjNum}")
- List<LtkjHysqd> getCcXZxYyLtkjHysqdByLisVi(String tjNum);
+ "WHERE a.PATIENTTYPE=3 AND a.GH_PATIENTNO =#{tjNum} AND a.HOSPITALID =#{dqyyyqbm}")
+ List<LtkjHysqd> getCcXZxYyLtkjHysqdByLisVi(@Param("tjNum") String tjNum,@Param("dqyyyqbm") String dqyyyqbm);
@@ -310,7 +308,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 +331,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 +341,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);
@@ -375,8 +379,8 @@
" SYSDATE create_time\n" +
" \n" +
"FROM\n" +
- " ris.V_TJ_JCBGXX_NEWTJ a WHERE trim(a.HIS_ID)=#{tjNum}")
- List<LtkjExamJcsqd> getCcXZxYyPacsLtkjExamJcsqd(String tjNum);
+ " ris.V_TJ_JCBGXX_NEWTJ a WHERE trim(a.HIS_ID)=#{tjNum} AND a.HOSTPITALID =#{dqyyyqbm} ")
+ List<LtkjExamJcsqd> getCcXZxYyPacsLtkjExamJcsqd(@Param("tjNum") String tjNum,@Param("dqyyyqbm") String dqyyyqbm);
@DataSource(value = DataSourceType.SLAVE_PACS)
--
Gitblit v1.8.0