科室病案首页占比报表增加查询条件

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

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

src/main/java/com/diagbot/facade/BasDoctorInfoFacade.java

@@ -15,7 +15,6 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * @Description:
@@ -29,24 +28,8 @@ public class BasDoctorInfoFacade extends BasDoctorInfoServiceImpl {
     @Autowired
     BasDeptInfoFacade basDeptInfoFacade;
     @Autowired
-    BasDoctorInfoFacade basDoctorInfoFacade;
-    @Autowired
     BehospitalInfoFacade behospitalInfoFacade;
 
-    /**
-     * 获取医院医生下拉列表信息
-     *
-     * @param
-     * @return 医院医生下拉列表信息
-     */
-    public List<String> getDoctorProfessorList() {
-       return basDoctorInfoFacade.lambdaQuery()
-                .eq(BasDoctorInfo::getHospitalId, Long.valueOf(SysUserUtils.getCurrentHospitalID()))
-                .eq(BasDoctorInfo::getIsDeleted, IsDeleteEnum.N.getKey())
-                .orderByAsc(BasDoctorInfo::getProfessor)
-                .list().stream().filter(obj->!"NULL".equals(obj.getProfessor()) && StringUtils.isNotBlank(obj.getProfessor())).map(BasDoctorInfo::getProfessor).distinct().collect(Collectors.toList());
-    }
-
     /**
      * 获取医院医生下拉列表信息
      *

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

@@ -62,6 +62,11 @@ public class FilterVO {
     //科室名称
     private String deptName;
 
+    /**
+     * 科室分类
+     */
+    private String deptId;
+
     private String level;
     /**
      * 是否归档（0：未归档，1：已归档）

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

@@ -17,6 +17,7 @@ public class BasDoctorInfoVO {
      */
     private String inputStr;
     private String deptName;
+    @ApiModelProperty(hidden = true)
     private String deptId;
     @ApiModelProperty(hidden = true)
     private Long hospitalId;

src/main/java/com/diagbot/web/BasDoctorInfoController.java

@@ -39,12 +39,4 @@ public class BasDoctorInfoController {
     public RespDTO<List<BasDoctorInfo>> getList(@RequestBody BasDoctorInfoVO basDoctorInfoVO) {
         return RespDTO.onSuc(basDoctorInfoFacade.getDoctorByDept(basDoctorInfoVO));
     }
-
-    @ApiOperation(value = "获取病历质控一览下医院医生职称[by:cy]",
-            notes = "inputStr: 搜索参数")
-    @PostMapping("/getDoctorProfessorList")
-    @SysLogger("getDoctorProfessorList")
-    public RespDTO<List<String>> getDoctorProfessorList() {
-        return RespDTO.onSuc(basDoctorInfoFacade.getDoctorProfessorList());
-    }
 }

src/main/java/com/diagbot/web/ConsoleByDeptController.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.*;
 import com.diagbot.facade.ConsoleByDeptFacade;
-import com.diagbot.facade.ConsoleFacade;
 import com.diagbot.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -31,8 +30,6 @@ import java.util.Map;
 public class ConsoleByDeptController {
     @Autowired
     private ConsoleByDeptFacade consoleByDeptFacade;
-    @Autowired
-    private ConsoleFacade consoleFacade;
 
     //region --------------------------首页接口开始------------------------------
     @ApiOperation(value = "出院病人统计（科室）-首页[by:zhaops]",

src/main/java/com/diagbot/web/ConsoleByDeptExportController.java

@@ -6,7 +6,6 @@ import com.diagbot.dto.DeptEntryNumDTO;
 import com.diagbot.dto.EntryStasByDeptDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.ConsoleByDeptExportFacade;
-import com.diagbot.facade.ConsoleExportFacade;
 import com.diagbot.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,8 +33,6 @@ public class ConsoleByDeptExportController {
 
     @Autowired
     private ConsoleByDeptExportFacade consoleByDeptExportFacade;
-    @Autowired
-    private ConsoleExportFacade consoleExportFacade;
 
 /**
      * 病案首页合格率占比科室-导出

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -3871,6 +3871,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>
@@ -3944,6 +3953,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>
@@ -4033,6 +4051,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>