Merge branch '20211018_yw_check' into test_qiyuan

# Conflicts:
#	src/main/resources/mapper/BehospitalInfoMapper.xml

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -6770,7 +6770,8 @@
         GROUP BY
         c.doctorId,
         c.doctorName
-        having  sum( d.cases_entry_id = 2511 ) is not null and sum( d.cases_entry_id = 2511 ) != 0
+        having
+        sum( d.cases_entry_id = 2511 ) is not null and sum( d.cases_entry_id = 2511 ) != 0
         ) UNION
         (
         SELECT
@@ -6855,7 +6856,7 @@
         d.doctor_name
         having  sum( e.cases_entry_id = 2594 ) is not null and sum( e.cases_entry_id = 2594 ) != 0
         and sum( e.cases_entry_id = 2973 ) is not null and sum( e.cases_entry_id = 2973 ) != 0
-         and sum( e.cases_entry_id = 2930 )is not null and sum( e.cases_entry_id = 2930 ) != 0
+        and sum( e.cases_entry_id = 2930 )is not null and sum( e.cases_entry_id = 2930 ) != 0
         ) UNION
         (
         SELECT
@@ -6934,7 +6935,7 @@
         GROUP BY
         c.doctor_id,
         c.doctor_name
-        having  sum( d.cases_entry_id = 2419 ) is not null and sum( d.cases_entry_id = 2419 ) != 0
+        having  sum( d.cases_entry_id = 2419 ) is not null and  sum( d.cases_entry_id = 2419 ) != 0
         ) UNION
         (
         SELECT
@@ -7013,7 +7014,7 @@
         GROUP BY
         b.doctor_id,
         b.doctor_name
-        having  sum(c.cases_entry_id = 2495) is not null sum(c.cases_entry_id = 2495)!= 0
+        having  sum(c.cases_entry_id = 2495) is not null and sum(c.cases_entry_id = 2495) != 0
         ) UNION
         (
         SELECT