From d866e43afbe901bfc640776e02f767b9045acbc2 Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期三, 12 六月 2024 09:04:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peis

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 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 f63179e..5d45f06 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
@@ -30,7 +30,7 @@
     @Select("SELECT * FROM histjv_Ltkj_middle_head")
     public List<LtkjMiddleHead> getMiddleHead();
 
-    @DataSource(value = DataSourceType.SLAVE_LIS)
+    @DataSource(value = DataSourceType.SLAVE_HIS)
     @Select("SELECT * FROM histjv_Ltkj_middle_head where fead_id=#{partId}")
     public LtkjMiddleHead getMiddleHeadByPartId(String partId);
 
@@ -41,7 +41,7 @@
     @Select("SELECT * FROM histjv_LTKJVTJPAT")
     public List<LtkjTjPat> getTjPat();
 
-    @DataSource(value = DataSourceType.SLAVE_PACS)
+    @DataSource(value = DataSourceType.SLAVE_HIS)
     @Select({"<script> select isnull(fcard_no,'涓嶈') xh,fcard_iD pacCode,pat_name pacName,\n" +
             " (case when patsex_id='0' then '鐢�' when patsex_id='1' then '濂�' else '鏈煡' end )+';'+brnl detail,\n" +
             " pat_id price , mobile+tjbz pacRemark" +
@@ -55,6 +55,7 @@
             " <when test='pacRemark!=null'>" +
             "  AND mobile = #{pacRemark}" +
             "</when>" +
+            " order by fcard_iD desc"+
             "</script>"})
     public List<Map<String,Object>> newGetTjPat(@Param("pacCode")String pacCode,
                                                 @Param("pacName")String pacName,
@@ -167,7 +168,7 @@
 
 
 
-    @DataSource(value = DataSourceType.SLAVE_PACS)
+    @DataSource(value = DataSourceType.SLAVE_LIS)
     @Select({"<script> select  *"+
             "  from histjv_Ltkj_hyxm where 1=1 "+
             " <when test='pacCode!=null'>" +
@@ -187,4 +188,23 @@
     @Select("SELECT * FROM histjv_ltkj_userinfo")
     @DataSource(value = DataSourceType.SLAVE_HIS)
     public List<LtkjHisUser> getLtkjHisUser();
+
+
+    @DataSource(value = DataSourceType.SLAVE_PACS)
+    @Select({"<script> select bgid xh,patname pacName ,rptid  pacCode,patage+patagename+'['+sex+']'+patbirth detail,djrq+jcxm pacRemark,lxhd price \n" +
+            "\tfrom V_HIS_PACS_SQ\n" +
+            "\twhere 1=1 " +
+            " <when test='patname!=null'>" +
+            "  AND patname=#{patname}" +
+            "</when>"+
+            " <when test='sex!=null'>" +
+            "  AND  sex=#{sex} "+
+            "</when>"+
+            " <when test='nn!=null'>" +
+             " AND  patage+patagename=#{nn}" +
+             "</when>"+
+            "</script>"})
+    public List<Map<String,Object>> getTjYxjcList(@Param("patname")String patname,
+                                                  @Param("sex")String sex,
+                                                  @Param("nn")String nn);
 }

--
Gitblit v1.8.0