Merge remote-tracking branch 'origin/dev/20200513end_1.2.0' into debug

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -782,8 +782,6 @@
         FROM
         (
         SELECT
-        a.doctor_id AS doctorId,
-        a.doctor_name AS doctorName,
         d.msg as name,
         count(*) AS num
         FROM
@@ -828,8 +826,7 @@
             AND a.beh_dept_name = #{filterPageByDeptVO.deptName}
         </if>
         GROUP BY
-        a.doctor_id,
-        a.doctor_name
+        d.msg
         ORDER BY
         count(*) DESC
         ) t1,