Merge remote-tracking branch 'origin/dev/20220613_v2.1.6厦门个性化_出院人数统计' into master

# Conflicts:
#	src/main/java/com/diagbot/config/ResourceServerConfigurer.java

doc/049.20220613_v2.1.6厦门个性化_出院人数统计/qc_init_v2.1.6.sql

@@ -0,0 +1,18 @@
+use `qc`;
+
+INSERT INTO `sys_user_pageset` (`is_deleted`,`gmt_create`,`gmt_modified`,`creator`,`modifier`,`user_id`,`page_type`,`name`,`val`,`status`,`order_no`) VALUES ('N','1970-01-01 12:00:00','1970-01-01 12:00:00','0','0',354,1,'主刀医生','operationDoctorName',1,19);
+INSERT INTO `sys_user_pageset` (`is_deleted`,`gmt_create`,`gmt_modified`,`creator`,`modifier`,`user_id`,`page_type`,`name`,`val`,`status`,`order_no`) VALUES ('N','1970-01-01 12:00:00','1970-01-01 12:00:00','0','0',354,1,'手术级别','operationLevel',1,20);
+
+update sys_user_pageset a set a.order_no = 21 where a.name = '科室' and a.user_id = 354;
+update sys_user_pageset a set a.order_no = 22 where a.name = '评分时间' and a.user_id = 354;
+
+
+INSERT INTO `sys_user_pageset` (`is_deleted`,`gmt_create`,`gmt_modified`,`creator`,`modifier`,`user_id`,`page_type`,`name`,`val`,`status`,`order_no`) VALUES ('N','1970-01-01 12:00:00','1970-01-01 12:00:00','0','0',-1,1,'主刀医生','operationDoctorName',1,22);
+INSERT INTO `sys_user_pageset` (`is_deleted`,`gmt_create`,`gmt_modified`,`creator`,`modifier`,`user_id`,`page_type`,`name`,`val`,`status`,`order_no`) VALUES ('N','1970-01-01 12:00:00','1970-01-01 12:00:00','0','0',-1,1,'手术级别','operationLevel',1,23);
+
+update sys_user_pageset a set a.order_no = 24 where a.name = '科室' and a.user_id = -1;
+update sys_user_pageset a set a.order_no = 25 where a.name = '评分时间' and a.user_id = -1;
+update sys_user_pageset a set a.order_no = 26 where a.name = '是否日间病历' and a.user_id = -1;
+
+
+

src/main/java/com/diagbot/aggregate/LeaveHosStatisticsAggregate.java

@@ -36,7 +36,13 @@ public class LeaveHosStatisticsAggregate {
             @DataConsumer("getNewBornCount") Integer newBornNum,
             @DataConsumer("getOperationCount") Integer operationNum,
             @DataConsumer("getNonAdviceCount") Integer nonAdviceNum,
-            @DataConsumer("get31DaysBehospitalCount") Integer reBehospitalNum) {
+            @DataConsumer("get31DaysBehospitalCount") Integer reBehospitalNum,
+            @DataConsumer("getBloodCount") Integer bloodNum,
+            @DataConsumer("getCancerCount") Integer cancerNum,
+            @DataConsumer("getOperationLevelOneCount") Integer operationLevelOneNum,
+            @DataConsumer("getOperationLevelTwoCount") Integer operationLevelTwoNum,
+            @DataConsumer("getOperationLevelThreeCount") Integer operationLevelThreeNum,
+            @DataConsumer("getOperationLevelFourCount") Integer operationLevelFourNum) {
 
         Map<String, Object> retMap = new LinkedHashMap<>();
         retMap.put("总人数", totleNum);
@@ -45,6 +51,12 @@ public class LeaveHosStatisticsAggregate {
         retMap.put("手术病人数", operationNum);
         retMap.put("非医嘱离院病人数", nonAdviceNum);
         retMap.put("31日再入院病历数", reBehospitalNum);
+        retMap.put("输血患者人数", bloodNum);
+        retMap.put("癌痛患者人数", cancerNum);
+        retMap.put("一级手术等级人数", operationLevelOneNum );
+        retMap.put("二级手术等级人数", operationLevelTwoNum );
+        retMap.put("三级手术等级人数", operationLevelThreeNum );
+        retMap.put("四级手术等级人数", operationLevelFourNum );
         return retMap;
 
     }
@@ -93,6 +105,50 @@ public class LeaveHosStatisticsAggregate {
         return behospitalInfoFacade.operationCount(filterVO);
     }
 
+    /**
+     * 一级手术级别人数
+     *
+     * @param filterVO
+     * @return
+     */
+    @DataProvider("getOperationLevelOneCount")
+    public Integer getOperationLevelOneCount(@InvokeParameter("filterVO") FilterVO filterVO) {
+        return behospitalInfoFacade.operationLevelOneCount(filterVO);
+    }
+
+    /**
+     * 二级手术级别人数
+     *
+     * @param filterVO
+     * @return
+     */
+    @DataProvider("getOperationLevelTwoCount")
+    public Integer getOperationLevelTwoCount(@InvokeParameter("filterVO") FilterVO filterVO) {
+        return behospitalInfoFacade.operationLevelTwoCount(filterVO);
+    }
+
+    /**
+     * 三级手术级别人数
+     *
+     * @param filterVO
+     * @return
+     */
+    @DataProvider("getOperationLevelThreeCount")
+    public Integer getOperationLevelThreeCount(@InvokeParameter("filterVO") FilterVO filterVO) {
+        return behospitalInfoFacade.operationLevelThreeCount(filterVO);
+    }
+
+    /**
+     * 四级手术级别人数
+     *
+     * @param filterVO
+     * @return
+     */
+    @DataProvider("getOperationLevelFourCount")
+    public Integer getOperationLevelFourCount(@InvokeParameter("filterVO") FilterVO filterVO) {
+        return behospitalInfoFacade.operationLevelFourCount(filterVO);
+    }
+
     /**
      * 非医嘱离院
      *
@@ -138,4 +194,26 @@ public class LeaveHosStatisticsAggregate {
         return new Date();
 
     }
+
+    /**
+     * 输血患者人数
+     *
+     * @param filterVO
+     * @return
+     */
+    @DataProvider("getBloodCount")
+    public Integer getBloodCount(@InvokeParameter("filterVO") FilterVO filterVO) {
+        return behospitalInfoFacade.bloodCount(filterVO);
+    }
+
+    /**
+     * 癌痛患者人数
+     *
+     * @param filterVO
+     * @return
+     */
+    @DataProvider("getCancerCount")
+    public Integer getCancerCount(@InvokeParameter("filterVO") FilterVO filterVO) {
+        return behospitalInfoFacade.cancerCount(filterVO);
+    }
 }

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

@@ -112,8 +112,11 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/console/homePageLevelStatistics").permitAll()
                 .antMatchers("/console/homePageLevelStatisticsXY").permitAll()
                 .antMatchers("/consoleByDept/homePageLevelStatisticsXYByDept").permitAll()
+                .antMatchers("/print/export/homePageLevelXYExportByDept").permitAll()
                 .antMatchers("/consoleByDept/entryCountGroupXYByEntryPageDept").permitAll()
+                .antMatchers("/print/export/entryCountGroupXYByExportDept").permitAll()
                 .antMatchers("/consoleByDept/qcResultShortXYPageByDept").permitAll()
+                .antMatchers("/print/export/qcResultShortXYPageExportDept").permitAll()
                 .antMatchers("/consoleByDept/badLevelXYPageByDept").permitAll()
                 .antMatchers("/print/export/badUnQualifiedLevelPageXYExportByDept").permitAll()
                 .antMatchers("/print/export/badQualifiedLevelPageXYExportByDept").permitAll()
@@ -193,15 +196,32 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/consoleByDept/casesEntryStatisticsByDept").permitAll()
                 .antMatchers("/bas/doctor/getList").permitAll()
                 .antMatchers("/consoleByDept/homePageOrGoodLevelByDept").permitAll()
+                .antMatchers("/print/export/homePageLevelExportByDept").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()
+                .antMatchers("/print/export/qcResultShortExportByDeptPage").permitAll()
+                .antMatchers("/print/export/levelExportByDept").permitAll()
                 .antMatchers("/consoleByDept/entryStatisticsByDept").permitAll()
+                .antMatchers("/print/export/entryStatisticsExportByDept").permitAll()
                 .antMatchers("/consoleByDept/leaveHosMRPageByDept").permitAll()
+                .antMatchers("/print/export/leaveHosMrPageExportByDept").permitAll()
                 .antMatchers("/consoleByDept/qcCheckStatisticsByDept").permitAll()
+                .antMatchers("/print/export/qcCheckStaExportByDept").permitAll()
                 .antMatchers("/consoleByDept/qcCheckMRPageByDept").permitAll()
+                .antMatchers("/print/export/qcCheckMRPageExportByDept").permitAll()
                 .antMatchers("/consoleByDept/hmImproveMRPageByDept").permitAll()
+                .antMatchers("/print/export/improveMRExportByDept").permitAll()
                 .antMatchers("/consoleByDept/reHos31DaysPageByDept").permitAll()
+                .antMatchers("/print/export/reHos31DaysPageExportByDept").permitAll()
                 .antMatchers("/consoleByDept/unModifyMRSByDept").permitAll()
+                .antMatchers("/print/export/unModifyMRSExportByDept").permitAll()
                 .antMatchers("/consoleByDept/unModifyMRPageByDept").permitAll()
+                .antMatchers("/print/export/unModifyMRPageExportByDept").permitAll()
                 .antMatchers("/consoleByDept/medicalCheckFormKs").permitAll()
+                .antMatchers("/print/export/medicalCheckExportByDept").permitAll()
                 .antMatchers("/consoleByDept/medicalCheckTitleKs").permitAll()
                 .antMatchers("/console/qualityControl").permitAll()
                 .antMatchers("/console/export/**").permitAll()
@@ -255,10 +275,13 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/appealInfo/getAppealMode").permitAll()
                 .antMatchers("/qc/appealInfo/getUserRole").permitAll()
                 .antMatchers("/qc/mode/getModes").permitAll()
+                .antMatchers("/consoleByDoctor/**").permitAll()
+                .antMatchers("/qc/getDoctorDetail/**").permitAll()
                 .antMatchers("/qcView/data/*").permitAll()
                 .antMatchers("/medDefectFeedback/*").permitAll()
                 .antMatchers("/consoleByDoctor/**").permitAll()
                 .antMatchers("/qc/getDoctorDetail/**").permitAll()
+                .antMatchers("/medNewsNotice/**").permitAll()
                 .antMatchers("/h5/statistics/**").permitAll()
                 .antMatchers("/logManage/**").permitAll()
                 .antMatchers("/qc/qcType/add").permitAll()

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

@@ -59,6 +59,8 @@ public class QcResultShortDTO {
     private String behDoctorId;
     @Excel(name = "住院医生", width = 30, orderNum = "14")
     private String behDoctorName;
+    @Excel(name = "手术级别", width = 30, orderNum = "18")
+    private String operationLevel;
     /**
      * 主治医生id
      */
@@ -71,6 +73,8 @@ public class QcResultShortDTO {
     private String directorDoctorId;
     @Excel(name = "主任医生", width = 30, orderNum = "16")
     private String directorDoctorName;
+    @Excel(name = "主刀医生", width = 30, orderNum = "17")
+     private String operationDoctorName;
     /**
      * 科室编码
      */
@@ -78,9 +82,9 @@ public class QcResultShortDTO {
     /**
      * 科室名称
      */
-    @Excel(name = "科室", width = 70, orderNum = "17")
+    @Excel(name = "科室", width = 70, orderNum = "19")
     private String behDeptName;
-    @Excel(name = "评分时间", format = "yyyy-MM-dd", width = 30, orderNum = "18")
+    @Excel(name = "评分时间", format = "yyyy-MM-dd", width = 30, orderNum = "20")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date gradeTime;
 

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

@@ -1,12 +1,14 @@
 package com.diagbot.facade;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.aggregate.AverageStatisticsAggregate;
 import com.diagbot.aggregate.MrStatisticsAggregate;
 import com.diagbot.aggregate.ResultStatisticsAggregate;
+import com.diagbot.biz.push.entity.Lis;
 import com.diagbot.dto.*;
 import com.diagbot.entity.*;
 import com.diagbot.enums.IsDeleteEnum;

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

@@ -85,6 +85,38 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      */
     public int operationCount(FilterVO filterVO);
 
+    /**
+     * 一级手术级别人数-全院-首页
+     *
+     * @param filterVO
+     * @return
+     */
+    public int operationLevelOneCount(FilterVO filterVO);
+
+    /**
+     * 二级手术级别人数-全院-首页
+     *
+     * @param filterVO
+     * @return
+     */
+    public int operationLevelTwoCount(FilterVO filterVO);
+
+    /**
+     * 三级手术级别人数-全院-首页
+     *
+     * @param filterVO
+     * @return
+     */
+    public int operationLevelThreeCount(FilterVO filterVO);
+
+    /**
+     * 四级手术级别人数-全院-首页
+     *
+     * @param filterVO
+     * @return
+     */
+    public int operationLevelFourCount(FilterVO filterVO);
+
     /**
      * 出院总人数统计-科室-首页
      *
@@ -363,6 +395,22 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      */
     public int get31DaysBehospitalCount(FilterVO filterVO);
 
+    /**
+     * 输血患者人数-科室-首页
+     *
+     * @param filterVO
+     * @return
+     */
+    public int bloodCount(FilterVO filterVO);
+
+    /**
+     * 癌痛患者人数-科室-首页
+     *
+     * @param filterVO
+     * @return
+     */
+    public int cancerCount(FilterVO filterVO);
+
     /**
      * 病案首页质控病历数统计-全院（首页）
      *

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

@@ -121,6 +121,46 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
         return baseMapper.operationCount(filterVO);
     }
 
+    /**
+     * 一级手术级别人数-全院-首页
+     *
+     * @param filterVO
+     * @return
+     */
+    public int operationLevelOneCount(FilterVO filterVO) {
+        return baseMapper.operationLevelOneCount(filterVO);
+    }
+
+    /**
+     * 二级手术级别人数-全院-首页
+     *
+     * @param filterVO
+     * @return
+     */
+    public int operationLevelTwoCount(FilterVO filterVO) {
+        return baseMapper.operationLevelTwoCount(filterVO);
+    }
+
+    /**
+     * 三级手术级别人数-全院-首页
+     *
+     * @param filterVO
+     * @return
+     */
+    public int operationLevelThreeCount(FilterVO filterVO) {
+        return baseMapper.operationLevelThreeCount(filterVO);
+    }
+
+    /**
+     * 四级手术级别人数-全院-首页
+     *
+     * @param filterVO
+     * @return
+     */
+    public int operationLevelFourCount(FilterVO filterVO) {
+        return baseMapper.operationLevelFourCount(filterVO);
+    }
+
     /**
      * 出院总人数统计-科室-首页
      *
@@ -472,6 +512,26 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
         return baseMapper.get31DaysBehospitalCount(filterVO);
     }
 
+    /**
+     * 输血患者人数
+     *
+     * @param filterVO
+     * @return
+     */
+    public int bloodCount(FilterVO filterVO){
+        return baseMapper.bloodCount(filterVO);
+    }
+
+    /**
+     * 癌痛患者人数
+     *
+     * @param filterVO
+     * @return
+     */
+    public int cancerCount(FilterVO filterVO){
+        return baseMapper.cancerCount(filterVO);
+    }
+
     /**
      * 病案首页质控病历数统计-全院（首页）
      *

src/main/java/com/diagbot/vo/QcResultShortPageVO.java

@@ -43,6 +43,16 @@ public class QcResultShortPageVO extends Page {
      */
     private String diagnose;
 
+    /**
+     * 主刀医生
+     */
+    private String operationDoctor;
+
+    /**
+     * 手术等级
+     */
+    private String operationLevel;
+
     /**
      * title名称
      */
@@ -97,7 +107,7 @@ public class QcResultShortPageVO extends Page {
     private Integer ruleType;
 
     /**
-     * 离院人员类型（0/null：总人数，1：死亡人数，2：新生儿，3：手术病人数，4：非医嘱离院病人，5:31日再入院病人）
+     * 离院人员类型（0/null：总人数，1：死亡人数，2：新生儿，3：手术病人数，4：非医嘱离院病人，5：31日再入院病人，6：输血患者病人，7：癌痛患者病人）
      */
     private Integer leaveHosType;
 

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

@@ -701,10 +701,12 @@ public class ConsoleController {
                     "chTimeEnd： 病历核查截止时间 <br>" +
                     "mrTimeStart： 首页核查起始时间 <br>" +
                     "mrTimeEnd： 首页核查截止时间 <br>" +
-                    "leaveHosType： 离院人员类型（0/null：总人数，1：死亡人数，2：新生儿，3：手术病人数，4：非医嘱离院病人，5:31日再入院病人） <br>" +
+                    "leaveHosType： 离院人员类型（0/null：总人数，1：死亡人数，2：新生儿，3：手术病人数，4：非医嘱离院病人，5:31日再入院病人，6：输血患者病人，7：癌痛患者病人） <br>" +
                     "startDate： 起始时间 <br>" +
                     "endDate： 截止时间 <br>" +
-                    "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
+                    "isPlacefile： 是否归档（0：未归档，1：已归档） <br>" +
+                    "operationDocterName： 主刀医生 <br>" +
+                    "operationLevel： 手术级别 <br>")
     @PostMapping("/leaveHosMRPage")
     @SysLogger("leaveHosMRPage")
     public RespDTO<IPage<QcResultShortDTO>> leaveHosMRPage(@RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {