入参修改

src/main/java/com/diagbot/vo/FilterPageVO.java

@@ -51,6 +51,11 @@ public class FilterPageVO extends Page {
      */
     private String deptName;
 
+    /**
+     * 科室id
+     */
+    private String deptId;
+
     /**
      * 医生姓名
      */

src/main/java/com/diagbot/vo/QcResultPageVO.java

@@ -66,6 +66,11 @@ public class QcResultPageVO extends Page {
      */
     private String deptClass;
 
+    /**
+     * 科室id
+     */
+    private String deptId;
+
     /**
      * 医生姓名
      */

src/main/resources/application-pre.yml

@@ -59,9 +59,9 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.121:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: teamback
-      password: goTulmLeon
+      url: jdbc:mysql://192.168.2.125:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      username: root
+      password: LangT0ng@lt
       # 连接池的配置信息
       # 初始化大小，最小，最大
       initialSize: 5

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -3461,7 +3461,8 @@
         GROUP BY
         a.beh_dept_id,
         a.beh_dept_name,
-        a.doctor_id
+        a.doctor_id,
+        a.doctor_name
         ) t1,
         (
         SELECT
@@ -3519,7 +3520,8 @@
         GROUP BY
         a.beh_dept_id,
         a.beh_dept_name,
-        a.doctor_id
+        a.doctor_id,
+        a.doctor_name
         ) t2,(
         SELECT
         h1.deptId,
@@ -3594,7 +3596,8 @@
         GROUP BY
         a.beh_dept_id,
         a.beh_dept_name,
-        a.doctor_id
+        a.doctor_id,
+        a.doctor_name
         ) h1,(
         SELECT
         count(*) AS entryNum
@@ -3615,7 +3618,8 @@
         left join bas_doctor_info bas
         on t4.doctorId = bas.doctor_id
         and bas.is_deleted = 'N'
-        where 1=1
+        where
+        t4.doctorName != ''
         <if test="professor != null and professor != ''">
             and bas.professor = #{professor}
         </if>
@@ -11755,6 +11759,9 @@
         <if test="qcResultPageVO.deptName != null and qcResultPageVO.deptName != ''">
             AND a.beh_dept_name = #{qcResultPageVO.deptName}
         </if>
+        <if test="qcResultPageVO.deptId != null and qcResultPageVO.deptId != ''">
+            AND a.beh_dept_id = #{qcResultPageVO.deptId}
+        </if>
         <if test="qcResultPageVO.behospitalCode != null and qcResultPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultPageVO.behospitalCode}, '%' )
         </if>
@@ -11855,6 +11862,9 @@
         <if test="qcResultPageVO.deptName != null and qcResultPageVO.deptName != ''">
             AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultPageVO.deptName}, '%' )
         </if>
+        <if test="qcResultPageVO.deptId != null and qcResultPageVO.deptId != ''">
+            AND a.beh_dept_id = #{qcResultPageVO.deptId}
+        </if>
         <if test="qcResultPageVO.behospitalCode != null and qcResultPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultPageVO.behospitalCode}, '%' )
         </if>

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -1683,6 +1683,9 @@
         <if test="filterPageVO.deptName != null and filterPageVO.deptName != ''">
             AND a.beh_dept_name = #{filterPageVO.deptName}
         </if>
+        <if test="filterPageVO.deptId != null and filterPageVO.deptId != ''">
+            AND a.beh_dept_id = #{filterPageVO.deptId}
+        </if>
         <if test="filterPageVO.doctorName != null and filterPageVO.doctorName != ''">
             AND a.doctor_name = #{filterPageVO.doctorName}
         </if>
@@ -1754,6 +1757,9 @@
         <if test="filterPageVO.deptName != null and filterPageVO.deptName != ''">
             AND a.beh_dept_name  =  #{filterPageVO.deptName}
         </if>
+        <if test="filterPageVO.deptId != null and filterPageVO.deptId != ''">
+            AND a.beh_dept_id = #{filterPageVO.deptId}
+        </if>
         <if test="filterPageVO.isReject != null">
             AND d.is_reject = #{filterPageVO.isReject}
         </if>