Merge remote-tracking branch 'origin/dev/20200716_1.3.8' into dev/20200716_1.3.8

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

@@ -134,6 +134,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/console/export/qcCheckStatisticsExport").permitAll()
                 .antMatchers("/console/export/unModifyMRPageExport").permitAll()
                 .antMatchers("/console/export/unModifyMRStatisticsExport").permitAll()
+                .antMatchers("/console/export/reHos31DaysPageExport").permitAll()
                 .antMatchers("/qc/data/sendDoctorInfos").permitAll()
                 .antMatchers("/qc/data/sendDeptInfos").permitAll()
                 .antMatchers("/qc/data/sendRecordTypes").permitAll()

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

@@ -177,6 +177,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/console/export/qcCheckStatisticsExport", request)
                 || matchers("/console/export/unModifyMRPageExport", request)
                 || matchers("/console/export/unModifyMRStatisticsExport", request)
+                || matchers("/console/export/reHos31DaysPageExport", request)
                 || matchers("/qc/data/sendDoctorInfos", request)
                 || matchers("/qc/data/sendDeptInfos", request)
                 || matchers("/qc/data/sendRecordTypes", request)

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

@@ -1,5 +1,7 @@
 package com.diagbot.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,21 +18,26 @@ public class ReBeHosDTO {
     /**
      * 病案号
      */
+    @Excel(name = "病案号", width = 20, needMerge = true, orderNum = "1")
     private String fileCode;
     /**
      * 性别
      */
+    @Excel(name = "性别", width = 10, needMerge = true, orderNum = "2")
     private String sex;
     /**
      * 主诊断
      */
+    @Excel(name = "主诊断", width = 50, needMerge = true, orderNum = "3")
     private String diagnose;
     /**
      * 间隔天数
      */
+    @Excel(name = "间隔天数", width = 10, needMerge = true, orderNum = "4")
     private Integer diffDays;
     /**
      * 比较病历组
      */
+    @ExcelCollection(name = "", orderNum = "5")
     private List<ReBeHosDetailDTO> details;
 }

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

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
@@ -17,18 +18,22 @@ public class ReBeHosDetailDTO {
     /**
      * 病人住院号
      */
+    @Excel(name = "病人住院号", width = 20, orderNum = "1")
     private String behospitalCode;
     /**
      * 病人姓名
      */
+    @Excel(name = "病人姓名", width = 20, orderNum = "2")
     private String name;
     /**
      * 病历等级
      */
+    @Excel(name = "病历等级", width = 10, orderNum = "3")
     private String level;
     /**
      * 病历得分
      */
+    @Excel(name = "病历得分", width = 10, orderNum = "4")
     private Double scoreRes;
     /**
      * 科室编码
@@ -37,16 +42,18 @@ public class ReBeHosDetailDTO {
     /**
      * 科室
      */
+    @Excel(name = "科室", width = 50, orderNum = "5")
     private String behDeptName;
-
     /**
      * 出院日期
      */
+    @Excel(name = "出院日期", format = "yyyy-MM-dd", width = 30, orderNum = "6")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date leaveHospitalDate;
     /**
      * 入院日期
      */
+    @Excel(name = "入院日期", format = "yyyy-MM-dd", width = 30, orderNum = "7")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date behospitalDate;
 }

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

@@ -17,6 +17,7 @@ import com.diagbot.dto.LevelStatisticsDTO;
 import com.diagbot.dto.LevelStatisticsTZDTO;
 import com.diagbot.dto.NumDTO;
 import com.diagbot.dto.QcResultPercentDTO;
+import com.diagbot.dto.ReBeHosDTO;
 import com.diagbot.dto.UnModifyMRDTO;
 import com.diagbot.entity.SysHospitalSet;
 import com.diagbot.exception.CommonErrorCode;
@@ -32,6 +33,7 @@ import com.diagbot.vo.FilterPageByAverageVO;
 import com.diagbot.vo.FilterPageVO;
 import com.diagbot.vo.FilterUnModifyMRVO;
 import com.diagbot.vo.QcResultShortPageVO;
+import com.diagbot.vo.ReBeHosPageVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -333,7 +335,7 @@ public class ConsoleExportFacade {
 
         List<String> columnSet = Arrays.asList(hospitalSet.getValue().split(","));
         for (String valueStr : columnSet) {
-            if(StringUtil.isBlank(valueStr)){
+            if (StringUtil.isBlank(valueStr)) {
                 continue;
             }
             String[] keyValue = valueStr.split("--");
@@ -351,4 +353,20 @@ public class ConsoleExportFacade {
         String fileName = "未整改病历统计.xls";
         ExcelUtils.exportExcelDynamicCol(colList, data, null, "sheet1", fileName, response);
     }
+
+    /**
+     * 31天再入院统计导出
+     *
+     * @param reBeHosPageVO
+     * @return
+     */
+    public void reHos31DaysPageExport(HttpServletResponse response, ReBeHosPageVO reBeHosPageVO) {
+        reBeHosPageVO.setCurrent(1L);
+        reBeHosPageVO.setSize(Long.MAX_VALUE);
+        reBeHosPageVO.setSearchCount(false);
+        IPage<ReBeHosDTO> page = consoleFacade.reHos31DaysPage(reBeHosPageVO);
+        List<ReBeHosDTO> records = page.getRecords();
+        String fileName = "31天再入院统计详情.xls";
+        ExcelUtils.exportExcel(records, null, "sheet1", ReBeHosDTO.class, fileName, response);
+    }
 }

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

@@ -1251,6 +1251,7 @@ public class ConsoleFacade {
                 BeanUtil.copyProperties(record, detailRecord);
                 details.add(detailRecord);
                 ReBeHosDetailDTO lastDetailRecord = new ReBeHosDetailDTO();
+                lastDetailRecord.setName(record.getName());
                 lastDetailRecord.setBehDeptId(record.getLastBehDeptId());
                 lastDetailRecord.setBehDeptName(record.getBehDeptName());
                 lastDetailRecord.setBehospitalCode(record.getLastBehospitalCode());

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

@@ -8,6 +8,7 @@ import com.diagbot.vo.FilterPageByAverageVO;
 import com.diagbot.vo.FilterPageVO;
 import com.diagbot.vo.FilterUnModifyMRVO;
 import com.diagbot.vo.QcResultShortPageVO;
+import com.diagbot.vo.ReBeHosPageVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -300,4 +301,22 @@ public class ConsoleExportController {
     public void unModifyMRStatisticsExport(HttpServletResponse response, @RequestBody @Valid FilterUnModifyMRVO filterUnModifyMRVO) {
         consoleExportFacade.unModifyMRStatisticsExport(response, filterUnModifyMRVO);
     }
+
+    /**
+     * 未整改病历统计导出
+     * 31天再入院统计导出
+     *
+     * @param reBeHosPageVO
+     * @return
+     */
+    @ApiOperation(value = "31天再入院统计导出[by:zhaops]",
+            notes = "name： 病人姓名 <br>" +
+                    "fileCode： 病案号 <br>" +
+                    "startDate： 起始时间 <br>" +
+                    "endDate： 截止时间 <br>")
+    @PostMapping("/reHos31DaysPageExport")
+    @SysLogger("reHos31DaysPageExport")
+    public void reHos31DaysPageExport(HttpServletResponse response, @RequestBody @Valid ReBeHosPageVO reBeHosPageVO) {
+        consoleExportFacade.reHos31DaysPageExport(response, reBeHosPageVO);
+    }
 }