Merge remote-tracking branch 'origin/dev/20200522temp' into debug

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -376,7 +376,6 @@
         WHERE
         a.is_deleted = 'N'
         AND a.is_placefile = '1'
-        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
         </if>
@@ -486,7 +485,6 @@
         AND a.hospital_id = c.hospital_id
         AND a.beh_dept_id = c.dept_id
         AND a.is_placefile = '1'
-        <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="userId!=null">
             AND c.user_id = #{userId}
         </if>

src/main/resources/mapper/QcCasesEntryMapper.xml

@@ -121,7 +121,7 @@
         AND t2.is_deleted = 'N'
         AND t3.is_deleted = 'N'
         AND t1.id = t2.cases_entry_id
-        AND t2.is_used = 1
+--         AND t2.is_used = 1
         AND t1.mode_id = t3.id
         AND t2.hospital_id = #{hospitalId}
         ORDER BY t3.order_no,t1.order_no