Merge branch '20211018_yw_check' into test_qiyuan

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -6853,7 +6853,7 @@
         GROUP BY
         d.doctor_id,
         d.doctor_name
-        having  sum( e.cases_entry_id = 2594 ) is not null or sum( e.cases_entry_id = 2973 ) is not null or sum( e.cases_entry_id = 2930 )is not null
+        having  sum( e.cases_entry_id = 2594 ) is not null and sum( e.cases_entry_id = 2973 ) is not null and sum( e.cases_entry_id = 2930 )is not null
         ) UNION
         (
         SELECT