From 95604975d26071d55e270e73784af4787b042d98 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 12 二月 2025 17:32:45 +0800
Subject: [PATCH] zjh20250212

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 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..c577c8a 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
@@ -310,7 +310,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 +333,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 +343,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