时效性报表展示

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

@@ -75,6 +75,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/casesEntryHospital/getQcCasesAll").permitAll()
                 .antMatchers("/qc/behospitalInfo/getByBehospitalCode").permitAll()
                 .antMatchers("/bas/dept/getList").permitAll()
+                .antMatchers("/bas/dept/getTimelinessList").permitAll()
                 .antMatchers("/bas/dept/getListUser").permitAll()
                 .antMatchers("/qc/behospitalInfo/page_dept").permitAll()
                 .antMatchers("/qc/behospitalInfo/page_person").permitAll()
@@ -128,6 +129,8 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/console/qcCheckStatistics").permitAll()
                 .antMatchers("/console/unModifyMRStatistics").permitAll()
                 .antMatchers("/console/unModifyMRPage").permitAll()
+                .antMatchers("/console/TimelinessReportA").permitAll()
+                .antMatchers("/console/TimelinessReportB").permitAll()
                 .antMatchers("/console/reHos31DaysPage").permitAll()
                 .antMatchers("/console/beHosCount").permitAll()
                 .antMatchers("/console/casesEntryStatisticsById").permitAll()

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

@@ -150,6 +150,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/casesEntryHospital/getQcCasesAll", request)
                 || matchers("/qc/behospitalInfo/getByBehospitalCode", request)
                 || matchers("/bas/dept/getList", request)
+                || matchers("/bas/dept/getTimelinessList", request)
                 || matchers("/bas/dept/getListUser", request)
                 || matchers("/qc/behospitalInfo/page_dept", request)
                 || matchers("/qc/behospitalInfo/page_person", request)
@@ -204,6 +205,8 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/console/qcCheckStatistics", request)
                 || matchers("/console/unModifyMRStatistics", request)
                 || matchers("/console/unModifyMRPage", request)
+                || matchers("/console/TimelinessReportA", request)
+                || matchers("/console/TimelinessReportB", request)
                 || matchers("/console/reHos31DaysPage", request)
                 || matchers("/console/beHosCount", request)
                 || matchers("/console/casesEntryStatisticsById", request)

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

@@ -0,0 +1,16 @@
+package com.diagbot.dto;
+
+import lombok.Data;
+
+@Data
+public class TimelinessListInfoDTO {
+    /**
+     * 表头编号
+     */
+    private Long TimelinessId;
+
+    /**
+     * 表头名称
+     */
+    private String TimelinessName;
+}

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

@@ -1,11 +1,13 @@
 package com.diagbot.facade;
 
 import com.diagbot.dto.BasDeptInfoDTO;
+import com.diagbot.dto.TimelinessListInfoDTO;
 import com.diagbot.service.impl.BasDeptInfoServiceImpl;
 import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.BasDeptInfoVO;
 import org.springframework.stereotype.Component;
 
+import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -29,6 +31,44 @@ public class BasDeptInfoFacade extends BasDeptInfoServiceImpl {
     }
 
 
+    /**
+     * 获取医院科室下拉列表信息
+     *
+     * @param basDeptInfoVO 搜索参数
+     * @return 医院科室下拉列表信息
+     */
+    public List<TimelinessListInfoDTO> listForTimeliness(BasDeptInfoVO basDeptInfoVO) {
+        List<TimelinessListInfoDTO> timelinessListInfoDTOList = new LinkedList<>();
+
+        TimelinessListInfoDTO timelinessListInfoDTO1 = new TimelinessListInfoDTO();
+        timelinessListInfoDTO1.setTimelinessId(3241L);
+        timelinessListInfoDTO1.setTimelinessName("首次病程未在患者入院8小时内完成(杭州七院标准版)");
+        timelinessListInfoDTOList.add(timelinessListInfoDTO1);
+
+        TimelinessListInfoDTO timelinessListInfoDTO2 = new TimelinessListInfoDTO();
+        timelinessListInfoDTO2.setTimelinessId(3242L);
+        timelinessListInfoDTO2.setTimelinessName("入院记录未在患者入院24小时内完成（杭州七院标准版）");
+        timelinessListInfoDTOList.add(timelinessListInfoDTO2);
+
+        TimelinessListInfoDTO timelinessListInfoDTO3 = new TimelinessListInfoDTO();
+        timelinessListInfoDTO3.setTimelinessId(3243L);
+        timelinessListInfoDTO3.setTimelinessName("自杀、冲动、猝死病历入院记录未在患者入院24小时内完成（杭州七院标准版）");
+        timelinessListInfoDTOList.add(timelinessListInfoDTO3);
+
+        TimelinessListInfoDTO timelinessListInfoDTO4 = new TimelinessListInfoDTO();
+        timelinessListInfoDTO4.setTimelinessId(3240L);
+        timelinessListInfoDTO4.setTimelinessName("住院期间连续3天无病程记录（杭州七院标准版）");
+        timelinessListInfoDTOList.add(timelinessListInfoDTO4);
+
+        TimelinessListInfoDTO timelinessListInfoDTO5 = new TimelinessListInfoDTO();
+        timelinessListInfoDTO5.setTimelinessId(3244L);
+        timelinessListInfoDTO5.setTimelinessName("住院期间连续6天无病程记录（杭州七院标准版）");
+        timelinessListInfoDTOList.add(timelinessListInfoDTO5);
+
+        return timelinessListInfoDTOList;
+    }
+
+
     /**
      * 获取医院用户下拉列表信息
      *

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

@@ -21,6 +21,7 @@ import javax.validation.Valid;
 
 import com.diagbot.dto.*;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.diagbot.vo.*;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.BeanUtils;
@@ -57,22 +58,6 @@ import com.diagbot.util.ListUtil;
 import com.diagbot.util.ObjectUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.SysUserUtils;
-import com.diagbot.vo.AlgorithmVO;
-import com.diagbot.vo.BehospitalPageVO;
-import com.diagbot.vo.CaseScoreVO;
-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.FilterVO;
-import com.diagbot.vo.IndexTimeVO;
-import com.diagbot.vo.MedIndexFilterVO;
-import com.diagbot.vo.QcResultAlgVO;
-import com.diagbot.vo.QcResultPageVO;
-import com.diagbot.vo.QcResultShortPageVO;
-import com.diagbot.vo.ReBeHosPageVO;
 import com.google.common.collect.Lists;
 
 import io.github.lvyahui8.spring.aggregate.facade.DataBeanAggregateQueryFacade;
@@ -3153,6 +3138,247 @@ public class ConsoleFacade {
     }
 
 
+    /**
+     * 未整改病历统计
+     *
+     * @param filterTimelinessVO
+     * @return
+     */
+    public UnModifyMRDTO TimelinessReportA(FilterTimelinessVO filterTimelinessVO) {
+        UnModifyMRDTO unModifyMRDTO = new UnModifyMRDTO();
+            List<Object> retList = Lists.newLinkedList();
+        List<ColumnDTO> columns = Lists.newLinkedList();
+
+        Integer orderNo = 1;
+        ColumnDTO columnHospitalCode = new ColumnDTO();
+        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++;
+
+        ColumnDTO columnBehospitalGmtCreate = new ColumnDTO();
+        columnBehospitalGmtCreate.setOrderNo(orderNo);
+        columnBehospitalGmtCreate.setFieldName("behospitalGmtCreate");
+        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++;
+
+        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);
+
+        for (String casesEntryId : filterTimelinessVO.getCasesEntryIds()) {
+            if (casesEntryId.equals("3241")) {
+                List<ExportReportDetailaDTO> unfinishedFirst = behospitalInfoFacade.getUnfinishedFirst_HZQY(qcResultShortPageVO);
+                retList.addAll(unfinishedFirst);
+            } else if (casesEntryId.equals("3242")) {
+                List<ExportReportDetailaDTO> unfinishedIn = behospitalInfoFacade.getUnfinishedIn_HZQY(qcResultShortPageVO);
+                retList.addAll(unfinishedIn);
+            } else if (casesEntryId.equals("3243")) {
+                List<ExportReportDetailaDTO> unfinishedSuicide = behospitalInfoFacade.getUnfinishedSuicide_HZQY(qcResultShortPageVO);
+                retList.addAll(unfinishedSuicide);
+            }
+        }
+
+        unModifyMRDTO.setColumns(columns);
+        unModifyMRDTO.setData(retList);
+        return unModifyMRDTO;
+    }
+
+
+    /**
+     * 未整改病历统计
+     *
+     * @param filterTimelinessVO
+     * @return
+     */
+    public UnModifyMRDTO TimelinessReportB(FilterTimelinessVO filterTimelinessVO) {
+        UnModifyMRDTO unModifyMRDTO = new UnModifyMRDTO();
+        List<Object> retList = Lists.newLinkedList();
+        List<ColumnDTO> columns = Lists.newLinkedList();
+
+        Integer orderNo = 1;
+        ColumnDTO columnHospitalCode = new ColumnDTO();
+        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++;
+
+        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);
+        List<String> casesEntryIds = filterTimelinessVO.getCasesEntryIds();
+        for (String casesEntryId : casesEntryIds) {
+            if (casesEntryId.equals("3240")) {
+                List<ExportReportDetailbDTO> unfinishedThree = behospitalInfoFacade.getUnfinishedThree_HZQY(qcResultShortPageVO);
+                retList.addAll(unfinishedThree);
+            } else if (casesEntryId.equals("3244")) {
+                List<ExportReportDetailbDTO> unfinishedSix = behospitalInfoFacade.getUnfinishedSix_HZQY(qcResultShortPageVO);
+                retList.addAll(unfinishedSix);
+            }
+        }
+
+        unModifyMRDTO.setColumns(columns);
+        unModifyMRDTO.setData(retList);
+        return unModifyMRDTO;
+    }
+
+
     /**
      * 未整改病历质控评分页（内页）
      *

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

@@ -512,6 +512,13 @@ public class FilterFacade {
         filterUnModifyMRVO.setUserId(Long.valueOf(userId));
     }
 
+    public void filterTimelinessVOSet(FilterTimelinessVO filterTimelinessVO) {
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        String userId = SysUserUtils.getCurrentPrincipleID();
+        filterTimelinessVO.setHospitalId(hospitalId);
+        filterTimelinessVO.setUserId(Long.valueOf(userId));
+    }
+
     /**
      * 31天再入院参数拼接
      *

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

@@ -0,0 +1,42 @@
+package com.diagbot.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class FilterTimelinessVO {
+
+    /**
+     * 医院id
+     */
+    @ApiModelProperty(hidden = true)
+    private String hospitalId;
+
+    /**
+     * 医生id
+     */
+    @ApiModelProperty(hidden = true)
+    private Long userId;
+
+    /**
+     * 关键条目id
+     */
+    private List<String> casesEntryIds;
+//    private Long casesEntryId;
+
+    /**
+     * 科室名称
+     */
+    private String deptName;
+
+    @NotNull(message = "请输入起始时间")
+    private Date startDate;
+
+    @NotNull(message = "请输入截止时间")
+    private Date endDate;
+
+}

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

@@ -4,6 +4,7 @@ package com.diagbot.web;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.BasDeptInfoDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.TimelinessListInfoDTO;
 import com.diagbot.facade.BasDeptInfoFacade;
 import com.diagbot.vo.BasDeptInfoVO;
 import io.swagger.annotations.Api;
@@ -49,6 +50,14 @@ public class BasDeptInfoController {
         return RespDTO.onSuc(basDeptInfoFacade.listForUser(basDeptInfoVO));
     }
 
+    @ApiOperation(value = "获取时效性报表下拉列表信息[by:gaodm]",
+            notes = "inputStr: 搜索参数")
+    @PostMapping("/getTimelinessList")
+    @SysLogger("getTimelinessList")
+    public RespDTO<List<TimelinessListInfoDTO>> getTimelinessList(@RequestBody BasDeptInfoVO basDeptInfoVO) {
+        return RespDTO.onSuc(basDeptInfoFacade.listForTimeliness(basDeptInfoVO));
+    }
+
     @ApiOperation(value = "获取病历质控一览下用户科室下拉列表信息[by:gaodm]",
             notes = "inputStr: 搜索参数")
     @PostMapping("/getListUser")

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

@@ -5,6 +5,7 @@ import java.util.Map;
 
 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;
@@ -33,18 +34,6 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SjcfStatisticsDTO;
 import com.diagbot.dto.UnModifyMRDTO;
 import com.diagbot.facade.ConsoleFacade;
-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.FilterVO;
-import com.diagbot.vo.IndexTimeVO;
-import com.diagbot.vo.QcResultPageVO;
-import com.diagbot.vo.QcResultShortPageVO;
-import com.diagbot.vo.ReBeHosPageVO;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -742,6 +731,38 @@ public class ConsoleController {
         return RespDTO.onSuc(consoleFacade.unModifyMRStatistics(filterUnModifyMRVO));
     }
 
+    /**
+     * 时效性报表展示：首次病程未在患者入院8小时内完成（杭州七院标准版）、入院记录未在患者入院24小时内完成（杭州七院标准版）、自杀、冲动、猝死病历入院记录未在患者入院24小时内完成（杭州七院标准版）     *
+     *
+     * @param filterTimelinessVO
+     * @return
+     */
+    @ApiOperation(value = "时效性报表展示：首次病程未在患者入院8小时内完成（杭州七院标准版）、入院记录未在患者入院24小时内完成（杭州七院标准版）、自杀、冲动、猝死病历入院记录未在患者入院24小时内完成（杭州七院标准版）[by:zhaops]",
+            notes = "casesEntryIds： 关键条目id <br>" +
+                    "startDate： 起始时间 <br>" +
+                    "endDate： 截止时间 <br>")
+    @PostMapping("/TimelinessReportA")
+    @SysLogger("TimelinessReportA")
+    public RespDTO<UnModifyMRDTO> TimelinessReportA(@RequestBody @Valid FilterTimelinessVO filterTimelinessVO) {
+        return RespDTO.onSuc(consoleFacade.TimelinessReportA(filterTimelinessVO));
+    }
+
+    /**
+     * 时效性报表展示：住院期间连续3天无病程记录（杭州七院标准版）、住院期间连续6天无病程记录（杭州七院标准版）
+     *
+     * @param filterTimelinessVO
+     * @return
+     */
+    @ApiOperation(value = "时效性报表展示：住院期间连续3天无病程记录（杭州七院标准版）、住院期间连续6天无病程记录（杭州七院标准版）[by:zhaops]",
+            notes = "casesEntryIds： 关键条目id <br>" +
+                    "startDate： 起始时间 <br>" +
+                    "endDate： 截止时间 <br>")
+    @PostMapping("/TimelinessReportB")
+    @SysLogger("TimelinessReportB")
+    public RespDTO<UnModifyMRDTO> TimelinessReportB(@RequestBody @Valid FilterTimelinessVO filterTimelinessVO) {
+        return RespDTO.onSuc(consoleFacade.TimelinessReportB(filterTimelinessVO));
+    }
+
     /**
      * 未整改病历质控评分页（内页）
      *

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -3267,8 +3267,8 @@
     <!-- 时效性报表-首次病程未在患者入院8小时内完成（杭州七院标准版） -->
     <select id="getUnfinishedFirst_HZQY" parameterType="com.diagbot.vo.QcResultShortPageVO" resultType="com.diagbot.dto.ExportReportDetailaDTO">
         SELECT DISTINCT
-            a.behospital_code AS hospitalId,
-            a.hospital_id AS behospitalCode,
+        a.behospital_code AS behospitalCode,
+        a.hospital_id AS hospitalId,
             a.`name` AS name,
             a.sex AS sex,
             a.file_code AS fileCode,
@@ -3284,8 +3284,6 @@
                 JOIN
             (
                 SELECT
-                    mode_id,
-                    rec_title,
                     behospital_code,
                     MIN(rec_date) as rec_date
                 FROM
@@ -3321,8 +3319,8 @@
     <!-- 时效性报表-入院记录未在患者入院24小时内完成（杭州七院） -->
     <select id="getUnfinishedIn_HZQY" parameterType="com.diagbot.vo.QcResultShortPageVO" resultType="com.diagbot.dto.ExportReportDetailaDTO">
         SELECT DISTINCT
-        a.behospital_code AS hospitalId,
-        a.hospital_id AS behospitalCode,
+        a.behospital_code AS behospitalCode,
+        a.hospital_id AS hospitalId,
         a.`name` AS name,
         a.sex AS sex,
         a.file_code AS fileCode,
@@ -3338,8 +3336,6 @@
         JOIN
         (
         SELECT
-        mode_id,
-        rec_title,
         behospital_code,
         MIN(rec_date) as rec_date
         FROM
@@ -3375,8 +3371,8 @@
     <!-- 时效性报表-自杀、冲动、猝死病历入院记录未在患者入院24小时内完成（杭州七院） -->
     <select id="getUnfinishedSuicide_HZQY" parameterType="com.diagbot.vo.QcResultShortPageVO" resultType="com.diagbot.dto.ExportReportDetailaDTO">
         SELECT DISTINCT
-        a.behospital_code AS hospitalId,
-        a.hospital_id AS behospitalCode,
+        a.behospital_code AS behospitalCode,
+        a.hospital_id AS hospitalId,
         a.`name` AS name,
         a.sex AS sex,
         a.file_code AS fileCode,
@@ -3392,8 +3388,6 @@
         JOIN
         (
         SELECT
-        mode_id,
-        rec_title,
         behospital_code,
         MIN(rec_date) as rec_date
         FROM
@@ -3429,8 +3423,8 @@
     <!-- 时效性报表-时效性报表-超过三天未书写病历（杭州七院） -->
     <select id="getUnfinishedThree_HZQY" parameterType="com.diagbot.vo.QcResultShortPageVO" resultType="com.diagbot.dto.ExportReportDetailbDTO">
         SELECT DISTINCT
-        a.behospital_code AS hospitalId,
-        a.hospital_id AS behospitalCode,
+        a.behospital_code AS behospitalCode,
+        a.hospital_id AS hospitalId,
         a.`name` AS name,
         a.sex AS sex,
         a.file_code AS fileCode,
@@ -3469,8 +3463,8 @@
     <!-- 时效性报表-超过六天未书写病历（杭州七院） -->
     <select id="getUnfinishedSix_HZQY" parameterType="com.diagbot.vo.QcResultShortPageVO" resultType="com.diagbot.dto.ExportReportDetailbDTO">
         SELECT DISTINCT
-        a.behospital_code AS hospitalId,
-        a.hospital_id AS behospitalCode,
+        a.behospital_code AS behospitalCode,
+        a.hospital_id AS hospitalId,
         a.`name` AS name,
         a.sex AS sex,
         a.file_code AS fileCode,