From 36a14ff3a8e17a7ffbf299b3bd2617574da77376 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Tue, 19 Jan 2021 16:00:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC20210113?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/Archive_MasterMapper.xml    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index 3770b5e..c06bfba 100644
--- a/src/main/resources/mapper/Archive_MasterMapper.xml
+++ b/src/main/resources/mapper/Archive_MasterMapper.xml
@@ -128,7 +128,7 @@
     <if test="idNo != null and idNo != ''">
       and m.ID_NO like '%'+#{idNo,jdbcType=NCHAR}+'%'
     </if>
-      <if test="sex != null">
+      <if test="sex != null and sex != ''">
         and m.sex = #{sex,jdbcType=NVARCHAR}
       </if>
       <if test="deptName!= null and deptName!= ''">
@@ -137,7 +137,7 @@
         #{item}
       </foreach>
     </if>
-      <if test="dischargeDateTime != null">
+      <if test="dischargeDateTime != null and dischargeDateTime != ''">
         and m.discharge_date_time = #{dischargeDateTime,jdbcType=NVARCHAR}
       </if>
 
@@ -155,28 +155,28 @@
     </choose>
 
 
-      <if test="checkDoctor != null">
+      <if test="checkDoctor != null and checkDoctor != ''">
         and m.check_doctor = #{checkDoctor,jdbcType=NVARCHAR}
       </if>
       <if test="checkedDoctor != null">
         and checked_doctor = #{checkedDoctor,jdbcType=NVARCHAR}
       </if>
-      <if test="checkDatetime != null">
+      <if test="checkDatetime != null and checkDatetime != ''">
         and m.check_datetime = #{checkDatetime,jdbcType=NVARCHAR}
       </if>
       <if test="checkedDatetime != null">
         and m.checked_datetime = #{checkedDatetime,jdbcType=NVARCHAR}
       </if>
-      <if test="lockinfo != null">
+      <if test="lockinfo != null and lockinfo != ''">
         and m.LockInfo = #{lockinfo,jdbcType=NVARCHAR}
       </if>
-      <if test="doctorInCharge != null">
+      <if test="doctorInCharge != null and doctorInCharge != ''">
         and m.DOCTOR_IN_CHARGE LIKE '%'+#{doctorInCharge,jdbcType=NVARCHAR}+'%'
       </if>
-      <if test="dischargeDisposition != null">
+      <if test="dischargeDisposition != null and dischargeDisposition != ''">
         and m.DISCHARGE_DISPOSITION = #{dischargeDisposition,jdbcType=NVARCHAR}
       </if>
-      <if test="deptCodeLend != null">
+      <if test="deptCodeLend != null and deptCodeLend != ''">
         and m.dept_code_lend = #{deptCodeLend,jdbcType=NVARCHAR}
       </if>
     ORDER BY m.admission_date_time desc