Merge branch '20211018_yw_check' into test_qiyuan

src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -441,7 +441,7 @@
                 #{item}
             </foreach>
         </if>
-        <if test="wards !=null and wards.size > 0">
+        <if test="wards !=null and wards.size > 0 and depts.size ==0">
             AND mbi.ward_code IN
             <foreach collection="wards" item="item" open="(" close=")" separator=",">
                 #{item}