From 1356787741a823dde5ed40bb19dece59dd979511 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 30 五月 2025 15:36:51 +0800
Subject: [PATCH] zjh20250530

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java |   46 +++++++++++++++++++++++++++++++---------------
 1 files changed, 31 insertions(+), 15 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 eaf00bf..1cae618 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
@@ -349,7 +349,7 @@
             "FROM\n" +
             "  vi_his_patientresult a JOIN vi_his_patientinfo b ON b.SAMPLEID=a.SAMPLEID\n" +
             "WHERE  b.PATIENTTYPE=3 AND\n" +
-            "  a.SAMPLEID = #{tmh}")
+            "  a.SAMPLEID = #{tmh}  ORDER BY a.PRINTORDER")
     List<LtkjHybgd> getCcXZxYyLtkjHybgdByLisVi(String tmh);
 
 
@@ -471,24 +471,41 @@
 
 
     @DataSource(value = DataSourceType.SLAVE_PACS)
-    @Select("SELECT\n" +
+//    @Select("SELECT\n" +
+//            "  trim(a.HIS_ID) tjh,\n" +
+//            "  trim(a.HIS_ID) tmh,\n" +
+//            "  a.JCLX jclx,\n" +
+//            "  NULL jczlx,\n" +
+//            "  a.BGYS bgys,\n" +
+//            "  NULL bgysid,\n" +
+//            "  a.SQRJ sqsj,\n" +
+//            "  a.BGSJ jgsj,\n" +
+//            "  REPLACE(a.JCMC,'tj_','') jcxmmc,\n" +
+//            "  trim(a.JCMID) jcxmid,\n" +
+//            "  a.JCBW bw,\n" +
+//            "  TRIM(a.JCJL) jgzt,\n" +
+//            "  TRIM(a.JCSJ) jgbx,\n" +
+//            "  SYSDATE create_time\n" +
+//            "   \n" +
+//            "FROM\n" +
+//            "  ris.V_TJ_JCBGXX_NEWTJ a  WHERE trim(a.HIS_ID)=#{tjNum} AND a.HOSTPITALID = #{hosp}")
+    @Select(" SELECT\n" +
             "  trim(a.HIS_ID) tjh,\n" +
             "  trim(a.HIS_ID) tmh,\n" +
-            "  a.JCLX jclx,\n" +
-            "  NULL jczlx,\n" +
-            "  a.BGYS bgys,\n" +
-            "  NULL bgysid,\n" +
+            "  trim(a.JCMID) xmdm,\n" +
+            "  a.JCMC xmmc,\n" +
+            "  NULL bg_mig,\n" +
+            "  NULL bg_url,\n" +
+            "  TRIM(a.JCSJ) bg_nr,\n" +
+            "  a.SHYS shysdm,\n" +
+            "  a.SHYS shysxm,\n" +
+            "  TRIM(a.JCJL) yxbx,\n" +
+            "  a.BGSJ zdsj,\n" +
             "  a.SQRJ sqsj,\n" +
-            "  a.BGSJ jgsj,\n" +
-            "  REPLACE(a.JCMC,'tj_','') jcxmmc,\n" +
-            "  trim(a.JCMID) jcxmid,\n" +
-            "  a.JCBW bw,\n" +
-            "  TRIM(a.JCJL) jgzt,\n" +
-            "  TRIM(a.JCSJ) jgbx,\n" +
+            "  a.JCBW jcbw,\n" +
             "  SYSDATE create_time\n" +
-            "   \n" +
             "FROM\n" +
-            "  ris.V_TJ_JCBGXX_NEWTJ a  WHERE trim(a.HIS_ID)=#{tjNum} AND a.HOSTPITALID = #{hosp}")
+            "  ris.V_TJ_JCBGXX_NEWTJ a  WHERE a.HIS_ID=#{tjNum}  AND a.HOSTPITALID = #{hosp} ")
     List<LtkjExamJcbgd> getCcXZxYyPacsLtkjExamJcbgd(@Param("tjNum") String tjNum,@Param("hosp") String hosp);
 
 
@@ -537,7 +554,6 @@
             "  LTEMR.V_TJ_JCBGXX_NEWTJ a  WHERE trim(a.HIS_ID)=#{tjNum}")
     List<LtkjExamJcbgd> getCcXZxYyPacsLtkjExamJcbgd1(String tjNum);
 
-    @DataSource(value = DataSourceType.MASTER)
     @Select("call tj_bingzhongtongji(#{p_start,mode=IN},#{p_end,mode=IN})")
     List<Map<String ,Object>> getBingZhongInfo(@Param("p_start") String start,@Param("p_end") String end);
 

--
Gitblit v1.8.0