From d0fe7d5013acc43ffbf99c140e6d103588dc8265 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期日, 04 二月 2024 15:22:42 +0800
Subject: [PATCH] zjh 本地 2024/02/4 -1

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java |    2 +-
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java          |    2 +-
 2 files changed, 2 insertions(+), 2 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 f9a4313..f63179e 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
@@ -44,7 +44,7 @@
     @DataSource(value = DataSourceType.SLAVE_PACS)
     @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 pacRemark" +
+            " pat_id price , mobile+tjbz pacRemark" +
             "  from histjv_ltkjvtjpat where 1=1 "+
             " <when test='pacCode!=null'>" +
             "  AND fcard_no like '%'+#{pacCode}+'%'" +
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
index 82ce1ad..8c63dbf 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -26,7 +26,7 @@
     @Select("SELECT * FROM tj_order_remark WHERE tj_number=#{tjNumber} AND pro_id=#{proParentId} AND deleted='0'")
     TjOrderRemark getTjOrderRemarkByTjNumAndProParentId(@Param("tjNumber") String tjNumber,@Param("proParentId") String proParentId);
 
-    @Select("SELECT COUNT(*) a FROM tj_order_remark WHERE tj_number=#{tjNumber} AND type=3 or type=0 AND deleted=0")
+    @Select("SELECT COUNT(*) a FROM tj_order_remark WHERE tj_number=#{tjNumber} AND type IN (0,3) AND deleted=0")
     int getTjYqOrderRemarkByTjNum(String tjNumber);
 
     @Delete("DELETE  FROM tj_order_remark WHERE tj_number=#{tjNumber}")

--
Gitblit v1.8.0