条目缺陷占比导出

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

@@ -184,6 +184,8 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/print/export/homePageLevelExportByDept").permitAll()
                 .antMatchers("/print/export/homePageOrLevelExportByDept").permitAll()
                 .antMatchers("/print/export/entryGroupExportByDeptPage").permitAll()
+                .antMatchers("/print/export/entryGroupExportByDeptCase").permitAll()
+                .antMatchers("/print/export/entryGroupByEntryDeptPage").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

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

@@ -228,6 +228,8 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/print/export/homePageLevelExportByDept", request)
                 || matchers("/print/export/homePageOrLevelExportByDept", request)
                 || matchers("/print/export/entryGroupExportByDeptPage", request)
+                || matchers("/print/export/entryGroupExportByDeptCase", request)
+                || matchers("/print/export/entryGroupByEntryDeptPage", request)
                 || matchers("/", request)) {
             return true;
         }

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

@@ -60,12 +60,12 @@ public class DeptEntryNumDTO {
     /**
      * 条目缺陷分值
      */
-//    @Excel(name = "分值", orderNum = "3")
+    @Excel(name = "分值", orderNum = "3")
     private Double score = 0d;
     /**
      * 单项否决标识
      */
-//    @Excel(name = "单项否决", orderNum = "4", replace = { "否_0", "是_1" })
+    @Excel(name = "单项否决", orderNum = "4", replace = { "否_0", "是_1" })
     private Integer isReject;
     /**
      * 规则类型(0：无，1：空项，2：错误)

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

@@ -100,7 +100,40 @@ public class ConsoleByDeptExportFacade {
         ExcelUtils.exportExcel(page.getRecords(), null, "sheet1", DeptEntryNumDTO.class, fileName, response, 12.8f);
     }
 
-    public void  solveParam(QcResultShortPageVO qcResultShortPageVO){
+
+    /**
+     *  各模块缺陷占比导出-科室
+     *
+     * @param filterPageByDeptVO
+     * @return
+     */
+    public void entryGroupExportByDeptCase(HttpServletResponse response,FilterPageByDeptVO filterPageByDeptVO) {
+        filterFacade.filterPageByDeptVOSet(filterPageByDeptVO);
+        IPage<NumDTO> page = qcresultInfoFacade.entryCountGroupByCaseAndDeptPage(filterPageByDeptVO);
+        filterPageByDeptVO.setCurrent(1L);
+        filterPageByDeptVO.setSize(Long.MAX_VALUE);
+        filterPageByDeptVO.setSearchCount(false);
+        String fileName = "各模块缺陷详情.xls";
+        ExcelUtils.exportExcel(page.getRecords(), null, "sheet1", NumDTO.class, fileName, response, 12.8f);
+    }
+
+    /**
+     *  条目缺陷占比（内页）-科室
+     *
+     * @param filterPageByDeptVO
+     * @return
+     */
+    public void entryGroupByEntryDeptPage(HttpServletResponse response,FilterPageByDeptVO filterPageByDeptVO) {
+        filterFacade.filterPageByDeptVOSet(filterPageByDeptVO);
+        IPage<DeptEntryNumDTO> page = qcresultInfoFacade.entryGroupByEntryAndDeptInnerPage(filterPageByDeptVO);
+        filterPageByDeptVO.setCurrent(1L);
+        filterPageByDeptVO.setSize(Long.MAX_VALUE);
+        filterPageByDeptVO.setSearchCount(false);
+        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();

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

@@ -390,7 +390,7 @@ public class ConsoleByDeptFacade {
      * @param filterPageByDeptVO
      * @return
      */
-    public IPage<DeptNumDTO> entryCountGroupByCaseAndDeptPage(FilterPageByDeptVO filterPageByDeptVO) {
+    public IPage<NumDTO> entryCountGroupByCaseAndDeptPage(FilterPageByDeptVO filterPageByDeptVO) {
         if (StringUtil.isBlank(filterPageByDeptVO.getDeptName())) {
             List<DeptBaseDTO> deptList = this.getDept();
             //默认取第一个科室
@@ -399,7 +399,7 @@ public class ConsoleByDeptFacade {
             }
         }
         filterFacade.filterPageByDeptVOSet(filterPageByDeptVO);
-        IPage<DeptNumDTO> page = qcresultInfoFacade.entryCountGroupByCaseAndDeptPage(filterPageByDeptVO);
+        IPage<NumDTO> page = qcresultInfoFacade.entryCountGroupByCaseAndDeptPage(filterPageByDeptVO);
         return page;
     }
 

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

@@ -142,7 +142,7 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
      * @param filterPageByDeptVO
      * @return
      */
-    public IPage<DeptNumDTO> entryCountGroupByCaseAndDeptPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
+    public IPage<NumDTO> entryCountGroupByCaseAndDeptPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
 
     /**
      * 缺陷详情-科室（分页）

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

@@ -140,7 +140,7 @@ public interface QcresultInfoService extends IService<QcresultInfo> {
      * @param filterPageByDeptVO
      * @return
      */
-    public IPage<DeptNumDTO> entryCountGroupByCaseAndDeptPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
+    public IPage<NumDTO> entryCountGroupByCaseAndDeptPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
 
     /**
      * 缺陷详情-科室（分页）

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

@@ -187,7 +187,7 @@ public class QcresultInfoServiceImpl extends ServiceImpl<QcresultInfoMapper, Qcr
      * @return
      */
     @Override
-    public IPage<DeptNumDTO> entryCountGroupByCaseAndDeptPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO) {
+    public IPage<NumDTO> entryCountGroupByCaseAndDeptPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO) {
         return baseMapper.entryCountGroupByCaseAndDeptPage(filterPageByDeptVO);
     }
 

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

@@ -136,8 +136,8 @@ public class ConsoleByDeptController {
                     "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
     @PostMapping("/entryCountGroupByCaseAndDeptPage")
     @SysLogger("entryCountGroupByCaseAndDeptPage")
-    public RespDTO<IPage<DeptNumDTO>> entryCountGroupByCaseAndDeptPage(@RequestBody @Valid FilterPageByDeptVO filterPageByDeptVO) {
-        IPage<DeptNumDTO> data = consoleByDeptFacade.entryCountGroupByCaseAndDeptPage(filterPageByDeptVO);
+    public RespDTO<IPage<NumDTO>> entryCountGroupByCaseAndDeptPage(@RequestBody @Valid FilterPageByDeptVO filterPageByDeptVO) {
+        IPage<NumDTO> data = consoleByDeptFacade.entryCountGroupByCaseAndDeptPage(filterPageByDeptVO);
         return RespDTO.onSuc(data);
     }
 

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

@@ -59,7 +59,7 @@ public class ConsoleByDeptExportController {
      * @param qcResultShortPageVO
      * @return
      */
-    @ApiOperation(value = "病案首页不合格/合格数病历详情页导出[by:cy]",
+    @ApiOperation(value = "病案首页不合格/合格数病历详情页导出-科室[by:cy]",
             notes = "behospitalCode： 病历号<br>" +
                     "patName： 病人姓名 <br>" +
                     "behDeptName：科室名称 <br>" +
@@ -101,23 +101,39 @@ public class ConsoleByDeptExportController {
        consoleByDeptExportFacade.entryGroupExportByDeptPage(response,filterPageByDeptVO);
     }
 
+    /**
+     * 各模块缺陷占比导出-科室
+     *
+     * @param filterPageByDeptVO
+     * @return
+     */
+
+    @ApiOperation(value = "各模块缺陷占比导出-科室[by:cy]",
+            notes = "type： 统计维度 1-本月，2-本年(必填)<br>" +
+                    "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
+    @PostMapping("/entryGroupExportByDeptCase")
+    @SysLogger("entryGroupExportByDeptCase")
+    public void entryGroupExportByDeptCase(HttpServletResponse response, @RequestBody @Valid FilterPageByDeptVO filterPageByDeptVO) {
+        consoleByDeptExportFacade.entryGroupExportByDeptCase(response, filterPageByDeptVO);
+    }
+
 
 /**
-     * 条目缺陷占比（内页）
+     * 条目缺陷占比（内页）-科室
      *
-     * @param filterPageVO
+     * @param filterPageByDeptVO
      * @return
-
-    @ApiOperation(value = "条目缺陷占比导出[by:gaodm]",
+ */
+    @ApiOperation(value = "条目缺陷占比（内页）-科室[by:cy]",
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>" +
                     "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
-    @PostMapping("/entryGroupByEntryExport")
-    @SysLogger("entryGroupByEntryExport")
-    public void entryGroupByEntryExport(HttpServletResponse response, @RequestBody @Valid FilterPageVO filterPageVO) {
-        consoleExportFacade.entryGroupByEntryExport(response, filterPageVO);
+    @PostMapping("/entryGroupByEntryDeptPage")
+    @SysLogger("entryGroupByEntryDeptPage")
+    public void entryGroupByEntryDeptPage(HttpServletResponse response, @RequestBody @Valid FilterPageByDeptVO filterPageByDeptVO) {
+        consoleByDeptExportFacade.entryGroupByEntryDeptPage(response, filterPageByDeptVO);
     }
 
-*//**
+/**
      * 病历稽查统计（首页）
      * @param filterVO
      * @return
@@ -213,35 +229,21 @@ public class ConsoleByDeptExportController {
      *
      * @param filterPageVO
      * @return
-     *//*
+     */
 
-    @ApiOperation(value = "各科室甲级病历占比排行导出[by:gaodm]",
+/*    @ApiOperation(value = "各科室甲级病历占比排行导出[by:gaodm]",
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>" +
                     "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
     @PostMapping("/levelPercentGroupByDeptExport")
     @SysLogger("levelPercentGroupByDeptExport")
     public void levelPercentGroupByDeptExport(HttpServletResponse response, @RequestBody @Valid FilterPageVO filterPageVO) {
         consoleExportFacade.levelPercentGroupByDeptExport(response, filterPageVO);
-    }
+    }*/
 
 
-/**
-     * 各模块缺陷占比导出
-     *
-     * @param filterPageVO
-     * @return
-     *//*
 
-    @ApiOperation(value = "各模块缺陷占比导出[by:gaodm]",
-            notes = "type： 统计维度 1-本月，2-本年(必填)<br>" +
-                    "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
-    @PostMapping("/entryCountGroupByCaseExport")
-    @SysLogger("entryCountGroupByCaseExport")
-    public void entryCountGroupByCaseExport(HttpServletResponse response, @RequestBody @Valid FilterPageVO filterPageVO) {
-        consoleExportFacade.entryCountGroupByCaseExport(response, filterPageVO);
-    }
 
-*//**
+/**
      * 关键条目缺陷占比统计导出
      *
      * @param entryStatisticsVO

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -1865,7 +1865,7 @@
     </select>
 
     <!-- 按模块统计质控缺陷数-科室（分页） -->
-    <select id="entryCountGroupByCaseAndDeptPage" resultType="com.diagbot.dto.DeptNumDTO">
+    <select id="entryCountGroupByCaseAndDeptPage" resultType="com.diagbot.dto.NumDTO">
         SELECT
         t.id,
         t.`NAME`,