bug处理

src/main/java/com/diagbot/dto/ImproveByDeptDTO.java

@@ -20,7 +20,7 @@ public class ImproveByDeptDTO {
     /**
      * 主治医生
      */
-    @Excel(name = "主治医生", width = 30)
+    @Excel(name = "主管医生", width = 30)
     private String doctorName;
     /**
      * 质控总数（总病历数）
@@ -28,9 +28,9 @@ public class ImproveByDeptDTO {
     @Excel(name = "质控总数", width = 10)
     private Integer mrNum = 0;
     /**
-     * 核查数量
+     * 病历核查数量
      */
-    @Excel(name = "核查数量", width = 10)
+    @Excel(name = "病历核查数量", width = 10)
     private Integer checkedNum = 0;
     /**
      * 核查占比

src/main/java/com/diagbot/vo/data/BasDoctorInfoVO.java

@@ -16,7 +16,7 @@ public class BasDoctorInfoVO {
      * 搜索参数
      */
     private String inputStr;
-    private String deptName;
+    private String deptName = "";
     @ApiModelProperty(hidden = true)
     private String deptId;
     @ApiModelProperty(hidden = true)

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -2125,6 +2125,9 @@
         <if test="filterPageByDeptVO.doctorName != null and filterPageByDeptVO.doctorName != ''">
             AND a.doctor_name  like CONCAT('%', #{filterPageByDeptVO.doctorName}, '%')
         </if>
+        <if test="filterPageByDeptVO.doctorId != null and filterPageByDeptVO.doctorId != ''">
+            AND a.doctor_id = #{filterPageByDeptVO.doctorId}
+        </if>
         <if test="filterPageByDeptVO.casesId != null and filterPageByDeptVO.casesId != 0">
             AND d.cases_id = #{filterPageByDeptVO.casesId}
         </if>
@@ -2200,6 +2203,9 @@
         <if test="filterPageByDeptVO.doctorName != null and filterPageByDeptVO.doctorName != ''">
             AND a.doctor_name  like CONCAT('%', #{filterPageByDeptVO.doctorName}, '%')
         </if>
+        <if test="filterPageByDeptVO.doctorId != null and filterPageByDeptVO.doctorId != ''">
+            AND a.doctor_id = #{filterPageByDeptVO.doctorId}
+        </if>
         <if test="filterPageByDeptVO.isReject != null">
             AND d.is_reject = #{filterPageByDeptVO.isReject}
         </if>