缺陷占比详情导出

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -183,6 +183,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/consoleByDept/homePageOrGoodLevelByDept").permitAll()
                 .antMatchers("/print/export/homePageLevelExportByDept").permitAll()
                 .antMatchers("/print/export/homePageOrLevelExportByDept").permitAll()
+                .antMatchers("/print/export/entryGroupExportByDeptPage").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -227,6 +227,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/consoleByDept/homePageOrGoodLevelByDept", request)
                 || matchers("/print/export/homePageLevelExportByDept", request)
                 || matchers("/print/export/homePageOrLevelExportByDept", request)
+                || matchers("/print/export/entryGroupExportByDeptPage", request)
                 || matchers("/", request)) {
             return true;
         }

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

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -19,6 +20,7 @@ public class DeptEntryNumDTO {
     /**
      * 条目缺陷名称
      */
+    @Excel(name = "缺陷名称", width = 40, orderNum = "2")
     private String name;
     /**
      * 模块id
@@ -27,6 +29,7 @@ public class DeptEntryNumDTO {
     /**
      * 模块名称
      */
+    @Excel(name = "模块名称", width = 20, orderNum = "1")
     private String casesName;
     /**
      * 科室id
@@ -43,10 +46,12 @@ public class DeptEntryNumDTO {
     /**
      * 条目缺陷数
      */
+    @Excel(name = "数量", orderNum = "5")
     private Integer num = 0;
     /**
      * 条目缺陷占比
      */
+    @Excel(name = "缺陷占比", orderNum = "6")
     private Double percent = 0.00d;
     /**
      * 条目缺陷占比（百分比）
@@ -55,10 +60,12 @@ public class DeptEntryNumDTO {
     /**
      * 条目缺陷分值
      */
+//    @Excel(name = "分值", orderNum = "3")
     private Double score = 0d;
     /**
      * 单项否决标识
      */
+//    @Excel(name = "单项否决", orderNum = "4", replace = { "否_0", "是_1" })
     private Integer isReject;
     /**
      * 规则类型(0：无，1：空项，2：错误)

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

@@ -1,5 +1,6 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.*;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -29,6 +30,9 @@ public class ConsoleByDeptExportFacade {
     private SysHospitalSetFacade sysHospitalSetFacade;
     @Autowired
     private FilterFacade filterFacade;
+    @Autowired
+    private QcresultInfoFacade qcresultInfoFacade;
+
 
     /**
      * 病案首页合格率占比
@@ -41,326 +45,8 @@ public class ConsoleByDeptExportFacade {
         String fileName = "病案首页合格率占比.xls";
         ExcelUtils.exportExcel(res, null, "sheet1", HomePageByDeptDTO.class, fileName, response, 12.8f);
     }
-/*
-    *//**
-     * 条目缺陷占比（内页）
-     *
-     * @param filterPageVO
-     * @return
-     *//*
-    public void entryGroupByEntryExport(HttpServletResponse response, FilterPageVO filterPageVO) {
-        filterPageVO.setCurrent(1L);
-        filterPageVO.setSize(Long.MAX_VALUE);
-        filterPageVO.setSearchCount(false);
-        IPage<EntryNumDTO> page = consoleFacade.entryGroupByEntryInnerPage(filterPageVO);
-        String fileName = "条目缺陷占比.xls";
-        ExcelUtils.exportExcel(page.getRecords(), null, "sheet1", EntryNumDTO.class, fileName, response, 12.8f);
-    }
-
-    *//**
-     * 稽查统计导出（首页）
-     *
-     * @param filterVO
-     * @return
-     *//*
-    public void medicalCheckExport(HttpServletResponse response, FilterMedicalCheckVO filterVO) {
-        filterVO.setCurrent(1L);
-        filterVO.setSize(Long.MAX_VALUE);
-        filterVO.setSearchCount(false);
-        String fileName = null;
-        if ( "1".equals(filterVO.getIsPlacefile())) {
-            fileName = "终末病历稽查表.xls";
-        } else {
-            fileName = "运行病历稽查表.xls";
-        }
-        List<MedicalCheckExportDTO> records = consoleFacade.medicalCheckExport(filterVO);
-        ExcelUtils.exportExcel(records, null, "sheet1", MedicalCheckExportDTO.class, fileName, response, 15.8f);
-    }
-
-    *//**
-     * 各科室缺陷占比（组合）
-     *
-     * @param filterOrderVO
-     * @return
-     *//*
-    public void levelExport(HttpServletResponse response, FilterOrderVO filterOrderVO) {
-        List<LevelStatisticsDTO> records = consoleFacade.levelStatisticsStr(filterOrderVO);
-        String fileName = "各科室缺陷占比.xls";
-        ExcelUtils.exportExcel(records, null, "sheet1", LevelStatisticsDTO.class, fileName, response, 12.8f);
-    }
-
-    *//**
-     * 各科室缺陷占比（组合）-台州-导出
-     *
-     * @param filterOrderVO
-     * @return
-     *//*
-    public void levelExport_TZ(HttpServletResponse response, FilterOrderVO filterOrderVO) {
-        List<LevelStatisticsTZDTO> records = consoleFacade.levelStatisticsByDeptStr_TZ(filterOrderVO);
-        String fileName = "各科室缺陷占比-台州.xls";
-        ExcelUtils.exportExcel(records, null, "sheet1", LevelStatisticsTZDTO.class, fileName, response, 12.8f);
-    }
-
-    *//**
-     * 按科室统计平均住院天数导出
-     *
-     * @param filterPageByAverageVO
-     * @return
-     *//*
-    public void getAverageDayNumExport(HttpServletResponse response, FilterPageByAverageVO filterPageByAverageVO) {
-        filterPageByAverageVO.setCurrent(1L);
-        filterPageByAverageVO.setSize(Long.MAX_VALUE);
-        filterPageByAverageVO.setSearchCount(false);
-        IPage<AverageStatisticsDTO> page = consoleFacade.getAverageDayNumPage(filterPageByAverageVO);
-        String fileName = " 按科室统计平均住院天数.xls";
-
-        if (filterPageByAverageVO.getType() == 2) {
-            ExcelUtils.exportExcel(page.getRecords(), null, "sheet1", AverageStatisticsDTO.class, fileName, response, 12.8f);
-        }
-        if (filterPageByAverageVO.getType() == 1) {
-            List<AverageStatisticsMonthDTO> list = BeanUtil.listCopyTo(page.getRecords(), AverageStatisticsMonthDTO.class);
-            ExcelUtils.exportExcel(list, null, "sheet1", AverageStatisticsMonthDTO.class, fileName, response, 12.8f);
-        }
-
-    }
-
-    *//**
-     * 按科室统计平均住院费用导出
-     *
-     * @param filterPageByAverageVO
-     * @return
-     *//*
-    public void getAverageFeeExport(HttpServletResponse response, FilterPageByAverageVO filterPageByAverageVO) {
-        filterPageByAverageVO.setCurrent(1L);
-        filterPageByAverageVO.setSize(Long.MAX_VALUE);
-        filterPageByAverageVO.setSearchCount(false);
-        IPage<AverageStatisticsFeeDTO> page = consoleFacade.getAverageFeePage(filterPageByAverageVO);
-        String fileName = " 按科室统计平均住院费用.xls";
-
-        if (filterPageByAverageVO.getType() == 2) {
-            ExcelUtils.exportExcel(page.getRecords(), null, "sheet1", AverageStatisticsFeeDTO.class, fileName, response, 12.8f);
-        }
-        if (filterPageByAverageVO.getType() == 1) {
-            List<AverageStatisticsFeeMonthDTO> list = BeanUtil.listCopyTo(page.getRecords(), AverageStatisticsFeeMonthDTO.class);
-            ExcelUtils.exportExcel(list, null, "sheet1", AverageStatisticsFeeMonthDTO.class, fileName, response, 12.8f);
-        }
-    }
-
-    *//**
-     * 各科室甲级病历占比排行导出
-     *
-     * @param filterPageVO
-     * @return
-     *//*
-    public void levelPercentGroupByDeptExport(HttpServletResponse response, FilterPageVO filterPageVO) {
-        filterPageVO.setCurrent(1L);
-        filterPageVO.setSize(Long.MAX_VALUE);
-        filterPageVO.setSearchCount(false);
-        IPage<QcResultPercentDTO> page = consoleFacade.levelPercentGroupByDeptPage(filterPageVO);
-        String fileName = " 各科室甲级病历占比排行.xls";
-        ExcelUtils.exportExcel(page.getRecords(), null, "sheet1", QcResultPercentDTO.class, fileName, response, 12.8f);
-    }
-
-    *//**
-     * 缺陷详情导出
-     *
-     * @param filterPageVO
-     * @return
-     *//*
-    public void entryCountGroupByEntryExport(HttpServletResponse response, FilterPageVO filterPageVO) {
-        filterPageVO.setCurrent(1L);
-        filterPageVO.setSize(Long.MAX_VALUE);
-        filterPageVO.setSearchCount(false);
-        IPage<EntryNumGroupDTO> page = consoleFacade.entryCountGroupByEntryPage(filterPageVO);
-        String fileName = "缺陷详情.xls";
-        ExcelUtils.exportExcel(page.getRecords(), null, "sheet1", EntryNumGroupDTO.class, fileName, response, 12.8f);
-    }
 
-
-    *//**
-     * 各模块缺陷占比导出
-     *
-     * @param filterPageVO
-     * @return
-     *//*
-    public void entryCountGroupByCaseExport(HttpServletResponse response, FilterPageVO filterPageVO) {
-        filterPageVO.setCurrent(1L);
-        filterPageVO.setSize(Long.MAX_VALUE);
-        filterPageVO.setSearchCount(false);
-        IPage<NumDTO> page = consoleFacade.entryCountGroupByCasePage(filterPageVO);
-        String fileName = "缺陷详情.xls";
-        ExcelUtils.exportExcel(page.getRecords(), null, "sheet1", NumDTO.class, fileName, response, 12.8f);
-    }
-
-    *//**
-     * 关键条目缺陷占比统计
-     *
-     * @param entryStatisticsVO
-     * @return
-     *//*
-    public void entryStatisticsExport(HttpServletResponse response, EntryStatisticsVO entryStatisticsVO) {
-        List<EntryStatisticsDTO> records = consoleFacade.entryStatistics(entryStatisticsVO);
-        String fileName = "关键条目缺陷占比统计.xls";
-        ExcelUtils.exportExcel(records, null, "sheet1", EntryStatisticsDTO.class, fileName, response, 12.8f);
-    }
-
-    *//**
-     * 缺陷详情质控评分页导出
-     *
-     * @param qcResultShortPageVO
-     * @return
-     *//*
-    public void qcResultShortPageExport(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        qcResultShortPageVO.setHospitalId(hospitalId);
-        if (StringUtil.isNotBlank(qcResultShortPageVO.getDeptName())
-                && qcResultShortPageVO.getDeptName().equals("全部")) {
-            qcResultShortPageVO.setDeptName("");
-        }
-        Date startDate = qcResultShortPageVO.getStartDate();
-        Date endDate = qcResultShortPageVO.getEndDate();
-        //时间间隔90天
-        long interval = 90l * 24l * 60l * 60l * 1000l;
-        if (endDate.getTime() < startDate.getTime()) {
-            throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
-        }
-        if (endDate.getTime() - startDate.getTime() > interval) {
-            throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于90天");
-        }
-
-        qcResultShortPageVO.setCurrent(1L);
-        qcResultShortPageVO.setSize(Long.MAX_VALUE);
-        qcResultShortPageVO.setSearchCount(false);
-        List<ExportExcelDTO> record = behospitalInfoFacade.qcResultShortPageExport(qcResultShortPageVO);
-        String fileName = "缺陷详情质控评分页.xls";
-        ExcelUtils.exportExcelUser(record, null, "sheet1", ExportExcelDTO.class, fileName, response);
-    }
-
-    *//**
-     * 出院人数统计导出
-     *
-     * @param qcResultShortPageVO
-     * @return
-     *//*
-    public void leaveHosMrPageExport(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        qcResultShortPageVO.setHospitalId(hospitalId);
-        if (StringUtil.isNotBlank(qcResultShortPageVO.getDeptName())
-                && qcResultShortPageVO.getDeptName().equals("全部")) {
-            qcResultShortPageVO.setDeptName("");
-        }
-        Date startDate = qcResultShortPageVO.getStartDate();
-        Date endDate = qcResultShortPageVO.getEndDate();
-        //时间间隔7天
-        long interval_7 = 7 * 24 * 60 * 60 * 1000;
-        long interval_90 = 90l * 24 * 60 * 60 * 1000;
-
-        if("1".equals(qcResultShortPageVO.getRadioCheck())){
-            //时间间隔7天
-            if (endDate.getTime() < startDate.getTime()) {
-                throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
-            }
-            if (endDate.getTime() - startDate.getTime() > interval_7) {
-                throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于7天");
-            }
-        }else{
-            //时间间隔90天
-            if (endDate.getTime() < startDate.getTime()) {
-                throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
-            }
-            if (endDate.getTime() - startDate.getTime() > interval_90) {
-                throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于90天");
-            }
-        }
-
-        qcResultShortPageVO.setCurrent(1L);
-        qcResultShortPageVO.setSize(Long.MAX_VALUE);
-        qcResultShortPageVO.setSearchCount(false);
-        List<ExportExcelDTO> records = behospitalInfoFacade.leaveHosMRPageExport(qcResultShortPageVO);
-        List<ExportWideExcelDTO> resWide = new ArrayList<ExportWideExcelDTO>();
-        if("2".equals(qcResultShortPageVO.getRadioCheck())){
-            resWide = transList(records, resWide);
-        }
-        String fileName = "出院人数统计.xls";
-          if("1".equals(qcResultShortPageVO.getRadioCheck())){
-            ExcelUtils.exportExcelUser(records, null, "sheet1", ExportExcelDTO.class, fileName, response);
-        }
-        if("2".equals(qcResultShortPageVO.getRadioCheck())){
-            ExcelUtils.exportExcelUser(resWide, null, "sheet1", ExportWideExcelDTO.class, fileName, response);
-        }
-    }
-
-    public List<ExportWideExcelDTO> transList(List<ExportExcelDTO>res, List<ExportWideExcelDTO>resWide){
-        if(ListUtil.isNotEmpty(res)){
-            res.forEach(exportExcelDTO->{
-                ExportWideExcelDTO exportWideExcelDTO = new ExportWideExcelDTO();
-                exportWideExcelDTO.setAvgScore(exportExcelDTO.getAvgScore());
-                exportWideExcelDTO.setBehDeptName(exportExcelDTO.getBehDeptName());
-                List<ExportExcelBehospitalDTO> excelBehospitalDTOS = exportExcelDTO.getExcelBehospitalDTOS();
-                List<ExportExcelWideBehospitalDTO> exportExcelWideBehospitalDTOs = new ArrayList<>();
-                excelBehospitalDTOS.forEach(exportExcelBehospitalDTO->{
-                    ExportExcelWideBehospitalDTO exportExcelWideBehospitalDTO = new ExportExcelWideBehospitalDTO();
-                    exportExcelWideBehospitalDTO.setBehDoctorName(exportExcelBehospitalDTO.getBehDoctorName());
-                    exportExcelWideBehospitalDTO.setBehospitalCode(exportExcelBehospitalDTO.getBehospitalCode());
-                    exportExcelWideBehospitalDTO.setBehospitalDate(exportExcelBehospitalDTO.getBehospitalDate());
-                    exportExcelWideBehospitalDTO.setLeaveHospitalDate(exportExcelBehospitalDTO.getLeaveHospitalDate());
-                    exportExcelWideBehospitalDTO.setPatName(exportExcelBehospitalDTO.getPatName());
-                    exportExcelWideBehospitalDTO.setScore(exportExcelBehospitalDTO.getScore());
-                    exportExcelWideBehospitalDTO.setScoreBn(exportExcelBehospitalDTO.getScoreBn());
-                    exportExcelWideBehospitalDTOs.add(exportExcelWideBehospitalDTO);
-                });
-                exportWideExcelDTO.setExcelBehospitalDTOS(exportExcelWideBehospitalDTOs);
-                resWide.add(exportWideExcelDTO);
-            });
-        }
-        return resWide;
-    }
-
-    *//**
-     * 质控核查统计导出
-     *
-     * @param filterOrderVO
-     * @return
-     *//*
-    public void qcCheckStatisticsExport(HttpServletResponse response, FilterOrderVO filterOrderVO) {
-        List<HomePageImproveDTO> records = consoleFacade.qcCheckStatistics(filterOrderVO);
-        String fileName = "质控核查统计.xls";
-        ExcelUtils.exportExcel(records, null, "sheet1", HomePageImproveDTO.class, fileName, response, 12.8f);
-    }
-
-    *//**
-     * 未整改病历详情页导出
-     *
-     * @param qcResultShortPageVO
-     * @return
-     *//*
-    public void unModifyMRPageExport(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        qcResultShortPageVO.setHospitalId(hospitalId);
-        if (StringUtil.isNotBlank(qcResultShortPageVO.getDeptName())
-                && qcResultShortPageVO.getDeptName().equals("全部")) {
-            qcResultShortPageVO.setDeptName("");
-        }
-        Date startDate = qcResultShortPageVO.getStartDate();
-        Date endDate = qcResultShortPageVO.getEndDate();
-        //时间间隔7天
-        long interval = 90l * 24l * 60l * 60l * 1000l;
-        if (endDate.getTime() < startDate.getTime()) {
-            throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
-        }
-        if (endDate.getTime() - startDate.getTime() > interval) {
-            throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于90天");
-        }
-
-        qcResultShortPageVO.setCurrent(1L);
-        qcResultShortPageVO.setSize(Long.MAX_VALUE);
-        qcResultShortPageVO.setSearchCount(false);
-        List<ExportExcelDTO> records = behospitalInfoFacade.unModifyMRPageExport(qcResultShortPageVO);
-        String fileName = "未整改病历详情页.xls";
-        ExcelUtils.exportExcelUser(records, null, "sheet1", ExportExcelDTO.class, fileName, response);
-    }
-
-    *//**
+    /**
      * 病案首页不合格/合格数
      *
      * @param qcResultShortPageVO
@@ -398,7 +84,23 @@ public class ConsoleByDeptExportFacade {
         }
    }
 
-   public void  solveParam(QcResultShortPageVO qcResultShortPageVO){
+    /**
+     * 缺陷详情-科室（分页）导出
+     *
+     * @param filterPageByDeptVO
+     * @return
+     */
+    public void entryGroupExportByDeptPage(HttpServletResponse response,FilterPageByDeptVO filterPageByDeptVO) {
+        filterFacade.filterPageByDeptVOSet(filterPageByDeptVO);
+        filterPageByDeptVO.setCurrent(1L);
+        filterPageByDeptVO.setSize(Long.MAX_VALUE);
+        filterPageByDeptVO.setSearchCount(false);
+        IPage<DeptEntryNumDTO> page = qcresultInfoFacade.entryCountGroupByEntryAndDeptPage(filterPageByDeptVO);
+        String fileName = "缺陷详情.xls";
+        ExcelUtils.exportExcel(page.getRecords(), null, "sheet1", DeptEntryNumDTO.class, fileName, response, 12.8f);
+    }
+
+    public void  solveParam(QcResultShortPageVO qcResultShortPageVO){
        String hospitalId = SysUserUtils.getCurrentHospitalID();
        qcResultShortPageVO.setHospitalId(hospitalId);
        Date startDate = qcResultShortPageVO.getStartDate();
@@ -457,173 +159,4 @@ public class ConsoleByDeptExportFacade {
         return resWide;
     }
 
-
-    /**
-     * 未整改病历统计导出
-     *
-     * @param response
-     * @param filterUnModifyMRVO
-     *//*
-    public void unModifyMRStatisticsExport(HttpServletResponse response, FilterUnModifyMRVO filterUnModifyMRVO) {
-        filterFacade.filterUnModifyMRVOSet(filterUnModifyMRVO);
-        List<ExcelExportEntity> colList = Lists.newLinkedList();
-        ExcelExportEntity deptNameCol = new ExcelExportEntity("科室", "deptName");
-        deptNameCol.setWidth(50);
-        colList.add(deptNameCol);
-
-        QueryWrapper<SysHospitalSet> hospitalSetQueryWrapper = new QueryWrapper<>();
-        hospitalSetQueryWrapper.eq("is_deleted", 'N')
-                .eq("hospital_id", filterUnModifyMRVO.getHospitalId())
-                .eq("code", "unmodify_mr_entry");
-        SysHospitalSet hospitalSet = sysHospitalSetFacade.getOne(hospitalSetQueryWrapper);
-        //缺陷条目未维护
-        if (hospitalSet == null || StringUtil.isBlank(hospitalSet.getValue())) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "未整改病历条目未设置");
-        }
-
-        List<String> columnSet = Arrays.asList(hospitalSet.getValue().split(","));
-        for (String valueStr : columnSet) {
-            if (StringUtil.isBlank(valueStr)) {
-                continue;
-            }
-            String[] keyValue = valueStr.split("--");
-            if (keyValue != null || keyValue.length > 1) {
-                ExcelExportEntity entryCol = new ExcelExportEntity(keyValue[1], "entry_" + keyValue[0] + "_num");
-                entryCol.setWidth(20);
-                colList.add(entryCol);
-            }
-        }
-        UnModifyMRDTO unModifyMRDTO = consoleFacade.unModifyMRStatistics(filterUnModifyMRVO);
-        List<Object> data = Lists.newLinkedList();
-        if (unModifyMRDTO != null && ListUtil.isNotEmpty(unModifyMRDTO.getData())) {
-            data = unModifyMRDTO.getData();
-        }
-        String fileName = "未整改病历统计.xls";
-        ExcelUtils.exportExcelDynamicCol(colList, data, null, "sheet1", fileName, response);
-    }
-
-    *//**
-     * 31天再入院统计导出
-     *
-     * @param reBeHosPageVO
-     * @return
-     *//*
-    public void reHos31DaysPageExport(HttpServletResponse response, ReBeHosPageVO reBeHosPageVO) {
-        reBeHosPageVO.setCurrent(1L);
-        reBeHosPageVO.setSize(Long.MAX_VALUE);
-        reBeHosPageVO.setSearchCount(false);
-        IPage<ReBeHosDTO> page = consoleFacade.reHos31DaysPage(reBeHosPageVO);
-        List<ReBeHosDTO> records = page.getRecords();
-        String fileName = "31天再入院统计详情.xls";
-        ExcelUtils.exportExcel(records, null, "sheet1", ReBeHosDTO.class, fileName, response);
-    }
-
-    *//**
-     * 病案首页改善率质控评分页导出
-     *
-     * @param qcResultShortPageVO
-     * @return
-     *//*
-    public void hmImproveMRPageExport(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        qcResultShortPageVO.setHospitalId(hospitalId);
-    if (StringUtil.isNotBlank(qcResultShortPageVO.getDeptName())
-                && qcResultShortPageVO.getDeptName().equals("全部")) {
-            qcResultShortPageVO.setDeptName("");
-        }
-        Date startDate = qcResultShortPageVO.getStartDate();
-        Date endDate = qcResultShortPageVO.getEndDate();
-        //时间间隔7天
-        long interval_7 = 7 * 24 * 60 * 60 * 1000;
-        long interval_90 = 90l * 24 * 60 * 60 * 1000;
-
-        if("1".equals(qcResultShortPageVO.getRadioCheck())){
-            //时间间隔7天
-            if (endDate.getTime() < startDate.getTime()) {
-                throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
-            }
-            if (endDate.getTime() - startDate.getTime() > interval_7) {
-                throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于7天");
-            }
-        }else{
-            //时间间隔90天
-            if (endDate.getTime() < startDate.getTime()) {
-                throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
-            }
-            if (endDate.getTime() - startDate.getTime() > interval_90) {
-                throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于90天");
-            }
-        }
-
-        qcResultShortPageVO.setCurrent(1L);
-        qcResultShortPageVO.setSize(Long.MAX_VALUE);
-        qcResultShortPageVO.setSearchCount(false);
-        List<ExportExcelDTO> records = behospitalInfoFacade.hmImproveMRPageExport(qcResultShortPageVO);
-        List<ExportWideExcelDTO> resWide = new ArrayList<ExportWideExcelDTO>();
-        if("2".equals(qcResultShortPageVO.getRadioCheck())){
-            resWide = transList(records, resWide);
-        }
-        String fileName = "病案首页改善率评分病历导出.xls";
-        if("1".equals(qcResultShortPageVO.getRadioCheck())){
-            ExcelUtils.exportExcelUser(records, null, "sheet1", ExportExcelDTO.class, fileName, response);
-        }
-        if("2".equals(qcResultShortPageVO.getRadioCheck())){
-            ExcelUtils.exportExcelUser(resWide, null, "sheet1", ExportWideExcelDTO.class, fileName, response);
-        }
-    }
-
-    *//**
-     * 质控核查质控评分页导出
-     *
-     * @param qcResultShortPageVO
-     * @return
-     *//*
-    public void qcCheckMRPageExport(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
-        String hospitalId = SysUserUtils.getCurrentHospitalID();
-        qcResultShortPageVO.setHospitalId(hospitalId);
-        if (StringUtil.isNotBlank(qcResultShortPageVO.getDeptName())
-                && qcResultShortPageVO.getDeptName().equals("全部")) {
-            qcResultShortPageVO.setDeptName("");
-        }
-        Date startDate = qcResultShortPageVO.getStartDate();
-        Date endDate = qcResultShortPageVO.getEndDate();
-
-        //时间间隔7天
-        long interval_7 = 7 * 24 * 60 * 60 * 1000;
-        long interval_90 = 90l * 24 * 60 * 60 * 1000;
-
-        if("1".equals(qcResultShortPageVO.getRadioCheck())){
-            //时间间隔7天
-            if (endDate.getTime() < startDate.getTime()) {
-                throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
-            }
-            if (endDate.getTime() - startDate.getTime() > interval_7) {
-                throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于7天");
-            }
-        }else{
-            //时间间隔90天
-            if (endDate.getTime() < startDate.getTime()) {
-                throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
-            }
-            if (endDate.getTime() - startDate.getTime() > interval_90) {
-                throw new CommonException(CommonErrorCode.PARAM_ERROR, "统计区间不能大于90天");
-            }
-        }
-
-        qcResultShortPageVO.setCurrent(1L);
-        qcResultShortPageVO.setSize(Long.MAX_VALUE);
-        qcResultShortPageVO.setSearchCount(false);
-        List<ExportExcelDTO> records = behospitalInfoFacade.qcCheckMRPageExport(qcResultShortPageVO);
-        List<ExportWideExcelDTO> resWide = new ArrayList<ExportWideExcelDTO>();
-        if("2".equals(qcResultShortPageVO.getRadioCheck())){
-            resWide = transList(records, resWide);
-        }
-        String fileName = "质控核查病历导出.xls";
-        if("1".equals(qcResultShortPageVO.getRadioCheck())){
-            ExcelUtils.exportExcelUser(records, null, "sheet1", ExportExcelDTO.class, fileName, response);
-        }
-        if("2".equals(qcResultShortPageVO.getRadioCheck())){
-            ExcelUtils.exportExcelUser(resWide, null, "sheet1", ExportWideExcelDTO.class, fileName, response);
-        }
-    }*/
 }

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

@@ -394,7 +394,7 @@ public class FilterFacade {
         qcResultShortPageVO.setEndDate(new Date(Long.valueOf(interval)));*/
     }
     /**
-     * 全科合格/不合格数病历号入参拼接
+     * 合格/不合格数病历号入参拼接-科室
      *
      * @param qcResultPageVO
      */
@@ -403,7 +403,7 @@ public class FilterFacade {
         String userId = SysUserUtils.getCurrentPrincipleID();
         qcResultPageVO.setHospitalId(hospitalId);
         qcResultPageVO.setUserId(Long.valueOf(userId));
-        if (StringUtils.isNotEmpty(qcResultPageVO.getDeptClass())) {
+        if (StringUtils.isEmpty(qcResultPageVO.getDoctorId())) {
             qcResultPageVO.setDoctorName("");
         }
         /*long interval = qcResultShortPageVO.getEndDate().getTime() + 1000;

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

@@ -1,6 +1,9 @@
 package com.diagbot.web;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.DeptEntryNumDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.ConsoleByDeptExportFacade;
 import com.diagbot.vo.*;
 import io.swagger.annotations.Api;
@@ -83,6 +86,22 @@ public class ConsoleByDeptExportController {
 
 
 
+    @ApiOperation(value = "缺陷详情内页-科室[by:cy]",
+            notes = "type： 统计维度 1-本月，2-本年(必填)<br>" +
+                    "name： 缺陷名称<br>" +
+                    "deptName： 科室名称(必填)<br>" +
+                    "casesId： 模块id：243=病案首页 <br>" +
+                    "casesName： 模块名称<br>" +
+                    "isReject： 单项否决 1-否决，0-非<br>" +
+                    "ruleType： 规则类型 0：无，1：空项，2：错误<br>" +
+                    "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
+    @PostMapping("/entryGroupExportByDeptPage")
+    @SysLogger("entryGroupExportByDeptPage")
+    public void entryGroupExportByDeptPage(HttpServletResponse response,@RequestBody @Valid FilterPageByDeptVO filterPageByDeptVO) {
+       consoleByDeptExportFacade.entryGroupExportByDeptPage(response,filterPageByDeptVO);
+    }
+
+
 /**
      * 条目缺陷占比（内页）
      *
@@ -205,28 +224,8 @@ public class ConsoleByDeptExportController {
         consoleExportFacade.levelPercentGroupByDeptExport(response, filterPageVO);
     }
 
-*//**
-     * 条目缺陷占比导出
-     *
-     * @param filterPageVO
-     * @return
-     *//*
-
-    @ApiOperation(value = "缺陷详情导出[by:gaodm]",
-            notes = "type： 统计维度 1-本月，2-本年(必填)<br>" +
-                    "deptName： 科室名称 <br>" +
-                    "casesId： 模块id：243=病案首页 <br>" +
-                    "casesName： 模块名称 <br>" +
-                    "isReject： 单项否决 1-否决，0-非<br>" +
-                    "ruleType： 规则类型 0：无，1：空项，2：错误<br>" +
-                    "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
-    @PostMapping("/entryCountGroupByEntryExport")
-    @SysLogger("entryCountGroupByEntryExport")
-    public void entryCountGroupByEntryExport(HttpServletResponse response, @RequestBody @Valid FilterPageVO filterPageVO) {
-        consoleExportFacade.entryCountGroupByEntryExport(response, filterPageVO);
-    }
 
-*//**
+/**
      * 各模块缺陷占比导出
      *
      * @param filterPageVO

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -4577,8 +4577,8 @@
                 <![CDATA[ AND a.leave_hospital_date <= #{qcResultShortPageVO.endDate}]]>
             </if>
         </if>
-        <if test="qcResultShortPageVO.behDeptName != null and qcResultShortPageVO.behDeptName != ''">
-            AND a.beh_dept_name = #{qcResultShortPageVO.behDeptName}
+        <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}

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -2220,5 +2220,6 @@
         </if>
         ) t2
         )t
+        order by t.id DESC
     </select>
 </mapper>