时效性报表升降序、分页大小等

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

@@ -129,6 +129,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/console/qcCheckStatistics").permitAll()
                 .antMatchers("/console/unModifyMRStatistics").permitAll()
                 .antMatchers("/console/unModifyMRPage").permitAll()
+                .antMatchers("/console/TimelinessReport").permitAll()
                 .antMatchers("/console/TimelinessReportA").permitAll()
                 .antMatchers("/console/TimelinessReportB").permitAll()
                 .antMatchers("/console/reHos31DaysPage").permitAll()

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

@@ -205,6 +205,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/console/qcCheckStatistics", request)
                 || matchers("/console/unModifyMRStatistics", request)
                 || matchers("/console/unModifyMRPage", request)
+                || matchers("/console/TimelinessReport", request)
                 || matchers("/console/TimelinessReportA", request)
                 || matchers("/console/TimelinessReportB", request)
                 || matchers("/console/reHos31DaysPage", request)

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

@@ -0,0 +1,13 @@
+package com.diagbot.dto;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.Data;
+
+import javax.imageio.IIOParam;
+import java.util.List;
+
+@Data
+public class TimelinessReportDTO {
+    private List<ColumnDTO> columns;
+    private IPage<?> data;
+}

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

@@ -5,6 +5,7 @@ import java.util.*;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
+import com.diagbot.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -41,15 +42,6 @@ import com.diagbot.util.ExcelUtils;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.SysUserUtils;
-import com.diagbot.vo.BehospitalPageVO;
-import com.diagbot.vo.EntryStatisticsVO;
-import com.diagbot.vo.FilterMedicalCheckVO;
-import com.diagbot.vo.FilterOrderVO;
-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.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 
@@ -147,21 +139,21 @@ public class ConsoleExportFacade {
     /**
      * 时效性报表导出-杭州七院
      */
-    public void TimelinessReportExport(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
+    public void TimelinessReportExport(HttpServletResponse response, FilterTimelinessVO filterTimelinessVO) {
         String hospitalId = SysUserUtils.getCurrentHospitalID();
-        qcResultShortPageVO.setHospitalId(hospitalId);
-        if (StringUtil.isNotBlank(qcResultShortPageVO.getDeptName())
-                && qcResultShortPageVO.getDeptName().equals("全部")) {
-            qcResultShortPageVO.setDeptName("");
+        filterTimelinessVO.setHospitalId(hospitalId);
+        if (StringUtil.isNotBlank(filterTimelinessVO.getDeptName())
+                && filterTimelinessVO.getDeptName().equals("全部")) {
+            filterTimelinessVO.setDeptName("");
         }
 
-        qcResultShortPageVO.setCurrent(1L);
-        qcResultShortPageVO.setSize(Long.MAX_VALUE);
-        qcResultShortPageVO.setSearchCount(false);
+        filterTimelinessVO.setCurrent(1L);
+        filterTimelinessVO.setSize(Long.MAX_VALUE);
+        filterTimelinessVO.setSearchCount(false);
 
         String fileName = "时效性报表.xls";
 
-        List<Map<String, Object>> sheetList = consoleFacade.TimelinessReportExport(qcResultShortPageVO);
+        List<Map<String, Object>> sheetList = consoleFacade.TimelinessReportExport(filterTimelinessVO);
 
         ExcelUtils.exportExcel(sheetList, fileName, response);
     }

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

@@ -2856,13 +2856,13 @@ public class ConsoleFacade {
     /**
      * 时效性报表导出-杭州七院
      */
-    public List<Map<String, Object>> TimelinessReportExport(QcResultShortPageVO qcResultShortPageVO) {
+    public List<Map<String, Object>> TimelinessReportExport(FilterTimelinessVO filterTimelinessVO) {
         List<Map<String, Object>> records = new LinkedList<>();
-        List<ExportReportDetailaaDTO> unfinishedFirst = behospitalInfoFacade.getUnfinishedFirst_HZQY(qcResultShortPageVO);
-        List<ExportReportDetailabDTO> unfinishedIn = behospitalInfoFacade.getUnfinishedIn_HZQY(qcResultShortPageVO);
-        List<ExportReportDetailacDTO> unfinishedSuicide = behospitalInfoFacade.getUnfinishedSuicide_HZQY(qcResultShortPageVO);
-        List<ExportReportDetailbDTO> unfinishedThree = behospitalInfoFacade.getUnfinishedThree_HZQY(qcResultShortPageVO);
-        List<ExportReportDetailbDTO> unfinishedSix = behospitalInfoFacade.getUnfinishedSix_HZQY(qcResultShortPageVO);
+        List<ExportReportDetailaaDTO> unfinishedFirst = behospitalInfoFacade.getUnfinishedFirstExport_HZQY(filterTimelinessVO);
+        List<ExportReportDetailabDTO> unfinishedIn = behospitalInfoFacade.getUnfinishedInExport_HZQY(filterTimelinessVO);
+        List<ExportReportDetailacDTO> unfinishedSuicide = behospitalInfoFacade.getUnfinishedSuicideExport_HZQY(filterTimelinessVO);
+        List<ExportReportDetailbDTO> unfinishedThree = behospitalInfoFacade.getUnfinishedThreeExport_HZQY(filterTimelinessVO);
+        List<ExportReportDetailbDTO> unfinishedSix = behospitalInfoFacade.getUnfinishedSixExport_HZQY(filterTimelinessVO);
 
         Map<String, Object> map1 = new HashMap<>();
         ExportParams empExportParams1 = new ExportParams();
@@ -2875,14 +2875,14 @@ public class ConsoleFacade {
         ExportParams empExportParams2 = new ExportParams();
         empExportParams2.setSheetName("入院记录未在患者入院24小时内完成");
         map2.put("title", empExportParams2);
-        map2.put("entity", ExportReportDetailaDTO.class);
+        map2.put("entity", ExportReportDetailabDTO.class);
         map2.put("data", unfinishedIn);
 
         Map<String, Object> map3 = new HashMap<>();
         ExportParams empExportParams3 = new ExportParams();
         empExportParams3.setSheetName("自杀、冲动、猝死病历入院记录未在患者入院24小时内完成");
         map3.put("title", empExportParams3);
-        map3.put("entity", ExportReportDetailaDTO.class);
+        map3.put("entity", ExportReportDetailacDTO.class);
         map3.put("data", unfinishedSuicide);
 
         Map<String, Object> map4 = new HashMap<>();
@@ -3145,9 +3145,215 @@ public class ConsoleFacade {
      * @param filterTimelinessVO
      * @return
      */
-    public UnModifyMRDTO TimelinessReportA(FilterTimelinessVO filterTimelinessVO) {
-        UnModifyMRDTO unModifyMRDTO = new UnModifyMRDTO();
-        List<Object> retList = Lists.newLinkedList();
+    public TimelinessReportDTO TimelinessReport(FilterTimelinessVO filterTimelinessVO) {
+        TimelinessReportDTO timelinessReportDTO = new TimelinessReportDTO();
+        IPage<?> retList = new Page<>();
+        List<ColumnDTO> columns = Lists.newLinkedList();
+
+        Integer orderNo = 1;
+        ColumnDTO columnHospitalCode = new ColumnDTO();
+        if (filterTimelinessVO.getCasesEntryId().equals("3241") || filterTimelinessVO.getCasesEntryId().equals("3242") || filterTimelinessVO.getCasesEntryId().equals("3243")) {
+            columnHospitalCode.setOrderNo(orderNo);
+            columnHospitalCode.setFieldName("hospitalCode");
+            columnHospitalCode.setColumnName("病人住院序号");
+            columnHospitalCode.setIsShow(1);
+            columns.add(columnHospitalCode);
+            orderNo++;
+
+            ColumnDTO columnName = new ColumnDTO();
+            columnName.setOrderNo(orderNo);
+            columnName.setFieldName("name");
+            columnName.setColumnName("病人姓名");
+            columnName.setIsShow(1);
+            columns.add(columnName);
+            orderNo++;
+
+            ColumnDTO columnSex = new ColumnDTO();
+            columnSex.setOrderNo(orderNo);
+            columnSex.setFieldName("sex");
+            columnSex.setColumnName("性别");
+            columnSex.setIsShow(1);
+            columns.add(columnSex);
+            orderNo++;
+
+            ColumnDTO columnFileCode = new ColumnDTO();
+            columnFileCode.setOrderNo(orderNo);
+            columnFileCode.setFieldName("fileCode");
+            columnFileCode.setColumnName("病案号");
+            columnFileCode.setIsShow(1);
+            columns.add(columnFileCode);
+            orderNo++;
+
+            ColumnDTO columnDoctorName = new ColumnDTO();
+            columnDoctorName.setOrderNo(orderNo);
+            columnDoctorName.setFieldName("doctorName");
+            columnDoctorName.setColumnName("主管医生");
+            columnDoctorName.setIsShow(1);
+            columns.add(columnDoctorName);
+            orderNo++;
+
+            ColumnDTO columnDeptName = new ColumnDTO();
+            columnDeptName.setOrderNo(orderNo);
+            columnDeptName.setFieldName("behDeptName");
+            columnDeptName.setColumnName("住院科室");
+            columnDeptName.setIsShow(1);
+            columns.add(columnDeptName);
+            orderNo++;
+
+            ColumnDTO columnRuleName = new ColumnDTO();
+            columnRuleName.setOrderNo(orderNo);
+            columnRuleName.setFieldName("ruleName");
+            columnRuleName.setColumnName("规则名称");
+            columnRuleName.setIsShow(1);
+            columns.add(columnRuleName);
+            orderNo++;
+
+            ColumnDTO columnBehospitalDate = new ColumnDTO();
+            columnBehospitalDate.setOrderNo(orderNo);
+            columnBehospitalDate.setFieldName("behospitalDate");
+            columnBehospitalDate.setColumnName("入院日期");
+            columnBehospitalDate.setIsShow(1);
+            columns.add(columnBehospitalDate);
+            orderNo++;
+        } else {
+            columnHospitalCode.setOrderNo(orderNo);
+            columnHospitalCode.setFieldName("hospitalCode");
+            columnHospitalCode.setColumnName("病人住院序号");
+            columnHospitalCode.setIsShow(1);
+            columns.add(columnHospitalCode);
+            orderNo++;
+
+            ColumnDTO columnName = new ColumnDTO();
+            columnName.setOrderNo(orderNo);
+            columnName.setFieldName("name");
+            columnName.setColumnName("病人姓名");
+            columnName.setIsShow(1);
+            columns.add(columnName);
+            orderNo++;
+
+            ColumnDTO columnSex = new ColumnDTO();
+            columnSex.setOrderNo(orderNo);
+            columnSex.setFieldName("sex");
+            columnSex.setColumnName("性别");
+            columnSex.setIsShow(1);
+            columns.add(columnSex);
+            orderNo++;
+
+            ColumnDTO columnFileCode = new ColumnDTO();
+            columnFileCode.setOrderNo(orderNo);
+            columnFileCode.setFieldName("fileCode");
+            columnFileCode.setColumnName("病案号");
+            columnFileCode.setIsShow(1);
+            columns.add(columnFileCode);
+            orderNo++;
+
+            ColumnDTO columnDoctorName = new ColumnDTO();
+            columnDoctorName.setOrderNo(orderNo);
+            columnDoctorName.setFieldName("doctorName");
+            columnDoctorName.setColumnName("主管医生");
+            columnDoctorName.setIsShow(1);
+            columns.add(columnDoctorName);
+            orderNo++;
+
+            ColumnDTO columnDeptName = new ColumnDTO();
+            columnDeptName.setOrderNo(orderNo);
+            columnDeptName.setFieldName("behDeptName");
+            columnDeptName.setColumnName("住院科室");
+            columnDeptName.setIsShow(1);
+            columns.add(columnDeptName);
+            orderNo++;
+
+            ColumnDTO columnRuleName = new ColumnDTO();
+            columnRuleName.setOrderNo(orderNo);
+            columnRuleName.setFieldName("ruleName");
+            columnRuleName.setColumnName("规则名称");
+            columnRuleName.setIsShow(1);
+            columns.add(columnRuleName);
+            orderNo++;
+
+            ColumnDTO columnRemark = new ColumnDTO();
+            columnRemark.setOrderNo(orderNo);
+            columnRemark.setFieldName("remark");
+            columnRemark.setColumnName("备注");
+            columnRemark.setIsShow(1);
+            columns.add(columnRemark);
+            orderNo++;
+
+            ColumnDTO columnBehospitalDate = new ColumnDTO();
+            columnBehospitalDate.setOrderNo(orderNo);
+            columnBehospitalDate.setFieldName("behospitalDate");
+            columnBehospitalDate.setColumnName("入院日期");
+            columnBehospitalDate.setIsShow(1);
+            columns.add(columnBehospitalDate);
+            orderNo++;
+
+            ColumnDTO columnIsPlacefile = new ColumnDTO();
+            columnIsPlacefile.setOrderNo(orderNo);
+            columnIsPlacefile.setFieldName("isPlacefile");
+            columnIsPlacefile.setColumnName("是否归档");
+            columnIsPlacefile.setIsShow(1);
+            columns.add(columnIsPlacefile);
+            orderNo++;
+        }
+
+        ColumnDTO columnBehospitalGmtCreate = new ColumnDTO();
+        columnBehospitalGmtCreate.setOrderNo(orderNo);
+        columnBehospitalGmtCreate.setFieldName("behospitalGmtCreate");
+        if (filterTimelinessVO.getCasesEntryId().equals("3241")) {
+            // 首次病程未在患者入院8小时内完成
+            columnBehospitalGmtCreate.setColumnName("首次病程创建时间");
+        } else if (filterTimelinessVO.getCasesEntryId().equals("3242")) {
+            // 入院记录未在患者入院24小时内完成
+            columnBehospitalGmtCreate.setColumnName("入院记录创建时间");
+        } else if (filterTimelinessVO.getCasesEntryId().equals("3243")) {
+            // 自杀、冲动、猝死病历入院记录未在患者入院24小时内完成
+            columnBehospitalGmtCreate.setColumnName("自杀等记录创建时间");
+        }
+//        columnBehospitalGmtCreate.setColumnName("入院记录创建时间");
+        columnBehospitalGmtCreate.setIsShow(1);
+        columns.add(columnBehospitalGmtCreate);
+        orderNo++;
+
+        ColumnDTO columnIsPlacefile = new ColumnDTO();
+        columnIsPlacefile.setOrderNo(orderNo);
+        columnIsPlacefile.setFieldName("isPlacefile");
+        columnIsPlacefile.setColumnName("是否归档");
+        columnIsPlacefile.setIsShow(1);
+        columns.add(columnIsPlacefile);
+        orderNo++;
+
+        if (filterTimelinessVO.getCasesEntryId().equals("3241")) {
+            IPage<ExportReportDetailaaDTO> unfinishedFirst = behospitalInfoFacade.getUnfinishedFirst_HZQY(filterTimelinessVO);
+            retList = unfinishedFirst;
+        } else if (filterTimelinessVO.getCasesEntryId().equals("3242")) {
+            IPage<ExportReportDetailabDTO> unfinishedIn = behospitalInfoFacade.getUnfinishedIn_HZQY(filterTimelinessVO);
+            retList = unfinishedIn;
+        } else if (filterTimelinessVO.getCasesEntryId().equals("3243")) {
+            IPage<ExportReportDetailacDTO> unfinishedSuicide = behospitalInfoFacade.getUnfinishedSuicide_HZQY(filterTimelinessVO);
+            retList = unfinishedSuicide;
+        } else if (filterTimelinessVO.getCasesEntryId().equals("3240")) {
+            IPage<ExportReportDetailbDTO> unfinishedThree = behospitalInfoFacade.getUnfinishedThree_HZQY(filterTimelinessVO);
+            retList = unfinishedThree;
+        } else if (filterTimelinessVO.getCasesEntryId().equals("3244")) {
+            IPage<ExportReportDetailbDTO> unfinishedSix = behospitalInfoFacade.getUnfinishedSix_HZQY(filterTimelinessVO);
+            retList = unfinishedSix;
+        }
+
+        timelinessReportDTO.setColumns(columns);
+        timelinessReportDTO.setData(retList);
+        return timelinessReportDTO;
+    }
+
+
+    /**
+     * 未整改病历统计
+     *
+     * @param filterTimelinessVO
+     * @return
+     */
+    public TimelinessReportDTO TimelinessReportA(FilterTimelinessVO filterTimelinessVO) {
+        TimelinessReportDTO timelinessReportDTO = new TimelinessReportDTO();
+        IPage<?> retList = new Page<>();
         List<ColumnDTO> columns = Lists.newLinkedList();
 
         Integer orderNo = 1;
@@ -3241,43 +3447,35 @@ public class ConsoleFacade {
         columns.add(columnIsPlacefile);
         orderNo++;
 
-        Date startDate = filterTimelinessVO.getStartDate();
-        Date endDate = filterTimelinessVO.getEndDate();
-
-        if (endDate.getTime() < startDate.getTime()) {
-            throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
-        }
-
-        QcResultShortPageVO qcResultShortPageVO = new QcResultShortPageVO();
-        qcResultShortPageVO.setStartDate(startDate);
-        qcResultShortPageVO.setEndDate(endDate);
-
         if (filterTimelinessVO.getCasesEntryId().equals("3241")) {
-            List<ExportReportDetailaaDTO> unfinishedFirst = behospitalInfoFacade.getUnfinishedFirst_HZQY(qcResultShortPageVO);
-            retList.addAll(unfinishedFirst);
+            IPage<ExportReportDetailaaDTO> unfinishedFirst = behospitalInfoFacade.getUnfinishedFirst_HZQY(filterTimelinessVO);
+            retList = unfinishedFirst;
         } else if (filterTimelinessVO.getCasesEntryId().equals("3242")) {
-            List<ExportReportDetailabDTO> unfinishedIn = behospitalInfoFacade.getUnfinishedIn_HZQY(qcResultShortPageVO);
-            retList.addAll(unfinishedIn);
+            IPage<ExportReportDetailabDTO> unfinishedIn = behospitalInfoFacade.getUnfinishedIn_HZQY(filterTimelinessVO);
+            retList = unfinishedIn;
         } else if (filterTimelinessVO.getCasesEntryId().equals("3243")) {
-            List<ExportReportDetailacDTO> unfinishedSuicide = behospitalInfoFacade.getUnfinishedSuicide_HZQY(qcResultShortPageVO);
-            retList.addAll(unfinishedSuicide);
+            IPage<ExportReportDetailacDTO> unfinishedSuicide = behospitalInfoFacade.getUnfinishedSuicide_HZQY(filterTimelinessVO);
+            retList = unfinishedSuicide;
         }
 
-        unModifyMRDTO.setColumns(columns);
-        unModifyMRDTO.setData(retList);
-        return unModifyMRDTO;
+        timelinessReportDTO.setColumns(columns);
+        timelinessReportDTO.setData(retList);
+        return timelinessReportDTO;
     }
 
 
+
+
+
     /**
      * 未整改病历统计
      *
      * @param filterTimelinessVO
      * @return
      */
-    public UnModifyMRDTO TimelinessReportB(FilterTimelinessVO filterTimelinessVO) {
-        UnModifyMRDTO unModifyMRDTO = new UnModifyMRDTO();
-        List<Object> retList = Lists.newLinkedList();
+    public TimelinessReportDTO TimelinessReportB(FilterTimelinessVO filterTimelinessVO) {
+        TimelinessReportDTO timelinessReportDTO = new TimelinessReportDTO();
+        IPage<?> retList = new Page<>();
         List<ColumnDTO> columns = Lists.newLinkedList();
 
         Integer orderNo = 1;
@@ -3361,28 +3559,16 @@ public class ConsoleFacade {
         columns.add(columnIsPlacefile);
         orderNo++;
 
-        Date startDate = filterTimelinessVO.getStartDate();
-        Date endDate = filterTimelinessVO.getEndDate();
-
-        if (endDate.getTime() < startDate.getTime()) {
-            throw new CommonException(CommonErrorCode.PARAM_ERROR, "截止时间不能小于起始时间");
-        }
-
-        QcResultShortPageVO qcResultShortPageVO = new QcResultShortPageVO();
-        qcResultShortPageVO.setStartDate(startDate);
-        qcResultShortPageVO.setEndDate(endDate);
-
         if (filterTimelinessVO.getCasesEntryId().equals("3240")) {
-            List<ExportReportDetailbDTO> unfinishedThree = behospitalInfoFacade.getUnfinishedThree_HZQY(qcResultShortPageVO);
-            retList.addAll(unfinishedThree);
+            IPage<ExportReportDetailbDTO> unfinishedThree = behospitalInfoFacade.getUnfinishedThree_HZQY(filterTimelinessVO);
+            retList = unfinishedThree;
         } else if (filterTimelinessVO.getCasesEntryId().equals("3244")) {
-            List<ExportReportDetailbDTO> unfinishedSix = behospitalInfoFacade.getUnfinishedSix_HZQY(qcResultShortPageVO);
-            retList.addAll(unfinishedSix);
+            IPage<ExportReportDetailbDTO> unfinishedSix = behospitalInfoFacade.getUnfinishedSix_HZQY(filterTimelinessVO);
+            retList = unfinishedSix;
         }
-
-        unModifyMRDTO.setColumns(columns);
-        unModifyMRDTO.setData(retList);
-        return unModifyMRDTO;
+        timelinessReportDTO.setColumns(columns);
+        timelinessReportDTO.setData(retList);
+        return timelinessReportDTO;
     }
 
 

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

@@ -4,24 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.*;
 import com.diagbot.entity.BehospitalInfo;
-import com.diagbot.vo.AnalyzeCodeVO;
-import com.diagbot.vo.AnalyzeVO;
-import com.diagbot.vo.BehospitalPageVO;
-import com.diagbot.vo.CaseScoreVO;
-import com.diagbot.vo.EntryStatisticsVO;
-import com.diagbot.vo.ExportQcresultVO;
-import com.diagbot.vo.FilterMedicalCheckVO;
-import com.diagbot.vo.FilterOrderByDeptVO;
-import com.diagbot.vo.FilterOrderVO;
-import com.diagbot.vo.FilterPageByDeptVO;
-import com.diagbot.vo.FilterPageVO;
-import com.diagbot.vo.FilterUnModifyMRVO;
-import com.diagbot.vo.FilterVO;
-import com.diagbot.vo.MedIndexFilterVO;
-import com.diagbot.vo.QcResultPageVO;
-import com.diagbot.vo.QcResultShortPageVO;
-import com.diagbot.vo.ReBeHosPageVO;
-import com.diagbot.vo.TaskVO;
+import com.diagbot.vo.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -287,42 +270,82 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
     /**
      * 时效性报表-首次病程未在患者入院8小时内完成（杭州七院）
      *
-     * @param qcResultShortPageVO
+     * @param filterTimelinessVO
      * @return
      */
-    public List<ExportReportDetailaaDTO> getUnfinishedFirst_HZQY(QcResultShortPageVO qcResultShortPageVO);
+    public IPage<ExportReportDetailaaDTO> getUnfinishedFirst_HZQY(FilterTimelinessVO filterTimelinessVO);
 
     /**
      * 时效性报表-入院记录未在患者入院24小时内完成（杭州七院）
      *
-     * @param qcResultShortPageVO
+     * @param filterTimelinessVO
      * @return
      */
-    public List<ExportReportDetailabDTO> getUnfinishedIn_HZQY(QcResultShortPageVO qcResultShortPageVO);
+    public IPage<ExportReportDetailabDTO> getUnfinishedIn_HZQY(FilterTimelinessVO filterTimelinessVO);
 
     /**
      * 时效性报表-自杀、冲动、猝死病历入院记录未在患者入院24小时内完成（杭州七院）
      *
-     * @param qcResultShortPageVO
+     * @param filterTimelinessVO
      * @return
      */
-    public List<ExportReportDetailacDTO> getUnfinishedSuicide_HZQY(QcResultShortPageVO qcResultShortPageVO);
+    public IPage<ExportReportDetailacDTO> getUnfinishedSuicide_HZQY(FilterTimelinessVO filterTimelinessVO);
 
     /**
      * 时效性报表-超过三天未书写病历（杭州七院）
      *
-     * @param qcResultShortPageVO
+     * @param filterTimelinessVO
      * @return
      */
-    public List<ExportReportDetailbDTO> getUnfinishedThree_HZQY(QcResultShortPageVO qcResultShortPageVO);
+    public IPage<ExportReportDetailbDTO> getUnfinishedThree_HZQY(FilterTimelinessVO filterTimelinessVO);
 
     /**
      * 时效性报表-超过六天未书写病历（杭州七院）
      *
-     * @param qcResultShortPageVO
+     * @param filterTimelinessVO
+     * @return
+     */
+    public IPage<ExportReportDetailbDTO> getUnfinishedSix_HZQY(FilterTimelinessVO filterTimelinessVO);
+
+    /**
+     * 时效性报表导出-首次病程未在患者入院8小时内完成（杭州七院）
+     *
+     * @param filterTimelinessVO
+     * @return
+     */
+    public List<ExportReportDetailaaDTO> getUnfinishedFirstExport_HZQY(FilterTimelinessVO filterTimelinessVO);
+
+    /**
+     * 时效性报表导出-入院记录未在患者入院24小时内完成（杭州七院）
+     *
+     * @param filterTimelinessVO
+     * @return
+     */
+    public List<ExportReportDetailabDTO> getUnfinishedInExport_HZQY(FilterTimelinessVO filterTimelinessVO);
+
+    /**
+     * 时效性报表导出-自杀、冲动、猝死病历入院记录未在患者入院24小时内完成（杭州七院）
+     *
+     * @param filterTimelinessVO
+     * @return
+     */
+    public List<ExportReportDetailacDTO> getUnfinishedSuicideExport_HZQY(FilterTimelinessVO filterTimelinessVO);
+
+    /**
+     * 时效性报表导出-超过三天未书写病历（杭州七院）
+     *
+     * @param filterTimelinessVO
+     * @return
+     */
+    public List<ExportReportDetailbDTO> getUnfinishedThreeExport_HZQY(FilterTimelinessVO filterTimelinessVO);
+
+    /**
+     * 时效性报表导出-超过六天未书写病历（杭州七院）
+     *
+     * @param filterTimelinessVO
      * @return
      */
-    public List<ExportReportDetailbDTO> getUnfinishedSix_HZQY(QcResultShortPageVO qcResultShortPageVO);
+    public List<ExportReportDetailbDTO> getUnfinishedSixExport_HZQY(FilterTimelinessVO filterTimelinessVO);
 
     /**
      * 质控评分导出到excel

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

@@ -290,42 +290,84 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
     /**
      * 时效性报表-首次病程未在患者入院8小时内完成（杭州七院）
      *
-     * @param qcResultShortPageVO
+     * @param filterTimelinessVO
      * @return
      */
-    public List<ExportReportDetailaaDTO> getUnfinishedFirst_HZQY(QcResultShortPageVO qcResultShortPageVO);
+    public IPage<ExportReportDetailaaDTO> getUnfinishedFirst_HZQY(FilterTimelinessVO filterTimelinessVO);
 
     /**
      * 时效性报表-入院记录未在患者入院24小时内完成（杭州七院）
      *
-     * @param qcResultShortPageVO
+     * @param filterTimelinessVO
      * @return
      */
-    public List<ExportReportDetailabDTO> getUnfinishedIn_HZQY(QcResultShortPageVO qcResultShortPageVO);
+    public IPage<ExportReportDetailabDTO> getUnfinishedIn_HZQY(FilterTimelinessVO filterTimelinessVO);
 
     /**
      * 时效性报表-自杀、冲动、猝死病历入院记录未在患者入院24小时内完成（杭州七院）
      *
-     * @param qcResultShortPageVO
+     * @param filterTimelinessVO
      * @return
      */
-    public List<ExportReportDetailacDTO> getUnfinishedSuicide_HZQY(QcResultShortPageVO qcResultShortPageVO);
+    public IPage<ExportReportDetailacDTO> getUnfinishedSuicide_HZQY(FilterTimelinessVO filterTimelinessVO);
 
     /**
      * 时效性报表-超过三天未书写病历（杭州七院）
      *
-     * @param qcResultShortPageVO
+     * @param filterTimelinessVO
      * @return
      */
-    public List<ExportReportDetailbDTO> getUnfinishedThree_HZQY(QcResultShortPageVO qcResultShortPageVO);
+    public IPage<ExportReportDetailbDTO> getUnfinishedThree_HZQY(FilterTimelinessVO filterTimelinessVO);
 
     /**
      * 时效性报表-超过六天未书写病历（杭州七院）
      *
-     * @param qcResultShortPageVO
+     * @param filterTimelinessVO
+     * @return
+     */
+    public IPage<ExportReportDetailbDTO> getUnfinishedSix_HZQY(FilterTimelinessVO filterTimelinessVO);
+
+    /**
+     * 时效性报表导出-首次病程未在患者入院8小时内完成（杭州七院）
+     *
+     * @param filterTimelinessVO
+     * @return
+     */
+    public List<ExportReportDetailaaDTO> getUnfinishedFirstExport_HZQY(FilterTimelinessVO filterTimelinessVO);
+
+    /**
+     * 时效性报表导出-入院记录未在患者入院24小时内完成（杭州七院）
+     *
+     * @param filterTimelinessVO
+     * @return
+     */
+    public List<ExportReportDetailabDTO> getUnfinishedInExport_HZQY(FilterTimelinessVO filterTimelinessVO);
+
+    /**
+     * 时效性报表导出-自杀、冲动、猝死病历入院记录未在患者入院24小时内完成（杭州七院）
+     *
+     * @param filterTimelinessVO
+     * @return
+     */
+    public List<ExportReportDetailacDTO> getUnfinishedSuicideExport_HZQY(FilterTimelinessVO filterTimelinessVO);
+
+    /**
+     * 时效性报表导出-超过三天未书写病历（杭州七院）
+     *
+     * @param filterTimelinessVO
+     * @return
+     */
+    public List<ExportReportDetailbDTO> getUnfinishedThreeExport_HZQY(FilterTimelinessVO filterTimelinessVO);
+
+    /**
+     * 时效性报表导出-超过六天未书写病历（杭州七院）
+     *
+     * @param filterTimelinessVO
      * @return
      */
-    public List<ExportReportDetailbDTO> getUnfinishedSix_HZQY(QcResultShortPageVO qcResultShortPageVO);
+    public List<ExportReportDetailbDTO> getUnfinishedSixExport_HZQY(FilterTimelinessVO filterTimelinessVO);
+
+
     /**
      * 质控评分导出到excel
      *

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

@@ -353,56 +353,111 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
     /**
      * 时效性报表-首次病程未在患者入院8小时内完成（杭州七院）
      *
-     * @param qcResultShortPageVO
+     * @param filterTimelinessVO
      * @return
      */
     @Override
-    public List<ExportReportDetailaaDTO> getUnfinishedFirst_HZQY(QcResultShortPageVO qcResultShortPageVO) {
-        return baseMapper.getUnfinishedFirst_HZQY(qcResultShortPageVO);
+    public IPage<ExportReportDetailaaDTO> getUnfinishedFirst_HZQY(FilterTimelinessVO filterTimelinessVO) {
+        return baseMapper.getUnfinishedFirst_HZQY(filterTimelinessVO);
     }
 
     /**
      * 时效性报表-入院记录未在患者入院24小时内完成（杭州七院）
      *
-     * @param qcResultShortPageVO
+     * @param filterTimelinessVO
      * @return
      */
     @Override
-    public List<ExportReportDetailabDTO> getUnfinishedIn_HZQY(QcResultShortPageVO qcResultShortPageVO) {
-        return baseMapper.getUnfinishedIn_HZQY(qcResultShortPageVO);
+    public IPage<ExportReportDetailabDTO> getUnfinishedIn_HZQY(FilterTimelinessVO filterTimelinessVO) {
+        return baseMapper.getUnfinishedIn_HZQY(filterTimelinessVO);
     }
 
     /**
      * 时效性报表-自杀、冲动、猝死病历入院记录未在患者入院24小时内完成（杭州七院）
      *
-     * @param qcResultShortPageVO
+     * @param filterTimelinessVO
      * @return
      */
     @Override
-    public List<ExportReportDetailacDTO> getUnfinishedSuicide_HZQY(QcResultShortPageVO qcResultShortPageVO) {
-        return baseMapper.getUnfinishedSuicide_HZQY(qcResultShortPageVO);
+    public IPage<ExportReportDetailacDTO> getUnfinishedSuicide_HZQY(FilterTimelinessVO filterTimelinessVO) {
+        return baseMapper.getUnfinishedSuicide_HZQY(filterTimelinessVO);
     }
 
     /**
      * 时效性报表-超过三天未书写病历（杭州七院）
      *
-     * @param qcResultShortPageVO
+     * @param filterTimelinessVO
      * @return
      */
     @Override
-    public List<ExportReportDetailbDTO> getUnfinishedThree_HZQY(QcResultShortPageVO qcResultShortPageVO) {
-        return baseMapper.getUnfinishedThree_HZQY(qcResultShortPageVO);
+    public IPage<ExportReportDetailbDTO> getUnfinishedThree_HZQY(FilterTimelinessVO filterTimelinessVO) {
+        return baseMapper.getUnfinishedThree_HZQY(filterTimelinessVO);
     }
 
     /**
      * 时效性报表-超过六天未书写病历（杭州七院）
      *
+     * @param filterTimelinessVO
+     * @return
+     */
+    @Override
+    public IPage<ExportReportDetailbDTO> getUnfinishedSix_HZQY(FilterTimelinessVO filterTimelinessVO) {
+        return baseMapper.getUnfinishedSix_HZQY(filterTimelinessVO);
+    }
+
+    /**
+     * 时效性报表导出-首次病程未在患者入院8小时内完成（杭州七院）
+     *
+     * @param qcResultShortPageVO
+     * @return
+     */
+    @Override
+    public List<ExportReportDetailaaDTO> getUnfinishedFirstExport_HZQY(FilterTimelinessVO filterTimelinessVO) {
+        return baseMapper.getUnfinishedFirstExport_HZQY(filterTimelinessVO);
+    }
+
+    /**
+     * 时效性报表导出-入院记录未在患者入院24小时内完成（杭州七院）
+     *
+     * @param qcResultShortPageVO
+     * @return
+     */
+    @Override
+    public List<ExportReportDetailabDTO> getUnfinishedInExport_HZQY(FilterTimelinessVO filterTimelinessVO) {
+        return baseMapper.getUnfinishedInExport_HZQY(filterTimelinessVO);
+    }
+
+    /**
+     * 时效性报表导出-自杀、冲动、猝死病历入院记录未在患者入院24小时内完成（杭州七院）
+     *
+     * @param qcResultShortPageVO
+     * @return
+     */
+    @Override
+    public List<ExportReportDetailacDTO> getUnfinishedSuicideExport_HZQY(FilterTimelinessVO filterTimelinessVO) {
+        return baseMapper.getUnfinishedSuicideExport_HZQY(filterTimelinessVO);
+    }
+
+    /**
+     * 时效性报表导出-超过三天未书写病历（杭州七院）
+     *
+     * @param qcResultShortPageVO
+     * @return
+     */
+    @Override
+    public List<ExportReportDetailbDTO> getUnfinishedThreeExport_HZQY(FilterTimelinessVO filterTimelinessVO) {
+        return baseMapper.getUnfinishedThreeExport_HZQY(filterTimelinessVO);
+    }
+
+    /**
+     * 时效性报表导出-超过六天未书写病历（杭州七院）
+     *
      * @param qcResultShortPageVO
      * @return
      */
     @Override
-    public List<ExportReportDetailbDTO> getUnfinishedSix_HZQY(QcResultShortPageVO qcResultShortPageVO) {
-        return baseMapper.getUnfinishedSix_HZQY(qcResultShortPageVO);
+    public List<ExportReportDetailbDTO> getUnfinishedSixExport_HZQY(FilterTimelinessVO filterTimelinessVO) {
+        return baseMapper.getUnfinishedSixExport_HZQY(filterTimelinessVO);
     }
 
     @Override

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

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -8,7 +9,7 @@ import java.util.Date;
 import java.util.List;
 
 @Data
-public class FilterTimelinessVO {
+public class FilterTimelinessVO extends Page {
 
     /**
      * 医院id

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

@@ -5,6 +5,7 @@ import java.util.Map;
 
 import javax.validation.Valid;
 
+import com.diagbot.dto.*;
 import com.diagbot.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,25 +15,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.AverageStatisticsDTO;
-import com.diagbot.dto.AverageStatisticsFeeDTO;
-import com.diagbot.dto.ColumnDTO;
-import com.diagbot.dto.DeptNumDTO;
-import com.diagbot.dto.EntryNumDTO;
-import com.diagbot.dto.EntryNumGroupDTO;
-import com.diagbot.dto.EntryStatisticsDTO;
-import com.diagbot.dto.HomePageImproveDTO;
-import com.diagbot.dto.HomePageNumDTO;
-import com.diagbot.dto.LevelStatisticsDTO;
-import com.diagbot.dto.LevelStatisticsTZDTO;
-import com.diagbot.dto.MedicalCheckDTO;
-import com.diagbot.dto.NumDTO;
-import com.diagbot.dto.QcResultShortDTO;
-import com.diagbot.dto.QualityControlDTO;
-import com.diagbot.dto.ReBeHosDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.SjcfStatisticsDTO;
-import com.diagbot.dto.UnModifyMRDTO;
 import com.diagbot.facade.ConsoleFacade;
 
 import io.swagger.annotations.Api;
@@ -731,6 +713,24 @@ public class ConsoleController {
         return RespDTO.onSuc(consoleFacade.unModifyMRStatistics(filterUnModifyMRVO));
     }
 
+    /**
+     * 时效性报表展示：首次病程未在患者入院8小时内完成（杭州七院标准版）、入院记录未在患者入院24小时内完成（杭州七院标准版）、自杀、冲动、猝死病历入院记录未在患者入院24小时内完成（杭州七院标准版）     *
+     *
+     * @param filterTimelinessVO
+     * @return
+     */
+    @ApiOperation(value = "时效性报表展示（杭州七院）[by:zhaops]",
+            notes = "asc： 排序（升序） <br>" +
+                    "desc：排序（降序） <br>" +
+                    "casesEntryIds： 关键条目id <br>" +
+                    "startDate： 起始时间 <br>" +
+                    "endDate： 截止时间 <br>")
+    @PostMapping("/TimelinessReport")
+    @SysLogger("TimelinessReport")
+    public RespDTO<TimelinessReportDTO> TimelinessReport(@RequestBody @Valid FilterTimelinessVO filterTimelinessVO) {
+        return RespDTO.onSuc(consoleFacade.TimelinessReport(filterTimelinessVO));
+    }
+
     /**
      * 时效性报表展示：首次病程未在患者入院8小时内完成（杭州七院标准版）、入院记录未在患者入院24小时内完成（杭州七院标准版）、自杀、冲动、猝死病历入院记录未在患者入院24小时内完成（杭州七院标准版）     *
      *
@@ -738,12 +738,14 @@ public class ConsoleController {
      * @return
      */
     @ApiOperation(value = "时效性报表展示：首次病程未在患者入院8小时内完成（杭州七院标准版）、入院记录未在患者入院24小时内完成（杭州七院标准版）、自杀、冲动、猝死病历入院记录未在患者入院24小时内完成（杭州七院标准版）[by:zhaops]",
-            notes = "casesEntryIds： 关键条目id <br>" +
+            notes = "asc： 排序（升序） <br>" +
+                    "desc：排序（降序） <br>" +
+                    "casesEntryIds： 关键条目id <br>" +
                     "startDate： 起始时间 <br>" +
                     "endDate： 截止时间 <br>")
     @PostMapping("/TimelinessReportA")
     @SysLogger("TimelinessReportA")
-    public RespDTO<UnModifyMRDTO> TimelinessReportA(@RequestBody @Valid FilterTimelinessVO filterTimelinessVO) {
+    public RespDTO<TimelinessReportDTO> TimelinessReportA(@RequestBody @Valid FilterTimelinessVO filterTimelinessVO) {
         return RespDTO.onSuc(consoleFacade.TimelinessReportA(filterTimelinessVO));
     }
 
@@ -754,12 +756,14 @@ public class ConsoleController {
      * @return
      */
     @ApiOperation(value = "时效性报表展示：住院期间连续3天无病程记录（杭州七院标准版）、住院期间连续6天无病程记录（杭州七院标准版）[by:zhaops]",
-            notes = "casesEntryIds： 关键条目id <br>" +
+            notes = "asc： 排序（升序） <br>" +
+                    "desc：排序（降序） <br>" +
+                    "casesEntryIds： 关键条目id <br>" +
                     "startDate： 起始时间 <br>" +
                     "endDate： 截止时间 <br>")
     @PostMapping("/TimelinessReportB")
     @SysLogger("TimelinessReportB")
-    public RespDTO<UnModifyMRDTO> TimelinessReportB(@RequestBody @Valid FilterTimelinessVO filterTimelinessVO) {
+    public RespDTO<TimelinessReportDTO> TimelinessReportB(@RequestBody @Valid FilterTimelinessVO filterTimelinessVO) {
         return RespDTO.onSuc(consoleFacade.TimelinessReportB(filterTimelinessVO));
     }
 

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

@@ -3,6 +3,7 @@ package com.diagbot.web;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
+import com.diagbot.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -11,15 +12,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.facade.ConsoleExportFacade;
-import com.diagbot.vo.BehospitalPageVO;
-import com.diagbot.vo.EntryStatisticsVO;
-import com.diagbot.vo.FilterMedicalCheckVO;
-import com.diagbot.vo.FilterOrderVO;
-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;
@@ -137,7 +129,7 @@ public class ConsoleExportController {
                     "endDate： 截止时间 <br>")
     @PostMapping("/TimelinessReportExport")
     @SysLogger("TimelinessReportExport")
-    public void TimelinessReportExport(HttpServletResponse response, @RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
+    public void TimelinessReportExport(HttpServletResponse response, @RequestBody @Valid FilterTimelinessVO qcResultShortPageVO) {
         consoleExportFacade.TimelinessReportExport(response, qcResultShortPageVO);
     }