Merge remote-tracking branch 'origin/dev/20200702_1.3.7' into debug

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

@@ -130,6 +130,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/console/export/entryStatisticsExport").permitAll()
                 .antMatchers("/console/export/qcResultShortPageExport").permitAll()
                 .antMatchers("/console/export/leaveHosMrPageExport").permitAll()
+                .antMatchers("/console/export/qcCheckStatisticsExport").permitAll()
                 .antMatchers("/qc/data/sendDoctorInfos").permitAll()
                 .antMatchers("/qc/data/sendDeptInfos").permitAll()
                 .antMatchers("/qc/data/sendRecordTypes").permitAll()

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

@@ -174,6 +174,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/console/export/entryStatisticsExport", request)
                 || matchers("/console/export/qcResultShortPageExport", request)
                 || matchers("/console/export/leaveHosMrPageExport", request)
+                || matchers("/console/export/qcCheckStatisticsExport", request)
                 || matchers("/qc/data/sendDoctorInfos", request)
                 || matchers("/qc/data/sendDeptInfos", request)
                 || matchers("/qc/data/sendRecordTypes", request)

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

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,20 +12,77 @@ import lombok.Setter;
 @Getter
 @Setter
 public class HomePageImproveDTO {
+    /**
+     * 科室编码
+     */
     private String deptId;
+    /**
+     * 科室
+     */
+    @Excel(name = "科室", width = 70, orderNum = "1")
     private String deptName;
+    /**
+     * 质控总数（总病历数）
+     */
+    @Excel(name = "质控总数", width = 30, orderNum = "2")
     private Integer mrNum = 0;
+    /**
+     * 核查数量
+     */
+    @Excel(name = "核查数量", width = 30, orderNum = "3")
     private Integer checkedNum = 0;
+    /**
+     * 核查占比
+     */
     private Double checkedPercent = 0d;
+    /**
+     * 核查占比（百分比）
+     */
     private String checkedPercentStr = "0.00%";
+    /**
+     * 有病案首页的病历数
+     */
     private Integer homePageMRNum = 0;
+    /**
+     * 已改善数量
+     */
+    @Excel(name = "已改善数量", width = 30, orderNum = "4")
     private Integer improveNum = 0;
+    /**
+     * 改善率
+     */
     private Double improvePercent = 0d;
+    /**
+     * 改善率（百分比）
+     */
+    @Excel(name = "改善率", width = 30, orderNum = "5")
     private String improvePercentStr = "0.00%";
+    /**
+     * 改善至合格数量
+     */
+    @Excel(name = "改善至合格数量", width = 30, orderNum = "6")
     private Integer improveToPassNum = 0;
+    /**
+     * 改善至合格率
+     */
     private Double improveToPassPercent = 0d;
+    /**
+     * 改善至合格率（百分比）
+     */
+    @Excel(name = "改善至合格率", width = 30, orderNum = "7")
     private String improveToPassPercentStr = "0.00%";
+    /**
+     * 改善至满分数量
+     */
+    @Excel(name = "改善至满分数量", width = 30, orderNum = "8")
     private Integer improveToFullNum = 0;
+    /**
+     * 改善至满分率
+     */
     private Double improveToFullPercent = 0d;
+    /**
+     * 改善至满分率（百分比）
+     */
+    @Excel(name = "改善至满分率", width = 30, orderNum = "9")
     private String improveToFullPercentStr = "0.00%";
-}
+}

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

@@ -8,6 +8,7 @@ import com.diagbot.dto.AverageStatisticsMonthDTO;
 import com.diagbot.dto.EntryNumDTO;
 import com.diagbot.dto.EntryNumGroupDTO;
 import com.diagbot.dto.EntryStatisticsDTO;
+import com.diagbot.dto.HomePageImproveDTO;
 import com.diagbot.dto.HomePageNumDTO;
 import com.diagbot.dto.LevelStatisticsDTO;
 import com.diagbot.dto.LevelStatisticsTZDTO;
@@ -223,4 +224,16 @@ public class ConsoleExportFacade {
         String fileName = "出院人数统计.xls";
         ExcelUtils.exportExcel(page.getRecords(), null, "sheet1", QcResultShortDTO.class, fileName, response, 12.8f);
     }
+
+    /**
+     * 质控核查统计导出
+     *
+     * @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);
+    }
 }

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

@@ -540,6 +540,8 @@ public class ConsoleController {
      */
     @ApiOperation(value = "质控核查统计[by:zhaops]",
             notes = "name： 科室名称 <br>" +
+                    "asc： 排序（升序） <br>" +
+                    "desc：排序（降序） <br>" +
                     "startDate： 起始时间 <br>" +
                     "endDate： 截止时间 <br>")
     @PostMapping("/qcCheckStatistics")

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

@@ -242,4 +242,22 @@ public class ConsoleExportController {
     public void leaveHosMrPageExport(HttpServletResponse response, @RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
         consoleExportFacade.leaveHosMrPageExport(response, qcResultShortPageVO);
     }
+
+    /**
+     * 质控核查统计导出
+     *
+     * @param filterOrderVO
+     * @return
+     */
+    @ApiOperation(value = "质控核查统计导出[by:zhaops]",
+            notes = "name： 科室名称 <br>" +
+                    "asc： 排序（升序） <br>" +
+                    "desc：排序（降序） <br>" +
+                    "startDate： 起始时间 <br>" +
+                    "endDate： 截止时间 <br>")
+    @PostMapping("/qcCheckStatisticsExport")
+    @SysLogger("qcCheckStatisticsExport")
+    public void qcCheckStatisticsExport(HttpServletResponse response, @RequestBody @Valid FilterOrderVO filterOrderVO) {
+        consoleExportFacade.qcCheckStatisticsExport(response, filterOrderVO);
+    }
 }