zhaops 4 lat temu
rodzic
commit
bd82141932

+ 24 - 12
src/main/java/com/diagbot/web/ConsoleByDeptController.java

@@ -42,7 +42,8 @@ public class ConsoleByDeptController {
 
     //region --------------------------首页接口开始------------------------------
     @ApiOperation(value = "出院病人统计(科室)-首页[by:zhaops]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/leaveHosCountByDept")
     @SysLogger("leaveHosCountByDept")
     public RespDTO<Map<String, Object>> leaveHosCountByDept(@RequestBody @Valid FilterVO filterVO) {
@@ -51,7 +52,8 @@ public class ConsoleByDeptController {
     }
 
     @ApiOperation(value = "病历数统计(科室)-首页[by:zhaops]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/mrCountByDept")
     @SysLogger("mrCountByDept")
     public RespDTO<Map<String, Object>> mrCountByDept(@RequestBody @Valid FilterVO filterVO) {
@@ -60,7 +62,8 @@ public class ConsoleByDeptController {
     }
 
     @ApiOperation(value = "各模块缺陷占比排名(科室)-首页[by:zhaops]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/entryCountGroupByCaseAndDept")
     @SysLogger("entryCountGroupByCaseAndDept")
     public RespDTO<Map<String, Object>> entryCountGroupByCaseAndDept(@RequestBody @Valid FilterVO filterVO) {
@@ -69,7 +72,8 @@ public class ConsoleByDeptController {
     }
 
     @ApiOperation(value = "条目缺陷占比(科室)-首页[by:zhaops]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/entryCountGroupByEntryAndDept")
     @SysLogger("entryCountGroupByEntryAndDept")
     public RespDTO<Map<String, Object>> entryCountGroupByEntryAndDept(@RequestBody @Valid FilterVO filterVO) {
@@ -89,7 +93,8 @@ public class ConsoleByDeptController {
                     "name: 主治医生名称 <br>" +
                     "deptName: 科室名称 <br>" +
                     "asc: 排序(升序) <br>" +
-                    "desc: 排序(降序) <br>")
+                    "desc: 排序(降序) <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/homePageLevelByDeptLimit")
     @SysLogger("homePageLevelByDeptLimit")
     public RespDTO<List<HomePageNumDTO>> homePageLevelByDeptLimit(@RequestBody @Valid FilterOrderByDeptVO filterOrderByDeptVO) {
@@ -110,7 +115,8 @@ public class ConsoleByDeptController {
     @ApiOperation(value = "各模块缺陷占比排名-科室(分页)-内页[by:zhaops]",
             notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
                     "name: 模块名称<br>" +
-                    "deptName: 科室名称(必填)<br>")
+                    "deptName: 科室名称(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/entryCountGroupByCaseAndDeptPage")
     @SysLogger("entryCountGroupByCaseAndDeptPage")
     public RespDTO<IPage<DeptNumDTO>> entryCountGroupByCaseAndDeptPage(@RequestBody @Valid FilterPageByDeptVO filterPageByDeptVO) {
@@ -125,7 +131,8 @@ public class ConsoleByDeptController {
                     "casesId: 模块id:243=病案首页 <br>" +
                     "casesName: 模块名称<br>" +
                     "isReject: 单项否决 1-否决,0-非<br>" +
-                    "ruleType: 规则类型 0:无,1:空项,2:错误<br>")
+                    "ruleType: 规则类型 0:无,1:空项,2:错误<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/entryCountGroupByEntryAndDeptPage")
     @SysLogger("entryCountGroupByEntryAndDeptPage")
     public RespDTO<IPage<DeptEntryNumDTO>> entryCountGroupByEntryAndDeptPage(@RequestBody @Valid FilterPageByDeptVO filterPageByDeptVO) {
@@ -137,7 +144,8 @@ public class ConsoleByDeptController {
             notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
                     "name: 缺陷名称<br>" +
                     "deptName: 科室名称(必填)<br>" +
-                    "doctorName: 医生名称(必填)<br>")
+                    "doctorName: 医生名称(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/resultStatisticsByDeptAndDoctorPage")
     @SysLogger("resultStatisticsByDeptAndDoctorPage")
     @ApiIgnore
@@ -157,7 +165,8 @@ public class ConsoleByDeptController {
                     "name: 缺陷名称<br>" +
                     "deptName: 科室名称(必填)<br>" +
                     "isReject: 单项否决 1-否决,0-非<br>" +
-                    "casesName: 模块名称<br>")
+                    "casesName: 模块名称<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/entryGroupByEntryAndDeptInnerPage")
     @SysLogger("entryGroupByEntryAndDeptInnerPage")
     public RespDTO<IPage<DeptEntryNumDTO>> entryGroupByEntryAndDeptInnerPage(@RequestBody @Valid FilterPageByDeptVO filterPageByDeptVO) {
@@ -177,7 +186,8 @@ public class ConsoleByDeptController {
                     "name: 主治医生名称 <br>" +
                     "deptName: 科室名称 <br>" +
                     "asc: 排序(升序) <br>" +
-                    "desc: 排序(降序) <br>")
+                    "desc: 排序(降序) <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/levelStatisticsByDept")
     @SysLogger("levelStatisticsByDept")
     public RespDTO<List<LevelStatisticsDTO>> levelStatisticsByDept(@RequestBody @Valid FilterOrderByDeptVO filterOrderByDeptVO) {
@@ -196,7 +206,8 @@ public class ConsoleByDeptController {
                     "name: 主治医生名称 <br>" +
                     "deptName: 科室名称 <br>" +
                     "asc: 排序(升序) <br>" +
-                    "desc: 排序(降序) <br>")
+                    "desc: 排序(降序) <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/homePageLevelStatisticsByDept")
     @SysLogger("homePageLevelStatisticsByDept")
     public RespDTO<List<HomePageNumDTO>> homePageLevelStatisticsByDept(@RequestBody @Valid FilterOrderByDeptVO filterOrderByDeptVO) {
@@ -220,7 +231,8 @@ public class ConsoleByDeptController {
                     "isReject: 单项否决 1-否决,0-非<br>" +
                     "ruleType: 规则类型 0:无,1:空项,2:错误<br>" +
                     "startDate: 起始时间 <br>" +
-                    "endDate: 截止时间 <br>")
+                    "endDate: 截止时间 <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/qcResultShortByDeptPage")
     @SysLogger("qcResultShortByDeptPage")
     public RespDTO<IPage<QcResultShortDTO>> qcResultShortByDeptPage(@RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {

+ 74 - 37
src/main/java/com/diagbot/web/ConsoleController.java

@@ -55,7 +55,8 @@ public class ConsoleController {
 
     //region-----------------------聚合接口开始-------------------------------
     @ApiOperation(value = "病历相关统计[by:zhaops]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/mrStatistics")
     @SysLogger("mrStatistics")
     @ApiIgnore
@@ -65,7 +66,8 @@ public class ConsoleController {
     }
 
     @ApiOperation(value = "缺陷相关统计[by:zhaops]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/resultStatistics")
     @SysLogger("resultStatistics")
     @ApiIgnore
@@ -75,7 +77,8 @@ public class ConsoleController {
     }
 
     @ApiOperation(value = "平均值相关统计[by:zhaops]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/averageStatistics")
     @SysLogger("averageStatistics")
     @ApiIgnore
@@ -94,7 +97,8 @@ public class ConsoleController {
      * @return
      */
     @ApiOperation(value = "平均住院天数[by:zhaops]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/getAverageDayNum")
     @SysLogger("getAverageDayNum")
     public RespDTO<Map<String, Object>> getAverageDayNum(@RequestBody @Valid FilterVO filterVO) {
@@ -108,7 +112,8 @@ public class ConsoleController {
      * @return
      */
     @ApiOperation(value = "平均住院费用[by:zhaops]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/getAverageFee")
     @SysLogger("getAverageFee")
     public RespDTO<Map<String, Object>> getAverageFee(@RequestBody @Valid FilterVO filterVO) {
@@ -122,7 +127,8 @@ public class ConsoleController {
      * @return
      */
     @ApiOperation(value = "质控平均分按科室统计[by:zhaops]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/getAverageScore")
     @SysLogger("getAverageScore")
     public RespDTO<Map<String, Object>> getAverageScore(@RequestBody @Valid FilterVO filterVO) {
@@ -137,7 +143,8 @@ public class ConsoleController {
      */
     @ApiOperation(value = "各科室质控平均分(首页)-根据内外科系统统计[by:zhaops]",
             notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
-                    "deptClass: 科室分类:内科/外科,全部不传 <br>")
+                    "deptClass: 科室分类:内科/外科,全部不传 <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/getAverageScoreByDeptClass")
     @SysLogger("getAverageScoreByDeptClass")
     public RespDTO<Map<String, Object>> getAverageScoreByDeptClass(@RequestBody @Valid FilterVO filterVO) {
@@ -151,7 +158,8 @@ public class ConsoleController {
      * @return
      */
     @ApiOperation(value = "各科室甲级病历占比[by:zhaops]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/getLevelResultDept")
     @SysLogger("getLevelResultDept")
     public RespDTO<Map<String, Object>> getLevelResultDept(@RequestBody @Valid FilterVO filterVO) {
@@ -165,7 +173,8 @@ public class ConsoleController {
      * @return
      */
     @ApiOperation(value = "出院人数统计[by:zhaops]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/leaveHosCount")
     @SysLogger("leaveHosCount")
     public RespDTO<Map<String, Object>> leaveHosCount(@RequestBody @Valid FilterVO filterVO) {
@@ -179,7 +188,8 @@ public class ConsoleController {
      * @return
      */
     @ApiOperation(value = "质控病历统计[by:zhaops]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/mrCount")
     @SysLogger("mrCount")
     public RespDTO<Map<String, Object>> mrCount(@RequestBody @Valid FilterVO filterVO) {
@@ -193,7 +203,8 @@ public class ConsoleController {
      * @return
      */
     @ApiOperation(value = "各模块缺陷占比排行(首页)[by:zhaops]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/entryCountGroupByCase")
     @SysLogger("entryCountGroupByCase")
     public RespDTO<Map<String, Object>> entryCountGroupByCase(@RequestBody @Valid FilterVO filterVO) {
@@ -209,7 +220,8 @@ public class ConsoleController {
     @ApiOperation(value = "条目缺陷占比(首页)[by:zhaops]",
             notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
                     "isReject: 单项否决 1-否决,0-非<br>" +
-                    "casesName: 模块名称<br>")
+                    "casesName: 模块名称<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/entryCountGroupByEntry")
     @SysLogger("entryCountGroupByEntry")
     public RespDTO<Map<String, Object>> entryCountGroupByEntry(@RequestBody @Valid FilterVO filterVO) {
@@ -223,7 +235,8 @@ public class ConsoleController {
      * @return
      */
     @ApiOperation(value = "单项否决缺陷占比(首页)[by:zhaops]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/entryRejectPercent")
     @SysLogger("entryRejectPercent")
     public RespDTO<List<EntryNumDTO>> entryRejectPercent(@RequestBody @Valid FilterVO filterVO) {
@@ -238,7 +251,8 @@ public class ConsoleController {
      */
     @ApiOperation(value = "各科室甲/乙/丙级病历占比(首页)[by:zhaops]",
             notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
-                    "level: 病历等级 甲、乙、丙(必填)<br>")
+                    "level: 病历等级 甲、乙、丙(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/qcResultLevelPercent")
     @SysLogger("qcResultLevelPercent")
     public RespDTO<List<DeptNumDTO>> qcResultLevelPercent(@RequestBody @Valid FilterVO filterVO) {
@@ -252,7 +266,8 @@ public class ConsoleController {
      * @return
      */
     @ApiOperation(value = "各科室缺陷占比[by:zhaops]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/entryByDept")
     @SysLogger("entryByDept")
     public RespDTO<Map<String, Object>> entryByDept(@RequestBody @Valid FilterVO filterVO) {
@@ -269,7 +284,8 @@ public class ConsoleController {
      * @return
      */
     @ApiOperation(value = "各模块缺陷占比(分页)[by:zhaops]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/entryCountGroupByCasePage")
     @SysLogger("entryCountGroupByCasePage")
     public RespDTO<IPage<NumDTO>> entryCountGroupByCasePage(@RequestBody @Valid FilterPageVO filterPageVO) {
@@ -288,7 +304,8 @@ public class ConsoleController {
                     "casesId: 模块id:243=病案首页 <br>" +
                     "casesName: 模块名称 <br>" +
                     "isReject: 单项否决 1-否决,0-非<br>" +
-                    "ruleType: 规则类型 0:无,1:空项,2:错误<br>")
+                    "ruleType: 规则类型 0:无,1:空项,2:错误<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/entryCountGroupByEntryPage")
     @SysLogger("entryCountGroupByEntryPage")
     public RespDTO<IPage<EntryNumGroupDTO>> entryCountGroupByEntryPage(@RequestBody @Valid FilterPageVO filterPageVO) {
@@ -303,7 +320,8 @@ public class ConsoleController {
      */
     @ApiOperation(value = "按科室统计平均住院天数(分页)[by:zhaops]",
             notes = "type: 统计维度 1-本月,2-本年<br>" +
-                    "dateType: 时间类型 1-本月/本年,2-上月/去年,3-去年本月/去年<br>")
+                    "dateType: 时间类型 1-本月/本年,2-上月/去年,3-去年本月/去年<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/getAverageDayNumPage")
     @SysLogger("getAverageDayNumPage")
     public RespDTO<IPage<AverageStatisticsDTO>> getAverageDayNumPage(@RequestBody FilterPageByAverageVO filterPageByAverageVO) {
@@ -318,7 +336,8 @@ public class ConsoleController {
      */
     @ApiOperation(value = "按科室统计平均住院费用(分页)[by:zhaops]",
             notes = "type: 统计维度 1-本月,2-本年<br>" +
-                    "dateType: 时间类型 1-本月/本年,2-上月/去年,3-去年本月/去年<br>")
+                    "dateType: 时间类型 1-本月/本年,2-上月/去年,3-去年本月/去年<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/getAverageFeePage")
     @SysLogger("getAverageFeePage")
     public RespDTO<IPage<AverageStatisticsFeeDTO>> getAverageFeePage(@RequestBody FilterPageByAverageVO filterPageByAverageVO) {
@@ -332,7 +351,8 @@ public class ConsoleController {
      * @return
      */
     @ApiOperation(value = "各科室质控平均分(分页)[by:zhaops]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/getAverageScoreByDeptPage")
     @SysLogger("getAverageScoreByDeptPage")
     public RespDTO<IPage<AverageStatisticsDTO>> getAverageScoreByDeptPage(@RequestBody @Valid FilterPageVO filterPageVO) {
@@ -346,7 +366,8 @@ public class ConsoleController {
      * @return
      */
     @ApiOperation(value = "各科室缺陷占比排行(分页)[by:zhaops]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/resultStatisticsByDeptPage")
     @SysLogger("resultStatisticsByDeptPage")
     public RespDTO<IPage<NumDTO>> resultStatisticsByDeptPage(@RequestBody @Valid FilterPageVO filterPageVO) {
@@ -360,7 +381,8 @@ public class ConsoleController {
      * @return
      */
     @ApiOperation(value = "各科室甲级病历占比排行(分页)[by:zhaops]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/levelPercentGroupByDeptPage")
     @SysLogger("levelPercentGroupByDeptPage")
     public RespDTO<IPage<NumDTO>> levelPercentGroupByDeptPage(@RequestBody @Valid FilterPageVO filterPageVO) {
@@ -374,7 +396,8 @@ public class ConsoleController {
      * @return
      */
     @ApiOperation(value = "条目缺陷占比(分页)[by:zhaops]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/entryGroupByEntryInnerPage")
     @SysLogger("entryGroupByEntryInnerPage")
     public RespDTO<IPage<EntryNumDTO>> entryGroupByEntryInnerPage(@RequestBody @Valid FilterPageVO filterPageVO) {
@@ -393,7 +416,8 @@ public class ConsoleController {
                     "level: 病历等级 <br>" +
                     "name: 科室名称 <br>" +
                     "asc: 排序(升序) <br>" +
-                    "desc: 排序(降序) <br>")
+                    "desc: 排序(降序) <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/levelStatistics")
     @SysLogger("levelStatistics")
     public RespDTO<List<LevelStatisticsDTO>> levelStatistics(@RequestBody @Valid FilterOrderVO filterOrderVO) {
@@ -412,7 +436,8 @@ public class ConsoleController {
                     "name: 科室名称 <br>" +
                     "deptClass: 科室分类:内科/外科,全部不传 <br>" +
                     "asc: 排序(升序) <br>" +
-                    "desc: 排序(降序) <br>")
+                    "desc: 排序(降序) <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/levelStatisticsByDeptClass")
     @SysLogger("levelStatisticsByDeptClass")
     public RespDTO<List<LevelStatisticsTZDTO>> levelStatisticsByDeptClass(@RequestBody @Valid FilterOrderVO filterOrderVO) {
@@ -430,7 +455,8 @@ public class ConsoleController {
                     "level: 病历等级 <br>" +
                     "name: 科室名称 <br>" +
                     "asc: 排序(升序) <br>" +
-                    "desc: 排序(降序) <br>")
+                    "desc: 排序(降序) <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/homePageLevelStatistics")
     @SysLogger("homePageLevelStatistics")
     public RespDTO<List<HomePageNumDTO>> homePageLevelStatistics(@RequestBody @Valid FilterOrderVO filterOrderVO) {
@@ -448,7 +474,8 @@ public class ConsoleController {
                     "level: 病历等级 <br>" +
                     "name: 科室名称 <br>" +
                     "asc: 排序(升序) <br>" +
-                    "desc: 排序(降序) <br>")
+                    "desc: 排序(降序) <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/homePageLevelLimit")
     @SysLogger("homePageLevelLimit")
     public RespDTO<List<HomePageNumDTO>> homePageLevelLimit(@RequestBody @Valid FilterOrderVO filterOrderVO) {
@@ -484,7 +511,8 @@ public class ConsoleController {
                     "mrTimeStart: 首页核查起始时间 <br>" +
                     "mrTimeEnd: 首页核查截止时间 <br>" +
                     "startDate: 起始时间 <br>" +
-                    "endDate: 截止时间 <br>")
+                    "endDate: 截止时间 <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/qcResultShortPage")
     @SysLogger("qcResultShortPage")
     public RespDTO<IPage<QcResultShortDTO>> qcResultShortPage(@RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
@@ -502,7 +530,8 @@ public class ConsoleController {
                     "asc: 排序(升序) <br>" +
                     "desc:排序(降序) <br>" +
                     "startDate: 起始时间 <br>" +
-                    "endDate: 截止时间 <br>")
+                    "endDate: 截止时间 <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/entryStatistics")
     @SysLogger("entryStatistics")
     public RespDTO<List<EntryStatisticsDTO>> entryStatistics(@RequestBody @Valid EntryStatisticsVO entryStatisticsVO) {
@@ -517,7 +546,8 @@ public class ConsoleController {
      */
     @ApiOperation(value = "病案首页病历统计[by:zhaops]",
             notes = "startDate: 起始时间 <br>" +
-                    "endDate: 截止时间 <br>")
+                    "endDate: 截止时间 <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/homePageMRCount")
     @SysLogger("homePageMRCount")
     public RespDTO<Map<String, Object>> homePageMRCount(@RequestBody @Valid FilterVO filterVO) {
@@ -547,7 +577,8 @@ public class ConsoleController {
                     "mrTimeEnd: 首页核查截止时间 <br>" +
                     "leaveHosType: 离院人员类型(0/null:总人数,1:死亡人数,2:新生儿,3:手术病人数,4:非医嘱离院病人,5:31日再入院病人) <br>" +
                     "startDate: 起始时间 <br>" +
-                    "endDate: 截止时间 <br>")
+                    "endDate: 截止时间 <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/leaveHosMRPage")
     @SysLogger("leaveHosMRPage")
     public RespDTO<IPage<QcResultShortDTO>> leaveHosMRPage(@RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
@@ -565,7 +596,8 @@ public class ConsoleController {
                     "asc: 排序(升序) <br>" +
                     "desc:排序(降序) <br>" +
                     "startDate: 起始时间 <br>" +
-                    "endDate: 截止时间 <br>")
+                    "endDate: 截止时间 <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/qcCheckStatistics")
     @SysLogger("qcCheckStatistics")
     public RespDTO<List<HomePageImproveDTO>> qcCheckStatistics(@RequestBody @Valid FilterOrderVO filterOrderVO) {
@@ -583,7 +615,8 @@ public class ConsoleController {
                     "asc: 排序(升序) <br>" +
                     "desc:排序(降序) <br>" +
                     "startDate: 起始时间 <br>" +
-                    "endDate: 截止时间 <br>")
+                    "endDate: 截止时间 <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/unModifyMRStatistics")
     @SysLogger("unModifyMRStatistics")
     public RespDTO<UnModifyMRDTO> unModifyMRStatistics(@RequestBody @Valid FilterUnModifyMRVO filterUnModifyMRVO) {
@@ -614,7 +647,8 @@ public class ConsoleController {
                     "mrTimeStart: 首页核查起始时间 <br>" +
                     "mrTimeEnd: 首页核查截止时间 <br>" +
                     "startDate: 起始时间 <br>" +
-                    "endDate: 截止时间 <br>")
+                    "endDate: 截止时间 <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/unModifyMRPage")
     @SysLogger("unModifyMRPage")
     public RespDTO<IPage<QcResultShortDTO>> unModifyMRPage(@RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
@@ -632,7 +666,8 @@ public class ConsoleController {
             notes = "name: 病人名称 <br>" +
                     "fileCode: 病案号 <br>" +
                     "startDate: 起始时间 <br>" +
-                    "endDate: 截止时间 <br>")
+                    "endDate: 截止时间 <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/reHos31DaysPage")
     @SysLogger("reHos31DaysPage")
     public RespDTO<IPage<ReBeHosDTO>> reHos31DaysPage(@RequestBody @Valid ReBeHosPageVO reBeHosPageVO) {
@@ -647,7 +682,8 @@ public class ConsoleController {
      */
     @ApiOperation(value = "入院人数统计(首页)[by:zhaops]",
             notes = "startDate: 起始时间 <br>" +
-                    "endDate: 截止时间 <br>")
+                    "endDate: 截止时间 <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/beHosCount")
     @SysLogger("beHosCount")
     public RespDTO<List<NumDTO>> beHosCount(@RequestBody @Valid FilterVO filterVO) {
@@ -662,7 +698,8 @@ public class ConsoleController {
      */
     @ApiOperation(value = "单条条目缺陷统计(首页)[by:zhaops]",
             notes = "startDate: 起始时间 <br>" +
-                    "endDate: 截止时间 <br>")
+                    "endDate: 截止时间 <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/casesEntryStatisticsById")
     @SysLogger("casesEntryStatisticsById")
     public RespDTO<List<NumDTO>> casesEntryStatisticsById(@RequestBody @Valid FilterVO filterVO) {

+ 32 - 16
src/main/java/com/diagbot/web/ConsoleExportController.java

@@ -45,7 +45,8 @@ public class ConsoleExportController {
                     "level: 病历等级 <br>" +
                     "name: 科室名称 <br>" +
                     "asc: 排序(升序) <br>" +
-                    "desc: 排序(降序) <br>")
+                    "desc: 排序(降序) <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/homePageLevelExport")
     @SysLogger("homePageLevelExport")
     public void homePageLevelExport(HttpServletResponse response, @RequestBody @Valid FilterOrderVO filterOrderVO) {
@@ -60,7 +61,8 @@ public class ConsoleExportController {
      * @return
      */
     @ApiOperation(value = "条目缺陷占比导出[by:gaodm]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/entryGroupByEntryExport")
     @SysLogger("entryGroupByEntryExport")
     public void entryGroupByEntryExport(HttpServletResponse response, @RequestBody @Valid FilterPageVO filterPageVO) {
@@ -78,7 +80,8 @@ public class ConsoleExportController {
                     "level: 病历等级 <br>" +
                     "name: 科室名称 <br>" +
                     "asc: 排序(升序) <br>" +
-                    "desc: 排序(降序) <br>")
+                    "desc: 排序(降序) <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/levelExport")
     @SysLogger("levelExport")
     public void levelExport(HttpServletResponse response, @RequestBody @Valid FilterOrderVO filterOrderVO) {
@@ -96,7 +99,8 @@ public class ConsoleExportController {
                     "level: 病历等级 <br>" +
                     "name: 科室名称 <br>" +
                     "asc: 排序(升序) <br>" +
-                    "desc: 排序(降序) <br>")
+                    "desc: 排序(降序) <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/levelExport_TZ")
     @SysLogger("levelExport_TZ")
     public void levelExport_TZ(HttpServletResponse response, @RequestBody @Valid FilterOrderVO filterOrderVO) {
@@ -111,7 +115,8 @@ public class ConsoleExportController {
      */
     @ApiOperation(value = "按科室统计平均住院天数导出[by:gaodm]",
             notes = "type: 统计维度 1-本月,2-本年<br>" +
-                    "dateType: 时间类型 1-本月/本年,2-上月/去年,3-去年本月/去年<br>")
+                    "dateType: 时间类型 1-本月/本年,2-上月/去年,3-去年本月/去年<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/getAverageDayNumExport")
     @SysLogger("getAverageDayNumExport")
     public void getAverageDayNumExport(HttpServletResponse response, @RequestBody FilterPageByAverageVO filterPageByAverageVO) {
@@ -126,7 +131,8 @@ public class ConsoleExportController {
      */
     @ApiOperation(value = "按科室统计平均住院费用导出[by:gaodm]",
             notes = "type: 统计维度 1-本月,2-本年<br>" +
-                    "dateType: 时间类型 1-本月/本年,2-上月/去年,3-去年本月/去年<br>")
+                    "dateType: 时间类型 1-本月/本年,2-上月/去年,3-去年本月/去年<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/getAverageFeeExport")
     @SysLogger("getAverageFeeExport")
     public void getAverageFeeExport(HttpServletResponse response, @RequestBody FilterPageByAverageVO filterPageByAverageVO) {
@@ -140,7 +146,8 @@ public class ConsoleExportController {
      * @return
      */
     @ApiOperation(value = "各科室甲级病历占比排行导出[by:gaodm]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/levelPercentGroupByDeptExport")
     @SysLogger("levelPercentGroupByDeptExport")
     public void levelPercentGroupByDeptExport(HttpServletResponse response, @RequestBody @Valid FilterPageVO filterPageVO) {
@@ -159,7 +166,8 @@ public class ConsoleExportController {
                     "casesId: 模块id:243=病案首页 <br>" +
                     "casesName: 模块名称 <br>" +
                     "isReject: 单项否决 1-否决,0-非<br>" +
-                    "ruleType: 规则类型 0:无,1:空项,2:错误<br>")
+                    "ruleType: 规则类型 0:无,1:空项,2:错误<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/entryCountGroupByEntryExport")
     @SysLogger("entryCountGroupByEntryExport")
     public void entryCountGroupByEntryExport(HttpServletResponse response, @RequestBody @Valid FilterPageVO filterPageVO) {
@@ -173,7 +181,8 @@ public class ConsoleExportController {
      * @return
      */
     @ApiOperation(value = "各模块缺陷占比导出[by:gaodm]",
-            notes = "type: 统计维度 1-本月,2-本年(必填)<br>")
+            notes = "type: 统计维度 1-本月,2-本年(必填)<br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/entryCountGroupByCaseExport")
     @SysLogger("entryCountGroupByCaseExport")
     public void entryCountGroupByCaseExport(HttpServletResponse response, @RequestBody @Valid FilterPageVO filterPageVO) {
@@ -191,7 +200,8 @@ public class ConsoleExportController {
                     "asc: 排序(升序) <br>" +
                     "desc:排序(降序) <br>" +
                     "startDate: 起始时间 <br>" +
-                    "endDate: 截止时间 <br>")
+                    "endDate: 截止时间 <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/entryStatisticsExport")
     @SysLogger("entryStatisticsExport")
     public void entryStatisticsExport(HttpServletResponse response, @RequestBody @Valid EntryStatisticsVO entryStatisticsVO) {
@@ -227,7 +237,8 @@ public class ConsoleExportController {
                     "mrTimeStart: 首页核查起始时间 <br>" +
                     "mrTimeEnd: 首页核查截止时间 <br>" +
                     "startDate: 起始时间 <br>" +
-                    "endDate: 截止时间 <br>")
+                    "endDate: 截止时间 <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/qcResultShortPageExport")
     @SysLogger("qcResultShortPageExport")
     public void qcResultShortPageExport(HttpServletResponse response, @RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
@@ -257,7 +268,8 @@ public class ConsoleExportController {
                     "mrTimeStart: 首页核查起始时间 <br>" +
                     "mrTimeEnd: 首页核查截止时间 <br>" +
                     "startDate: 起始时间 <br>" +
-                    "endDate: 截止时间 <br>")
+                    "endDate: 截止时间 <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/leaveHosMrPageExport")
     @SysLogger("leaveHosMrPageExport")
     public void leaveHosMrPageExport(HttpServletResponse response, @RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
@@ -275,7 +287,8 @@ public class ConsoleExportController {
                     "asc: 排序(升序) <br>" +
                     "desc:排序(降序) <br>" +
                     "startDate: 起始时间 <br>" +
-                    "endDate: 截止时间 <br>")
+                    "endDate: 截止时间 <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/qcCheckStatisticsExport")
     @SysLogger("qcCheckStatisticsExport")
     public void qcCheckStatisticsExport(HttpServletResponse response, @RequestBody @Valid FilterOrderVO filterOrderVO) {
@@ -304,7 +317,8 @@ public class ConsoleExportController {
                     "mrTimeStart: 首页核查起始时间 <br>" +
                     "mrTimeEnd: 首页核查截止时间 <br>" +
                     "startDate: 起始时间 <br>" +
-                    "endDate: 截止时间 <br>")
+                    "endDate: 截止时间 <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/unModifyMRPageExport")
     @SysLogger("unModifyMRPageExport")
     public void unModifyMRPageExport(HttpServletResponse response, @RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
@@ -322,7 +336,8 @@ public class ConsoleExportController {
                     "asc: 排序(升序) <br>" +
                     "desc:排序(降序) <br>" +
                     "startDate: 起始时间 <br>" +
-                    "endDate: 截止时间 <br>")
+                    "endDate: 截止时间 <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/unModifyMRStatisticsExport")
     @SysLogger("unModifyMRStatisticsExport")
     public void unModifyMRStatisticsExport(HttpServletResponse response, @RequestBody @Valid FilterUnModifyMRVO filterUnModifyMRVO) {
@@ -340,7 +355,8 @@ public class ConsoleExportController {
             notes = "name: 病人姓名 <br>" +
                     "fileCode: 病案号 <br>" +
                     "startDate: 起始时间 <br>" +
-                    "endDate: 截止时间 <br>")
+                    "endDate: 截止时间 <br>" +
+                    "isPlacefile: 是否归档(0:未归档,1:已归档) <br>")
     @PostMapping("/reHos31DaysPageExport")
     @SysLogger("reHos31DaysPageExport")
     public void reHos31DaysPageExport(HttpServletResponse response, @RequestBody @Valid ReBeHosPageVO reBeHosPageVO) {