From d5e10c19d8e67aa8caf33d220d00d3e7ee03d490 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 06 八月 2025 13:39:58 +0800
Subject: [PATCH] zjh202500806

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java |   10 ++++++----
 1 files changed, 6 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 727060a..81ccbf8 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);
 
 
@@ -465,7 +465,7 @@
             "  a.SQRJ 鐢宠鏃堕棿,\n" +
             "  a.JCBW 妫�鏌ラ儴浣峔n" +
             "FROM\n" +
-            "V_TJ_JCBGXX_NEWTJ a  WHERE a.HIS_ID=#{tjNum} AND a.HOSTPITALID = #{hosp}")
+            "ris.V_TJ_JCBGXX_NEWTJ a  WHERE trim(a.HIS_ID)=#{tjNum} AND a.HOSTPITALID = #{hosp}")
     List<Map<String, Object>> sysgetCcXZxYyPacsLtkjExamJcsqd(@Param("tjNum") String tjNum,@Param("hosp") String hosp);
 
 
@@ -489,6 +489,9 @@
 //            "   \n" +
 //            "FROM\n" +
 //            "  ris.V_TJ_JCBGXX_NEWTJ a  WHERE trim(a.HIS_ID)=#{tjNum} AND a.HOSTPITALID = #{hosp}")
+
+//    CONCAT(trim(a.HIS_ID), CASE WHEN LENGTH(trim(a.JCMID)) > 6 THEN SUBSTR(trim(a.JCMID), -6) ELSE trim(a.JCMID) END) tmh,
+
     @Select(" SELECT\n" +
             "  trim(a.HIS_ID) tjh,\n" +
             "  trim(a.HIS_ID) tmh,\n" +
@@ -505,7 +508,7 @@
             "  a.JCBW jcbw,\n" +
             "  SYSDATE create_time\n" +
             "FROM\n" +
-            "  ris.V_TJ_JCBGXX_NEWTJ a  WHERE a.HIS_ID=#{tjNum}  AND a.HOSTPITALID = #{hosp} ")
+            "  ris.V_TJ_JCBGXX_NEWTJ a  WHERE trim(a.HIS_ID)=#{tjNum}  AND a.HOSTPITALID = #{hosp} ")
     List<LtkjExamJcbgd> getCcXZxYyPacsLtkjExamJcbgd(@Param("tjNum") String tjNum,@Param("hosp") String hosp);
 
 
@@ -554,7 +557,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