From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-hosp/src/main/resources/mapper/hosp/TjOrderRemarkMapper.xml | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderRemarkMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderRemarkMapper.xml
index aeaab55..af6564e 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderRemarkMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjOrderRemarkMapper.xml
@@ -4,7 +4,8 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ltkj.hosp.mapper.TjOrderRemarkMapper">
- <select id="tjYishengjianchajianyi" parameterType="java.util.Map" statementType="CALLABLE" resultType="java.util.Map">
+ <select id="tjYishengjianchajianyi" parameterType="java.util.Map" statementType="CALLABLE"
+ resultType="java.util.Map">
{call tj_yishengjianchajianyi(
#{tjNum,mode=IN,jdbcType=VARCHAR},
#{ksId,mode=IN,jdbcType=VARCHAR},
@@ -13,4 +14,40 @@
)}
</select>
+
+ <select id="shoufeiyemianyishoufei" resultType="com.ltkj.hosp.domain.TjOrderRemark">
+ SELECT * FROM tj_order_remark a
+ <where>
+ a.deleted=0 AND a.type !=2 and !isnull(a.sfbz) AND a.tj_number=#{tjNumber}
+ <choose>
+ <!-- 濡傛灉 jxbz 涓嶄负绌猴紝璧版閫昏緫 -->
+ <when test="jxbz != null and jxbz != ''">
+ AND a.jxbz = #{jxbz}
+ </when>
+ <!-- 濡傛灉 jxbz 涓虹┖锛岃蛋鍏朵粬閫昏緫 -->
+ <otherwise>
+ AND a.jxbz IS NULL
+ </otherwise>
+ </choose>
+ </where>
+ </select>
+
+
+ <select id="shoufeiyemianweishoufei" resultType="com.ltkj.hosp.domain.TjOrderRemark">
+ SELECT * FROM tj_order_remark a
+ <where>
+ a.deleted=0 AND a.type !=2 and isnull(a.sfbz) AND a.tj_number=#{tjNumber}
+ <choose>
+ <!-- 濡傛灉 jxbz 涓嶄负绌猴紝璧版閫昏緫 -->
+ <when test="jxbz != null and jxbz != ''">
+ AND a.jxbz = #{jxbz}
+ </when>
+ <!-- 濡傛灉 jxbz 涓虹┖锛岃蛋鍏朵粬閫昏緫 -->
+ <otherwise>
+ AND a.jxbz IS NULL
+ </otherwise>
+ </choose>
+ </where>
+ </select>
+
</mapper>
--
Gitblit v1.8.0