Browse Source

湘雅医院在通用版特殊处理

chengyao 3 năm trước cách đây
mục cha
commit
d2375c100d

+ 1 - 0
doc/036.20211015_2.1.1/qc_initv2.1.1.sql

@@ -1,3 +1,4 @@
+-- 仅仅湘雅医院执行!!
 use `qc`;
 -- 全院
 update sys_menu a set a.order_no = a.order_no+1 where a.parent_id = 17 and a.order_no>0;

+ 5 - 0
src/main/java/com/diagbot/dto/HomePageNumDTO.java

@@ -29,6 +29,11 @@ public class HomePageNumDTO {
      * 主管医生名称
      */
     private String doctorName;
+
+    /**
+     * 主管医生职称
+     */
+    private String professor;
     /**
      * 缺陷条目数
      */

+ 138 - 0
src/main/java/com/diagbot/dto/HomePageNumXYDTO.java

@@ -0,0 +1,138 @@
+package com.diagbot.dto;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:病案首页合格率占比返回结构
+ * @Author:zhaops
+ * @time: 2020/6/5 17:32
+ */
+@Getter
+@Setter
+public class HomePageNumXYDTO {
+    /**
+     * 科室id(科室编码)
+     */
+    private String deptId;
+    /**
+     * 科室名称
+     */
+    @Excel(name = "科室", width = 30, orderNum = "1")
+    private String deptName;
+
+
+    /**
+     * 主管医生职称
+     */
+    @Excel(name = "医师类别", width = 20, orderNum = "2")
+    private String professor;
+
+    /**
+     * 主管医生id
+     */
+    private String doctorId;
+    /**
+     * 主管医生名称
+     */
+    @Excel(name = "医师姓名", width = 20, orderNum = "3")
+    private String doctorName;
+    /**
+     * 缺陷条目数
+     */
+    @Excel(name = "缺陷总数", orderNum = "4")
+    private Integer entryNum = 0;
+    /**
+     * 病案首页不合格病历数
+     */
+    @Excel(name = "不合格数", orderNum = "5")
+    private Integer secondLevelNum = 0;
+
+    /**
+     * 质控评分(总分)
+     */
+    private Double totleValue = 0d;
+
+    /**
+     * 病案首页合格病历数
+     */
+    @Excel(name = "合格数", orderNum = "6")
+    private Integer firstLevelNum = 0;
+    /**
+     * 病案首页合格病历占比
+     */
+    private Double firstLevelPercent = 0.00d;
+    /**
+     * 病案首页不合格病历占比
+     */
+    private Double secondLevelPercent = 0.00d;
+    /**
+     * 病案首页合格病历占比(百分比)
+     */
+    @Excel(name = "合格率", orderNum = "7")
+    private String firstLevelPercentStr = "0.00%";
+    /**
+     * 病案首页不合格病历占比(百分比)
+     */
+    private String secondLevelPercentStr = "0.00%";
+    /**
+     * 上级科室id(上级科室编码)
+     */
+    private String deptClassId;
+    /**
+     * 上级科室名称
+     */
+    private String deptClass;
+    /**
+     * 空项数
+     */
+    @Excel(name = "空项数", orderNum = "8")
+    private Integer emptyNum = 0;
+
+    /**
+     * 完整率
+     */
+
+    private Double emptyPercent = 0.00d;
+
+    /**
+     * 完整率(百分比)
+     */
+    @Excel(name = "完整率", orderNum = "9")
+    private String emptyPercentStr = "0.00%";
+
+    /**
+     * 错误数
+     */
+    @Excel(name = "错误数", orderNum = "10")
+    private Integer errorNum = 0;
+
+    /**
+     * 完整率、完善率分母(质控病历数*病案首页条目数)
+     */
+    private Integer entryTotleNum = 0;
+
+    /**
+     * 完善率
+     */
+    private Double errorPercent = 0.00d;
+
+    /**
+     * 完善率(百分比)
+     */
+    @Excel(name = "完善率", orderNum = "11")
+    private String errorPercentStr = "0.00%";
+
+    /**
+     * 质控评分(平均分)
+     */
+    @Excel(name = "质控平均分", orderNum = "12")
+    private Double averageValue = 0d;
+
+    /**
+     * 质控病历数
+     */
+    @Excel(name = "质控病历数", orderNum = "13")
+    private Integer mrNum = 0;
+}

+ 26 - 19
src/main/java/com/diagbot/facade/SysUserFacade.java

@@ -37,6 +37,7 @@ import com.diagbot.vo.SysUserBaseVO;
 import com.diagbot.vo.SysUserDeptVO;
 import com.diagbot.vo.SysUserQueryVO;
 import com.diagbot.vo.SysUserRoleVO;
+import com.diagbot.vo.UserLoginVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.crypto.factory.PasswordEncoderFactories;
@@ -143,34 +144,38 @@ public class SysUserFacade extends SysUserServiceImpl {
     /**
      * 获取jwt
      *
-     * @param username 用户名
-     * @param password 密码
+     * userLoginVO
      * @return jwt
      */
-    public JwtDTO getJwt(HttpServletRequest request, String username, String password, String captcha) {
+    public JwtDTO getJwt(HttpServletRequest request, UserLoginVO userLoginVO) {
         JwtDTO data = new JwtDTO();
-        if (StringUtil.isBlank(username)) {
+        if (StringUtil.isBlank(userLoginVO.getUsername())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
                     "请输入用户名");
         }
-        if (StringUtil.isBlank(password)) {
+        if (StringUtil.isBlank(userLoginVO.getPassword())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
                     "请输入密码");
         }
-        if (StringUtils.isEmpty(captcha)) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
-                    "请输入验证码");
-        }
-        // 验证码校验
-        String captchaId = request.getSession().getId();
-        Object captchaObject = redisUtils.get("user:captchaIds:" + captchaId);
-        if (null == captchaObject || StringUtil.isBlank(captchaObject.toString()) || !captchaObject.toString().trim().equalsIgnoreCase(captcha)) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "验证码错误");
+        //非湘雅医院执行
+        String captchaId ="";
+        if(!"1".equals(getHospitalMark())) {
+            if ( StringUtils.isEmpty(userLoginVO.getCaptcha())) {
+                throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
+                        "请输入验证码");
+            }
+            // 验证码校验
+            captchaId = request.getSession().getId();
+            Object captchaObject = redisUtils.get("user:captchaIds:" + captchaId);
+            if (null == captchaObject || StringUtil.isBlank(captchaObject.toString()) || !captchaObject.toString().trim().equalsIgnoreCase(userLoginVO.getCaptcha())) {
+                throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "验证码错误");
+            }
         }
+
         //使用MD5对密码进行加密
-        String MD5Password = DigestUtils.md5DigestAsHex(password.getBytes());
+        String MD5Password = DigestUtils.md5DigestAsHex(userLoginVO.getPassword().getBytes());
         QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
-        userQueryWrapper.eq("username", username)
+        userQueryWrapper.eq("username", userLoginVO.getUsername())
                 .eq("status", StatusEnum.Enable.getKey())
                 .eq("is_deleted", IsDeleteEnum.N.getKey());
         SysUser user = this.getOne(userQueryWrapper, false);
@@ -182,11 +187,13 @@ public class SysUserFacade extends SysUserServiceImpl {
             throw new CommonException(ServiceErrorCode.USER_PASSWORD_ERROR);
         }
         JWT jwt = authServiceClient.getToken("Basic dWFhLXNlcnZpY2U6MTIzNDU2",
-                "password", username, MD5Password);
+                "password", userLoginVO.getUsername(), MD5Password);
         if (null == jwt) {
             throw new CommonException(ServiceErrorCode.GET_TOKEN_FAIL);
         }
-        redisUtils.del("user:captchaIds:" + captchaId);
+        if(!"1".equals(getHospitalMark())) {
+            redisUtils.del("user:captchaIds:" + captchaId);
+        }
         data.setAccessToken(jwt.getAccess_token());
         data.setRefreshToken(jwt.getRefresh_token());
         data.setType(user.getType());
@@ -221,7 +228,7 @@ public class SysUserFacade extends SysUserServiceImpl {
         SysUserHospital userHospital = sysUserHospitalFacade.getOne(UserHospitalQueryWrapper, false);
         Long hospitalId = userHospital.getHospitalId();
         String idStr = String.valueOf(hospitalId);
-        Boolean passwordRegular = passwordRegular(password, idStr);
+        Boolean passwordRegular = passwordRegular(userLoginVO.getPassword(), idStr);
         if (!passwordRegular) {
             data.setPasswordComplexity("未修改初始密码,请及时修改密码");
         }

+ 2 - 0
src/main/java/com/diagbot/vo/UserLoginVO.java

@@ -18,4 +18,6 @@ public class UserLoginVO {
     private String username;
     @NotBlank(message = "请输入密码!")
     private String password;
+   //验证码
+    private String captcha;
 }

+ 4 - 4
src/main/java/com/diagbot/web/SysUserController.java

@@ -69,17 +69,17 @@ public class SysUserController {
                     "password:密码, 必填, 默认密码:a123456<br> ")
     @PostMapping("/getJwt")
     @SysLogger("getJwt")
-    public RespDTO<JwtDTO> getJwt(@RequestBody UserLoginVO userLoginVO) {
-        JwtDTO data = userFacade.getJwt(userLoginVO.getUsername(), userLoginVO.getPassword());
+    public RespDTO<JwtDTO> getJwt(HttpServletRequest request,@RequestBody UserLoginVO userLoginVO) {
+        JwtDTO data = userFacade.getJwt(request,userLoginVO);
         return RespDTO.onSuc(data);
     }
 
-/*    @ApiOperation(value = "获取验证码[by:cy]")
+    @ApiOperation(value = "获取验证码[by:cy]")
     @GetMapping("/getCaptcha")
     @SysLogger("getCaptcha")
     public void getCaptcha(HttpServletRequest request, HttpServletResponse response) throws IOException {
            userFacade.getCaptcha(request, response);
-    }*/
+    }
 
     @ApiOperation(value = "获取标识--选择登录页面[by:cy]")
     @PostMapping("/getHospitalMark")

+ 62 - 44
src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -4101,6 +4101,15 @@
         <if test="deptName!=null and deptName !=''">
             AND a.beh_dept_name = #{deptName}
         </if>
+        <if test="deptId!=null and deptId !=''">
+            AND a.beh_dept_id = #{deptId}
+        </if>
+        <if test="doctorId != null and doctorId != ''">
+            AND a.doctor_id  = #{doctorId}
+        </if>
+        <if test="doctorName != null and doctorName != ''">
+            AND a.doctor_name  like CONCAT('%', #{doctorName}, '%')
+        </if>
         <if test="name != null and name != ''">
             AND a.doctor_name  like CONCAT('%', #{name}, '%')
         </if>
@@ -4174,6 +4183,15 @@
         <if test="deptName!=null and deptName !=''">
             AND a.beh_dept_name = #{deptName}
         </if>
+        <if test="deptId!=null and deptId !=''">
+            AND a.beh_dept_id = #{deptId}
+        </if>
+        <if test="doctorId != null and doctorId != ''">
+            AND a.doctor_id  = #{doctorId}
+        </if>
+        <if test="doctorName != null and doctorName != ''">
+            AND a.doctor_name  like CONCAT('%', #{doctorName}, '%')
+        </if>
         <if test="name != null and name != ''">
             AND a.doctor_name  like CONCAT('%', #{name}, '%')
         </if>
@@ -4263,6 +4281,15 @@
         <if test="deptName!=null and deptName !=''">
             AND a.beh_dept_name = #{deptName}
         </if>
+        <if test="deptId!=null and deptId !=''">
+            AND a.beh_dept_id = #{deptId}
+        </if>
+        <if test="doctorId != null and doctorId != ''">
+            AND a.doctor_id  = #{doctorId}
+        </if>
+        <if test="doctorName != null and doctorName != ''">
+            AND a.doctor_name  like CONCAT('%', #{doctorName}, '%')
+        </if>
         <if test="name != null and name != ''">
             AND a.doctor_name  like CONCAT('%', #{name}, '%')
         </if>
@@ -5986,6 +6013,9 @@
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
+        <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
+            AND a.beh_dept_id = #{qcResultShortPageVO.deptId}
+        </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
         </if>
@@ -6008,9 +6038,7 @@
             AND d.cases_id = #{qcResultShortPageVO.casesId}
         </if>
         <if test="qcResultShortPageVO.doctorId != null and qcResultShortPageVO.doctorId != ''">
-            AND (a.doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.beh_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.director_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' ))
+            AND a.doctor_id = #{qcResultShortPageVO.doctorId}
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
             AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
@@ -10069,13 +10097,11 @@
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
-        <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
-            AND a.doctor_name = #{qcResultShortPageVO.doctorName}
+        <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
+            AND a.beh_dept_id = #{qcResultShortPageVO.deptId}
         </if>
         <if test="qcResultShortPageVO.doctorId != null and qcResultShortPageVO.doctorId != ''">
-            AND (a.doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.beh_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.director_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' ))
+            AND a.doctor_id = #{qcResultShortPageVO.doctorId}
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
             AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
@@ -10340,6 +10366,9 @@
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
+        <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
+            AND a.beh_dept_id = #{qcResultShortPageVO.deptId}
+        </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
         </if>
@@ -10362,9 +10391,7 @@
             AND d.cases_id = #{qcResultShortPageVO.casesId}
         </if>
         <if test="qcResultShortPageVO.doctorId != null and qcResultShortPageVO.doctorId != ''">
-            AND (a.doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.beh_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.director_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' ))
+            AND a.doctor_id = #{qcResultShortPageVO.doctorId}
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
             AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
@@ -12253,6 +12280,9 @@
         <if test="deptClass != null and deptClass != ''">
             and a.beh_dept_id = #{deptClass}
         </if>
+        <if test="deptId != null and deptId != ''">
+            and a.beh_dept_id = #{deptId}
+        </if>
         <if test="titleName != null and titleName != '' ">
             <if test="titleName == '不合格数'">
                 AND e.`level`='不合格'
@@ -12265,7 +12295,9 @@
             and a.is_placefile = #{isPlacefile}
         </if>
         <if test="doctorName != null and doctorName != ''">
-            AND a.doctor_name like CONCAT('%', #{doctorName}, '%')
+            AND (a.doctor_name LIKE CONCAT( '%', #{doctorName}, '%' )
+            OR a.beh_doctor_name LIKE CONCAT( '%', #{doctorName}, '%' )
+            OR a.director_doctor_name LIKE CONCAT( '%', #{doctorName}, '%'))
         </if>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
@@ -12296,9 +12328,7 @@
             AND a.NAME LIKE CONCAT( '%', #{patName}, '%' )
         </if>
         <if test="doctorId != null and doctorId != ''">
-            AND (a.doctor_id LIKE CONCAT( '%', #{doctorId}, '%' )
-            OR a.beh_doctor_id LIKE CONCAT( '%', #{doctorId}, '%' )
-            OR a.director_doctor_id LIKE CONCAT( '%', #{doctorId}, '%' ))
+            AND a.doctor_id = #{doctorId}
         </if>
         )be
         left join med_check_info mci
@@ -12352,14 +12382,6 @@
         AND d.cases_entry_id = e.id
         AND d.cases_id = 243
         AND a.qc_type_id != 0
-        <!--        <if test="titleName != null ">-->
-        <!--            <if test="titleName == '不合格数'">-->
-        <!--                AND c.`level`='不合格'-->
-        <!--            </if>-->
-        <!--            <if test="titleName == '合格数'">-->
-        <!--                AND c.`level`='合格'-->
-        <!--            </if>-->
-        <!--        </if>-->
         <if test="userId!=null">
             AND b.user_id = #{userId}
         </if>
@@ -12367,11 +12389,19 @@
             and a.beh_dept_name = #{deptName}
         </if>
         <if test="doctorName != null and doctorName != ''">
-            AND a.doctor_name like CONCAT('%', #{doctorName}, '%')
+            AND (a.doctor_name LIKE CONCAT( '%', #{doctorName}, '%' )
+            OR a.beh_doctor_name LIKE CONCAT( '%', #{doctorName}, '%' )
+            OR a.director_doctor_name LIKE CONCAT( '%', #{doctorName}, '%'))
+        </if>
+        <if test="doctorId != null and doctorId != ''">
+            AND a.doctor_id = #{doctorId}
         </if>
         <if test="deptClass != null and deptClass != ''">
             and a.beh_dept_id = #{deptClass}
         </if>
+        <if test="deptId != null and deptId != ''">
+            and a.beh_dept_id = #{deptId}
+        </if>
         <if test="isPlacefile != null and isPlacefile != ''">
             and a.is_placefile = #{isPlacefile}
         </if>
@@ -14503,9 +14533,6 @@
                 AND c.`level`='合格'
             </if>
         </if>
-        <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
-            AND a.doctor_name  like CONCAT('%', #{qcResultShortPageVO.doctorName}, '%')
-        </if>
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
             and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
         </if>
@@ -14534,6 +14561,9 @@
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
         </if>
+        <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
+            AND a.beh_dept_id = #{qcResultShortPageVO.deptId}
+        </if>
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
         </if>
@@ -14541,9 +14571,7 @@
             AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
         </if>
         <if test="qcResultShortPageVO.doctorId != null and qcResultShortPageVO.doctorId != ''">
-            AND (a.doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.beh_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.director_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' ))
+            AND a.doctor_id = #{qcResultShortPageVO.doctorId}
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
             AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
@@ -14724,21 +14752,10 @@
         AND c.cases_id = k.cases_id
         AND k.cases_id = d.cases_id
         AND k.cases_entry_id = d.id
-        <!--        <if test="qcResultShortPageVO.titleName != null ">-->
-        <!--            <if test="qcResultShortPageVO.titleName == '不合格数'">-->
-        <!--                AND c.`level`='不合格'-->
-        <!--            </if>-->
-        <!--            <if test="qcResultShortPageVO.titleName == '合格数'">-->
-        <!--                AND c.`level`='合格'-->
-        <!--            </if>-->
-        <!--        </if>-->
         AND a.qc_type_id != 0
         <if test="qcResultShortPageVO.userId!=null">
             AND b.user_id = #{qcResultShortPageVO.userId}
         </if>
-        <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
-            and a.doctor_name = #{qcResultShortPageVO.doctorName}
-        </if>
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
             and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
         </if>
@@ -14767,6 +14784,9 @@
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
         </if>
+        <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
+            AND a.beh_dept_id = #{qcResultShortPageVO.deptId}
+        </if>
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
         </if>
@@ -14777,9 +14797,7 @@
             AND d.NAME = #{qcResultShortPageVO.casesEntryName}
         </if>
         <if test="qcResultShortPageVO.doctorId != null and qcResultShortPageVO.doctorId != ''">
-            AND (a.doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.beh_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.director_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' ))
+            AND a.doctor_id = #{qcResultShortPageVO.doctorId}
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
             AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )