代码跟新

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

@@ -1,43 +0,0 @@
-package com.diagbot.dto;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/7/16 13:43
- */
-@Getter
-@Setter
-public class ReBeHosByDeptDTO {
-    /**
-     * 病案号
-     */
-    @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<ReBeHosDetailByDeptDTO> details;
-}

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

@@ -1,69 +0,0 @@
-package com.diagbot.dto;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/7/16 15:17
- */
-@Getter
-@Setter
-public class ReBeHosDetailByDeptDTO {
-    /**
-     * 病人住院号
-     */
-    @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;
-    /**
-     * 科室编码
-     */
-    private String behDeptId;
-    /**
-     * 主管医生
-     */
-    @Excel(name = "主管医生", width = 50, orderNum = "5")
-    private String doctorName;
-    /**
-     * 出院日期
-     */
-    @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;
-    /**
-     * 住院天数
-     */
-    @Excel(name = "住院天数", width = 15, orderNum = "8")
-    private String behospitalDayNum;
-    /**
-     * 住院费用
-     */
-    @Excel(name = "住院费用", width = 15, orderNum = "9")
-    private String totleFee;
-}

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

@@ -18,8 +18,6 @@ public class ReBeHosMergeDTO {
     private String diagnose;
     private String name;
     private String sex;
-    private String doctorName;
-    private String doctorId;
     private String behDeptId;
     private String behDeptName;
     private String behospitalCode;

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

@@ -1967,7 +1967,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
     private void exportQcresultVOSet(ExportQcresultVO exportQcresultVO) {
         //入参验证
         long interval_7 = 7 * 24 * 60 * 60 * 1000;
-        long interval_90 = 90 * 24 * 60 * 60 * 1000l;
+        long interval_90 = 90 * 24 * 60 * 60 * 1000;
         //入院时间
         if (null != exportQcresultVO && null != exportQcresultVO.getBehosDateStart() && null != exportQcresultVO.getBehosDateEnd()) {
             Date startDate = exportQcresultVO.getBehosDateStart();

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

@@ -288,54 +288,6 @@ public class ConsoleByDeptExportFacade {
     }
 
 
-    /**
-     * 病案首页改善率质控评分页导出-科室
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    public void improveMRExportByDept(HttpServletResponse response, QcResultShortPageVO qcResultShortPageVO) {
-        solveParam(qcResultShortPageVO);
-        qcResultShortPageVO.setCurrent(1L);
-        qcResultShortPageVO.setSize(Long.MAX_VALUE);
-        qcResultShortPageVO.setSearchCount(false);
-        List<ExportExcelByDeptDTO> records = behospitalInfoFacade.improveMRExportByDept(qcResultShortPageVO);
-        List<ExportSevenByDeptDTO> resDTO = new ArrayList<ExportSevenByDeptDTO>();
-        if(ListUtil.isNotEmpty(records)){
-            ExportSevenByDeptDTO exportByDeptDTO = new ExportSevenByDeptDTO();
-            exportByDeptDTO.setBehDeptName(records.get(0).getBehDeptName());
-            exportByDeptDTO.setExportExcelByDeptDTOS(records);
-            resDTO.add(exportByDeptDTO);
-        }
-
-        List<ExportNinetyByDeptDTO> resWide = new ArrayList<ExportNinetyByDeptDTO>();
-        if("2".equals(qcResultShortPageVO.getRadioCheck())){
-            resWide = transList(records, resWide);
-        }
-        String fileName = "病案首页改善率质控评分详情.xls";
-        if("1".equals(qcResultShortPageVO.getRadioCheck())){
-            ExcelUtils.exportExcelUser(resDTO, null, "sheet1", ExportSevenByDeptDTO.class, fileName, response);
-        }
-        if("2".equals(qcResultShortPageVO.getRadioCheck())){
-            ExcelUtils.exportExcelUser(resWide, null, "sheet1", ExportNinetyByDeptDTO.class, fileName, response);
-        }
-    }
-
-    /**
-     * 31天再入院统计导出-科室
-     *
-     * @param reBeHosPageVO
-     * @return
-     */
-    public void reHos31DaysPageExportByDept(HttpServletResponse response, ReBeHosPageVO reBeHosPageVO) {
-        reBeHosPageVO.setCurrent(1L);
-        reBeHosPageVO.setSize(Long.MAX_VALUE);
-        reBeHosPageVO.setSearchCount(false);
-        IPage<ReBeHosByDeptDTO> page = consoleByDeptFacade.reHos31DaysPageByDept(reBeHosPageVO);
-        List<ReBeHosByDeptDTO> records = page.getRecords();
-        String fileName = "31天再入院统计详情.xls";
-        ExcelUtils.exportExcel(records, null, "sheet1", ReBeHosByDeptDTO.class, fileName, response);
-    }
 
 
     public void solveParam(QcResultShortPageVO qcResultShortPageVO){
@@ -345,7 +297,7 @@ public class ConsoleByDeptExportFacade {
        Date endDate = qcResultShortPageVO.getEndDate();
        //时间间隔7天
        long interval_7 = 7 * 24 * 60 * 60 * 1000;
-       long interval_90 = 90 * 24 * 60 * 60 * 1000l;
+       long interval_90 = 90 * 24 * 60 * 60 * 1000;
 
        if("1".equals(qcResultShortPageVO.getRadioCheck())){
            //时间间隔7天

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

@@ -1,7 +1,6 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.*;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.EntityUtil;
@@ -764,57 +763,5 @@ public class ConsoleByDeptFacade {
         filterFacade.qcResultShortPageVOSet(qcResultShortPageVO);
         return behospitalInfoFacade.qcCheckMRPageByDept(qcResultShortPageVO);
     }
-    /**
-     * 病案首页改善率质控评分页-科室（内页）
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    public IPage<QcResultShortDTO> hmImproveMRPageByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO) {
-        filterFacade.qcResultShortPageVOSet(qcResultShortPageVO);
-        return behospitalInfoFacade.hmImproveMRPageByDept(qcResultShortPageVO);
-    }
-
-    /**
-     * 31天再入院详情页-科室
-     *
-     * @param reBeHosPageVO
-     * @return
-     */
-    public IPage<ReBeHosByDeptDTO> reHos31DaysPageByDept(ReBeHosPageVO reBeHosPageVO) {
-        filterFacade.reBeHosPageVOSet(reBeHosPageVO);
-        IPage<ReBeHosMergeDTO> page = behospitalInfoFacade.reHos31DaysPageByDept(reBeHosPageVO);
-        List<ReBeHosMergeDTO> records = page.getRecords();
-        IPage<ReBeHosByDeptDTO> retPage = new Page<>();
-        BeanUtil.copyProperties(page, retPage);
-        List<ReBeHosByDeptDTO> retRecords = Lists.newLinkedList();
-        if (ListUtil.isNotEmpty(records)) {
-            for (ReBeHosMergeDTO record : records) {
-                ReBeHosByDeptDTO retRecord = new ReBeHosByDeptDTO();
-                BeanUtil.copyProperties(record, retRecord);
-                List<ReBeHosDetailByDeptDTO> details = Lists.newLinkedList();
-                ReBeHosDetailByDeptDTO detailRecord = new ReBeHosDetailByDeptDTO();
-                BeanUtil.copyProperties(record, detailRecord);
-                details.add(detailRecord);
-                ReBeHosDetailByDeptDTO lastDetailRecord = new ReBeHosDetailByDeptDTO();
-                lastDetailRecord.setName(record.getName());
-                lastDetailRecord.setBehDeptId(record.getLastBehDeptId());
-                lastDetailRecord.setDoctorName(record.getDoctorName());
-                lastDetailRecord.setBehospitalCode(record.getLastBehospitalCode());
-                lastDetailRecord.setBehospitalDate(record.getLastBehospitalDate());
-                lastDetailRecord.setLeaveHospitalDate(record.getLastLeaveHospitalDate());
-                lastDetailRecord.setLevel(record.getLastLevel());
-                lastDetailRecord.setScoreRes(record.getLastScoreRes());
-                lastDetailRecord.setBehospitalDayNum(record.getLastBehospitalDayNum());
-                lastDetailRecord.setTotleFee(record.getLastTotleFee());
-                details.add(lastDetailRecord);
-                retRecord.setDetails(details);
-                retRecords.add(retRecord);
-            }
-        }
-        retPage.setRecords(retRecords);
-        return retPage;
-    }
-
 
 }

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

@@ -263,7 +263,7 @@ public class ConsoleExportFacade {
         Date endDate = qcResultShortPageVO.getEndDate();
         //时间间隔7天
         long interval_7 = 7 * 24 * 60 * 60 * 1000;
-        long interval_90 = 90 * 24 * 60 * 60 * 1000l;
+        long interval_90 = 90 * 24 * 60 * 60 * 1000;
 
         if("1".equals(qcResultShortPageVO.getRadioCheck())){
             //时间间隔7天
@@ -387,7 +387,7 @@ public class ConsoleExportFacade {
         Date endDate = qcResultShortPageVO.getEndDate();
         //时间间隔7天
         long interval_7 = 7 * 24 * 60 * 60 * 1000;
-        long interval_90 = 90 * 24 * 60 * 60 * 1000l;
+        long interval_90 = 90 * 24 * 60 * 60 * 1000;
 
         if("1".equals(qcResultShortPageVO.getRadioCheck())){
             //时间间隔7天
@@ -506,7 +506,7 @@ public class ConsoleExportFacade {
         Date endDate = qcResultShortPageVO.getEndDate();
         //时间间隔7天
         long interval_7 = 7 * 24 * 60 * 60 * 1000;
-        long interval_90 = 90 * 24 * 60 * 60 * 1000l;
+        long interval_90 = 90 * 24 * 60 * 60 * 1000;
 
         if("1".equals(qcResultShortPageVO.getRadioCheck())){
             //时间间隔7天
@@ -561,7 +561,7 @@ public class ConsoleExportFacade {
 
         //时间间隔7天
         long interval_7 = 7 * 24 * 60 * 60 * 1000;
-        long interval_90 = 90 * 24 * 60 * 60 * 1000l;
+        long interval_90 = 90 * 24 * 60 * 60 * 1000;
 
         if("1".equals(qcResultShortPageVO.getRadioCheck())){
             //时间间隔7天

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

@@ -474,15 +474,6 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      */
     public IPage<ReBeHosMergeDTO> reHos31DaysPage(@Param("reBeHosPageVO") ReBeHosPageVO reBeHosPageVO);
 
-    /**
-     * 31天再入院详情页-科室
-     *
-     * @param reBeHosPageVO
-     * @return
-     */
-    public IPage<ReBeHosMergeDTO> reHos31DaysPageByDept(@Param("reBeHosPageVO") ReBeHosPageVO reBeHosPageVO);
-
-
     /**
      * 入院人数统计-首页
      *
@@ -508,15 +499,6 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      */
     public IPage<QcResultShortDTO> hmImproveMRPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
-    /**
-     * 病案首页改善率质控评分页-科室（内页）
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    public IPage<QcResultShortDTO> hmImproveMRPageByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-
-
     /**
      * 病案首页改善率质控评分页导出
      *
@@ -549,15 +531,6 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      */
     public List<ExportExcelDTO> qcCheckMRPageExport(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
-    /**
-     * 质控核查质控评分页导出-科室
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    public List<ExportExcelByDeptDTO> improveMRExportByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-
-
     /**
      * 质控核查质控评分页-科室 导出
      *

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

@@ -439,14 +439,6 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      */
     public IPage<ReBeHosMergeDTO> reHos31DaysPage(@Param("reBeHosPageVO") ReBeHosPageVO reBeHosPageVO);
 
-    /**
-     * 31天再入院详情页
-     *
-     * @param reBeHosPageVO
-     * @return
-     */
-    public IPage<ReBeHosMergeDTO> reHos31DaysPageByDept(@Param("reBeHosPageVO") ReBeHosPageVO reBeHosPageVO);
-
     /**
      * 入院人数统计-首页
      *
@@ -470,13 +462,6 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @return
      */
     public IPage<QcResultShortDTO> hmImproveMRPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-    /**
-     * 病案首页改善率质控评分页-科室（内页）
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    public IPage<QcResultShortDTO> hmImproveMRPageByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
     /**
      * 病案首页改善率质控评分页导出
@@ -486,14 +471,6 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      */
     public List<ExportExcelDTO> hmImproveMRPageExport(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
-    /**
-     * 病案首页改善率质控评分页导出-科室
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    public List<ExportExcelByDeptDTO> improveMRExportByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-
     /**
      * 质控核查质控评分页（内页）
      *

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

@@ -710,17 +710,6 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
     public IPage<ReBeHosMergeDTO> reHos31DaysPage(@Param("reBeHosPageVO") ReBeHosPageVO reBeHosPageVO) {
         return baseMapper.reHos31DaysPage(reBeHosPageVO);
     }
-    /**
-     * 31天再入院详情页-科室
-     *
-     * @param reBeHosPageVO
-     * @return
-     */
-    @Override
-    public IPage<ReBeHosMergeDTO> reHos31DaysPageByDept(@Param("reBeHosPageVO") ReBeHosPageVO reBeHosPageVO) {
-        return baseMapper.reHos31DaysPageByDept(reBeHosPageVO);
-    }
-
 
     /**
      * 入院人数统计-首页
@@ -755,17 +744,6 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
         return baseMapper.hmImproveMRPage(qcResultShortPageVO);
     }
 
-    /**
-     * 病案首页改善率质控评分页-科室（内页）
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    @Override
-    public IPage<QcResultShortDTO> hmImproveMRPageByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO) {
-        return baseMapper.hmImproveMRPageByDept(qcResultShortPageVO);
-    }
-
     /**
      * 病案首页改善率质控评分页导出
      *
@@ -777,16 +755,6 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
         return baseMapper.hmImproveMRPageExport(qcResultShortPageVO);
     }
 
-    /**
-     * 病案首页改善率质控评分页导出-科室
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    @Override
-    public List<ExportExcelByDeptDTO> improveMRExportByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO) {
-        return baseMapper.improveMRExportByDept(qcResultShortPageVO);
-    }
     /**
      * 质控核查质控评分页（内页）
      *
@@ -820,6 +788,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
         return baseMapper.qcCheckMRPageExport(qcResultShortPageVO);
     }
 
+
     /**
      * 质控核查质控评分页-科室 导出
      *

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

@@ -20,7 +20,6 @@ public class ReBeHosPageVO extends Page {
     private Long userId;
     @ApiModelProperty(hidden = true)
     private String hospitalId;
-    private String deptName;
     @NotNull(message = "请输入起始时间")
     private Date startDate;
     @NotNull(message = "请输入截止时间")

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

@@ -242,7 +242,7 @@ public class ConsoleByDeptController {
                     "casesEntryName： 条目名称 <br>" +
                     "titleName： 标题名称 <br>" +
                     "casesEntryId： 条目id <br>" +
-                    "deptName：科室名称 <br>" +
+                    "behDeptName：科室名称 <br>" +
                     "doctorId：医生工号 <br>" +
                     "doctorName：医生姓名 <br>" +
                     "level： 病历等级 <br>" +
@@ -267,7 +267,7 @@ public class ConsoleByDeptController {
                     "patName： 病人姓名 <br>" +
                     "casesEntryName： 条目名称 <br>" +
                     "casesEntryId： 条目id <br>" +
-                    "deptName：科室名称 <br>" +
+                    "behDeptName：科室名称 <br>" +
                     "doctorName：主治医生名称 <br>" +
                     "level： 病历等级 <br>" +
                     "diagnose： 主诊断 <br>" +
@@ -310,7 +310,7 @@ public class ConsoleByDeptController {
     @ApiOperation(value = "出院人数统计-科室[by:cy]",
             notes = "behospitalCode： 病历号<br>" +
                     "patName： 病人姓名 <br>" +
-                    "deptName：科室名称 <br>" +
+                    "behDeptName：科室名称 <br>" +
                     "doctorId：医生工号 <br>" +
                     "doctorName：医生姓名 <br>" +
                     "level： 病历等级 <br>" +
@@ -360,7 +360,7 @@ public class ConsoleByDeptController {
     @ApiOperation(value = "质控核查质控评分页-科室（内页）[by:cy]",
             notes = "behospitalCode： 病历号<br>" +
                     "patName： 病人姓名 <br>" +
-                    "deptName：科室名称 <br>" +
+                    "behDeptName：科室名称 <br>" +
                     "doctorId：医生工号 <br>" +
                     "doctorName：医生姓名 <br>" +
                     "level： 病历等级 <br>" +
@@ -380,54 +380,5 @@ public class ConsoleByDeptController {
     public RespDTO<IPage<QcResultShortDTO>> qcCheckMRPageByDept(@RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
         return RespDTO.onSuc(consoleByDeptFacade.qcCheckMRPageByDept(qcResultShortPageVO));
     }
-
-    /**
-     * 病案首页改善率质控评分页-科室（内页）
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    @ApiOperation(value = "病案首页改善率质控评分页（内页）[by:cy]",
-            notes = "behospitalCode： 病历号<br>" +
-                    "patName： 病人姓名 <br>" +
-                    "deptName：科室名称 <br>" +
-                    "doctorId：医生工号 <br>" +
-                    "doctorName：医生姓名 <br>" +
-                    "level： 病历等级 <br>" +
-                    "improveType： 改善标志（1：病案首页改善病历，2：病案首页改善至合格病历，3：病案首页改善至满分病历） <br>" +
-                    "checkStatus： 核查状态（1：已核查，0：未核查） <br>" +
-                    "mrStatus： 首页核查状态（1：已核查，0：未核查） <br>" +
-                    "chName： 病历核查人员 <br>" +
-                    "mrName： 首页核查人员 <br>" +
-                    "chTimeStart： 病历核查起始时间 <br>" +
-                    "chTimeEnd： 病历核查截止时间 <br>" +
-                    "mrTimeStart： 首页核查起始时间 <br>" +
-                    "mrTimeEnd： 首页核查截止时间 <br>" +
-                    "startDate： 起始时间 <br>" +
-                    "endDate： 截止时间 <br>" +
-                    "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
-    @PostMapping("/hmImproveMRPageByDept")
-    @SysLogger("hmImproveMRPageByDept")
-    public RespDTO<IPage<QcResultShortDTO>> hmImproveMRPageByDept(@RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
-        return RespDTO.onSuc(consoleByDeptFacade.hmImproveMRPageByDept(qcResultShortPageVO));
-    }
-
-    /**
-     * 31天再入院人数-科室（内页）
-     *
-     * @param reBeHosPageVO
-     * @return
-     */
-    @ApiOperation(value = "31天再入院人数-科室（内页）[by:cy]",
-            notes = "name： 病人名称 <br>" +
-                    "fileCode： 病案号 <br>" +
-                    "startDate： 起始时间 <br>" +
-                    "endDate： 截止时间 <br>" +
-                    "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
-    @PostMapping("/reHos31DaysPageByDept")
-    @SysLogger("reHos31DaysPageByDept")
-    public RespDTO<IPage<ReBeHosDTO>> reHos31DaysPageByDept(@RequestBody @Valid ReBeHosPageVO reBeHosPageVO) {
-        return RespDTO.onSuc(consoleByDeptFacade.reHos31DaysPageByDept(reBeHosPageVO));
-    }
     //endregion -----------------------内页接口结束------------------------------
 }

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

@@ -281,56 +281,6 @@ public class ConsoleByDeptExportController {
         consoleByDeptExportFacade.qcCheckMRPageExportByDept(response, qcResultShortPageVO);
     }
 
-    /**
-     * 病案首页改善率质控评分页导出-科室
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    @ApiOperation(value = "病案首页改善率质控评分页导出[by:cy]",
-            notes = "behospitalCode： 病历号<br>" +
-                    "patName： 病人姓名 <br>" +
-                    "deptName：科室名称 <br>" +
-                    "doctorId：医生工号 <br>" +
-                    "doctorName：医生姓名 <br>" +
-                    "level： 病历等级 <br>" +
-                    "improveType： 改善标志（1：病案首页改善病历，2：病案首页改善至合格病历，3：病案首页改善至满分病历） <br>" +
-                    "checkStatus： 核查状态（1：已核查，0：未核查） <br>" +
-                    "mrStatus： 首页核查状态（1：已核查，0：未核查） <br>" +
-                    "chName： 病历核查人员 <br>" +
-                    "mrName： 首页核查人员 <br>" +
-                    "chTimeStart： 病历核查起始时间 <br>" +
-                    "chTimeEnd： 病历核查截止时间 <br>" +
-                    "mrTimeStart： 首页核查起始时间 <br>" +
-                    "mrTimeEnd： 首页核查截止时间 <br>" +
-                    "startDate： 起始时间 <br>" +
-                    "endDate： 截止时间 <br>" +
-                    "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
-    @PostMapping("/improveMRExportByDept")
-    @SysLogger("improveMRExportByDept")
-    public void improveMRExportByDept(HttpServletResponse response, @RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
-        consoleByDeptExportFacade.improveMRExportByDept(response, qcResultShortPageVO);
-    }
-
-    /**
-     * 未整改病历统计-科室 导出
-     * 31天再入院统计-科室 导出
-     *
-     * @param reBeHosPageVO
-     * @return
-     */
-    @ApiOperation(value = "31天再入院统计导出-科室 [by:cy]",
-            notes = "name： 病人姓名 <br>" +
-                    "fileCode： 病案号 <br>" +
-                    "startDate： 起始时间 <br>" +
-                    "endDate： 截止时间 <br>" +
-                    "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
-    @PostMapping("/reHos31DaysPageExportByDept")
-    @SysLogger("reHos31DaysPageExportByDept")
-    public void reHos31DaysPageExportByDept(HttpServletResponse response, @RequestBody @Valid ReBeHosPageVO reBeHosPageVO) {
-        consoleByDeptExportFacade.reHos31DaysPageExportByDept(response, reBeHosPageVO);
-    }
-
 /**
      * 病历稽查统计（首页）
      * @param filterVO