浏览代码

运行质控不判断出院时间为空

zhaops 4 年之前
父节点
当前提交
1b59037550
共有 2 个文件被更改,包括 0 次插入95 次删除
  1. 0 65
      src/main/resources/mapper/BehospitalInfoMapper.xml
  2. 0 30
      src/main/resources/mapper/QcresultInfoMapper.xml

+ 0 - 65
src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -199,7 +199,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -246,7 +245,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -672,7 +670,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -714,7 +711,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -753,7 +749,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -795,7 +790,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -831,7 +825,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -877,7 +870,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -932,7 +924,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -984,7 +975,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -1039,7 +1029,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -1096,7 +1085,6 @@
             AND a.hospital_id = #{filterPageVO.hospitalId}
         </if>
         <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="filterPageVO.startDate != null and filterPageVO.startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{filterPageVO.startDate}]]>
             </if>
@@ -1144,7 +1132,6 @@
             AND a.hospital_id = #{filterPageVO.hospitalId}
         </if>
         <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="filterPageVO.startDate != null and filterPageVO.startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{filterPageVO.startDate}]]>
             </if>
@@ -1210,7 +1197,6 @@
             AND a.hospital_id = #{filterPageByDeptVO.hospitalId}
         </if>
         <if test="filterPageByDeptVO.isPlacefile != null and filterPageByDeptVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="filterPageByDeptVO.startDate != null and filterPageByDeptVO.startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{filterPageByDeptVO.startDate}]]>
             </if>
@@ -1269,7 +1255,6 @@
             AND a.hospital_id = #{filterPageByDeptVO.hospitalId}
         </if>
         <if test="filterPageByDeptVO.isPlacefile != null and filterPageByDeptVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="filterPageByDeptVO.startDate != null and filterPageByDeptVO.startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{filterPageByDeptVO.startDate}]]>
             </if>
@@ -1350,7 +1335,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -1405,7 +1389,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -1557,7 +1540,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -1627,7 +1609,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -1780,7 +1761,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -1858,7 +1838,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -1998,7 +1977,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -2055,7 +2033,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -2127,7 +2104,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -2274,7 +2250,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -2338,7 +2313,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -2474,7 +2448,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -2545,7 +2518,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -2632,7 +2604,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -3491,7 +3462,6 @@
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="qcResultShortPageVO.startDate != null ">
                 <![CDATA[ AND a.behospital_date >= #{qcResultShortPageVO.startDate}]]>
             </if>
@@ -3715,7 +3685,6 @@
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="qcResultShortPageVO.startDate != null ">
                 <![CDATA[ AND a.behospital_date >= #{qcResultShortPageVO.startDate}]]>
             </if>
@@ -3961,7 +3930,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null ">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -4030,7 +3998,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null ">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -4095,7 +4062,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null ">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -4160,7 +4126,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null ">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -4225,7 +4190,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null ">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -4339,7 +4303,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -4409,7 +4372,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -4444,7 +4406,6 @@
             AND tt2.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(tt2.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND tt2.behospital_date >= #{startDate}]]>
             </if>
@@ -4502,7 +4463,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -4537,7 +4497,6 @@
             AND tt2.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(tt2.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND tt2.behospital_date >= #{startDate}]]>
             </if>
@@ -4599,7 +4558,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -4660,7 +4618,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -4780,7 +4737,6 @@
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="qcResultShortPageVO.startDate != null ">
                 <![CDATA[ AND a.behospital_date >= #{qcResultShortPageVO.startDate}]]>
             </if>
@@ -4960,7 +4916,6 @@
             AND m1.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(m1.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND m1.behospital_date >= #{startDate}]]>
             </if>
@@ -5005,7 +4960,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -5044,7 +4998,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -5107,7 +5060,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -5156,7 +5108,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -5204,7 +5155,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -5270,7 +5220,6 @@
             AND m1.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(m1.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND m1.behospital_date >= #{startDate}]]>
             </if>
@@ -5314,7 +5263,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -5518,7 +5466,6 @@
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="qcResultShortPageVO.startDate != null ">
                 <![CDATA[ AND a.behospital_date >= #{qcResultShortPageVO.startDate}]]>
             </if>
@@ -5742,7 +5689,6 @@
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="qcResultShortPageVO.startDate != null ">
                 <![CDATA[ AND a.behospital_date >= #{qcResultShortPageVO.startDate}]]>
             </if>
@@ -6015,7 +5961,6 @@
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="qcResultShortPageVO.startDate != null ">
                 <![CDATA[ AND a.behospital_date >= #{qcResultShortPageVO.startDate}]]>
             </if>
@@ -6261,7 +6206,6 @@
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="qcResultShortPageVO.startDate != null ">
                 <![CDATA[ AND a.behospital_date >= #{qcResultShortPageVO.startDate}]]>
             </if>
@@ -6440,7 +6384,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null ">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -6568,7 +6511,6 @@
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="qcResultShortPageVO.startDate != null ">
                 <![CDATA[ AND a.behospital_date >= #{qcResultShortPageVO.startDate}]]>
             </if>
@@ -6794,7 +6736,6 @@
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="qcResultShortPageVO.startDate != null ">
                 <![CDATA[ AND a.behospital_date >= #{qcResultShortPageVO.startDate}]]>
             </if>
@@ -6991,7 +6932,6 @@
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="qcResultShortPageVO.startDate != null ">
                 <![CDATA[ AND a.behospital_date >= #{qcResultShortPageVO.startDate}]]>
             </if>
@@ -7201,7 +7141,6 @@
             AND a.hospital_id = #{reBeHosPageVO.hospitalId}
         </if>
         <if test="reBeHosPageVO.isPlacefile != null and reBeHosPageVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="reBeHosPageVO.startDate != null ">
                 <![CDATA[ AND a.behospital_date >= #{reBeHosPageVO.startDate}]]>
             </if>
@@ -7242,7 +7181,6 @@
             AND tt2.hospital_id = #{reBeHosPageVO.hospitalId}
         </if>
         <if test="reBeHosPageVO.isPlacefile != null and reBeHosPageVO.isPlacefile == 0">
-            AND ifnull(tt2.leave_hospital_date ,'') = ''
             <if test="reBeHosPageVO.startDate != null ">
                 <![CDATA[ AND tt2.behospital_date >= #{reBeHosPageVO.startDate}]]>
             </if>
@@ -7316,7 +7254,6 @@
             AND a.hospital_id = #{reBeHosPageVO.hospitalId}
         </if>
         <if test="reBeHosPageVO.isPlacefile != null and reBeHosPageVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="reBeHosPageVO.startDate != null ">
                 <![CDATA[ AND a.behospital_date >= #{reBeHosPageVO.startDate}]]>
             </if>
@@ -7357,7 +7294,6 @@
             AND tt2.hospital_id = #{reBeHosPageVO.hospitalId}
         </if>
         <if test="reBeHosPageVO.isPlacefile != null and reBeHosPageVO.isPlacefile == 0">
-            AND ifnull(tt2.leave_hospital_date ,'') = ''
             <if test="reBeHosPageVO.startDate != null ">
                 <![CDATA[ AND tt2.behospital_date >= #{reBeHosPageVO.startDate}]]>
             </if>
@@ -7427,7 +7363,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>

+ 0 - 30
src/main/resources/mapper/QcresultInfoMapper.xml

@@ -36,7 +36,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -80,7 +79,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -132,7 +130,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -180,7 +177,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -246,7 +242,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -289,7 +284,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -372,7 +366,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -415,7 +408,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -491,7 +483,6 @@
             AND a.hospital_id = #{filterPageVO.hospitalId}
         </if>
         <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="filterPageVO.startDate != null and filterPageVO.startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{filterPageVO.startDate}]]>
             </if>
@@ -550,7 +541,6 @@
             AND a.hospital_id = #{filterPageVO.hospitalId}
         </if>
         <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="filterPageVO.startDate != null and filterPageVO.startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{filterPageVO.startDate}]]>
             </if>
@@ -622,7 +612,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -671,7 +660,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -716,7 +704,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -770,7 +757,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -823,7 +809,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -895,7 +880,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -974,7 +958,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -1028,7 +1011,6 @@
             AND a.hospital_id = #{hospitalId}
         </if>
         <if test="isPlacefile != null and isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="startDate != null and startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{startDate}]]>
             </if>
@@ -1124,7 +1106,6 @@
             AND a.hospital_id = #{filterPageByDeptVO.hospitalId}
         </if>
         <if test="filterPageByDeptVO.isPlacefile != null and filterPageByDeptVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="filterPageByDeptVO.startDate != null and filterPageByDeptVO.startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{filterPageByDeptVO.startDate}]]>
             </if>
@@ -1197,7 +1178,6 @@
             AND a.hospital_id = #{filterPageByDeptVO.hospitalId}
         </if>
         <if test="filterPageByDeptVO.isPlacefile != null and filterPageByDeptVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="filterPageByDeptVO.startDate != null and filterPageByDeptVO.startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{filterPageByDeptVO.startDate}]]>
             </if>
@@ -1277,7 +1257,6 @@
             AND a.hospital_id = #{filterPageVO.hospitalId}
         </if>
         <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="filterPageVO.startDate != null and filterPageVO.startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{filterPageVO.startDate}]]>
             </if>
@@ -1326,7 +1305,6 @@
             AND a.hospital_id = #{filterPageVO.hospitalId}
         </if>
         <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="filterPageVO.startDate != null and filterPageVO.startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{filterPageVO.startDate}]]>
             </if>
@@ -1421,7 +1399,6 @@
             AND a.hospital_id = #{filterPageVO.hospitalId}
         </if>
         <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="filterPageVO.startDate != null and filterPageVO.startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{filterPageVO.startDate}]]>
             </if>
@@ -1487,7 +1464,6 @@
             AND a.hospital_id = #{filterPageVO.hospitalId}
         </if>
         <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="filterPageVO.startDate != null and filterPageVO.startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{filterPageVO.startDate}]]>
             </if>
@@ -1548,7 +1524,6 @@
             AND a.hospital_id = #{filterPageVO.hospitalId}
         </if>
         <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="filterPageVO.startDate != null and filterPageVO.startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{filterPageVO.startDate}]]>
             </if>
@@ -1603,7 +1578,6 @@
             AND a.hospital_id = #{filterPageVO.hospitalId}
         </if>
         <if test="filterPageVO.isPlacefile != null and filterPageVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="filterPageVO.startDate != null and filterPageVO.startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{filterPageVO.startDate}]]>
             </if>
@@ -1696,7 +1670,6 @@
             AND a.hospital_id = #{filterPageByDeptVO.hospitalId}
         </if>
         <if test="filterPageByDeptVO.isPlacefile != null and filterPageByDeptVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="filterPageByDeptVO.startDate != null and filterPageByDeptVO.startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{filterPageByDeptVO.startDate}]]>
             </if>
@@ -1756,7 +1729,6 @@
             AND a.hospital_id = #{filterPageByDeptVO.hospitalId}
         </if>
         <if test="filterPageByDeptVO.isPlacefile != null and filterPageByDeptVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="filterPageByDeptVO.startDate != null and filterPageByDeptVO.startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{filterPageByDeptVO.startDate}]]>
             </if>
@@ -1866,7 +1838,6 @@
             AND a.hospital_id = #{filterPageByDeptVO.hospitalId}
         </if>
         <if test="filterPageByDeptVO.isPlacefile != null and filterPageByDeptVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="filterPageByDeptVO.startDate != null and filterPageByDeptVO.startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{filterPageByDeptVO.startDate}]]>
             </if>
@@ -1949,7 +1920,6 @@
             AND a.hospital_id = #{filterPageByDeptVO.hospitalId}
         </if>
         <if test="filterPageByDeptVO.isPlacefile != null and filterPageByDeptVO.isPlacefile == 0">
-            AND ifnull(a.leave_hospital_date ,'') = ''
             <if test="filterPageByDeptVO.startDate != null and filterPageByDeptVO.startDate != ''">
                 <![CDATA[ AND a.behospital_date >= #{filterPageByDeptVO.startDate}]]>
             </if>