各科室缺陷占比-台州

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

@@ -115,6 +115,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/console/export/homePageLevelExport").permitAll()
                 .antMatchers("/console/export/entryGroupByEntryExport").permitAll()
                 .antMatchers("/console/export/levelExport").permitAll()
+                .antMatchers("/console/export/levelExport_TZ").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

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

@@ -158,6 +158,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/console/export/homePageLevelExport", request)
                 || matchers("/console/export/entryGroupByEntryExport", request)
                 || matchers("/console/export/levelExport", request)
+                || matchers("/console/export/levelExport_TZ", request)
                 || matchers("/", request)) {
             return true;
         }

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

@@ -15,7 +15,7 @@ public class LevelStatisticsDTO {
     /**
      * 科室id（科室编码）
      */
-    @Excel(name = "科室编码", orderNum = "1")
+    @Excel(name = "科室编码", orderNum = "0")
     private String deptId;
     /**
      * 科室名称
@@ -91,12 +91,4 @@ public class LevelStatisticsDTO {
      */
     @Excel(name = "丙级率", orderNum = "11")
     private String thirdLevelPercentStr;
-    /**
-     * 上级科室id（上级科室编码）
-     */
-    private String deptClassId;
-    /**
-     * 上级科室名称
-     */
-    private String deptClass;
 }

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

@@ -0,0 +1,24 @@
+package com.diagbot.dto;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:各科室缺陷占比-台州
+ * @Author:zhaops
+ * @time: 2020/6/22 13:41
+ */
+@Getter
+@Setter
+public class LevelStatisticsTZDTO extends LevelStatisticsDTO{
+    /**
+     * 上级科室id（上级科室编码）
+     */
+    private String deptClassId;
+    /**
+     * 上级科室名称
+     */
+    @Excel(name = "科室系统",width = 20, orderNum = "1")
+    private String deptClass;
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.EntryNumDTO;
 import com.diagbot.dto.HomePageNumDTO;
 import com.diagbot.dto.LevelStatisticsDTO;
+import com.diagbot.dto.LevelStatisticsTZDTO;
 import com.diagbot.util.ExcelUtils;
 import com.diagbot.vo.FilterOrderVO;
 import com.diagbot.vo.FilterPageVO;
@@ -64,4 +65,15 @@ public class ConsoleExportFacade {
         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.levelStatisticsByDeptClass_TZ(filterOrderVO);
+        String fileName = "各科室缺陷占比-台州.xls";
+        ExcelUtils.exportExcel(records, null, "sheet1", LevelStatisticsTZDTO.class, fileName, response, 12.8f);
+    }
 }

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

@@ -9,6 +9,7 @@ import com.diagbot.dto.DeptNumDTO;
 import com.diagbot.dto.EntryNumDTO;
 import com.diagbot.dto.HomePageNumDTO;
 import com.diagbot.dto.LevelStatisticsDTO;
+import com.diagbot.dto.LevelStatisticsTZDTO;
 import com.diagbot.dto.NumDTO;
 import com.diagbot.dto.QcResultPercentDTO;
 import com.diagbot.dto.QcResultShortDTO;
@@ -455,9 +456,9 @@ public class ConsoleFacade {
      * @param filterOrderVO
      * @return
      */
-    public List<LevelStatisticsDTO> levelStatisticsByDeptClass(FilterOrderVO filterOrderVO) {
+    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass_TZ(FilterOrderVO filterOrderVO) {
         filterFacade.filterOrderVOSet(filterOrderVO);
-        List<LevelStatisticsDTO> records = behospitalInfoFacade.levelStatisticsByDeptClass2(filterOrderVO);
+        List<LevelStatisticsTZDTO> records = behospitalInfoFacade.levelStatisticsByDeptClass_TZ(filterOrderVO);
         return records;
     }
 

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

@@ -7,6 +7,7 @@ import com.diagbot.dto.DeptNumDTO;
 import com.diagbot.dto.ExportExcelDTO;
 import com.diagbot.dto.HomePageNumDTO;
 import com.diagbot.dto.LevelStatisticsDTO;
+import com.diagbot.dto.LevelStatisticsTZDTO;
 import com.diagbot.dto.MsgDTO;
 import com.diagbot.dto.NumDTO;
 import com.diagbot.dto.QcResultShortDTO;
@@ -179,20 +180,20 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
     public IPage<DeptNumDTO> resultStatisticsByDeptAndDoctorPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
 
     /**
-     * 各科室缺陷占比（组合）-全院-根据内外科系统统计
+     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（台州）
      *
      * @param filterOrderVO
      * @return
      */
-    public List<LevelStatisticsDTO> levelStatisticsByDeptClass(FilterOrderVO filterOrderVO);
+    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass(FilterOrderVO filterOrderVO);
 
     /**
-     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（上级科室允许为空）
+     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（上级科室允许为空）（台州）
      *
      * @param filterOrderVO
      * @return
      */
-    public List<LevelStatisticsDTO> levelStatisticsByDeptClass2(FilterOrderVO filterOrderVO);
+    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass_TZ(FilterOrderVO filterOrderVO);
 
 
     List<ExportExcelDTO> exportExcel();

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

@@ -7,6 +7,7 @@ import com.diagbot.dto.DeptNumDTO;
 import com.diagbot.dto.ExportExcelDTO;
 import com.diagbot.dto.HomePageNumDTO;
 import com.diagbot.dto.LevelStatisticsDTO;
+import com.diagbot.dto.LevelStatisticsTZDTO;
 import com.diagbot.dto.MsgDTO;
 import com.diagbot.dto.NumDTO;
 import com.diagbot.dto.QcResultShortDTO;
@@ -180,20 +181,20 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
     public IPage<DeptNumDTO> resultStatisticsByDeptAndDoctorPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
 
     /**
-     * 各科室缺陷占比（组合）-全院-根据内外科系统统计
+     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（台州）
      *
      * @param filterOrderVO
      * @return
      */
-    public List<LevelStatisticsDTO> levelStatisticsByDeptClass(FilterOrderVO filterOrderVO);
+    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass(FilterOrderVO filterOrderVO);
 
     /**
-     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（上级科室允许为空）
+     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（上级科室允许为空）（台州）
      *
      * @param filterOrderVO
      * @return
      */
-    public List<LevelStatisticsDTO> levelStatisticsByDeptClass2(FilterOrderVO filterOrderVO);
+    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass_TZ(FilterOrderVO filterOrderVO);
 
     List<ExportExcelDTO> exportExcel();
 

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

@@ -7,6 +7,7 @@ import com.diagbot.dto.DeptNumDTO;
 import com.diagbot.dto.ExportExcelDTO;
 import com.diagbot.dto.HomePageNumDTO;
 import com.diagbot.dto.LevelStatisticsDTO;
+import com.diagbot.dto.LevelStatisticsTZDTO;
 import com.diagbot.dto.MsgDTO;
 import com.diagbot.dto.NumDTO;
 import com.diagbot.dto.QcResultShortDTO;
@@ -243,25 +244,25 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
     }
 
     /**
-     * 各科室缺陷占比（组合）-全院-根据内外科系统统计
+     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（台州）
      *
      * @param filterOrderVO
      * @return
      */
     @Override
-    public List<LevelStatisticsDTO> levelStatisticsByDeptClass(FilterOrderVO filterOrderVO) {
+    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass(FilterOrderVO filterOrderVO) {
         return baseMapper.levelStatisticsByDeptClass(filterOrderVO);
     }
 
     /**
-     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（上级科室允许为空）
+     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（上级科室允许为空）（台州）
      *
      * @param filterOrderVO
      * @return
      */
     @Override
-    public List<LevelStatisticsDTO> levelStatisticsByDeptClass2(FilterOrderVO filterOrderVO) {
-        return baseMapper.levelStatisticsByDeptClass2(filterOrderVO);
+    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass_TZ(FilterOrderVO filterOrderVO) {
+        return baseMapper.levelStatisticsByDeptClass_TZ(filterOrderVO);
     }
 
     @Override

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

@@ -7,6 +7,7 @@ import com.diagbot.dto.DeptNumDTO;
 import com.diagbot.dto.EntryNumDTO;
 import com.diagbot.dto.HomePageNumDTO;
 import com.diagbot.dto.LevelStatisticsDTO;
+import com.diagbot.dto.LevelStatisticsTZDTO;
 import com.diagbot.dto.NumDTO;
 import com.diagbot.dto.QcResultShortDTO;
 import com.diagbot.dto.RespDTO;
@@ -405,8 +406,8 @@ public class ConsoleController {
                     "desc： 排序（降序） <br>")
     @PostMapping("/levelStatisticsByDeptClass")
     @SysLogger("levelStatisticsByDeptClass")
-    public RespDTO<List<LevelStatisticsDTO>> levelStatisticsByDeptClass(@RequestBody @Valid FilterOrderVO filterOrderVO) {
-        return RespDTO.onSuc(consoleFacade.levelStatisticsByDeptClass(filterOrderVO));
+    public RespDTO<List<LevelStatisticsTZDTO>> levelStatisticsByDeptClass(@RequestBody @Valid FilterOrderVO filterOrderVO) {
+        return RespDTO.onSuc(consoleFacade.levelStatisticsByDeptClass_TZ(filterOrderVO));
     }
 
     /**

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

@@ -79,4 +79,22 @@ public class ConsoleExportController {
     public void levelExport(HttpServletResponse response, @RequestBody @Valid FilterOrderVO filterOrderVO) {
         consoleExportFacade.levelExport(response, filterOrderVO);
     }
+
+    /**
+     * 各科室缺陷占比（组合）
+     *
+     * @param filterOrderVO
+     * @return
+     */
+    @ApiOperation(value = "各科室缺陷占比（组合）导出-台州[by:gaodm]",
+            notes = "type： 统计维度 1-本月，2-本年(必填)<br>" +
+                    "level： 病历等级 <br>" +
+                    "name： 科室名称 <br>" +
+                    "asc： 排序（升序） <br>" +
+                    "desc： 排序（降序） <br>")
+    @PostMapping("/levelExport_TZ")
+    @SysLogger("levelExport_TZ")
+    public void levelExport_TZ(HttpServletResponse response, @RequestBody @Valid FilterOrderVO filterOrderVO) {
+        consoleExportFacade.levelExport_TZ(response, filterOrderVO);
+    }
 }

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -1074,9 +1074,9 @@
         </if>
     </select>
 
-    <!-- 各科室缺陷占比（组合）-全院-根据内外科系统统计 -->
+    <!-- 各科室缺陷占比（组合）-全院-根据内外科系统统计（台州 -->
     <select id="levelStatisticsByDeptClass" parameterType="com.diagbot.vo.FilterOrderVO"
-            resultType="com.diagbot.dto.LevelStatisticsDTO">
+            resultType="com.diagbot.dto.LevelStatisticsTZDTO">
         SELECT
         t1.deptId,
         t1.deptName,
@@ -1282,7 +1282,7 @@
     </select>
 
     <!-- 各科室缺陷占比（组合）-全院-根据内外科系统统计（上级科室允许为空） -->
-    <select id="levelStatisticsByDeptClass2" parameterType="com.diagbot.vo.FilterOrderVO" resultType="com.diagbot.dto.LevelStatisticsDTO">
+    <select id="levelStatisticsByDeptClass_TZ" parameterType="com.diagbot.vo.FilterOrderVO" resultType="com.diagbot.dto.LevelStatisticsTZDTO">
         SELECT
         t1.deptId,
         t1.deptName,