Merge branch '20211018_yw_check' into test_qiyuan

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -4537,7 +4537,7 @@
         </if>
         t1.behospitalCode
        )tp
-        LEFT JOIN (SELECT * FROM med_check_info WHERE is_deleted = 'N' AND check_type = 0 ) g
+        LEFT JOIN (SELECT * FROM med_check_info WHERE is_deleted = 'N' AND check_type in(0,2) ) g
         ON tp.behospitalCode = g.behospital_code
         AND tp.hospitalId = g.hospital_id
         LEFT JOIN (SELECT * FROM med_check_info WHERE is_deleted = 'N'AND check_type = 1 ) h