病案首页不合格/合格数病历详情页导出接口拆分

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

@@ -119,7 +119,8 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/consoleByDept/qcResultShortXYPageByDept").permitAll()
                 .antMatchers("/print/export/qcResultShortXYPageExportDept").permitAll()
                 .antMatchers("/consoleByDept/badLevelXYPageByDept").permitAll()
-                .antMatchers("/print/export/badLevelPageXYExportByDept").permitAll()
+                .antMatchers("/print/export/badUnQualifiedLevelPageXYExportByDept").permitAll()
+                .antMatchers("/print/export/badQualifiedLevelPageXYExportByDept").permitAll()
                 .antMatchers("/console/leaveHosCount").permitAll()
                 .antMatchers("/console/medicalRecordIndicator").permitAll()
                 .antMatchers("/console/codingMonthly").permitAll()
@@ -206,8 +207,10 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/console/export/medicalCheckInnerExport").permitAll()
                 .antMatchers("/console/badLevelPage").permitAll()
                 .antMatchers("/console/badLevelXYPage").permitAll()
-                .antMatchers("/console/export/badLevelPagePageExport").permitAll()
-                .antMatchers("/console/export/badLevelPageXYExport").permitAll()
+                .antMatchers("/console/export/badUnQualifiedLevelPagePageExport").permitAll()
+                .antMatchers("/console/export/badQualifiedLevelPagePageExport").permitAll()
+                .antMatchers("/console/export/badUnQualifiedLevelPageXYExport").permitAll()
+                .antMatchers("/console/export/badQualifiedLevelPageXYExport").permitAll()
                 .antMatchers("/qc/medNurse/getMedNursePage").permitAll()
                 .antMatchers("/qc/medRecordOther/getMedRecordOtherPage").permitAll()
                 .antMatchers("/qc/medRecordOther/getMedRecordContentOther").permitAll()
@@ -217,7 +220,8 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/bas/doctor/getList").permitAll()
                 .antMatchers("/consoleByDept/homePageOrGoodLevelByDept").permitAll()
                 .antMatchers("/print/export/homePageLevelExportByDept").permitAll()
-                .antMatchers("/print/export/homePageOrLevelExportByDept").permitAll()
+                .antMatchers("/print/export/homeUnQualifiedPageOrLevelExportByDept").permitAll()
+                .antMatchers("/print/export/homeQualifiedPageOrLevelExportByDept").permitAll()
                 .antMatchers("/print/export/entryGroupExportByDeptPage").permitAll()
                 .antMatchers("/print/export/entryGroupExportByDeptCase").permitAll()
                 .antMatchers("/print/export/entryGroupExportByDeptEntry").permitAll()

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

@@ -171,7 +171,8 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/consoleByDept/qcResultShortXYPageByDept", request)
                 || matchers("/print/export/qcResultShortXYPageExportDept", request)
                 || matchers("/consoleByDept/badLevelXYPageByDept", request)
-                || matchers("/print/export/badLevelPageXYExportByDept", request)
+                || matchers("/print/export/badUnQualifiedLevelPageXYExportByDept", request)
+                || matchers("/print/export/badQualifiedLevelPageXYExportByDept", request)
                 || matchers("/console/leaveHosCount", request)
                 || matchers("/console/levelPercentGroupByDeptPage", request)
                 || matchers("/console/levelStatistics", request)
@@ -283,8 +284,10 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/console/export/medicalCheckInnerExport", request)
                 || matchers("/console/badLevelPage", request)
                 || matchers("/console/badLevelXYPage", request)
-                || matchers("/console/export/badLevelPagePageExport", request)
-                || matchers("/console/export/badLevelPageXYExport", request)
+                || matchers("/console/export/badUnQualifiedLevelPagePageExport", request)
+                || matchers("/console/export/badQualifiedLevelPagePageExport", request)
+                || matchers("/console/export/badUnQualifiedLevelPageXYExport", request)
+                || matchers("/console/export/badQualifiedLevelPageXYExport", request)
                 || matchers("/qc/medNurse/getMedNursePage", request)
                 || matchers("/qc/medRecordOther/getMedRecordOtherPage", request)
                 || matchers("/qc/medRecordOther/getMedRecordContentOther", request)
@@ -294,7 +297,8 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/bas/doctor/getList", request)
                 || matchers("/consoleByDept/homePageOrGoodLevelByDept", request)
                 || matchers("/print/export/homePageLevelExportByDept", request)
-                || matchers("/print/export/homePageOrLevelExportByDept", request)
+                || matchers("/print/export/homeUnQualifiedPageOrLevelExportByDept", request)
+                || matchers("/print/export/homeQualifiedPageOrLevelExportByDept", request)
                 || matchers("/print/export/entryGroupExportByDeptPage", request)
                 || matchers("/print/export/entryGroupExportByDeptCase", request)
                 || matchers("/print/export/entryGroupExportByDeptEntry", request)

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

@@ -99,25 +99,69 @@ public class ConsoleByDeptExportController {
     }
 
     /**
-     * 病案首页不合格/合格数病历详情页科室导出-XY
+     * 病案首页合格数病历详情页科室导出-XY
      *
      * @param qcResultShortPageVO
      * @return
      */
-    @ApiOperation(value = "病案首页不合格/合格数病历详情页导出[by:cy]")
-    @PostMapping("/badLevelPageXYExportByDept")
-    @SysLogger("badLevelPageXYExportByDept")
-    public void badLevelPageXYExportByDept(HttpServletResponse response, @RequestBody @Valid QcResultShortXYPageVO qcResultShortPageVO) {
+    @ApiOperation(value = "病案首页合格数病历详情页导出[by:cy]")
+    @PostMapping("/badQualifiedLevelPageXYExportByDept")
+    @SysLogger("badQualifiedLevelPageXYExportByDept")
+    public void badQualifiedLevelPageXYExportByDept(HttpServletResponse response, @RequestBody @Valid QcResultShortXYPageVO qcResultShortPageVO) {
         consoleExportFacade.badLevelPageXYExport(response, qcResultShortPageVO);
     }
 
     /**
-     * 病案首页不合格/合格数病历详情页导出-科室
+     * 病案首页不合格数病历详情页科室导出-XY
      *
      * @param qcResultShortPageVO
      * @return
      */
-    @ApiOperation(value = "病案首页不合格/合格数病历详情页导出-科室[by:cy]",
+    @ApiOperation(value = "病案首页不合格数病历详情页导出[by:cy]")
+    @PostMapping("/badUnQualifiedLevelPageXYExportByDept")
+    @SysLogger("badUnQualifiedLevelPageXYExportByDept")
+    public void badUnQualifiedLevelPageXYExportByDept(HttpServletResponse response, @RequestBody @Valid QcResultShortXYPageVO qcResultShortPageVO) {
+        consoleExportFacade.badLevelPageXYExport(response, qcResultShortPageVO);
+    }
+
+    /**
+     * 病案首页合格数病历详情页导出-科室
+     *
+     * @param qcResultShortPageVO
+     * @return
+     */
+    @ApiOperation(value = "病案首页合格数病历详情页导出-科室[by:cy]",
+            notes = "behospitalCode： 病历号<br>" +
+                    "patName： 病人姓名 <br>" +
+                    "behDeptName：科室名称 <br>" +
+                    "doctorId：医生工号 <br>" +
+                    "doctorName：医生姓名 <br>" +
+                    "level： 病历等级 <br>" +
+                    "checkStatus： 核查状态（1：已核查，0：未核查） <br>" +
+                    "mrStatus： 首页核查状态（1：已核查，0：未核查） <br>" +
+                    "chName： 病历核查人员 <br>" +
+                    "mrName： 首页核查人员 <br>" +
+                    "chTimeStart： 病历核查起始时间 <br>" +
+                    "chTimeEnd： 病历核查截止时间 <br>" +
+                    "mrTimeStart： 首页核查起始时间 <br>" +
+                    "mrTimeEnd： 首页核查截止时间 <br>" +
+                    "startDate： 起始时间 <br>" +
+                    "endDate： 截止时间 <br>" +
+                    "titleName： 是否合格数 <br>" +
+                    "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
+    @PostMapping("/homeQualifiedPageOrLevelExportByDept")
+    @SysLogger("homeQualifiedPageOrLevelExportByDept")
+    public void homeQualifiedPageOrLevelExportByDept(HttpServletResponse response, @RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
+        consoleByDeptExportFacade.homePageOrLevelExportByDept(response, qcResultShortPageVO);
+    }
+
+    /**
+     * 病案首页不合格数病历详情页导出-科室
+     *
+     * @param qcResultShortPageVO
+     * @return
+     */
+    @ApiOperation(value = "病案首页不合格数病历详情页导出-科室[by:cy]",
             notes = "behospitalCode： 病历号<br>" +
                     "patName： 病人姓名 <br>" +
                     "behDeptName：科室名称 <br>" +
@@ -136,9 +180,9 @@ public class ConsoleByDeptExportController {
                     "endDate： 截止时间 <br>" +
                     "titleName： 是否合格数 <br>" +
                     "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
-    @PostMapping("/homePageOrLevelExportByDept")
-    @SysLogger("homePageOrLevelExportByDept")
-    public void homePageOrLevelExportByDept(HttpServletResponse response, @RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
+    @PostMapping("/homeUnQualifiedPageOrLevelExportByDept")
+    @SysLogger("homeUnQualifiedPageOrLevelExportByDept")
+    public void homeUnQualifiedPageOrLevelExportByDept(HttpServletResponse response, @RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
         consoleByDeptExportFacade.homePageOrLevelExportByDept(response, qcResultShortPageVO);
     }
 

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

@@ -381,12 +381,12 @@ public class ConsoleExportController {
     }
 
     /**
-     * 病案首页不合格/合格数病历详情页导出
+     * 病案首页合格数病历详情页导出
      *
      * @param qcResultShortPageVO
      * @return
      */
-    @ApiOperation(value = "病案首页不合格/合格数病历详情页导出[by:cy]",
+    @ApiOperation(value = "病案首页合格数病历详情页导出[by:cy]",
             notes = "behospitalCode： 病历号<br>" +
                     "patName： 病人姓名 <br>" +
                     "behDeptName：科室名称 <br>" +
@@ -404,26 +404,68 @@ public class ConsoleExportController {
                     "startDate： 起始时间 <br>" +
                     "endDate： 截止时间 <br>" +
                     "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
-    @PostMapping("/badLevelPagePageExport")
-    @SysLogger("badLevelPagePageExport")
-    public void badLevelPagePageExport(HttpServletResponse response, @RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
+    @PostMapping("/badQualifiedLevelPagePageExport")
+    @SysLogger("badQualifiedLevelPagePageExport")
+    public void badQualifiedLevelPagePageExport(HttpServletResponse response, @RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
+        consoleExportFacade.badLevelPagePageExport(response, qcResultShortPageVO);
+    }
+
+    /**
+     * 病案首页不合格数病历详情页导出
+     *
+     * @param qcResultShortPageVO
+     * @return
+     */
+    @ApiOperation(value = "病案首页不合格数病历详情页导出[by:cy]",
+            notes = "behospitalCode： 病历号<br>" +
+                    "patName： 病人姓名 <br>" +
+                    "behDeptName：科室名称 <br>" +
+                    "doctorId：医生工号 <br>" +
+                    "doctorName：医生姓名 <br>" +
+                    "level： 病历等级 <br>" +
+                    "checkStatus： 核查状态（1：已核查，0：未核查） <br>" +
+                    "mrStatus： 首页核查状态（1：已核查，0：未核查） <br>" +
+                    "chName： 病历核查人员 <br>" +
+                    "mrName： 首页核查人员 <br>" +
+                    "chTimeStart： 病历核查起始时间 <br>" +
+                    "chTimeEnd： 病历核查截止时间 <br>" +
+                    "mrTimeStart： 首页核查起始时间 <br>" +
+                    "mrTimeEnd： 首页核查截止时间 <br>" +
+                    "startDate： 起始时间 <br>" +
+                    "endDate： 截止时间 <br>" +
+                    "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
+    @PostMapping("/badUnQualifiedLevelPagePageExport")
+    @SysLogger("badUnQualifiedLevelPagePageExport")
+    public void badUnQualifiedLevelPagePageExport(HttpServletResponse response, @RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
         consoleExportFacade.badLevelPagePageExport(response, qcResultShortPageVO);
     }
 
 
     /**
-     * 病案首页不合格/合格数病历详情页导出-XY
+     * 病案首页合格数病历详情页导出-XY
      *
      * @param qcResultShortPageVO
      * @return
      */
-    @ApiOperation(value = "病案首页不合格/合格数病历详情页导出[by:cy]")
-    @PostMapping("/badLevelPageXYExport")
-    @SysLogger("badLevelPageXYExport")
-    public void badLevelPageXYExport(HttpServletResponse response, @RequestBody @Valid QcResultShortXYPageVO qcResultShortPageVO) {
+    @ApiOperation(value = "病案首页合格数病历详情页导出[by:cy]")
+    @PostMapping("/badQualifiedLevelPageXYExport")
+    @SysLogger("badQualifiedLevelPageXYExport")
+    public void badQualifiedLevelPageXYExport(HttpServletResponse response, @RequestBody @Valid QcResultShortXYPageVO qcResultShortPageVO) {
         consoleExportFacade.badLevelPageXYExport(response, qcResultShortPageVO);
     }
 
+    /**
+     * 病案首页不合格数病历详情页导出-XY
+     *
+     * @param qcResultShortPageVO
+     * @return
+     */
+    @ApiOperation(value = "病案首页不合格数病历详情页导出[by:cy]")
+    @PostMapping("/badUnQualifiedLevelPageXYExport")
+    @SysLogger("badUnQualifiedLevelPageXYExport")
+    public void badUnQualifiedLevelPageXYExport(HttpServletResponse response, @RequestBody @Valid QcResultShortXYPageVO qcResultShortPageVO) {
+        consoleExportFacade.badLevelPageXYExport(response, qcResultShortPageVO);
+    }
 
     /**
      * 稽查病历详情页导出