From fda3f5aee2ce04ca6b9a161d11365c207cb94510 Mon Sep 17 00:00:00 2001
From: wangbo <184677810@qq.com>
Date: Wed, 26 Jun 2019 16:31:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E9=99=A2=E8=AF=8A=E6=96=AD=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mainOrm/master/BabyDiagnoseMapper.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml
index 622a2f4..49a8159 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml
@@ -91,38 +91,38 @@
     <sql id="babyDiagnosesCondition">
         <where>
             1=1
-            <if test="startDischargeDate != null">
+            <if test="startDischargeDate != null and startDischargeDate!=''">
                 AND
                 <![CDATA[
                 DATEDIFF(#{startDischargeDate},cyrq)<=0
                 ]]>
             </if>
-            <if test="endDischargeDate != null">
+            <if test="endDischargeDate != null and endDischargeDate!=''">
                 AND
                 <![CDATA[
                 DATEDIFF(#{endDischargeDate},cyrq)>=0
                 ]]>
             </if>
-            <if test="startBirthDate != null">
+            <if test="startBirthDate != null and startBirthDate!=''">
                 AND
                 <![CDATA[
                 DATEDIFF(#{startBirthDate},birth)>=0
                 ]]>
             </if>
-            <if test="endBirthDate != null">
+            <if test="endBirthDate != null and endBirthDate!=''">
                 AND
                 <![CDATA[
                 DATEDIFF(#{endBirthDate},birth)>=0
                 ]]>
             </if>
-            <if test="hospitalizationNo != null">
+            <if test="hospitalizationNo != null and hospitalizationNo != ''">
                 and blh = #{hospitalizationNo}
             </if>
-            <if test="babyName != null">
+            <if test="babyName != null and babyName!=''">
                 and hzxm =#{babyName}
             </if>
-            <if test="finalDiagnosis != null">
-                and cyzddm like '#{finalDiagnosis}%'
+            <if test="finalDiagnosis != null and finalDiagnosis!= '' ">
+                and cyzddm like CONCAT(#{finalDiagnosis},'%')
             </if>
             <if test="isbuild != null">
                 and isbuild = #{isbuild}
-- 
1.8.3.1