控制台

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

@@ -10,10 +10,10 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.SysUserUtils;
-import com.diagbot.vo.FilterByDeptVO;
 import com.diagbot.vo.FilterPageByDeptVO;
-import com.diagbot.vo.HPFilterByDeptVO;
-import com.diagbot.vo.QcresultFilterByDeptVO;
+import com.diagbot.vo.FilterVO;
+import com.diagbot.vo.HomePageFilterVO;
+import com.diagbot.vo.QcresultFilterVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -30,6 +30,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+
 /**
  * @Description:主任医生相关首页
  * @Author:zhaops
@@ -51,39 +52,39 @@ public class ConsoleByDeptFacade {
     /**
      * 出院人数统计-按科室
      *
-     * @param filterByDeptVO
+     * @param filterVO
      * @return
      */
-    public Map<String, Object> leaveHosCountByDept(FilterByDeptVO filterByDeptVO) {
+    public Map<String, Object> leaveHosCountByDept(FilterVO filterVO) {
         Map<String, Object> retMap = new LinkedHashMap<>();
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         String userId = SysUserUtils.getCurrentPrincipleID();
-        String startDate = filterFacade.getStartDateStr(filterByDeptVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterByDeptVO.getType(), null);
-        filterByDeptVO.setHospitalId(hospitalId);
-        filterByDeptVO.setUserId(Long.valueOf(userId));
-        filterByDeptVO.setStartDate(startDate);
-        filterByDeptVO.setEndDate(endDate);
-        HPFilterByDeptVO hpFilterByDeptVO = new HPFilterByDeptVO();
-        BeanUtil.copyProperties(filterByDeptVO, hpFilterByDeptVO);
+        String startDate = filterFacade.getStartDateStr(filterVO.getType(), null);
+        String endDate = filterFacade.getEndDateStr(filterVO.getType(), null);
+        filterVO.setHospitalId(hospitalId);
+        filterVO.setUserId(Long.valueOf(userId));
+        filterVO.setStartDate(startDate);
+        filterVO.setEndDate(endDate);
+        HomePageFilterVO homePageFilterVO = new HomePageFilterVO();
+        BeanUtil.copyProperties(filterVO, homePageFilterVO);
         //关联科室
-        Map<String, Object> deptMap = getDeptByUser(filterByDeptVO);
+        Map<String, Object> deptMap = getDeptByUser(filterVO);
         if (deptMap == null) {
             return retMap;
         }
         //出院总人数
-        List<NumDTO> totleNumList = behospitalInfoFacade.homePageCountByDept(hpFilterByDeptVO);
+        List<NumDTO> totleNumList = behospitalInfoFacade.homePageCountByDept(homePageFilterVO);
         Map<String, NumDTO> totleMap = ListUtil.isEmpty(totleNumList)
                 ? new HashMap<>()
                 : EntityUtil.makeEntityMap(totleNumList, "name");
         //死亡人数
-        hpFilterByDeptVO.setDeath(1);
-        List<NumDTO> deathNumList = behospitalInfoFacade.homePageCountByDept(hpFilterByDeptVO);
+        homePageFilterVO.setDeath(1);
+        List<NumDTO> deathNumList = behospitalInfoFacade.homePageCountByDept(homePageFilterVO);
         Map<String, NumDTO> deathMap = ListUtil.isEmpty(deathNumList)
                 ? new HashMap<>()
                 : EntityUtil.makeEntityMap(deathNumList, "name");
         //手术人数
-        List<NumDTO> operationNumList = behospitalInfoFacade.homePageCountForOperationByDept(filterByDeptVO);
+        List<NumDTO> operationNumList = behospitalInfoFacade.homePageCountForOperationByDept(filterVO);
         Map<String, NumDTO> operationMap = ListUtil.isEmpty(operationNumList)
                 ? new HashMap<>()
                 : EntityUtil.makeEntityMap(operationNumList, "name");
@@ -110,47 +111,47 @@ public class ConsoleByDeptFacade {
     /**
      * 病历数统计-按科室
      *
-     * @param filterByDeptVO
+     * @param filterVO
      * @return
      */
-    public Map<String, Object> mrCountByDept(FilterByDeptVO filterByDeptVO) {
+    public Map<String, Object> mrCountByDept(FilterVO filterVO) {
         DecimalFormat df = new DecimalFormat("#0.00");
         Map<String, Object> retMap = new LinkedHashMap<>();
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         String userId = SysUserUtils.getCurrentPrincipleID();
-        String startDate = filterFacade.getStartDateStr(filterByDeptVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterByDeptVO.getType(), null);
-        filterByDeptVO.setHospitalId(hospitalId);
-        filterByDeptVO.setUserId(Long.valueOf(userId));
-        filterByDeptVO.setStartDate(startDate);
-        filterByDeptVO.setEndDate(endDate);
-        QcresultFilterByDeptVO qcresultFilterByDeptVO = new QcresultFilterByDeptVO();
-        BeanUtil.copyProperties(filterByDeptVO, qcresultFilterByDeptVO);
+        String startDate = filterFacade.getStartDateStr(filterVO.getType(), null);
+        String endDate = filterFacade.getEndDateStr(filterVO.getType(), null);
+        filterVO.setHospitalId(hospitalId);
+        filterVO.setUserId(Long.valueOf(userId));
+        filterVO.setStartDate(startDate);
+        filterVO.setEndDate(endDate);
+        QcresultFilterVO qcresultFilterVO = new QcresultFilterVO();
+        BeanUtil.copyProperties(filterVO, qcresultFilterVO);
         //关联科室
-        Map<String, Object> deptMap = getDeptByUser(filterByDeptVO);
+        Map<String, Object> deptMap = getDeptByUser(filterVO);
         if (deptMap == null) {
             return retMap;
         }
         //质控病历总数
-        List<NumDTO> totleNumList = qcresultInfoFacade.resultCountByDept(qcresultFilterByDeptVO);
+        List<NumDTO> totleNumList = qcresultInfoFacade.resultCountByDept(qcresultFilterVO);
         Map<String, NumDTO> totleMap = ListUtil.isEmpty(totleNumList)
                 ? new HashMap<>()
                 : EntityUtil.makeEntityMap(totleNumList, "name");
         //甲级病历
-        qcresultFilterByDeptVO.setLevel("甲");
-        List<NumDTO> firstNumList = qcresultInfoFacade.resultCountByDept(qcresultFilterByDeptVO);
+        qcresultFilterVO.setLevel("甲");
+        List<NumDTO> firstNumList = qcresultInfoFacade.resultCountByDept(qcresultFilterVO);
         Map<String, NumDTO> firstMap = ListUtil.isEmpty(firstNumList)
                 ? new HashMap<>()
                 : EntityUtil.makeEntityMap(firstNumList, "name");
         //乙级病历
-        qcresultFilterByDeptVO.setLevel("乙");
-        List<NumDTO> secondNumList = qcresultInfoFacade.resultCountByDept(qcresultFilterByDeptVO);
+        qcresultFilterVO.setLevel("乙");
+        List<NumDTO> secondNumList = qcresultInfoFacade.resultCountByDept(qcresultFilterVO);
         Map<String, NumDTO> secondMap = ListUtil.isEmpty(secondNumList)
                 ? new HashMap<>()
                 : EntityUtil.makeEntityMap(secondNumList, "name");
         //丙级病历
-        qcresultFilterByDeptVO.setLevel("丙");
-        List<NumDTO> thirdNumList = qcresultInfoFacade.resultCountByDept(qcresultFilterByDeptVO);
+        qcresultFilterVO.setLevel("丙");
+        List<NumDTO> thirdNumList = qcresultInfoFacade.resultCountByDept(qcresultFilterVO);
         Map<String, NumDTO> thirdMap = ListUtil.isEmpty(thirdNumList)
                 ? new HashMap<>()
                 : EntityUtil.makeEntityMap(thirdNumList, "name");
@@ -224,36 +225,36 @@ public class ConsoleByDeptFacade {
     /**
      * 各模块缺陷占比排名-按科室
      *
-     * @param filterByDeptVO
+     * @param filterVO
      * @return
      */
-    public Map<String, Object> entryCountGroupByCaseAndDept(FilterByDeptVO filterByDeptVO) {
+    public Map<String, Object> entryCountGroupByCaseAndDept(FilterVO filterVO) {
         DecimalFormat df = new DecimalFormat("#0.00");
         Map<String, Object> retMap = new LinkedHashMap<>();
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         String userId = SysUserUtils.getCurrentPrincipleID();
-        String startDate = filterFacade.getStartDateStr(filterByDeptVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterByDeptVO.getType(), null);
-        filterByDeptVO.setHospitalId(hospitalId);
-        filterByDeptVO.setUserId(Long.valueOf(userId));
-        filterByDeptVO.setStartDate(startDate);
-        filterByDeptVO.setEndDate(endDate);
-        if (filterByDeptVO.getLimitCount() == null || filterByDeptVO.getLimitCount().equals(0)) {
-            filterByDeptVO.setLimitCount(10);
+        String startDate = filterFacade.getStartDateStr(filterVO.getType(), null);
+        String endDate = filterFacade.getEndDateStr(filterVO.getType(), null);
+        filterVO.setHospitalId(hospitalId);
+        filterVO.setUserId(Long.valueOf(userId));
+        filterVO.setStartDate(startDate);
+        filterVO.setEndDate(endDate);
+        if (filterVO.getLimitCount() == null || filterVO.getLimitCount().equals(0)) {
+            filterVO.setLimitCount(10);
         }
-        Integer limitCount = filterByDeptVO.getLimitCount();
-        QcresultFilterByDeptVO qcresultFilterByDeptVO = new QcresultFilterByDeptVO();
-        BeanUtil.copyProperties(filterByDeptVO, qcresultFilterByDeptVO);
+        Integer limitCount = filterVO.getLimitCount();
+        QcresultFilterVO qcresultFilterVO = new QcresultFilterVO();
+        BeanUtil.copyProperties(filterVO, qcresultFilterVO);
         //关联科室
-        Map<String, Object> deptMap = getDeptByUser(filterByDeptVO);
+        Map<String, Object> deptMap = getDeptByUser(filterVO);
         if (deptMap == null) {
             return retMap;
         }
-        List<NumDTO> mrNumList = qcresultInfoFacade.resultCountByDept(qcresultFilterByDeptVO);
+        List<NumDTO> mrNumList = qcresultInfoFacade.resultCountByDept(qcresultFilterVO);
         Map<String, NumDTO> mrMap = ListUtil.isEmpty(mrNumList)
                 ? new HashMap<>()
                 : EntityUtil.makeEntityMap(mrNumList, "name");
-        List<DeptNumDTO> qcEntryNumList = qcresultInfoFacade.entryCountGroupByCaseAndDept(filterByDeptVO);
+        List<DeptNumDTO> qcEntryNumList = qcresultInfoFacade.entryCountGroupByCaseAndDept(filterVO);
         Map<String, List<DeptNumDTO>> qcEntryMap = ListUtil.isEmpty(qcEntryNumList)
                 ? new HashMap<>()
                 : EntityUtil.makeEntityListMap(qcEntryNumList, "deptName");
@@ -329,30 +330,30 @@ public class ConsoleByDeptFacade {
     /**
      * 条目缺陷占比-按科室
      *
-     * @param filterByDeptVO
+     * @param filterVO
      * @return
      */
-    public Map<String, Object> entryCountGroupByEntryAndDept(FilterByDeptVO filterByDeptVO) {
+    public Map<String, Object> entryCountGroupByEntryAndDept(FilterVO filterVO) {
         DecimalFormat df = new DecimalFormat("#0.00");
         Map<String, Object> retMap = new LinkedHashMap<>();
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         String userId = SysUserUtils.getCurrentPrincipleID();
-        String startDate = filterFacade.getStartDateStr(filterByDeptVO.getType(), null);
-        String endDate = filterFacade.getEndDateStr(filterByDeptVO.getType(), null);
-        filterByDeptVO.setHospitalId(hospitalId);
-        filterByDeptVO.setUserId(Long.valueOf(userId));
-        filterByDeptVO.setStartDate(startDate);
-        filterByDeptVO.setEndDate(endDate);
-        if (filterByDeptVO.getLimitCount() == null || filterByDeptVO.getLimitCount().equals(0)) {
-            filterByDeptVO.setLimitCount(10);
+        String startDate = filterFacade.getStartDateStr(filterVO.getType(), null);
+        String endDate = filterFacade.getEndDateStr(filterVO.getType(), null);
+        filterVO.setHospitalId(hospitalId);
+        filterVO.setUserId(Long.valueOf(userId));
+        filterVO.setStartDate(startDate);
+        filterVO.setEndDate(endDate);
+        if (filterVO.getLimitCount() == null || filterVO.getLimitCount().equals(0)) {
+            filterVO.setLimitCount(10);
         }
-        Integer limitCount = filterByDeptVO.getLimitCount();
+        Integer limitCount = filterVO.getLimitCount();
         //关联科室
-        Map<String, Object> deptMap = getDeptByUser(filterByDeptVO);
+        Map<String, Object> deptMap = getDeptByUser(filterVO);
         if (deptMap == null) {
             return retMap;
         }
-        List<DeptNumDTO> entryList = qcresultInfoFacade.entryCountGroupByEntryAndDept(filterByDeptVO);
+        List<DeptNumDTO> entryList = qcresultInfoFacade.entryCountGroupByEntryAndDept(filterVO);
         Map<String, List<DeptNumDTO>> numListMap = ListUtil.isEmpty(entryList)
                 ? new HashMap<>()
                 : EntityUtil.makeEntityListMap(entryList, "deptName");
@@ -428,11 +429,11 @@ public class ConsoleByDeptFacade {
     /**
      * 用户关联科室
      *
-     * @param filterByDeptVO
+     * @param filterVO
      * @return
      */
-    public Map<String, Object> getDeptByUser(FilterByDeptVO filterByDeptVO) {
-        List<DeptBaseDTO> deptList = basDeptInfoFacade.getDeptByUser(filterByDeptVO);
+    public Map<String, Object> getDeptByUser(FilterVO filterVO) {
+        List<DeptBaseDTO> deptList = basDeptInfoFacade.getDeptByUser(filterVO);
         if (ListUtil.isNotEmpty(deptList)) {
             return EntityUtil.makeMapWithKeyValue(deptList, "deptName", "deptId");
         } else {
@@ -447,12 +448,12 @@ public class ConsoleByDeptFacade {
      * @return
      */
     public List<DeptBaseDTO> getDept() {
-        FilterByDeptVO filterByDeptVO = new FilterByDeptVO();
+        FilterVO filterVO = new FilterVO();
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         String userId = SysUserUtils.getCurrentPrincipleID();
-        filterByDeptVO.setHospitalId(hospitalId);
-        filterByDeptVO.setUserId(Long.valueOf(userId));
-        List<DeptBaseDTO> deptList = basDeptInfoFacade.getDeptByUser(filterByDeptVO);
+        filterVO.setHospitalId(hospitalId);
+        filterVO.setUserId(Long.valueOf(userId));
+        List<DeptBaseDTO> deptList = basDeptInfoFacade.getDeptByUser(filterVO);
         return deptList;
     }
 

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

@@ -48,13 +48,11 @@ public class ConsoleFacade {
     @Autowired
     private QcresultInfoFacade qcresultInfoFacade;
     @Autowired
-    private QcCasesFacade qcCasesFacade;
-    @Autowired
     private HomePageFacade homePageFacade;
     @Autowired
     private BehospitalInfoFacade behospitalInfoFacade;
 
-    //-----------------------聚合接口开始-------------------------------
+    //region-----------------------聚合接口开始-------------------------------
 
     /**
      * 病历相关统计
@@ -140,9 +138,9 @@ public class ConsoleFacade {
         return retMap;
     }
 
-    //-----------------------聚合接口结束-------------------------------
+    //endregion-----------------------聚合接口结束-------------------------------
 
-    //-----------------------单独接口开始-------------------------------
+    //region-----------------------单独接口开始-------------------------------
 
     /**
      * 平均住院天数
@@ -299,9 +297,9 @@ public class ConsoleFacade {
             filterVO.setLimitCount(10);
         }
     }
-    //-----------------------单独接口结束-------------------------------
+    //endregion-----------------------单独接口结束-------------------------------
 
-    //_______________________分页接口开始-------------------------------
+    //region_______________________分页接口开始-------------------------------
 
     /**
      * 过滤条件设置
@@ -314,17 +312,28 @@ public class ConsoleFacade {
         String endDate = "";
         Date date = new Date();
 
-        //1-本月，2-本年，3-上月，4-去年本月，5-去年
-        if (filterPageVO.getType().equals(1) || filterPageVO.getType().equals(2)) {
-            startDate = filterFacade.getStartDateStr(filterPageVO.getType(), null);
-            endDate = filterFacade.getEndDateStr(filterPageVO.getType(), null);
-        } else if (filterPageVO.getType().equals(3) || filterPageVO.getType().equals(5)) {
-            startDate = filterFacade.getLastStartDateStr(filterPageVO.getType());
-            endDate = filterFacade.getLastEndDateStr(filterPageVO.getType());
-        } else if (filterPageVO.getType().equals(4)) {
-            String year = DateUtil.getYear(date);
-            startDate = filterFacade.getStartDateStr(filterPageVO.getType(), Integer.valueOf(year) - 1);
-            endDate = filterFacade.getEndDateStr(filterPageVO.getType(), Integer.valueOf(year) - 1);
+        //统计维度 1-本月，2-本年
+        //时间类型 1-本月/本年，2-上月/去年，3-去年本月/去年
+        if (filterPageVO.getType().equals(1)) {
+            if (filterPageVO.getDateType().equals(2)) {
+                startDate = filterFacade.getLastStartDateStr(filterPageVO.getType());
+                endDate = filterFacade.getLastEndDateStr(filterPageVO.getType());
+            } else if (filterPageVO.getDateType().equals(3)) {
+                String year = DateUtil.getYear(date);
+                startDate = filterFacade.getStartDateStr(filterPageVO.getType(), Integer.valueOf(year) - 1);
+                endDate = filterFacade.getEndDateStr(filterPageVO.getType(), Integer.valueOf(year) - 1);
+            } else {
+                startDate = filterFacade.getStartDateStr(filterPageVO.getType(), null);
+                endDate = filterFacade.getEndDateStr(filterPageVO.getType(), null);
+            }
+        } else if (filterPageVO.getType().equals(2)) {
+            if (filterPageVO.getDateType().equals(2) || filterPageVO.getDateType().equals(3)) {
+                startDate = filterFacade.getLastStartDateStr(filterPageVO.getType());
+                endDate = filterFacade.getLastEndDateStr(filterPageVO.getType());
+            } else {
+                startDate = filterFacade.getStartDateStr(filterPageVO.getType(), null);
+                endDate = filterFacade.getEndDateStr(filterPageVO.getType(), null);
+            }
         }
 
         filterPageVO.setStartDate(startDate);
@@ -429,5 +438,5 @@ public class ConsoleFacade {
         IPage<QcResultPercentDTO> page = qcresultInfoFacade.levelPercentGroupByDeptPage(filterPageVO);
         return page;
     }
-    //-----------------------分页接口结束-------------------------------
+    //endregion-----------------------分页接口结束-------------------------------
 }

src/main/java/com/diagbot/mapper/BasDeptInfoMapper.java

@@ -5,7 +5,7 @@ import com.diagbot.dto.BasDeptInfoDTO;
 import com.diagbot.dto.DeptBaseDTO;
 import com.diagbot.entity.BasDeptInfo;
 import com.diagbot.vo.BasDeptInfoVO;
-import com.diagbot.vo.FilterByDeptVO;
+import com.diagbot.vo.FilterVO;
 
 import java.util.List;
 
@@ -25,8 +25,8 @@ public interface BasDeptInfoMapper extends BaseMapper<BasDeptInfo> {
     /**
      * 查询用户关联科室
      *
-     * @param filterByDeptVO
+     * @param filterVO
      * @return
      */
-    List<DeptBaseDTO> getDeptByUser(FilterByDeptVO filterByDeptVO);
+    List<DeptBaseDTO> getDeptByUser(FilterVO filterVO);
 }

src/main/java/com/diagbot/mapper/BehospitalInfoMapper.java

@@ -8,10 +8,8 @@ import com.diagbot.dto.NumDTO;
 import com.diagbot.entity.BehospitalInfo;
 import com.diagbot.vo.AnalyzeVO;
 import com.diagbot.vo.BehospitalPageVO;
-import com.diagbot.vo.FilterByDeptVO;
 import com.diagbot.vo.FilterPageVO;
 import com.diagbot.vo.FilterVO;
-import com.diagbot.vo.HPFilterByDeptVO;
 import com.diagbot.vo.HomePageFilterVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -97,18 +95,18 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
     /**
      * 按科室统计病案首页病历数
      *
-     * @param hpFilterByDeptVO
+     * @param homePageFilterVO
      * @return
      */
-    public List<NumDTO> homePageCountByDept(HPFilterByDeptVO hpFilterByDeptVO);
+    public List<NumDTO> homePageCountByDept(HomePageFilterVO homePageFilterVO);
 
     /**
      * 按科室统计病案首页手术病历数
      *
-     * @param filterByDeptVO
+     * @param filterVO
      * @return
      */
-    public List<NumDTO> homePageCountForOperationByDept(FilterByDeptVO filterByDeptVO);
+    public List<NumDTO> homePageCountForOperationByDept(FilterVO filterVO);
 
     /**
      * 各科室缺陷占比排行（分页）

src/main/java/com/diagbot/mapper/QcresultInfoMapper.java

@@ -7,11 +7,9 @@ import com.diagbot.dto.DeptNumDTO;
 import com.diagbot.dto.NumDTO;
 import com.diagbot.dto.QcResultPercentDTO;
 import com.diagbot.entity.QcresultInfo;
-import com.diagbot.vo.FilterByDeptVO;
 import com.diagbot.vo.FilterPageByDeptVO;
 import com.diagbot.vo.FilterPageVO;
 import com.diagbot.vo.FilterVO;
-import com.diagbot.vo.QcresultFilterByDeptVO;
 import com.diagbot.vo.QcresultFilterVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -79,26 +77,26 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
     /**
      * 按科室统计质控病历数
      *
-     * @param qcresultFilterByDeptVO
+     * @param qcresultFilterVO
      * @return
      */
-    public List<NumDTO> resultCountByDept(QcresultFilterByDeptVO qcresultFilterByDeptVO);
+    public List<NumDTO> resultCountByDept(QcresultFilterVO qcresultFilterVO);
 
     /**
      * 各模块缺陷占比-按科室
      *
-     * @param filterByDeptVO
+     * @param filterVO
      * @return
      */
-    public List<DeptNumDTO> entryCountGroupByCaseAndDept(FilterByDeptVO filterByDeptVO);
+    public List<DeptNumDTO> entryCountGroupByCaseAndDept(FilterVO filterVO);
 
     /**
      * 条目缺陷占比-按科室
      *
-     * @param filterByDeptVO
+     * @param filterVO
      * @return
      */
-    public List<DeptNumDTO> entryCountGroupByEntryAndDept(FilterByDeptVO filterByDeptVO);
+    public List<DeptNumDTO> entryCountGroupByEntryAndDept(FilterVO filterVO);
 
     /**
      * 各模块缺陷占比（分页）

src/main/java/com/diagbot/service/BasDeptInfoService.java

@@ -1,11 +1,11 @@
 package com.diagbot.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.BasDeptInfoDTO;
 import com.diagbot.dto.DeptBaseDTO;
 import com.diagbot.entity.BasDeptInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.vo.BasDeptInfoVO;
-import com.diagbot.vo.FilterByDeptVO;
+import com.diagbot.vo.FilterVO;
 
 import java.util.List;
 
@@ -25,8 +25,8 @@ public interface BasDeptInfoService extends IService<BasDeptInfo> {
     /**
      * 查询用户关联科室
      *
-     * @param filterByDeptVO
+     * @param filterVO
      * @return
      */
-    List<DeptBaseDTO> getDeptByUser(FilterByDeptVO filterByDeptVO);
+    List<DeptBaseDTO> getDeptByUser(FilterVO filterVO);
 }

src/main/java/com/diagbot/service/BehospitalInfoService.java

@@ -8,10 +8,8 @@ import com.diagbot.dto.NumDTO;
 import com.diagbot.entity.BehospitalInfo;
 import com.diagbot.vo.AnalyzeVO;
 import com.diagbot.vo.BehospitalPageVO;
-import com.diagbot.vo.FilterByDeptVO;
 import com.diagbot.vo.FilterPageVO;
 import com.diagbot.vo.FilterVO;
-import com.diagbot.vo.HPFilterByDeptVO;
 import com.diagbot.vo.HomePageFilterVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -97,18 +95,18 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
     /**
      * 按科室统计病案首页病历数
      *
-     * @param hpFilterByDeptVO
+     * @param homePageFilterVO
      * @return
      */
-    public List<NumDTO> homePageCountByDept(HPFilterByDeptVO hpFilterByDeptVO);
+    public List<NumDTO> homePageCountByDept(HomePageFilterVO homePageFilterVO);
 
     /**
      * 按科室统计病案首页手术病历数
      *
-     * @param filterByDeptVO
+     * @param filterVO
      * @return
      */
-    public List<NumDTO> homePageCountForOperationByDept(FilterByDeptVO filterByDeptVO);
+    public List<NumDTO> homePageCountForOperationByDept(FilterVO filterVO);
 
     /**
      * 各科室缺陷占比排行（分页）

src/main/java/com/diagbot/service/QcresultInfoService.java

@@ -7,11 +7,9 @@ import com.diagbot.dto.DeptNumDTO;
 import com.diagbot.dto.NumDTO;
 import com.diagbot.dto.QcResultPercentDTO;
 import com.diagbot.entity.QcresultInfo;
-import com.diagbot.vo.FilterByDeptVO;
 import com.diagbot.vo.FilterPageByDeptVO;
 import com.diagbot.vo.FilterPageVO;
 import com.diagbot.vo.FilterVO;
-import com.diagbot.vo.QcresultFilterByDeptVO;
 import com.diagbot.vo.QcresultFilterVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -80,26 +78,26 @@ public interface QcresultInfoService extends IService<QcresultInfo> {
     /**
      * 按科室统计质控病历数
      *
-     * @param qcresultFilterByDeptVO
+     * @param qcresultFilterVO
      * @return
      */
-    public List<NumDTO> resultCountByDept(QcresultFilterByDeptVO qcresultFilterByDeptVO);
+    public List<NumDTO> resultCountByDept(QcresultFilterVO qcresultFilterVO);
 
     /**
      * 各模块缺陷占比-按科室
      *
-     * @param filterByDeptVO
+     * @param filterVO
      * @return
      */
-    public List<DeptNumDTO> entryCountGroupByCaseAndDept(FilterByDeptVO filterByDeptVO);
+    public List<DeptNumDTO> entryCountGroupByCaseAndDept(FilterVO filterVO);
 
     /**
      * 条目缺陷占比-按科室
      *
-     * @param filterByDeptVO
+     * @param filterVO
      * @return
      */
-    public List<DeptNumDTO> entryCountGroupByEntryAndDept(FilterByDeptVO filterByDeptVO);
+    public List<DeptNumDTO> entryCountGroupByEntryAndDept(FilterVO filterVO);
 
     /**
      * 各模块缺陷占比（分页）

src/main/java/com/diagbot/service/impl/BasDeptInfoServiceImpl.java

@@ -7,7 +7,7 @@ import com.diagbot.entity.BasDeptInfo;
 import com.diagbot.mapper.BasDeptInfoMapper;
 import com.diagbot.service.BasDeptInfoService;
 import com.diagbot.vo.BasDeptInfoVO;
-import com.diagbot.vo.FilterByDeptVO;
+import com.diagbot.vo.FilterVO;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -36,11 +36,11 @@ public class BasDeptInfoServiceImpl extends ServiceImpl<BasDeptInfoMapper, BasDe
     /**
      * 查询用户关联科室
      *
-     * @param filterByDeptVO
+     * @param filterVO
      * @return
      */
     @Override
-    public List<DeptBaseDTO> getDeptByUser(FilterByDeptVO filterByDeptVO) {
-        return baseMapper.getDeptByUser(filterByDeptVO);
+    public List<DeptBaseDTO> getDeptByUser(FilterVO filterVO) {
+        return baseMapper.getDeptByUser(filterVO);
     }
 }

src/main/java/com/diagbot/service/impl/BehospitalInfoServiceImpl.java

@@ -10,10 +10,8 @@ import com.diagbot.mapper.BehospitalInfoMapper;
 import com.diagbot.service.BehospitalInfoService;
 import com.diagbot.vo.AnalyzeVO;
 import com.diagbot.vo.BehospitalPageVO;
-import com.diagbot.vo.FilterByDeptVO;
 import com.diagbot.vo.FilterPageVO;
 import com.diagbot.vo.FilterVO;
-import com.diagbot.vo.HPFilterByDeptVO;
 import com.diagbot.vo.HomePageFilterVO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
@@ -136,23 +134,23 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
     /**
      * 按科室统计病案首页病历数
      *
-     * @param hpFilterByDeptVO
+     * @param homePageFilterVO
      * @return
      */
     @Override
-    public List<NumDTO> homePageCountByDept(HPFilterByDeptVO hpFilterByDeptVO) {
-        return baseMapper.homePageCountByDept(hpFilterByDeptVO);
+    public List<NumDTO> homePageCountByDept(HomePageFilterVO homePageFilterVO) {
+        return baseMapper.homePageCountByDept(homePageFilterVO);
     }
 
     /**
      * 按科室统计病案首页手术病历数
      *
-     * @param filterByDeptVO
+     * @param filterVO
      * @return
      */
     @Override
-    public List<NumDTO> homePageCountForOperationByDept(FilterByDeptVO filterByDeptVO) {
-        return baseMapper.homePageCountForOperationByDept(filterByDeptVO);
+    public List<NumDTO> homePageCountForOperationByDept(FilterVO filterVO) {
+        return baseMapper.homePageCountForOperationByDept(filterVO);
     }
 
     /**

src/main/java/com/diagbot/service/impl/QcresultInfoServiceImpl.java

@@ -9,11 +9,9 @@ import com.diagbot.dto.QcResultPercentDTO;
 import com.diagbot.entity.QcresultInfo;
 import com.diagbot.mapper.QcresultInfoMapper;
 import com.diagbot.service.QcresultInfoService;
-import com.diagbot.vo.FilterByDeptVO;
 import com.diagbot.vo.FilterPageByDeptVO;
 import com.diagbot.vo.FilterPageVO;
 import com.diagbot.vo.FilterVO;
-import com.diagbot.vo.QcresultFilterByDeptVO;
 import com.diagbot.vo.QcresultFilterVO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
@@ -102,34 +100,34 @@ public class QcresultInfoServiceImpl extends ServiceImpl<QcresultInfoMapper, Qcr
     /**
      * 按科室统计质控病历数
      *
-     * @param qcresultFilterByDeptVO
+     * @param qcresultFilterVO
      * @return
      */
     @Override
-    public List<NumDTO> resultCountByDept(QcresultFilterByDeptVO qcresultFilterByDeptVO) {
-        return baseMapper.resultCountByDept(qcresultFilterByDeptVO);
+    public List<NumDTO> resultCountByDept(QcresultFilterVO qcresultFilterVO) {
+        return baseMapper.resultCountByDept(qcresultFilterVO);
     }
 
     /**
      * 各模块缺陷占比-按科室
      *
-     * @param filterByDeptVO
+     * @param filterVO
      * @return
      */
     @Override
-    public List<DeptNumDTO> entryCountGroupByCaseAndDept(FilterByDeptVO filterByDeptVO) {
-        return baseMapper.entryCountGroupByCaseAndDept(filterByDeptVO);
+    public List<DeptNumDTO> entryCountGroupByCaseAndDept(FilterVO filterVO) {
+        return baseMapper.entryCountGroupByCaseAndDept(filterVO);
     }
 
     /**
      * 条目缺陷占比-按科室
      *
-     * @param filterByDeptVO
+     * @param filterVO
      * @return
      */
     @Override
-    public List<DeptNumDTO> entryCountGroupByEntryAndDept(FilterByDeptVO filterByDeptVO) {
-        return baseMapper.entryCountGroupByEntryAndDept(filterByDeptVO);
+    public List<DeptNumDTO> entryCountGroupByEntryAndDept(FilterVO filterVO) {
+        return baseMapper.entryCountGroupByEntryAndDept(filterVO);
     }
 
     /**

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

@@ -1,17 +0,0 @@
-package com.diagbot.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:主任医生过滤
- * @Author:zhaops
- * @time: 2020/5/8 17:02
- */
-@Getter
-@Setter
-public class FilterByDeptVO extends FilterVO {
-    @ApiModelProperty(hidden = true)
-    private Long userId;
-}

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

@@ -0,0 +1,30 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2020/5/19 13:39
+ */
+@Getter
+@Setter
+public class FilterOrderVO extends FilterVO {
+    /**
+     * 等级
+     */
+    private String level;
+
+    /**
+     * 排序（正序）
+     */
+    private List<String> asc;
+
+    /**
+     * 排序（反序）
+     */
+    private List<String> desc;
+}

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

@@ -1,6 +1,5 @@
 package com.diagbot.vo;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,7 +11,8 @@ import lombok.Setter;
 @Getter
 @Setter
 public class FilterPageByDeptVO extends FilterPageVO {
-    @ApiModelProperty(hidden = true)
-    private Long userId;
+    /**
+     * 科室名称
+     */
     private String deptName;
 }

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

@@ -14,9 +14,13 @@ import lombok.Setter;
 @Setter
 public class FilterPageVO extends Page {
     /**
-     * 统计维度 1-本月，2-本年，3-上月，4-去年本月，5-去年
+     * 统计维度 1-本月，2-本年
      */
     private Integer type;
+    /**
+     * 时间类型 1-本月/本年，2-上月/去年，3-去年本月/去年
+     */
+    private Integer dateType;
     /**
      * 起始时间
      */
@@ -32,6 +36,10 @@ public class FilterPageVO extends Page {
      */
     @ApiModelProperty(hidden = true)
     private String hospitalId;
-
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(hidden = true)
+    private Long userId;
     private String name;
 }

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

@@ -36,4 +36,7 @@ public class FilterVO {
      */
     @ApiModelProperty(hidden = true)
     private Integer limitCount;
+
+    @ApiModelProperty(hidden = true)
+    private Long userId;
 }

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

@@ -1,18 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/5/8 19:27
- */
-@Getter
-@Setter
-public class HPFilterByDeptVO extends FilterByDeptVO {
-    /**
-     * 死亡
-     */
-    private Integer death;
-}

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

@@ -1,23 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/5/8 19:50
- */
-@Getter
-@Setter
-public class QcresultFilterByDeptVO extends FilterByDeptVO{
-    /**
-     * 等级
-     */
-    private String level;
-
-    /**
-     * 评分类型
-     */
-    private Integer gradeType;
-}

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

@@ -6,8 +6,8 @@ import com.diagbot.dto.DeptBaseDTO;
 import com.diagbot.dto.DeptNumDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.ConsoleByDeptFacade;
-import com.diagbot.vo.FilterByDeptVO;
 import com.diagbot.vo.FilterPageByDeptVO;
+import com.diagbot.vo.FilterVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,8 +36,8 @@ public class ConsoleByDeptController {
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>")
     @PostMapping("/leaveHosCountByDept")
     @SysLogger("leaveHosCountByDept")
-    public RespDTO<Map<String, Object>> leaveHosCountByDept(@RequestBody FilterByDeptVO filterByDeptVO) {
-        Map<String, Object> data = consoleByDeptFacade.leaveHosCountByDept(filterByDeptVO);
+    public RespDTO<Map<String, Object>> leaveHosCountByDept(@RequestBody FilterVO filterVO) {
+        Map<String, Object> data = consoleByDeptFacade.leaveHosCountByDept(filterVO);
         return RespDTO.onSuc(data);
     }
 
@@ -45,8 +45,8 @@ public class ConsoleByDeptController {
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>")
     @PostMapping("/mrCountByDept")
     @SysLogger("mrCountByDept")
-    public RespDTO<Map<String, Object>> mrCountByDept(@RequestBody FilterByDeptVO filterByDeptVO) {
-        Map<String, Object> data = consoleByDeptFacade.mrCountByDept(filterByDeptVO);
+    public RespDTO<Map<String, Object>> mrCountByDept(@RequestBody FilterVO filterVO) {
+        Map<String, Object> data = consoleByDeptFacade.mrCountByDept(filterVO);
         return RespDTO.onSuc(data);
     }
 
@@ -54,8 +54,8 @@ public class ConsoleByDeptController {
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>")
     @PostMapping("/entryCountGroupByCaseAndDept")
     @SysLogger("entryCountGroupByCaseAndDept")
-    public RespDTO<Map<String, Object>> entryCountGroupByCaseAndDept(@RequestBody FilterByDeptVO filterByDeptVO) {
-        Map<String, Object> data = consoleByDeptFacade.entryCountGroupByCaseAndDept(filterByDeptVO);
+    public RespDTO<Map<String, Object>> entryCountGroupByCaseAndDept(@RequestBody FilterVO filterVO) {
+        Map<String, Object> data = consoleByDeptFacade.entryCountGroupByCaseAndDept(filterVO);
         return RespDTO.onSuc(data);
     }
 
@@ -63,8 +63,8 @@ public class ConsoleByDeptController {
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>")
     @PostMapping("/entryCountGroupByEntryAndDept")
     @SysLogger("entryCountGroupByEntryAndDept")
-    public RespDTO<Map<String, Object>> entryCountGroupByEntryAndDept(@RequestBody FilterByDeptVO filterByDeptVO) {
-        Map<String, Object> data = consoleByDeptFacade.entryCountGroupByEntryAndDept(filterByDeptVO);
+    public RespDTO<Map<String, Object>> entryCountGroupByEntryAndDept(@RequestBody FilterVO filterVO) {
+        Map<String, Object> data = consoleByDeptFacade.entryCountGroupByEntryAndDept(filterVO);
         return RespDTO.onSuc(data);
     }
 

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

@@ -33,7 +33,7 @@ public class ConsoleController {
     @Autowired
     private ConsoleFacade consoleFacade;
 
-    //-----------------------聚合接口开始-------------------------------
+    //region-----------------------聚合接口开始-------------------------------
     @ApiOperation(value = "病历相关统计[by:zhaops]",
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>")
     @PostMapping("/mrStatistics")
@@ -63,9 +63,9 @@ public class ConsoleController {
         Map<String, Object> data = consoleFacade.averageStatistics(filterVO);
         return RespDTO.onSuc(data);
     }
-    //-----------------------聚合接口结束-------------------------------
+    //endregion-----------------------聚合接口结束-------------------------------
 
-    //-----------------------单独接口开始-------------------------------
+    //region-----------------------单独接口开始-------------------------------
 
     /**
      * 平均住院天数
@@ -192,9 +192,9 @@ public class ConsoleController {
     public RespDTO<Map<String, Object>> entryByDept(@RequestBody FilterVO filterVO) {
         return RespDTO.onSuc(consoleFacade.entryByDept(filterVO));
     }
-    //-----------------------单独接口结束-------------------------------
+    //endregion-----------------------单独接口结束-------------------------------
 
-    //-----------------------分页接口开始-------------------------------
+    //region-----------------------分页接口开始-------------------------------
 
     /**
      * 各模块缺陷占比（分页）
@@ -231,7 +231,8 @@ public class ConsoleController {
      * @return
      */
     @ApiOperation(value = "按科室统计平均住院天数（分页）[by:zhaops]",
-            notes = "type： 统计维度 1-本月，2-本年，3-上月，4-去年本月，5-去年(必填)<br>")
+            notes = "type： 统计维度 1-本月，2-本年<br>" +
+                    "dateType： 时间类型 1-本月/本年，2-上月/去年，3-去年本月/去年<br>")
     @PostMapping("/getAverageDayNumPage")
     @SysLogger("getAverageDayNumPage")
     public RespDTO<IPage<AverageStatisticsDTO>> getAverageDayNumPage(@RequestBody FilterPageVO filterPageVO) {
@@ -245,7 +246,8 @@ public class ConsoleController {
      * @return
      */
     @ApiOperation(value = "按科室统计平均住院费用（分页）[by:zhaops]",
-            notes = "type： 统计维度 1-本月，2-本年，3-上月，4-去年本月，5-去年(必填)<br>")
+            notes = "type： 统计维度 1-本月，2-本年<br>" +
+                    "dateType： 时间类型 1-本月/本年，2-上月/去年，3-去年本月/去年<br>")
     @PostMapping("/getAverageFeePage")
     @SysLogger("getAverageFeePage")
     public RespDTO<IPage<AverageStatisticsDTO>> getAverageFeePage(@RequestBody FilterPageVO filterPageVO) {
@@ -294,5 +296,5 @@ public class ConsoleController {
         return RespDTO.onSuc(consoleFacade.levelPercentGroupByDeptPage(filterPageVO));
     }
 
-    //-----------------------分页接口结束-------------------------------
+    //endregion-----------------------分页接口结束-------------------------------
 }

src/main/resources/mapper/BasDeptInfoMapper.xml

@@ -57,7 +57,7 @@
     </select>
 
     <!-- 查询用户关联科室 -->
-    <select id="getDeptByUser" parameterType="com.diagbot.vo.FilterByDeptVO" resultType="com.diagbot.dto.DeptBaseDTO">
+    <select id="getDeptByUser" parameterType="com.diagbot.vo.FilterVO" resultType="com.diagbot.dto.DeptBaseDTO">
         SELECT
         b.dept_id as deptId,
         b.dept_name as deptName

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -583,7 +583,7 @@
     </select>
 
     <!-- 按科室统计病案首页病历数 -->
-    <select id="homePageCountByDept" parameterType="com.diagbot.vo.HPFilterByDeptVO" resultType="com.diagbot.dto.NumDTO">
+    <select id="homePageCountByDept" parameterType="com.diagbot.vo.HomePageFilterVO" resultType="com.diagbot.dto.NumDTO">
         SELECT
         a.beh_dept_id AS id,
         a.beh_dept_name AS NAME,
@@ -622,7 +622,7 @@
     </select>
 
     <!-- 按科室病案首页手术病历数 -->
-    <select id="homePageCountForOperationByDept" parameterType="com.diagbot.vo.FilterByDeptVO" resultType="com.diagbot.dto.NumDTO">
+    <select id="homePageCountForOperationByDept" parameterType="com.diagbot.vo.FilterVO" resultType="com.diagbot.dto.NumDTO">
         SELECT
         a.beh_dept_id AS id,
         a.beh_dept_name AS NAME,

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -242,7 +242,7 @@
     </select>
 
     <!-- 按科室统计质控病历数 -->
-    <select id="resultCountByDept" parameterType="com.diagbot.vo.QcresultFilterByDeptVO" resultType="com.diagbot.dto.NumDTO">
+    <select id="resultCountByDept" parameterType="com.diagbot.vo.QcresultFilterVO" resultType="com.diagbot.dto.NumDTO">
         SELECT
         a.beh_dept_id AS id,
         a.beh_dept_name AS NAME,
@@ -288,7 +288,7 @@
     </select>
 
     <!-- 按模块统计质控缺陷数 -->
-    <select id="entryCountGroupByCaseAndDept" parameterType="com.diagbot.vo.FilterByDeptVO" resultType="com.diagbot.dto.DeptNumDTO">
+    <select id="entryCountGroupByCaseAndDept" parameterType="com.diagbot.vo.FilterVO" resultType="com.diagbot.dto.DeptNumDTO">
         SELECT
         d.cases_id AS id,
         e.NAME AS NAME,
@@ -343,7 +343,7 @@
     </select>
 
     <!-- 条目缺陷分组统计 -->
-    <select id="entryCountGroupByEntryAndDept" parameterType="com.diagbot.vo.FilterByDeptVO" resultType="com.diagbot.dto.DeptNumDTO">
+    <select id="entryCountGroupByEntryAndDept" parameterType="com.diagbot.vo.FilterVO" resultType="com.diagbot.dto.DeptNumDTO">
         SELECT
         d.id,
         d.NAME,