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

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>