病案首页报表统计相关接口更新

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

@@ -240,13 +240,6 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/print/export/qcResultShortExportByDeptPage").permitAll()
                 .antMatchers("/print/export/levelExportByDept").permitAll()
                 .antMatchers("/consoleByDept/entryStatisticsByDept").permitAll()
-                .antMatchers("/print/export/entryStatisticsExportByDept").permitAll()
-                .antMatchers("/consoleByDept/leaveHosMRPageByDept").permitAll()
-                .antMatchers("/print/export/leaveHosMrPageExportByDept").permitAll()
-                .antMatchers("/consoleByDept/qcCheckStatisticsByDept").permitAll()
-                .antMatchers("/print/export/qcCheckStaExportByDept").permitAll()
-                .antMatchers("/consoleByDept/qcCheckMRPageByDept").permitAll()
-                .antMatchers("/print/export/qcCheckMRPageExportByDept").permitAll()
                 .antMatchers("/consoleByDept/hmImproveMRPageByDept").permitAll()
                 .antMatchers("/print/export/improveMRExportByDept").permitAll()
                 .antMatchers("/consoleByDept/reHos31DaysPageByDept").permitAll()

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

@@ -316,13 +316,6 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/print/export/qcResultShortExportByDeptPage", request)
                 || matchers("/print/export/levelExportByDept", request)
                 || matchers("/consoleByDept/entryStatisticsByDept", request)
-                || matchers("/print/export/entryStatisticsExportByDept", request)
-                || matchers("/consoleByDept/leaveHosMRPageByDept", request)
-                || matchers("/print/export/leaveHosMrPageExportByDept", request)
-                || matchers("/consoleByDept/qcCheckStatisticsByDept", request)
-                || matchers("/print/export/qcCheckStaExportByDept", request)
-                || matchers("/consoleByDept/qcCheckMRPageByDept", request)
-                || matchers("/print/export/qcCheckMRPageExportByDept", request)
                 || matchers("/consoleByDept/hmImproveMRPageByDept", request)
                 || matchers("/print/export/improveMRExportByDept", request)
                 || matchers("/consoleByDept/reHos31DaysPageByDept", request)

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

@@ -1,23 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description: 核查科室输出类
- * @Author:songxl
- * @time: 2024/5/14 13:45
- */
-@Getter
-@Setter
-public class CheckDeptDTO {
-    //科室id
-    private String deptId;
-    //科室名称
-    private String deptName;
-    //科室医疗组列表
-    private List<CheckMedoupDTO> checkMedoups = new ArrayList<>();
-}

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

@@ -1,23 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description: 核查医疗组输出类
- * @Author:songxl
- * @time: 2024/5/14 13:45
- */
-@Getter
-@Setter
-public class CheckMedoupDTO {
-    //医疗组code
-    private String medoupCode;
-    //医疗组名称
-    private String medoupName;
-    //科室质控人员列表
-    private List<DeptCheckUserDTO> deptcheckUsers = new ArrayList<>();
-}

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

@@ -1,40 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description: 核查人员用户科室、姓名、角色输出类
- * @Author:songxl
- * @time: 2024/5/14 13:45
- */
-@Data
-public class CheckUserDTO {
-    /**
-     * 病区code
-     */
-    private String wardCode;
-    /**
-     * 病区名称
-     */
-    private String wardName;
-    //科室id
-    private String deptId;
-    //科室名称
-    private String deptName;
-    /**
-     * 医疗组Code
-     */
-    private String medoupCode;
-    /**
-     * 医疗组名称
-     */
-    private String medoupName;
-    //医生id
-    private String doctorId;
-    //医生名称
-    private String doctorName;
-    //角色id
-    private int roleId;
-}

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

@@ -1,43 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description: 科室核查人员输出类
- * @Author:songxl
- * @time: 2024/5/14 13:45
- */
-@Getter
-@Setter
-public class DeptCheckUserDTO {
-
-    /**
-     * 病区code
-     */
-    private String wardCode;
-    /**
-     * 病区名称
-     */
-    private String wardName;
-    //科室id
-    private String deptId;
-    //科室名称
-    private String deptName;
-    /**
-     * 医疗组Code
-     */
-    private String medoupCode;
-    /**
-     * 医疗组名称
-     */
-    private String medoupName;
-    //医生id
-    private String doctorId;
-    //医生名称
-    private String doctorName;
-    //核查数
-    private int jobNum;
-    private int checkNum;
-    private int status;
-}

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

@@ -1,75 +0,0 @@
-package com.diagbot.dto;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2024/6/5 14:26
- */
-@Getter
-@Setter
-public class DeptEntryNumDTO {
-    /**
-     * 条目缺陷id
-     */
-
-    private Long id;
-    /**
-     * 条目缺陷名称
-     */
-    @Excel(name = "缺陷名称", width = 40, orderNum = "2")
-    private String name;
-    /**
-     * 模块id
-     */
-    private Long casesId;
-    /**
-     * 模块名称
-     */
-    @Excel(name = "模块名称", width = 20, orderNum = "1")
-    private String casesName;
-    /**
-     * 科室id
-     */
-    private String deptId;
-    /**
-     * 科室名称
-     */
-    private String deptName;
-    /**
-     * 条目缺陷总数
-     */
-    private Integer totleNum = 0;
-    /**
-     * 条目缺陷数
-     */
-    @Excel(name = "数量", orderNum = "5")
-    private Integer num = 0;
-    /**
-     * 条目缺陷占比
-     */
-
-    private Double percent = 0.00d;
-    /**
-     * 条目缺陷占比（百分比）
-     */
-    @Excel(name = "缺陷占比", orderNum = "6")
-    private String percentStr = "0.00%";
-    /**
-     * 条目缺陷分值
-     */
-    @Excel(name = "分值", orderNum = "3")
-    private Double score = 0d;
-    /**
-     * 单项否决标识
-     */
-    @Excel(name = "单项否决", orderNum = "4", replace = { "否_0", "是_1" })
-    private Integer isReject;
-    /**
-     * 规则类型(0：无，1：空项，2：错误)
-     */
-    private Integer ruleType;
-}

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

@@ -1,178 +0,0 @@
-package com.diagbot.dto;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2024/6/18 20:17
- */
-@Getter
-@Setter
-public class EntryStasByDeptDTO {
-    /**
-     * 科室id（科室编码）
-     */
-    private String deptId;
-    /**
-     * 主治医生
-     */
-    @Excel(name = "主管医生", width = 30, orderNum = "1")
-    private String doctorName;
-    private String doctorId;
-    /**
-     * 未在24小时内完成会诊数
-     */
-    @Excel(name = "未在24小时内完成会诊数", width = 15, orderNum = "2")
-    private Integer consultationNum = 0;
-    /**
-     * 未在24小时内完成会诊条目id
-     */
-    private Long consultationEntryId = 2511L;
-    /**
-     * 未在24小时内完成会诊条目名称
-     */
-    private String consultationEntryName = "普通会诊未在24小时内完成";
-    /**
-     * 未在24小时内完成会诊率
-     */
-    private Double consultationPercent = 0.00d;
-    /**
-     * 未在24小时内完成会诊率（百分比）
-     */
-    @Excel(name = "未在24小时内完成会诊率", width = 15, orderNum = "3")
-    private String consultationPercentStr = "0.00%";
-    /**
-     * 会诊病历数
-     */
-    private Integer consultationMRNum = 0;
-    /**
-     * 手术记录名称不匹配条目id
-     */
-    private Long operationNameEntryId = 2594L;
-    /**
-     * 手术记录名称不匹配条目名称
-     */
-    private String operationNameEntryName = "首页手术名称与手术记录不一致";
-    /**
-     * 手术记录名称不匹配数
-     */
-    @Excel(name = "手术记录名称不匹配数", width = 15, orderNum = "4")
-    private Integer operationNameNum = 0;
-    /**
-     * 手术记录名称不匹配率
-     */
-    private Double operationNamePercent = 0.00d;
-    /**
-     * 手术记录名称不匹配率（百分比）
-     */
-    @Excel(name = "手术记录名称不匹配率", width = 15, orderNum = "5")
-    private String operationNamePercentStr = "0.00%";
-    /**
-     * 术后首程未在15分钟内完成条目id
-     */
-    private Long operation15MinuteEntryId = 2930L;
-    /**
-     * 术后首程未在15分钟内完成条目名称
-     */
-    private String operation15MinuteEntryName = "术后首次病程未即刻完成";
-    /**
-     * 术后首程未在15分钟内完成数
-     */
-    @Excel(name = "术后首程未在15分钟内完成数", width = 15, orderNum = "6")
-    private Integer operation15MinuteNum = 0;
-    /**
-     * 术后首程未在15分钟内完成率
-     */
-    private Double operation15MinutePercent = 0.00d;
-    /**
-     * 术后首程未在15分钟内完成率（百分比）
-     */
-    @Excel(name = "术后首程未在15分钟内完成率", width = 15, orderNum = "7")
-    private String operation15MinutePercentStr = "0.00%";
-    /**
-     * 病案首页手术时间不匹配条目id
-     */
-    private Long operationTimeEntryId = 2973L;
-    /**
-     * 病案首页手术时间不匹配条目名称
-     */
-    private String operationTimeEntryName = "手术日期与手术记录中手术日期不一致";
-    /**
-     * 病案首页手术时间不匹配数
-     */
-    @Excel(name = "病案首页手术时间不匹配数", width = 15, orderNum = "8")
-    private Integer operationTimeNum = 0;
-    /**
-     * 病案首页手术时间不匹配率
-     */
-    private Double operationTimePercent = 0.00;
-    /**
-     * 病案首页手术时间不匹配率（百分比）
-     */
-    @Excel(name = "病案首页手术时间不匹配率", width = 15, orderNum = "9")
-    private String operationTimePercentStr = "0.00%";
-    /**
-     * 手术记录病历数
-     */
-    private Integer operationMRNum = 0;
-    /**
-     * 未在6小时内书写危急值条目id
-     */
-    private Long crisisEntryId = 2419L;
-    /**
-     * 未在6小时内书写危急值条目名称
-     */
-    private String crisisEntryName = "危急值记录未在接到危急值报告后6小时内完成";
-    /**
-     * 未在6小时内书写危急值记录数
-     */
-    @Excel(name = "未在6小时内书写危急值记录数", width = 15, orderNum = "10")
-    private Integer crisisNum = 0;
-    /**
-     * 未在6小时内书写危急值记录率
-     */
-    private Double crisisPercent = 0.00d;
-    /**
-     * 未在6小时内书写危急值记录率（百分比）
-     */
-    @Excel(name = "未在6小时内书写危急值记录率", width = 15, orderNum = "11")
-    private String crisisPercentStr = "0.00%";
-    /**
-     * 危急值记录病历数
-     */
-    private Integer crisisMRNum = 0;
-    /**
-     * 住院超过31日病人数
-     */
-    @Excel(name = "住院超过31日病人数", width = 15, orderNum = "12")
-    private Integer beHosGT31DaysMRNum;
-    /**
-     * 阶段小节未书写条目id
-     */
-    private Long stageSummaryEntryId = 2495L;
-    /**
-     * 阶段小节未书写条目名称
-     */
-    private String stageSummaryEntryName = "无阶段小结";
-    /**
-     * 阶段小节未书写数
-     */
-    @Excel(name = "阶段小节未书写数", width = 15, orderNum = "13")
-    private Integer stageSummaryNum = 0;
-    /**
-     * 阶段小节未书写率
-     */
-    private Double stageSummaryPercent = 0.00d;
-    /**
-     * 阶段小节未书写率（百分比）
-     */
-    @Excel(name = "阶段小节未书写率", width = 15, orderNum = "14")
-    private String stageSummaryPercentStr = "0.00%";
-    /**
-     * 病人住院超过30天的病历数
-     */
-    private Integer stageSummaryMRNum = 0;
-}

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

@@ -1,36 +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.Date;
-import java.util.List;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2024/6/2 19:35
- */
-@Getter
-@Setter
-public class ExportExcelBehByDeptDTO {
-    @Excel(name = "患者姓名", needMerge = true)
-    private String patName;
-    @Excel(name = "病案号", needMerge = true)
-    private String fileCode;
-    @Excel(name = "住院号", needMerge = true)
-    private String behospitalCode;
-    @Excel(name = "入院时间", needMerge = true, exportFormat = "yyyy/MM/dd")
-    private Date behospitalDate;
-    @Excel(name = "出院时间", needMerge = true, exportFormat = "yyyy/MM/dd")
-    private Date leaveHospitalDate;
-    @Excel(name = "分数", needMerge = true)
-    private Double score;
-    @Excel(name = "病案首页分数", needMerge = true)
-    private Double scoreBn;
-    @ExcelCollection(name = "")
-    private List<ExportExcelCaseDTO> exportExcelCaseDTOS;
-
-}

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

@@ -1,32 +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: gaodm
- * @time: 2024/6/2 19:00
- */
-@Getter
-@Setter
-public class ExportExcelByDeptDTO {
-   // @Excel(name = "病区", needMerge = true)
-    private String wardName;
-//    @Excel(name = "科室", needMerge = true)
-    private String behDeptName;
-    @Excel(name = "医疗组", needMerge = true)
-    private String medoupName;
-    @Excel(name = "主管医生", needMerge = true)
-    private String doctorName;
-    @Excel(name = "平均分数", needMerge = true)
-    private Double avgScore;
-    @ExcelCollection(name = "")
-    private List<ExportExcelBehByDeptDTO> excelBehospitalDTOS;
-
-
-}

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

@@ -1,9 +0,0 @@
-package com.diagbot.dto;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2024/6/2 19:47
- */
-public class ExportExcelCase {
-}

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

@@ -1,25 +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: gaodm
- * @time: 2024/6/2 19:00
- */
-@Getter
-@Setter
-public class ExportNinetyByDeptDTO {
-    @Excel(name = "病区", needMerge = true)
-    private String wardName;
-    @Excel(name = "科室", needMerge = true)
-    private String behDeptName;
-    @ExcelCollection(name = "")
-    private List<ExportWideExcelByDeptDTO> exportExcelByDeptDTOS;
-
-}

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

@@ -1,58 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2024/6/2 19:57
- */
-@Getter
-@Setter
-public class ExportQcresultDTO {
-    /**
-     * 科室编码/科室id
-     */
-    private String deptId;
-    /**
-     * 科室名称
-     */
-    private String deptName;
-    /**
-     * 主管医生名称（主任医生+主治医生）
-     */
-    private String doctorName;
-    /**
-     * 患者姓名
-     */
-    private String patientName;
-    /**
-     * 病历号
-     */
-    private String behospitalCode;
-    /**
-     * 入院日期
-     */
-    private String behospitalDate;
-    /**
-     * 出院日期
-     */
-    private String leaveHospitalDate;
-    /**
-     * 质控评分
-     */
-    private Double scoreRes;
-    /**
-     * 科室质控平均分
-     */
-    private Double averageScore;
-    /**
-     * 存在问题
-     */
-    private String msg;
-    /**
-     * 错误所属区块
-     */
-    private String casesName;
-}

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

@@ -1,25 +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: gaodm
- * @time: 2024/6/2 19:00
- */
-@Getter
-@Setter
-public class ExportSevenByDeptDTO {
-    @Excel(name = "病区", needMerge = true)
-    private String wardName;
-    @Excel(name = "科室", needMerge = true)
-    private String behDeptName;
-    @ExcelCollection(name = "")
-    private List<ExportExcelByDeptDTO> exportExcelByDeptDTOS;
-
-}

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

@@ -1,32 +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: gaodm
- * @time: 2024/6/2 19:00
- */
-@Getter
-@Setter
-public class ExportWideExcelByDeptDTO {
-    // @Excel(name = "科室", needMerge = true)
-    private String behDeptName;
-    // @Excel(name = "病区", needMerge = true)
-    private String wardName;
-    @Excel(name = "医疗组", needMerge = true)
-    private String medoupName;
-    @Excel(name = "主管医生", needMerge = true)
-    private String doctorName;
-    @Excel(name = "平均分数", needMerge = true)
-    private Double avgScore;
-    @ExcelCollection(name = "" )
-    private List<ExportExcelWideBehByDeptDTO> excelBehospitalDTOS;
-
-
-}

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

@@ -1,118 +0,0 @@
-package com.diagbot.dto;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:病案首页合格率占比返回结构
- * @Author:zhaops
- * @time: 2024/6/5 17:32
- */
-@Getter
-@Setter
-public class HomePageByDeptDTO {
-    /**
-     * 科室id（科室编码）
-     */
-    private String deptId;
-    /**
-     * 科室名称
-     */
-    private String deptName;
-    /**
-     * 主管医生id
-     */
-    private String doctorId;
-    /**
-     * 主管医生名称
-     */
-    @Excel(name = "主管医生", width = 30, orderNum = "1")
-    private String doctorName;
-    /**
-     * 缺陷条目数
-     */
-    @Excel(name = "缺陷总数", orderNum = "2")
-    private Integer entryNum = 0;
-    /**
-     * 病案首页不合格病历数
-     */
-    @Excel(name = "不合格数", orderNum = "3")
-    private Integer secondLevelNum = 0;
-    /**
-     * 质控病历数
-     */
-    @Excel(name = "质控病历数", orderNum = "11")
-    private Integer mrNum = 0;
-    /**
-     * 质控评分（总分）
-     */
-    private Double totleValue = 0d;
-    /**
-     * 质控评分（平均分）
-     */
-    @Excel(name = "质控平均分", orderNum = "10")
-    private Double averageValue = 0d;
-    /**
-     * 病案首页合格病历数
-     */
-    @Excel(name = "合格数", orderNum = "4")
-    private Integer firstLevelNum = 0;
-    /**
-     * 病案首页合格病历占比
-     */
-    private Double firstLevelPercent = 0.00d;
-    /**
-     * 病案首页不合格病历占比
-     */
-    private Double secondLevelPercent = 0.00d;
-    /**
-     * 病案首页合格病历占比（百分比）
-     */
-    @Excel(name = "合格率", orderNum = "5")
-    private String firstLevelPercentStr = "0.00%";
-    /**
-     * 病案首页不合格病历占比（百分比）
-     */
-    private String secondLevelPercentStr = "0.00%";
-    /**
-     * 上级科室id（上级科室编码）
-     */
-    private String deptClassId;
-    /**
-     * 上级科室名称
-     */
-    private String deptClass;
-    /**
-     * 空项数
-     */
-    @Excel(name = "空项数", orderNum = "6")
-    private Integer emptyNum = 0;
-    /**
-     * 错误数
-     */
-    @Excel(name = "错误数", orderNum = "8")
-    private Integer errorNum = 0;
-    /**
-     * 完整率、完善率分母（质控病历数*病案首页条目数）
-     */
-    private Integer entryTotleNum = 0;
-    /**
-     * 完整率
-     */
-    private Double emptyPercent = 0.00d;
-    /**
-     * 完善率
-     */
-    private Double errorPercent = 0.00d;
-    /**
-     * 完整率（百分比）
-     */
-    @Excel(name = "完整率", orderNum = "7")
-    private String emptyPercentStr = "0.00%";
-    /**
-     * 完善率（百分比）
-     */
-    @Excel(name = "完善率", orderNum = "9")
-    private String errorPercentStr = "0.00%";
-}

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

@@ -1,91 +0,0 @@
-package com.diagbot.dto;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2024/7/6 20:03
- */
-@Getter
-@Setter
-public class ImproveByDeptDTO {
-    /**
-     * 科室编码
-     */
-    private String deptId;
-
-    /**
-     * 主治医生
-     */
-    @Excel(name = "主管医生", width = 15)
-    private String doctorName;
-
-    private String doctorId;
-    /**
-     * 质控总数（总病历数）
-     */
-    @Excel(name = "质控总数", width = 10)
-    private Integer mrNum = 0;
-    /**
-     * 病历核查数量
-     */
-    @Excel(name = "病历核查数量", width = 15)
-    private Integer checkedNum = 0;
-    /**
-     * 核查占比
-     */
-    private Double checkedPercent = 0d;
-    /**
-     * 核查占比（百分比）
-     */
-    private String checkedPercentStr = "0.00%";
-    /**
-     * 有病案首页的病历数
-     */
-    private Integer homePageMRNum = 0;
-    /**
-     * 已改善数量
-     */
-    @Excel(name = "已改善数量", width = 10)
-    private Integer improveNum = 0;
-    /**
-     * 改善率
-     */
-    private Double improvePercent = 0d;
-    /**
-     * 改善率（百分比）
-     */
-    @Excel(name = "改善率", width = 10)
-    private String improvePercentStr = "0.00%";
-    /**
-     * 改善至合格数量
-     */
-    @Excel(name = "改善至合格数量", width = 15)
-    private Integer improveToPassNum = 0;
-    /**
-     * 改善至合格率
-     */
-    private Double improveToPassPercent = 0d;
-    /**
-     * 改善至合格率（百分比）
-     */
-    @Excel(name = "改善至合格率", width = 15)
-    private String improveToPassPercentStr = "0.00%";
-    /**
-     * 改善至满分数量
-     */
-    @Excel(name = "改善至满分数量", width = 15)
-    private Integer improveToFullNum = 0;
-    /**
-     * 改善至满分率
-     */
-    private Double improveToFullPercent = 0d;
-    /**
-     * 改善至满分率（百分比）
-     */
-    @Excel(name = "改善至满分率", width = 15)
-    private String improveToFullPercentStr = "0.00%";
-}

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

@@ -1,26 +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: 2024/7/6 20:03
- */
-@Getter
-@Setter
-public class ImproveExportByDeptDTO {
-
-    /**
-     * 科室
-     */
-    @Excel(name = "科室", width = 20,needMerge = true)
-    private String deptName;
-    @ExcelCollection(name = "")
-    private List<ImproveByDeptDTO> improveByDeptDTOS;
-}

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

@@ -1,24 +0,0 @@
-package com.diagbot.dto;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:各科室缺陷占比-台州
- * @Author:zhaops
- * @time: 2024/6/22 13:41
- */
-@Getter
-@Setter
-public class LevelStatisticsTZDTO extends LevelStatisticsDTO {
-    /**
-     * 上级科室id（上级科室编码）
-     */
-    private String deptClassId;
-    /**
-     * 上级科室名称
-     */
-    @Excel(name = "科室系统", orderNum = "1", replace = { "内科系统_内科", "外科系统_外科", "-_null" })
-    private String deptClass;
-}

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

@@ -1,289 +0,0 @@
-package com.diagbot.dto;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:各科室缺陷占比返回结构
- * @Author:zhaops
- * @time: 2024/5/19 16:04
- */
-@Getter
-@Setter
-public class LevelStsByDeptDTO {
-    /**
-     * 科室id（科室编码）
-     */
-//    @Excel(name = "科室编码", orderNum = "0")
-    private String deptId;
-    /**
-     * 科室名称
-     */
-
-    private String deptName;
-    /**
-     * 主管医生id
-     */
-    private String doctorId;
-    /**
-     * 主管医生名称
-     */
-    @Excel(name = "主管医生", width = 30, orderNum = "2")
-    private String doctorName;
-    /**
-     * 缺陷条目数
-     */
-    private Integer entryNum = 0;
-
-    /**
-     * 缺陷条目数-带升降标示
-     */
-    @Excel(name = "缺陷总数", orderNum = "3")
-    private String entryStrNum = "0";
-
-    /**
-     * 同比总数
-     */
-    private Integer sameNum = 0;
-
-    /**
-     * 同比总数-带升降标示
-     */
-    @Excel(name = "同比总数", orderNum = "4")
-    private String sameStrNum = "0";
-
-    /**
-     * 缺陷条目数现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer entrySameNum = 0;
-
-    /**
-     * 质控病历数
-     */
-    private Integer mrNum = 0;
-
-    /**
-     * 质控病历数-带升降标示
-     */
-    @Excel(name = "质控病历数", orderNum = "7")
-    private String mrStrNum = "0";
-
-    /**
-     * 同比病历数
-     */
-    private Integer sameMrNum= 0;
-
-    /**
-     * 同比病历数-带升降标示
-     */
-    @Excel(name = "同比质控数", orderNum = "8")
-    private String sameMrStrNum = "0";
-
-    /**
-     * 质控病历数现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer mrSameNum = 0;
-
-    /**
-     * 质控评分（总分）
-     */
-    private Double totleValue = 0d;
-
-    /**
-     * 同比质控评分（总分）
-     */
-    private Double sameTotleValue= 0d;
-
-
-    /**
-     * 质控评分（平均分）
-     */
-    private Double averageValue = 0d;
-
-    /**
-     * 质控评分（平均分）-带升降标示
-     */
-    @Excel(name = "质控平均分", orderNum = "5")
-    private String averageStrValue = "0";
-
-    /**
-     * 同比评分（平均分）
-     */
-    private Double sameAvgValue = 0d;
-
-    /**
-     * 同比评分（平均分）-带升降标示
-     */
-    @Excel(name = "同比平均分", orderNum = "6")
-    private String sameAvgStrValue = "0";
-
-    /**
-     * 质控评分现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer avSameValue = 0;
-
-    /**
-     * 甲级病历数/病案首页合格病历数
-     */
-    private Integer firstLevelNum = 0;
-
-    /**
-     * 甲级病历数/病案首页合格病历数-带升降标示
-     */
-    @Excel(name = "甲级病历数", orderNum = "9")
-    private String firstLevelStrNum = "0";
-
-    /**
-     * 同比甲级病历数/病案首页合格病历数
-     */
-    private Integer sameFirstLevelNum = 0;
-
-    /**
-     * 同比甲级病历数/病案首页合格病历数-带升降标示
-     */
-    @Excel(name = "同比甲级数", orderNum = "10")
-    private String sameFirstLevelStrNum = "0";
-
-    /**
-     * 甲级病历数现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer firSameLevelNum = 0;
-
-    /**
-     * 乙级病历数/病案首页不合格病历数
-     */
-    private Integer secondLevelNum = 0;
-
-    /**
-     * 乙级病历数/病案首页不合格病历数-带升降标示
-     */
-    @Excel(name = "乙级病历数", orderNum = "11")
-    private String secondLevelStrNum = "0";
-
-    /**
-     * 同比乙级病历数/病案首页不合格病历数
-     */
-    private Integer sameSecondLevelNum = 0;
-
-    /**
-     * 同比乙级病历数/病案首页不合格病历数-带升降标示
-     */
-    @Excel(name = "同比乙级数", orderNum = "12")
-    private String sameSecondLevelStrNum = "0";
-
-
-    /**
-     * 乙级病历数现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer secSameLevelNum = 0;
-
-    /**
-     * 丙级病历数
-     */
-    private Integer thirdLevelNum = 0;
-
-    /**
-     * 丙级病历数-带升降标示
-     */
-    @Excel(name = "丙级病历数", orderNum = "13")
-    private String thirdLevelStrNum = "0";
-
-    /**
-     * 同比丙级病历数
-     */
-    private Integer sameThirdLevelNum = 0;
-
-    /**
-     * 同比丙级病历数-带升降标示
-     */
-    @Excel(name = "同比丙级数", orderNum = "14")
-    private String sameThirdLevelStrNum = "0";
-
-    /**
-     * 丙级病历数现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer thiSameLevelNum = 0;
-
-    /**
-     * 甲级病历占比/病案首页合格病历占比
-     */
-    private Double firstLevelPercent = 0d;
-
-    /**
-     * 同比甲级病历占比/病案首页合格病历占比
-     */
-    private Double sameFirstLevelPercent = 0d;
-
-    /**
-     * 甲级病历占比现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer firSameLevelPercent = 0;
-
-    /**
-     * 乙级病历占比/病案首页不合格病历占比
-     */
-    private Double secondLevelPercent= 0d;
-
-    /**
-     * 同比乙级病历占比/病案首页不合格病历占比
-     */
-    private Double sameSecondLevelPercent = 0d;
-
-    /**
-     * 乙级病历占比现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer secSameLevelPercent = 0;
-
-    /**
-     * 丙级病历占比
-     */
-    private Double thirdLevelPercent= 0d;
-
-    /**
-     * 同比丙级病历占比
-     */
-    private Double sameThirdLevelPercent = 0d;
-
-    /**
-     * 丙级病历占比现有数据与同期数据对比(-1-降 0-持平 1-升)
-     */
-    private Integer thiSameLevelPercent = 0;
-
-    /**
-     * 甲级病历占比（百分比）/病案首页合格病历占比（百分比）
-     */
-    @Excel(name = "甲级率", orderNum = "15")
-    private String firstLevelPercentStr = "0.00%";
-
-    /**
-     * 同比甲级病历占比（百分比）/病案首页合格病历占比（百分比）
-     */
-    @Excel(name = "同比甲级率", orderNum = "16")
-    private String sameFirstLevelPercentStr = "0.00%";
-
-    /**
-     * 乙级病历占比（百分比）/病案首页不合格病历占比（百分比）
-     */
-    @Excel(name = "乙级率", orderNum = "17")
-    private String secondLevelPercentStr = "0.00%";
-
-    /**
-     * 同比乙级病历占比（百分比）/病案首页不合格病历占比（百分比）
-     */
-    @Excel(name = "同比乙级率", orderNum = "18")
-    private String sameSecondLevelPercentStr = "0.00%";
-
-    /**
-     * 丙级病历占比（百分比）
-     */
-    @Excel(name = "丙级率", orderNum = "19")
-    private String thirdLevelPercentStr = "0.00%";
-
-    /**
-     * 同比丙级病历占比（百分比）
-     */
-    @Excel(name = "同比丙级率", orderNum = "20")
-    private String sameThirdLevelPercentStr = "0.00%";
-
-}

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

@@ -1,223 +0,0 @@
-package com.diagbot.dto;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-
-/**
- * @Description:医疗质量控制指标
- * @Author:cy
- * @time: 2024/1/20 13:32
- */
-@Getter
-@Setter
-public class MedQualityControlDTO {
-
-    /**
-     * 住院病案管理人员月均负担出院患者病历数
-     */
-    @Excel(name = "住院病案管理人员月均负担出院患者病历数", width = 12, orderNum = "1")
-    private Double managerBeNum = 0d;
-
-    /**
-     * 病案编码管理人员月均负担出院患者病历数
-     */
-    @Excel(name = "病案编码管理人员月均负担出院患者病历数", width = 12, orderNum = "2")
-    private Double coderBeNum= 0d;
-
-    /**
-     * 门诊病案管理人员月均负担出院患者病历数
-     */
-    @Excel(name = "门诊病案管理人员月均负担出院患者病历数", width = 12, orderNum = "3")
-    private Double secManagerBeNum= 0d;
-
-    /**
-     * 入院记录24小时内完成量
-     */
-    private Double admissionNum;
-
-    /**
-     * 入院记录24小时内完成率
-     */
-    @Excel(name = "入院记录24小时内完成率", width = 12, orderNum = "4")
-    private String admissionStr;
-
-    /**
-     * 手术记录24小时内完成量
-     */
-    private Double operationNum;
-
-    /**
-     * 手术记录24小时内完成率
-     */
-    @Excel(name = "手术记录24小时内完成率", width = 12, orderNum = "5")
-    private String operationStr;
-
-    /**
-     * 手术相关记录完整量
-     */
-    private Double  operationRecordNum;
-
-    /**
-     * 手术相关记录完整率
-     */
-    @Excel(name = "手术相关记录完整率", width = 12, orderNum = "5")
-    private String operationRecordStr  = "0.00%";
-
-
-    /**
-     * 出院记录24小时内完成量
-     */
-    private Double leaveHospitalNum;
-
-    /**
-     * 出院记录24小时内完成率
-     */
-    @Excel(name = "出院记录24小时内完成率", width = 12, orderNum = "6")
-    private String leaveHospitalStr;
-
-    /**
-     * 病案首页24小时内完成量
-     */
-    private Double medHomePageNum;
-
-    /**
-     * 病案首页24小时内完成率
-     */
-    @Excel(name = "病案首页24小时内完成率",width = 12, orderNum = "7")
-    private String medHomePageStr;
-
-    /**
-     * 医师查房记录完成量
-     */
-    private Double WardRoundNum;
-
-    /**
-     * 医师查房记录完成率
-     */
-    @Excel(name = "医师查房记录完成率",width = 12, orderNum = "8")
-    private String WardRoundStr = "0.00%";
-
-    /**
-     * 临床用血相关记录符合量
-     */
-    @Excel(name = "临床用血相关记录符合率",width = 12, orderNum = "8")
-    private Double bloodNum;
-    //临床用血相关记录符合率
-    private String bloodStr = "0.00%";
-
-    /**
-     * 患者抢救记录6h完成量
-     */
-    private Double rescueNum;
-
-    /**
-     * 患者抢救记录6h完成率
-     */
-    @Excel(name = "患者抢救记录完成率",width = 12, orderNum = "9")
-    private String rescueStr = "0.00%";
-
-    /**
-     * 出院患者病历2日归档量
-     */
-    private Double leaveSecFileNum;
-
-    /**
-     * 出院患者病历2日归档率
-     */
-    @Excel(name = "出院患者病历2日归档完整率",width = 12, orderNum = "10")
-    private String leaveSecFileStr = "0.00%";
-
-    /**
-     * 出院患者病历归档完整量
-     */
-    private Double leaveFileNum;
-
-    /**
-     * 出院患者病历归档完整率
-     */
-    @Excel(name = "出院患者病历归档完整率",width = 12, orderNum = "11")
-    private String leaveFileStr;
-
-    /**
-     * 主要诊断填写正确量
-     */
-    private Double mainDiagnosisNum;
-
-    /**
-     * 主要诊断填写正确率
-     */
-    @Excel(name = "主要诊断填写正确率",width = 12, orderNum = "12")
-    private String mainDiagnosisStr;
-
-    /**
-     * 主要诊断编码正确量
-     */
-    private Double mainCodeDiagnosisNum;
-
-    /**
-     * 主要诊断编码正确率
-     */
-    @Excel(name = "扣分", width = 12,orderNum = "13")
-    private String mainCodeDiagnosisStr;
-
-    /**
-     * 不合理复制病历发生量
-     */
-    private Double  notCopiedNum;
-
-    /**
-     * 不合理复制病历发生率
-     */
-    @Excel(name = "不合理复制病历发生率",width = 12, orderNum = "14")
-    private String  notCopiedStr;
-
-    /**
-     * 甲级病历量
-     */
-    private Double firGradeNum= 0d;
-
-    /**
-     * 甲级病历率
-     */
-    @Excel(name = "扣分",width = 12, orderNum = "15")
-    private String firGradeStr = "0.00%";
-
-    /**
-     * CT检查记录符合率
-     */
-    @Excel(name = "CT检查记录符合率",width = 12, orderNum = "16")
-    private String CTExaminationConform;
-
-    /**
-     * MRI检查记录符合率
-     */
-    @Excel(name = "MRI检查记录符合率",width = 12, orderNum = "18")
-    private String MRIExaminationConform;
-
-
-    /**
-     * 病理检查记录符合率
-     */
-    @Excel(name = "病理检查记录符合率",width = 12, orderNum = "20")
-    private String PathologicalExamination;
-
-    /**
-     * 细菌培养检查记录符合率
-     */
-    @Excel(name = "细菌培养检查记录符合率",width = 12, orderNum = "21")
-    private String BacterialCulture;
-
-    /**
-     * 抗菌药物使用记录符合率
-     */
-    @Excel(name = "抗菌药物使用记录符合率",width = 12, orderNum = "22")
-    private String AntibacterialDrugUse;
-
-    /**
-     * 恶性肿瘤化学治疗记录符合率
-     */
-    @Excel(name = "恶性肿瘤化学治疗记录符合率",width = 12, orderNum = "23")
-    private String ChemotherapyMalignantTumors;
-}

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

@@ -1,213 +0,0 @@
-package com.diagbot.dto;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description:
- * @Author:cy
- * @time: 2024/9/9 13:19
- */
-@Getter
-@Setter
-public class MedicalCheckDTO{
-
-    //科室名称
-    private String deptName;
-
-    //科室id
-    private String deptId;
-
-    //医生
-    private String doctorName;
-
-    //医疗组
-    private String doctorGroup;
-
-    //入院记录未24小时内_id
-    private String entry_2658_id;
-
-    //入院记录未24小时内_name
-    private String entry_2658_name;
-
-    //入院记录未24小时内_num
-    private Integer entry_2658_num = 0;
-
-    //首次病程记录未8小时内_id
-    private String entry_2686_id;
-
-    //首次病程记录未8小时内_name
-    private String entry_2686_name;
-
-    //首次病程记录未8小时内_num
-    private Integer entry_2686_num = 0;
-
-    //副主任/主任医师首次查房72小时内未完成_id
-    private String entry_2657_id;
-
-    //副主任/主任医师首次查房72小时内未完成_name
-    private String entry_2657_name;
-
-    //副主任/主任医师首次查房72小时内未完成_num
-    private Integer entry_2657_num = 0;
-
-    //入院后未连记3天病程_id
-    private String entry_3010_id;
-
-    //入院后未连记3天病程_name
-    private String entry_3010_name;
-
-    //入院后未连记3天病程_num
-    private Integer entry_3010_num = 0;
-
-    //每周未至少2次副主任/主任医师查房_id
-    private String entry_2655_id;
-
-    //每周未至少2次副主任/主任医师查房_name
-    private String entry_2655_name;
-
-    //每周未至少2次副主任/主任医师查房_num
-    private Integer entry_2655_num = 0;
-
-    //每周未至少3次主治医师查房记录_id
-    private String entry_2654_id;
-
-    //每周未至少3次主治医师查房记录_name
-    private String entry_2654_name;
-
-    //每周未至少3次主治医师查房记录_num
-    private Integer entry_2654_num = 0;
-
-    //抢救记录未6小时内完成_id
-    private String entry_2852_id;
-
-    //抢救记录未6小时内完成_name
-    private String entry_2852_name;
-
-    //抢救记录未6小时内完成-num
-    private Integer entry_2852_num = 0;
-
-    //会诊记录在会诊申请后未24小时完成_id
-    private String entry_2287_id;
-
-    //会诊记录在会诊申请后未24小时完成_name
-    private String entry_2287_name;
-
-    //会诊记录在会诊申请后未24小时完成_num
-    private Integer entry_2287_num = 0;
-
-    //术前讨论、术前小结未完成_id
-    private String entry_3025_id;
-
-    //术前讨论、术前小结未完成_name
-    private String entry_3025_name;
-
-    //术前讨论、术前小结未完成_num
-    private Integer entry_3025_num = 0;
-
-    //手术记录术后24小时内未完成_id
-    private String entry_2170_id;
-
-    //手术记录术后24小时内未完成_name
-    private String entry_2170_name;
-
-    //手术记录术后24小时内未完成_num
-    private Integer entry_2170_num = 0;
-
-    //术后首程在术后30分钟内未完成_id
-    private String entry_2930_id;
-
-    //术后首程在术后30分钟内未完成_name
-    private String entry_2930_name;
-
-    //术后首程在术后30分钟内未完成_num
-    private Integer entry_2930_num = 0;
-
-    //术后主刀查房24小时内未完成_id
-    private String entry_2900_id;
-
-    //术后主刀查房24小时内未完成_name
-    private String entry_2900_name;
-
-    //术后主刀查房24小时内未完成_num
-    private Integer entry_2900_num = 0;
-
-    //术后未连记3天病程_id
-    private String entry_2229_id;
-
-    //术后未连记3天病程_name
-    private String entry_2229_name;
-
-    //术后未连记3天病程_num
-    private Integer entry_2229_num = 0;
-
-    //转科后未连记3天病程_id
-    private String entry_2217_id;
-
-    //转科后未连记3天病程_name
-    private String entry_2217_name;
-
-    //转科后未连记3天病程_num
-    private Integer entry_2217_num = 0;
-
-    //转接科记录专科后24小时内未完成_id
-    private String entry_2218_id;
-
-    //转接科记录专科后24小时内未完成_name
-    private String entry_2218_name;
-
-    //转接科记录专科后24小时内未完成_num
-    private Integer entry_2218_num = 0;
-
-    //病危/重患者未每日记录病程_id
-    private String entry_2220_id;
-
-    //病危/重患者未每日记录病程_name
-    private String entry_2220_name;
-
-    //病危/重患者未每日记录病程_num
-    private Integer entry_2220_num = 0;
-
-    //输血后未完成输血记录_id
-    private String entry_2486_id;
-
-    //输血后未完成输血记录_name
-    private String entry_2486_name;
-
-    //输血后未完成输血记录_num
-    private Integer entry_2486_num = 0;
-
-    //24小时未完成输血后评价_id
-    private String entry_3063_id;
-
-    //24小时未完成输血后评价_name
-    private String entry_3063_name;
-
-    //24小时未完成输血后评价_num
-    private Integer entry_3063_num = 0;
-
-    //危急值未记录_id
-    private String entry_3062_id;
-
-    //危急值未记录_name
-    private String entry_3062_name;
-
-    //危急值未记录_num
-    private Integer entry_3062_num = 0;
-
-    //住院30天未阶段小结_id
-    private String entry_2495_id;
-
-    //住院30天未阶段小结_name
-    private String entry_2495_name;
-
-    //住院30天未阶段小结_num
-    private Integer entry_2495_num = 0;
-}
-

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

@@ -1,27 +0,0 @@
-package com.diagbot.dto;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @Description:
- * @Author:cy
- * @time: 2024/9/9 13:19
- */
-@Getter
-@Setter
-public class MedicalCheckExportDTO  {
-
-    //科室名称
-    @Excel(name = "科室",width = 18,needMerge = true,orderNum = "1")
-    private String deptName;
-
-    @ExcelCollection(name = "",orderNum = "2")
-    private List<MedicalDoctorExportDTO> medicalDoctorExportDTOS;
-}

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

@@ -1,18 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:cy
- * @time: 2024/9/9 13:19
- */
-@Getter
-@Setter
-public class MedicalCheckIdNameDTO {
-
-    private String id;
-    private String name;
-}
-

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

@@ -1,96 +0,0 @@
-package com.diagbot.dto;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:cy
- * @time: 2024/9/9 13:19
- */
-@Getter
-@Setter
-public class MedicalCheckTitleDTO {
-
-    //入院记录未24小时内
-    @Excel(name = "入院记录24小时内",orderNum = "1")
-    private String ryjlw_24 ;
-
-    //首次病程记录未8小时内
-    @Excel(name = "首次病程记录8小时内",orderNum = "2")
-    private String scbcjlw_8h;
-
-    @Excel( name = "副主任/主任医师首次查房72小时内完成",orderNum = "3")
-    //副主任/主任医师首次查房72小时内未完成
-    private String zrsccfw_72h;
-
-    //入院后未连记3天病程
-    @Excel(name = "入院后连记3天病程(不包括术后首程)",orderNum = "4")
-    private String ryhljbcw_3d;
-
-    //每周至少2次副主任/主任医师查房
-    @Excel(name = "每周至少2次副主任/主任医师查房",orderNum = "5")
-    private String zrcfw_2w;
-
-    //每周至少3次主治医师查房记录
-    @Excel(name = "每周至少3次主治医师查房记录",orderNum = "6")
-    private String zzcfw_3w;
-
-    //抢救记录未6小时内完成
-    @Excel(name = "抢救记录6小时内完成",orderNum = "7")
-    private String qjjlw_6h;
-
-    //会诊记录在会诊申请后未24小时完成
-    @Excel(name = "会诊记录在会诊申请后24小时完成",orderNum = "8")
-    private String hzjlw_24h;
-
-    //术前讨论、术前小结未完成
-    @Excel(name = "术前讨论、术前小结完成",orderNum = "9")
-    private String sqtlxjw;
-
-    //手术记录术后24小时内未完成
-    @Excel(name = "手术记录术后24小时内完成",orderNum = "10")
-    private String sxjlsw_24h;
-
-    //术后首程在术后30分钟内未完成
-    @Excel(name = "术后首程在术后30分钟内完成",orderNum = "11")
-    private String xhscw_30m;
-
-    //术后主刀查房24小时内未完成
-    @Excel(name = "术后主刀查房24小时内完成",orderNum = "12")
-    private String shzdcfw_24h;
-
-    //术后未连记3天病程
-    @Excel(name = "术后连记3天病程(包括术后首程)",orderNum = "13")
-    private String shjbcw_3d;
-
-    //转科后未连记3天病程
-    @Excel(name = "转科后连记3天病程(包括专科记录)",orderNum = "14")
-    private String zkjbcw_3d;
-
-    //转接科记录专科后24小时内未完成
-    @Excel(name = "转接科记录专科后24小时内完成",orderNum = "15")
-    private String zkjlw_24;
-
-    //病危/重患者未每日记录病程
-    @Excel(name = "病危/重患者每日记录病程",orderNum = "16")
-    private String bwzhjlbcw_md;
-
-    //输血后未完成输血记录
-    @Excel(name = "输血后完成输血记录",orderNum = "17")
-    private String sxhwjl;
-
-    //24小时未完成输血后评价
-    @Excel(name = "24小时完成输血后评价",orderNum = "18")
-    private String sxpjw_24;
-
-    //危急值未记录
-    @Excel(name = "危急值记录",orderNum = "19")
-    private String wjzwjl;
-
-    //住院30天未阶段小结
-    @Excel(name = "住院30天阶段小结",orderNum = "20")
-    private String wywwcxj;
-
-}

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

@@ -1,25 +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:cy
- * @time: 2024/9/9 13:19
- */
-@Getter
-@Setter
-public class MedicalDeptDTO {
-
-    //科室名称
-    @Excel(name = "科室",width = 18,needMerge = true,orderNum = "1")
-    private String deptName;
-
-    @ExcelCollection(name = "",orderNum = "2")
-    private List<MedicalDoDeptDTO> medicalDoctorExportDTOS;
-}

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

@@ -1,25 +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:cy
- * @time: 2024/9/9 13:19
- */
-@Getter
-@Setter
-public class MedicalDoDeptDTO {
-
-    //医疗组
-    @Excel(name = "医疗组",needMerge = true,orderNum = "1")
-    private String doctorGroup;
-
-    @ExcelCollection(name = "",orderNum = "2")
-    private List<MedicalSeeByDeptDTO> medicalCheckTitleDTOS;
-}

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

@@ -1,25 +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:cy
- * @time: 2024/9/9 13:19
- */
-@Getter
-@Setter
-public class MedicalDoctorExportDTO {
-
-    //医疗组
-    @Excel(name = "医疗组",needMerge = true,orderNum = "1")
-    private String doctorName;
-
-    @ExcelCollection(name = "",orderNum = "2")
-    private List<MedicalCheckTitleDTO> medicalCheckTitleDTOS;
-}

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

@@ -1,100 +0,0 @@
-package com.diagbot.dto;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:cy
- * @time: 2024/9/9 13:19
- */
-@Getter
-@Setter
-public class MedicalSeeByDeptDTO {
-
-    //主管医生
-    @Excel(name = "主管医生",orderNum = "1")
-    private String doctorName ;
-
-    //入院记录未24小时内
-    @Excel(name = "入院记录24小时内",orderNum = "2")
-    private String ryjlw_24 ;
-
-    //首次病程记录未8小时内
-    @Excel(name = "首次病程记录8小时内",orderNum = "3")
-    private String scbcjlw_8h;
-
-    @Excel( name = "副主任/主任医师首次查房72小时内完成",orderNum = "4")
-    //副主任/主任医师首次查房72小时内未完成
-    private String zrsccfw_72h;
-
-    //入院后未连记3天病程
-    @Excel(name = "入院后连记3天病程(不包括术后首程)",orderNum = "5")
-    private String ryhljbcw_3d;
-
-    //每周至少2次副主任/主任医师查房
-    @Excel(name = "每周至少2次副主任/主任医师查房",orderNum = "6")
-    private String zrcfw_2w;
-
-    //每周至少3次主治医师查房记录
-    @Excel(name = "每周至少3次主治医师查房记录",orderNum = "7")
-    private String zzcfw_3w;
-
-    //抢救记录未6小时内完成
-    @Excel(name = "抢救记录6小时内完成",orderNum = "8")
-    private String qjjlw_6h;
-
-    //会诊记录在会诊申请后未24小时完成
-    @Excel(name = "会诊记录在会诊申请后24小时完成",orderNum = "9")
-    private String hzjlw_24h;
-
-    //术前讨论、术前小结未完成
-    @Excel(name = "术前讨论、术前小结完成",orderNum = "10")
-    private String sqtlxjw;
-
-    //手术记录术后24小时内未完成
-    @Excel(name = "手术记录术后24小时内完成",orderNum = "11")
-    private String sxjlsw_24h;
-
-    //术后首程在术后30分钟内未完成
-    @Excel(name = "术后首程在术后30分钟内完成",orderNum = "12")
-    private String xhscw_30m;
-
-    //术后主刀查房24小时内未完成
-    @Excel(name = "术后主刀查房24小时内完成",orderNum = "13")
-    private String shzdcfw_24h;
-
-    //术后未连记3天病程
-    @Excel(name = "术后连记3天病程(包括术后首程)",orderNum = "14")
-    private String shjbcw_3d;
-
-    //转科后未连记3天病程
-    @Excel(name = "转科后连记3天病程(包括专科记录)",orderNum = "15")
-    private String zkjbcw_3d;
-
-    //转接科记录专科后24小时内未完成
-    @Excel(name = "转接科记录专科后24小时内完成",orderNum = "16")
-    private String zkjlw_24;
-
-    //病危/重患者未每日记录病程
-    @Excel(name = "病危/重患者每日记录病程",orderNum = "17")
-    private String bwzhjlbcw_md;
-
-    //输血后未完成输血记录
-    @Excel(name = "输血后完成输血记录",orderNum = "18")
-    private String sxhwjl;
-
-    //24小时未完成输血后评价
-    @Excel(name = "24小时完成输血后评价",orderNum = "19")
-    private String sxpjw_24;
-
-    //危急值未记录
-    @Excel(name = "危急值记录",orderNum = "20")
-    private String wjzwjl;
-
-    //住院30天未阶段小结
-    @Excel(name = "住院30天阶段小结",orderNum = "21")
-    private String wywwcxj;
-
-}

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

@@ -1,29 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 医疗组表
- * </p>
- *
- * @author zhanghang
- * @time: 2024-10-20
- */
-@Data
-public class MedoupDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 医疗组代码
-     */
-    private String code;
-    /**
-     * 医疗组名称
-     */
-    private String name;
-
-}

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

@@ -23,102 +23,81 @@ public class QcResultShortDTO {
     /**
      * 病历等级
      */
-    @Excel(name = "病历等级", width = 30, orderNum = "1")
-    private String level;
+//    @Excel(name = "病历等级", width = 30, orderNum = "1")
+//    private String level;
     /**
      * 病历得分
      */
     @Excel(name = "病历得分", width = 30, orderNum = "2")
     private Double scoreRes;
-    @Excel(name = "病案首页得分", width = 30, orderNum = "2.5")
-    private Double scoreBn;
+//    @Excel(name = "病案首页得分", width = 30, orderNum = "2.5")
+//    private Double scoreBn;
     @Excel(name = "病人住院序号", width = 40, orderNum = "3")
     private String behospitalCode;
     @Excel(name = "病案号", width = 30, orderNum = "5")
     private String fileCode;
     @Excel(name = "病人姓名", width = 30, orderNum = "6")
     private String name;
-    @Excel(name = "性别", width = 20, orderNum = "7")
-    private String sex;
-    @Excel(name = "年龄", width = 20, orderNum = "8")
-    private String age;
-    @Excel(name = "床号", width = 30, orderNum = "9")
-    private String bedCode;
+//    @Excel(name = "性别", width = 20, orderNum = "7")
+//    private String sex;
+//    @Excel(name = "年龄", width = 20, orderNum = "8")
+//    private String age;
+//    @Excel(name = "床号", width = 30, orderNum = "9")
+//    private String bedCode;
     @Excel(name = "入院日期", format = "yyyy-MM-dd", width = 30, orderNum = "10")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date behospitalDate;
     @Excel(name = "出院日期", format = "yyyy-MM-dd", width = 30, orderNum = "11")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date leaveHospitalDate;
-    @Excel(name = "归档日期", format = "yyyy-MM-dd", width = 30, orderNum = "12")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date placefileDate;
-    @Excel(name = "主诊断", width = 60, orderNum = "13")
-    private String diagnose;
-    private String behDoctorId;
-    @Excel(name = "住院医生", width = 30, orderNum = "14")
-    private String behDoctorName;
+//    @Excel(name = "归档日期", format = "yyyy-MM-dd", width = 30, orderNum = "12")
+//    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+//    private Date placefileDate;
+//    @Excel(name = "主诊断", width = 60, orderNum = "13")
+//    private String diagnose;
+//    private String behDoctorId;
+//    @Excel(name = "住院医生", width = 30, orderNum = "14")
+//    private String behDoctorName;
     /**
      * 主治医生id
      */
-    private String doctorId;
+//    private String doctorId;
     /**
      * 主治医生姓名
      */
     @Excel(name = "主管医生", width = 30, orderNum = "15")
     private String doctorName;
-    private String directorDoctorId;
-    @Excel(name = "主任医生", width = 30, orderNum = "16")
-    private String directorDoctorName;
+//    private String directorDoctorId;
+//    @Excel(name = "主任医生", width = 30, orderNum = "16")
+//    private String directorDoctorName;
     //病区code
-    private String ward_code;
-    private String wardName;
+//    private String ward_code;
+//    private String wardName;
     /**
      * 科室编码
      */
-    private String behDeptId;
+//    private String behDeptId;
     /**
      * 科室名称
      */
     @Excel(name = "科室", width = 70, orderNum = "18")
     private String behDeptName;
 
-    @Excel(name = "评分时间", format = "yyyy-MM-dd", width = 30, orderNum = "20")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date gradeTime;
+//    @Excel(name = "评分时间", format = "yyyy-MM-dd", width = 30, orderNum = "20")
+//    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+//    private Date gradeTime;
 
     /**
      * 评分类型
      */
-    private Integer gradeType;
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date birthday;
+//    private Integer gradeType;
+//    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+//    private Date birthday;
 
     /**
-     * 病历核查状态
-     */
-    //@Excel(name = "核查状态", width = 20, orderNum = "4",replace = { "已核查_1", "未核查_0", "_null" })
-    private Integer checkStatus;
-    /**
-     * 首页核查状态
-     */
-    private Integer mrStatus;
-    /**
-     * 病历核查人员
-     */
-    private String chName;
-    /**
-     * 首页核查人员
-     */
-    private String mrName;
-    /**
-     * 病历核查时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date chTime;
-    /**
-     * 首页核查时间
+     * 病历状态
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date mrTime;
+    //@Excel(name = "状态", width = 20, orderNum = "4",replace = { "已核查_1", "未核查_0", "_null" })
+    private String status;
+
 }

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

@@ -1,188 +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:cy
- * @time: 2024/1/20 13:32
- */
-@Getter
-@Setter
-public class QualityControlDeptDTO {
-
-    /**
-     * 姓名
-     */
-    @Excel(name = "病人姓名", width = 12, orderNum = "1")
-    private String name;
-
-    /**
-     * 病人住院ID
-     */
-    @Excel(name = "住院号", width = 16, orderNum = "2")
-    private String behospitalCode;
-
-    /**
-     * 主管医生id
-     */
-    private String doctorId;
-
-    /**
-     * 年龄
-     */
-    private String age;
-
-    /**
-     * 医生姓名
-     */
-    @Excel(name = "主治医生", width = 12, orderNum = "3")
-    private String doctorName;
-
-    /**
-     * 科室id（科室编码）
-     */
-    private String deptId;
-    /**
-     * 科室名称
-     */
-    @Excel(name = "科室名称", width = 16, orderNum = "4")
-    private String deptName;
-
-    /**
-     * 入院时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date behospitalDate;
-
-    /**
-     * 出院时间
-     */
-    @Excel(name = "出院时间", width = 25, orderNum = "5", exportFormat = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date leaveHospitalDate;
-
-    /**
-     * 病案首页--
-     */
-    @Excel(name = "病案首页", width = 30, orderNum = "6")
-    private String medHomePage = "无缺陷";
-    /**
-     * 病案首页扣分
-     */
-    @Excel(name = "扣分",width = 12, orderNum = "7")
-    private Double medHomePageScore= 0d;
-
-    /**
-     * 入院记录--
-     */
-    @Excel(name = "入院记录",width = 30, orderNum = "8")
-    private String admissionNote = "无缺陷";
-
-    /**
-     * 入院记录扣分
-     */
-    @Excel(name = "扣分",width = 12, orderNum = "9")
-    private Double admissionNoteScore= 0d;
-
-
-    /**
-     * 首次病程录--
-     */
-    @Excel(name = "首次病程录",width = 30, orderNum = "10")
-    private String firstCourseNote = "无缺陷";
-
-    /**
-     * 首次病程录扣分
-     */
-    @Excel(name = "扣分",width = 12, orderNum = "11")
-    private Double firstCourseNoteScore= 0d;
-
-    /**
-     * 病程记录--
-     */
-    @Excel(name = "病程记录",width = 30, orderNum = "12")
-    private String courseRecord = "无缺陷";
-
-    /**
-     * 病程记录扣分
-     */
-    @Excel(name = "扣分", width = 12,orderNum = "13")
-    private Double courseRecordScore= 0d;
-
-    /**
-     * 手术信息--
-     */
-    @Excel(name = "手术信息",width = 30, orderNum = "14")
-    private String  operationInfo = "无缺陷";
-
-    /**
-     * 手术信息扣分
-     */
-    @Excel(name = "扣分",width = 12, orderNum = "15")
-    private Double operationInfoScore= 0d;
-
-    /**
-     * 出院记录--
-     */
-    @Excel(name = "出院记录",width = 30, orderNum = "16")
-    private String  dischargeNote = "无缺陷";
-    /**
-     * 出院记录扣分
-     */
-    @Excel(name = "扣分",width = 12, orderNum = "17")
-    private Double  dischargeNoteScore= 0d;
-
-    /**
-     * 医嘱单--
-     */
-    @Excel(name = "医嘱单",width = 30, orderNum = "18")
-    private String  docAdviceNote = "无缺陷";
-    /**
-     * 医嘱单扣分
-     */
-    @Excel(name = "扣分",width = 12, orderNum = "19")
-    private Double docAdviceNoteScore= 0d;
-
-    /**
-     * 其他
-     */
-    @Excel(name = "其他",width = 30, orderNum = "20")
-    private String  otherCase = "无缺陷";
-    /**
-     * 其他扣分
-     */
-    @Excel(name = "扣分",width = 12, orderNum = "21")
-    private Double otherCaseScore= 0d;
-
-    /**
-     * 总分
-     */
-    @Excel(name = "总分",width = 12, orderNum = "22")
-    private Double  totalScore= 0d;
-    /**
-     * 病历等级
-     */
-    @Excel(name = "病历等级",width = 12, orderNum = "23")
-    private String level;
-
-    /**
-     * 病案首页核查人
-     */
-    @Excel(name = "首页检查者", width = 12,orderNum = "24")
-    private String  mrName;
-    /**
-     * 病历核查人
-     */
-    @Excel(name = "病历检查者",width = 12, orderNum = "25")
-    private String chName;
-
-
-
-
-}

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: 2024/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 = 10, needMerge = true, orderNum = "4")
-    private String diffDays;
-
-    @Excel(name = "是否有出院31天内再住院计划", width = 30, needMerge = true,  orderNum = "5")
-    private String lastAgainBehospitalPlan;//31天再入院计划(是/否)
-
-    /**
-     * 比较病历组
-     */
-    @ExcelCollection(name = "", orderNum = "6")
-    private List<ReBeHosDetailByDeptDTO> details;
-}

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

@@ -1,90 +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: 2024/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 behDeptName;
-
-    /**
-     * 主管医生
-     */
-    @Excel(name = "主管医生", width = 50, orderNum = "6")
-    private String doctorName;
-
-    /**
-     * 入院诊断
-     */
-    @Excel(name = "入院诊断", width = 50, needMerge = true, orderNum = "7")
-    private String diagnose;
-
-    /**
-     * 出院诊断
-     */
-    @Excel(name = "出院诊断", width = 50, needMerge = true, orderNum = "8")
-    private String diagnoseName;
-
-    /**
-     * 出院日期
-     */
-    @Excel(name = "出院日期", format = "yyyy-MM-dd", width = 30, orderNum = "9")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date leaveHospitalDate;
-    /**
-     * 入院日期
-     */
-    @Excel(name = "入院日期", format = "yyyy-MM-dd", width = 30, orderNum = "10")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date behospitalDate;
-    /**
-     * 住院天数
-     */
-    @Excel(name = "住院天数", width = 15, orderNum = "11")
-    private String behospitalDayNum;
-    /**
-     * 住院费用
-     */
-    @Excel(name = "住院费用", width = 15, orderNum = "12")
-    private String totleFee;
-}

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

@@ -1,22 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Data;
-
-
-/**
- * @Description:
- * @author: wangsy
- * @time: 2024/5/13 15:00
- */
-@Data
-public class RegionDTO {
-
-    /**
-     * 病区code
-     */
-    private String code;
-    /**
-     * 病区名称
-     */
-    private String name;
-}

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

@@ -1,27 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Description:
- * @author: dsYun
- * @time: 2024/03/02
- */
-@Getter
-@Setter
-public class RuleMsgDTO {
-    //得分
-    private BigDecimal score;
-    //提示信息
-    private String msg;
-    //提示信息
-    private String info;
-    //模块名称
-    private String modelName;
-}

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

@@ -1,35 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 入院记录
- * </p>
- *
- * @author cy
- * @time: 2024-10-09
- */
-@Data
-public class StrAdmissionNoteDTO implements Serializable {
-
-
-    /**
-     * 记录编号
-     */
-    private String recId;
-
-
-    /**
-     * 结构化数据
-     */
-    private String wholeData;
-
-    /**
-     * modeId
-     */
-    private String modeId;
-
-}

src/main/java/com/diagbot/entity/wrapper/QuestionWrapper.java

@@ -1,35 +0,0 @@
-package com.diagbot.entity.wrapper;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- * 标签保存参数
- * </p>
- *
- * @author zhoutg
- * @since 2018-12-03
- */
-
-@Data
-public class QuestionWrapper implements Serializable {
-    private Long id; //主键
-    private Long hospitalId; //医院ID
-    private Long modeId; //数据模块ID
-    private String tagName; //标签名
-    private String name; //界面名称
-    private String val; // value
-    private Integer tagType; //标签显示类型
-    private Integer controlType; //控件类型
-    private Integer retract; // 缩进(0：不缩进 1：缩进)
-    private Integer addLine; // 换行(0：不换行，1：换行)
-    private Integer bold; //换行(0：不换行，1：加粗)
-    private Integer position; //显示位置(1：靠右显示)
-    private String casesEntryIds; //质控条目id列表
-    private String remark; //备注
-    private List<QuestionMappingWrapper> questionMappings = new ArrayList<>(); //映射关系
-}

src/main/java/com/diagbot/enums/CheckerRoleEnum.java

@@ -1,53 +0,0 @@
-package com.diagbot.enums;
-
-import com.diagbot.core.KeyedNamed;
-import lombok.Setter;
-
-/**
- * @author wangfeng
- * @date 2018年11月21日 下午2:31:42
- */
-public enum CheckerRoleEnum implements KeyedNamed {
-    DEPT_SUPERVISOR(4, "临床科室监管人员"),
-    DEPT_GENERAL(7, "临床科室质控人员"),
-    QUAT_SUPERVISOR(5, "质控科监管人员"),
-    QUAT_GENERAL(8, "质控科质控人员"),
-    HOSP_SUPERVISOR(6, "院级监管人员"),
-    HOSP_GENERAL(9, "院级质控人员");
-
-    @Setter
-    private int key;
-
-    @Setter
-    private String name;
-
-    CheckerRoleEnum(int key, String name) {
-        this.key = key;
-        this.name = name;
-    }
-
-    public static CheckerRoleEnum getEnum(int key) {
-        for (CheckerRoleEnum item : CheckerRoleEnum.values()) {
-            if (item.key == key) {
-                return item;
-            }
-        }
-        return null;
-    }
-
-    public static String getName(int key) {
-        CheckerRoleEnum item = getEnum(key);
-        return item != null ? item.name : null;
-    }
-
-    @Override
-    public int getKey() {
-        return key;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-}
-

src/main/java/com/diagbot/enums/MedicalCheckEnum.java

@@ -1,122 +0,0 @@
-package com.diagbot.enums;
-
-
-
-/**
- * 稽查质控条目
- * @author cy
- */
-public enum MedicalCheckEnum  {
-
-    /**
-     * 入院记录未24小时内
-     */
-    RYJLW_24("2658"),
-
-    /**
-     * 首次病程记录未8小时内
-     */
-    SCBCJLW_8H("2686"),
-
-    /**
-     * 副主任/主任医师首次查房72小时内未完成
-     */
-    ZRSCCFW_72H("2657"),
-
-    /**
-     * 入院后未连记3天病程
-     */
-    RYHLJBCW_3D("3010"),
-
-    /**
-     * 每周至少2次副主任/主任医师查房
-     */
-    ZRCFW_2W ("2655"),
-
-    /**
-     * 每周至少3次主治医师查房记录
-     */
-    ZZCFW_3W("2654"),
-
-    /**
-     * 抢救记录6小时内完成
-     */
-    QJJLW_6H("2852"),
-
-    /**
-     * 会诊记录在会诊申请后24小时完成
-     */
-    HZJLW_24H("2287"),
-
-
-
-
-    /**
-     * 术前讨论、术前小结完成
-     */
-    SQTLXJW("3025"),
-
-    /**
-     * 手术记录术后24小时内完成
-     */
-    SXJLSW_24H("2170"),
-
-    /**
-     * 术后首程在术后30分钟内完成
-     */
-    XHSCW_30M("2930"),
-
-    /**
-     * 术后主刀查房24小时内完成
-     */
-    SHZDCFW_24H("2900"),
-
-    /**
-     * 术后连记3天病程(包括术后首程)
-     */
-    SHJBCW_3D("2229"),
-
-    /**
-     * 转科后连记3天病程(包括专科记录)
-     */
-    ZKJBCW_3D("2217"),
-
-    /**
-     * 转接科记录专科后24小时内完成
-     */
-    ZKJLW_24("2218"),
-
-    /**
-     * 病危/重患者未每日记录病程
-     */
-    BWZHJLBCW_MD("2220"),
-
-    /**
-     * 输血后完成输血记录
-     */
-    SXHWJL("2486"),
-
-    /**
-     * 24小时完成输血后评价
-     */
-    SXPJW_24("3063"),
-    /**
-     * 危急值记录
-     */
-    WJZWJL("3062"),
-
-    /**
-     * 住院30天阶段小结
-     */
-    WYWWCXJ("2495");
-
-    private String status;
-
-    MedicalCheckEnum(String status) {
-        this.status = status;
-    }
-
-    public String getStatus() {
-        return this.status;
-    }
-}

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

@@ -18,7 +18,6 @@ import com.diagbot.util.*;
 import com.diagbot.vo.*;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -65,27 +64,15 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
     QcModeFacade qcModeFacade;
     @Autowired
     AuthServiceClient authServiceClient;
-    @Autowired
-    QcCasesEntryPagedataFacade qcCasesEntryPagedataFacade;
     @Value("${encrypt.enable}")
     Boolean encryptFlag;
     @Autowired
-    QcQuestionFacade qcQuestionFacade;
-    @Autowired
-    QcModelHospitalFacade qcModelHospitalFacade;
-    @Autowired
-    private FilterFacade filterFacade;
-    @Autowired
-    MedLisInfoFacade medLisInfoFacade;
-    @Autowired
     MedLisResultFacade medLisResultFacade;
     @Autowired
     MedPacsResultFacade medPacsResultFacade;
     @Autowired
     MedCrisisInfoFacade medCrisisInfoFacade;
     @Autowired
-    MedExamineInfoFacade medCheckInfoFacade;
-    @Autowired
     MedRejectedInfoFacade medRejectedInfoFacade;
     @Autowired
     StrConsultationApplyFacade strConsultationApplyFacade;
@@ -136,27 +123,14 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
     @Autowired
     MedNurseFacade medNurseFacade;
     @Autowired
-    SysHospitalSetFacade sysHospitalSetFacade;
-    @Autowired
-    QcCasesRelevanceEntryFacade qcCasesRelevanceEntryFacade;
-    @Autowired
     StrInformedConsentServiceImpl strInformedConsentServiceImpl;
 
-    @Autowired
-    SysUserRoleFacade sysUserRoleFacade;
     @Autowired
     QcresultDetailFacade qcresultDetailFacade;
 
-    @Autowired
-    BasDeptInfoFacade basDeptInfoFacade;
 
     @Autowired
     private BehospitalInfoFacade behospitalInfoFacade;
-    @Autowired
-    @Qualifier("qcresultDetailServiceImpl")
-    private QcresultDetailServiceImpl qcresultDetailServiceImpl;
-
-    private TZDBConn tzDBConn = new TZDBConn();
 
     /**
      * 分页
@@ -977,15 +951,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         // 处理公共数据
         QueryVo queryVo = dealCommonData(hospitalId, analyzeVO);
         queryVo.setUseCrfCache(analyzeVO.isUseCrfCache());
-        //已核查抛出以评分
-//        List<MedCheckInfo> medCheckInfos = medCheckInfoFacade.list(new QueryWrapper<MedCheckInfo>()
-//                .eq("is_deleted", IsDeleteEnum.N.getKey())
-//                .eq("hospital_id", analyzeVO.getHospitalId())
-//                .eq("behospital_code", analyzeVO.getBehospitalCode()));
-//        Set<Integer> status = medCheckInfos.stream().map(MedCheckInfo::getStatus).collect(Collectors.toSet());
-//        if (medCheckInfos.size() >= 1 && status.contains(CheckStatusEnum.Enable.getKey()) && analyzeVO.getCheckFlag()) {
-//            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该病例已经核查无需评分！");
-//        }
         //  调用质控接口
         Response<OutputInfo> response = qcServiceClient.extract(queryVo);
         if (response == null || response.getData() == null) {
@@ -2249,45 +2214,4 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         return res;
     }
 
-    /**
-     * 手术费，抗菌药物，手术和病理费等含有人数
-     *
-     * @param filterVO
-     * @return
-     */
-    public List<Map<String, String>> selectOperationNum(FilterVO filterVO) {
-        return baseMapper.selectOperationNum(filterVO);
-    }
-
-    /**
-     * 触发规则人数
-     *
-     * @param filterVO
-     * @return
-     */
-    public Map<String, Long> triggeringRules(FilterVO filterVO) {
-        return baseMapper.triggeringRules(filterVO);
-    }
-
-    /**
-     * 病案首页关联的出院病历
-     *
-     * @param filterVO
-     * @return
-     */
-    public List<Map<String, String>> getMedicalRecords(@Param("filterVO") FilterVO filterVO) {
-        return baseMapper.getMedicalRecords(filterVO);
-    }
-
-    /**
-     * 首页恶性肿瘤人数
-     *
-     * @param filterVO
-     * @return
-     */
-    public List<Map<String, String>> malignancy(@Param("filterVO") FilterVO filterVO) {
-        return baseMapper.malignancy(filterVO);
-    }
-
-
 }

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

@@ -29,15 +29,10 @@ import com.diagbot.dto.ExportWideExcelDTO;
 import com.diagbot.dto.HomePageImproveDTO;
 import com.diagbot.dto.HomePageNumDTO;
 import com.diagbot.dto.LevelStatisticsDTO;
-import com.diagbot.dto.LevelStatisticsTZDTO;
-import com.diagbot.dto.MedicalCheckExportDTO;
 import com.diagbot.dto.NumDTO;
 import com.diagbot.dto.QcResultPercentDTO;
-import com.diagbot.dto.QualityControlDTO;
 import com.diagbot.dto.ReBeHosDTO;
 import com.diagbot.dto.SjcfStatisticsDTO;
-import com.diagbot.dto.UnModifyMRDTO;
-import com.diagbot.entity.SysHospitalSet;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.util.BeanUtil;
@@ -47,17 +42,12 @@ 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;
-
-import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 
 /**
  * @Description: 报表导出装饰层
@@ -115,18 +105,6 @@ public class ConsoleExportFacade {
         ExcelUtils.exportExcel(records, null, "sheet1", LevelStatisticsDTO.class, fileName, response, 12.8f);
     }
 
-    /**
-     * 各科室缺陷占比（组合）-台州-导出
-     *
-     * @param filterOrderVO
-     * @return
-     */
-    public void levelExport_TZ(HttpServletResponse response, FilterOrderVO filterOrderVO) {
-        List<LevelStatisticsTZDTO> records = consoleFacade.levelStatisticsByDeptStr_TZ(filterOrderVO);
-        String fileName = "各科室缺陷占比-台州.xls";
-        ExcelUtils.exportExcel(records, null, "sheet1", LevelStatisticsTZDTO.class, fileName, response, 12.8f);
-    }
-
     /**
      * 按科室统计平均住院天数导出
      *

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

@@ -2,11 +2,7 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.diagbot.dto.CheckDeptDTO;
-import com.diagbot.dto.CheckMedoupDTO;
-import com.diagbot.dto.DeptCheckUserDTO;
 import com.diagbot.dto.RejectPatientDTO;
 import com.diagbot.entity.*;
 import com.diagbot.enums.CheckTypeEnum;
@@ -20,7 +16,6 @@ import com.diagbot.util.StringUtil;
 import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.BehospitalcodeVO;
 import com.diagbot.vo.MedAppealInfoVO;
-import com.diagbot.vo.MedCheckInfoAddVO;
 import com.diagbot.vo.RejectedVo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -2,7 +2,6 @@ package com.diagbot.facade;
 
 import com.diagbot.dto.MedLisResultDTO;
 import com.diagbot.entity.BehospitalInfo;
-import com.diagbot.entity.MedLisResult;
 import com.diagbot.service.impl.MedLisResultServiceImpl;
 import org.springframework.stereotype.Component;
 

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

@@ -10,8 +10,6 @@ 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;
@@ -26,7 +24,6 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import javax.validation.Valid;
 
@@ -140,28 +137,20 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
     public IPage<NumDTO> resultStatisticsByDeptPage(@Param("filterPageVO") FilterPageVO filterPageVO);
 
     /**
-     * 各科室缺陷占比（组合）
+     * 病案首页合格率占比
      *
      * @param filterOrderVO
      * @return
      */
-    public List<LevelStatisticsDTO> levelStatistics(FilterOrderVO filterOrderVO);
+    public List<HomePageNumDTO> homePageLevelStatistics(FilterOrderVO filterOrderVO);
 
     /**
-     * 病历质控报表--扣分项
-     *
-     * @param caseScoreVO
-     * @return
-     */
-    public List<QualityControlDTO> getQualityCase(CaseScoreVO caseScoreVO);
-
-    /**
-     * 病历质控报表-扣分
+     * 各科室缺陷占比（组合）
      *
-     * @param caseScoreVO
+     * @param filterOrderVO
      * @return
      */
-    public List<QualityControlDTO> getQualitySorce(CaseScoreVO caseScoreVO);
+    public List<LevelStatisticsDTO> levelStatistics(FilterOrderVO filterOrderVO);
 
     /**
      * 病历质控报表-扣分数据
@@ -188,32 +177,6 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      */
     public IPage<QualityControlDTO> getQualityControl(BehospitalPageVO behospitalPageVO);
 
-    /**
-     * 病历质控报表-科室
-     *
-     * @param behospitalPageVO
-     * @return
-     */
-    public IPage<QualityControlDTO> getQualityControlExport(BehospitalPageVO behospitalPageVO);
-
-
-    /**
-     * 各科室缺陷占比（主任医生）
-     *
-     * @param filterOrderVO
-     * @return
-     */
-    public List<LevelStsByDeptDTO> levelStatisticsByDept(FilterOrderVO filterOrderVO);
-
-    /**
-     * 各科室缺陷占比科室导出
-     *
-     * @param exportQcresultVO
-     * @return
-     */
-    public List<ExportExcelByDeptDTO> levelStatisticsExportByDept(ExportQcresultVO exportQcresultVO);
-
-
     /**
      * 科室缺陷占比-科室（分页）
      *
@@ -231,21 +194,6 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      */
     public IPage<QcResultShortDeptDTO> getIsGoodLevelByDept(QcResultPageVO qcResultPageVO);
 
-    /**
-     * 各科室缺陷占比（组合）-全院-根据内外科系统统计-关联上级科室
-     *
-     * @param filterOrderVO
-     * @return
-     */
-    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass(FilterOrderVO filterOrderVO);
-
-    /**
-     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（台州）
-     *
-     * @param filterOrderVO
-     * @return
-     */
-    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass_TZ(FilterOrderVO filterOrderVO);
 
     List<ExportExcelDTO> exportExcel();
 
@@ -265,14 +213,6 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      */
     public IPage<QcResultShortDTO> qcResultShortPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
-    /**
-     * 条目缺陷质控评分页-科室（内页）
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    public IPage<QcResultShortDeptDTO> qcResultShortByDeptPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-
     /**
      * 根据两个主键-批量修改
      *
@@ -295,13 +235,6 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @return
      */
     public List<SjcfStatisticsDTO> sjcfStatistics(@Valid EntryStatisticsVO entryStatisticsVO);
-    /**
-     * 关键条目缺陷占比统计-科室
-     *
-     * @param entryStatisticsVO
-     * @return
-     */
-    public List<EntryStasByDeptDTO> entryStatisticsByDept(EntryStatisticsVO entryStatisticsVO);
 
     /**
      * 非医嘱离院病人记录
@@ -343,14 +276,6 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      */
     public IPage<QcResultShortDTO> leaveHosMRPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
-
-    /**
- * 离院病人质控评分年龄单独查询详情页
- *
- * @param
- * @return
- */
-    List<Map<String,Object>>getAge(@Param("hospitalId")String hospitalId, @Param("behospitalCodes")Set<String> behospitalCodes);
     /**
      * 改善率统计-全院（首页）
      *
@@ -376,14 +301,6 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      */
     public List<ExportExcelDTO> leaveHosMRPageExport(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
-    /**
-     * 离院病人质控评分详情-科室 页导出到excel
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    public List<ExportExcelByDeptDTO> leaveHosMRPageExportByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-
 
     /**
      * 条目缺陷质控评分详情页导出到excel
@@ -401,34 +318,6 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      */
     public List<UnModifyMRDetailDTO> unModifyMRStatistics(FilterUnModifyMRVO filterUnModifyMRVO);
 
-
-    /**
-     * 病历稽查表
-     *
-     * @param filterVO
-     * @return
-     */
-    public IPage<MedicalCheckDTO>  getMedicalCheck(@Param("filterVO")FilterMedicalCheckVO filterVO);
-
-    /**
-     * 病历稽查表-科室
-     *
-     * @param filterVO
-     * @return
-     */
-    public IPage<MedicalCheckDTO>  getMedicalCheckByDept(@Param("filterVO")FilterMedicalCheckVO filterVO);
-
-    public List<MedicalCheckIdNameDTO>  getMedicalEntryIds(@Param("casesEntryIds")List<Long> casesEntryIds);
-
-    /**
-     * 病历稽查表导出
-     *
-     * @param filterVO
-     * @return
-     */
-    public List<MedicalCheckExportDTO>  getMedicalCheckExport(@Param("filterVO")FilterMedicalCheckVO filterVO);
-
-
     /**
      * 未整改病历质控评分页（内页）
      *
@@ -437,14 +326,6 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      */
     public IPage<QcResultShortDTO> unModifyMRPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
-    /**
-     * 未整改病历质控评分页-科室（内页）
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    public IPage<QcResultShortDeptDTO> unModifyMRByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-
     /**
      * 不合格/合格数病历号（内页）
      *
@@ -463,15 +344,6 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
 
     public List<ExportExcelDTO> unModifyMRPageExport(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
-    /**
-     * 未整改病历缺陷评分详情页导出-科室
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-
-    public List<ExportExcelByDeptDTO> unModifyExportByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-
 
     /**
      * 病案首页不合格/合格数病历详情页导出
@@ -482,25 +354,6 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
 
     public List<ExportExcelDTO> badLevelPagePageExport(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
-    /**
-     * 病案首页不合格/合格数病历详情页导出-科室
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-
-    public List<ExportExcelByDeptDTO> homePageOrLevelExportByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-
-    /**
-     * 缺陷详情质控评分页导出-科室
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-
-    public List<ExportExcelByDeptDTO> qcResultShortByDeptPageExport(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-
-
     /**
      * 31天再入院详情页
      *
@@ -534,15 +387,6 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      */
     public IPage<QcResultShortDTO> hmImproveMRPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
-    /**
-     * 病案首页改善率质控评分页-科室（内页）
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    public IPage<QcResultShortDeptDTO> hmImproveMRPageByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-
-
     /**
      * 病案首页改善率质控评分页导出
      *
@@ -585,14 +429,6 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      */
     public IPage<QcResultShortDTO> qcCheckMRPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
-    /**
-     * 质控核查质控评分页-科室（内页）
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    public IPage<QcResultShortDeptDTO> qcCheckMRPageByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-
     /**
      * 质控核查质控评分页导出
      *
@@ -601,56 +437,4 @@ 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);
-
-
-    /**
-     * 质控核查质控评分页-科室 导出
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    public List<ExportExcelByDeptDTO> qcCheckMRPageExportByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-    /**
-     * 入院，手术，出院 24小时完成情况
-     *
-     * @param filterVO
-     * @return
-     */
-    public Map<String, Long> medicalRecordIndicator(@Param("filterVO") FilterVO filterVO);
-    /**
-     * 手术费，抗菌药物，手术和病理费等含有人数
-     *
-     * @param filterVO
-     * @return
-     */
-    public List<Map<String, String>> selectOperationNum(@Param("filterVO") FilterVO filterVO);
-
-    /**
-     * 病理CT/MR触发多规则人数
-     * @param filterVO
-     * @return
-     */
-    public Map<String,Long> triggeringRules(@Param("filterVO") FilterVO filterVO);
-
-    /**
-     * 病案首页关联的出院病历
-     * @param filterVO
-     * @return
-     */
-    public List<Map<String,String>> getMedicalRecords(@Param("filterVO") FilterVO filterVO);
-
-    /**
-     * 首页恶性肿瘤人数
-     * @param filterVO
-     * @return
-     */
-    public List<Map<String,String>> malignancy(@Param("filterVO") FilterVO filterVO);
-
 }

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

@@ -1,12 +1,10 @@
 package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.dto.CheckInfoDTO;
 import com.diagbot.dto.ExamineInfoDTO;
 import com.diagbot.dto.ExamineSonInfoDTO;
 import com.diagbot.entity.MedLisInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.vo.CheckInfoVO;
 import com.diagbot.vo.ExamineInfoVO;
 import com.diagbot.vo.ExamineSonInfoVO;
 import org.apache.ibatis.annotations.Param;

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

@@ -3,22 +3,18 @@ package com.diagbot.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.AverageStatisticsDTO;
-import com.diagbot.dto.DeptEntryNumDTO;
 import com.diagbot.dto.DeptNumDTO;
 import com.diagbot.dto.EntryNumDTO;
 import com.diagbot.dto.EntryNumGroupDTO;
 import com.diagbot.dto.NumDTO;
 import com.diagbot.dto.QcResultPercentDTO;
 import com.diagbot.entity.QcresultInfo;
-import com.diagbot.vo.FilterPageByDeptVO;
 import com.diagbot.vo.FilterPageVO;
 import com.diagbot.vo.FilterVO;
 import com.diagbot.vo.QcresultFilterVO;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**

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

@@ -4,13 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.*;
 import com.diagbot.entity.BehospitalInfo;
-import com.diagbot.entity.FilterRecordVO;
 import com.diagbot.vo.*;
 import org.apache.ibatis.annotations.Param;
 
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -38,14 +35,6 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      */
     public List<NumDTO> entryByDept(FilterVO filterVO);
 
-    /**
-     * 质控结果缺陷总数查询
-     *
-     * @param filterVO
-     * @return
-     */
-    public int getTotleResultNum(FilterVO filterVO);
-
 
     public List<BehospitalInfo> getNoGrade(TaskVO taskVO);
     /**
@@ -79,22 +68,6 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @return
      */
     public int operationCount(FilterVO filterVO);
-    /**
-     * 病案管理指标（内页）
-     *
-     * @param timeVo
-     * @return
-     */
-    public Map<String,Object> getBaseIndex( MedIndexFilterVO timeVo);
-
-    /**
-     * 病案管理规则质控参数查询
-     *
-     * @param filterVO
-     * @return
-     */
-    public Map<String,Object> getCountByEntry( FilterVO filterVO);
-
     /**
      * 病案管理规则质控病历参数查询
      *
@@ -128,24 +101,6 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      */
     public List<HomePageNumDTO> homePageLevelStatistics(FilterOrderVO filterOrderVO);
 
-
-
-    /**
-     * 病历质控报表-扣分项
-     *
-     * @param caseScoreVO
-     * @return
-     */
-    public List<QualityControlDTO> getQualityCase(CaseScoreVO caseScoreVO);
-
-    /**
-     * 病历质控报表-扣分
-     *
-     * @param caseScoreVO
-     * @return
-     */
-    public List<QualityControlDTO> getQualitySorce(CaseScoreVO caseScoreVO);
-
     /**
      * 病历质控报表
      *
@@ -173,30 +128,6 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      */
     public IPage<QualityControlDTO> getQualityControl(BehospitalPageVO behospitalPageVO);
 
-    /**
-     * 病历质控报表-科室
-     *
-     * @param behospitalPageVO
-     * @return
-     */
-    public IPage<QualityControlDTO> getQualityControlExport(BehospitalPageVO behospitalPageVO);
-
-    /**
-     * 各科室缺陷占比（主任医生）
-     *
-     * @param filterOrderVO
-     * @return
-     */
-    public List<LevelStsByDeptDTO> levelStatisticsByDept( FilterOrderVO filterOrderVO);
-
-    /**
-     * 单条条目缺陷统计-首页
-     *
-     * @param filterVO
-     * @return
-     */
-    public List<AdmissionCountDTO> casesEntryStatisticsByDept(FilterVO filterVO);
-
     /**
      * 缺陷明细-科室（分页）
      *
@@ -205,21 +136,6 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      */
     public IPage<DeptNumDTO> resultStatisticsByDeptAndDoctorPage(@Param("filterPageByDeptVO") FilterPageByDeptVO filterPageByDeptVO);
 
-    /**
-     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（关联上级科室）
-     *
-     * @param filterOrderVO
-     * @return
-     */
-    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass(FilterOrderVO filterOrderVO);
-
-    /**
-     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（台州）
-     *
-     * @param filterOrderVO
-     * @return
-     */
-    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass_TZ(FilterOrderVO filterOrderVO);
 
     List<ExportExcelDTO> exportExcel();
 
@@ -239,14 +155,6 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      */
     public IPage<QcResultShortDTO> qcResultShortPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
-    /**
-     * 条目缺陷质控评分页-科室（内页）
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    public IPage<QcResultShortDeptDTO> qcResultShortByDeptPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-
     /**
      * 关键条目缺陷占比统计
      *
@@ -255,17 +163,6 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      */
     public List<EntryStatisticsDTO> entryStatistics(EntryStatisticsVO entryStatisticsVO);
 
-    /**
-     * 关键条目缺陷占比统计-科室
-     *
-     * @param entryStatisticsVO
-     * @return
-     */
-    public List<EntryStasByDeptDTO> entryStatisticsByDept(EntryStatisticsVO entryStatisticsVO);
-
-
-
-
     /**
      * 非医嘱离院病人记录
      *
@@ -331,15 +228,6 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      */
     public List<ExportExcelDTO> leaveHosMRPageExport(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
-    /**
-     * 离院病人质控评分详情-科室 页导出到excel
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    public List<ExportExcelByDeptDTO> leaveHosMRPageExportByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-
-
     /**
      * 条目缺陷质控评分详情页导出到excel
      *
@@ -348,14 +236,6 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      */
     public List<ExportExcelDTO> qcResultShortPageExport(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
-    /**
-     * 缺陷详情质控评分页导出-科室
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    public List<ExportExcelByDeptDTO> qcResultShortByDeptPageExport(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-
     /**
      * 未整改病历统计
      *
@@ -365,25 +245,6 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
     public List<UnModifyMRDetailDTO> unModifyMRStatistics(FilterUnModifyMRVO filterUnModifyMRVO);
 
 
-    /**
-     * 病历稽查表
-     * @return
-     */
-    IPage<MedicalCheckDTO>  getMedicalCheck(FilterMedicalCheckVO filterVO,@Param("casesEntryIds")List<Long> casesEntryIds);
-
-    /**
-     * 病历稽查表
-     * @return
-     */
-    IPage<MedicalCheckDTO>  getMedicalChecks(FilterMedicalCheckVO filterVO,@Param("casesEntryIds")List<Long> casesEntryIds);
-
-    /**
-     * 病历稽查表导出
-     * @return
-     */
-    List<MedicalCheckExportDTO>  getMedicalCheckExport(FilterMedicalCheckVO filterVO);
-
-
     /**
      * 未整改病历质控评分页（内页）
      *
@@ -392,14 +253,6 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      */
     public IPage<QcResultShortDTO> unModifyMRPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
-    /**
-     * 未整改病历质控评分页-科室（内页）
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    public IPage<QcResultShortDeptDTO> unModifyMRByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-
     /**
      * 不合格数病历号（内页）
      * @param qcResultPageVO
@@ -415,16 +268,6 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      */
     public List<ExportExcelDTO> unModifyMRPageExport(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
-
-    /**
-     * 未整改病历缺陷评分详情页导出-科室
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    public List<ExportExcelByDeptDTO> unModifyExportByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-
-
     /**
      * 病案首页不合格/合格数病历详情页导出
      *
@@ -432,14 +275,6 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @return
      */
     public List<ExportExcelDTO> badLevelPagePageExport(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-    /**
-     * 病案首页不合格/合格数病历详情页导出-科室
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    public List<ExportExcelByDeptDTO> homePageOrLevelExportByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-
 
 
     /**
@@ -473,13 +308,6 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @return
      */
     public IPage<QcResultShortDTO> hmImproveMRPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-    /**
-     * 病案首页改善率质控评分页-科室（内页）
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    public IPage<QcResultShortDeptDTO> hmImproveMRPageByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
     /**
      * 病案首页改善率质控评分页导出
@@ -489,14 +317,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);
-
     /**
      * 质控核查质控评分页（内页）
      *
@@ -505,15 +325,6 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      */
     public IPage<QcResultShortDTO> qcCheckMRPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
-
-    /**
-     * 质控核查质控评分页-科室（内页）
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    public IPage<QcResultShortDeptDTO> qcCheckMRPageByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-
     /**
      * 质控核查质控评分页导出
      *
@@ -522,41 +333,4 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      */
     public List<ExportExcelDTO> qcCheckMRPageExport(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
-    /**
-     * 质控核查质控评分页-科室 导出
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    public List<ExportExcelByDeptDTO> qcCheckMRPageExportByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-
-
-    /**
-     * 手术费，抗菌药物，手术和病理费等含有人数
-     * @param filterVO
-     * @return
-     */
-    public List<Map<String, String>> selectOperationNum(@Param("filterVO")FilterVO filterVO);
-
-    /**
-     * 触发规则人数
-     * @param filterVO
-     * @return
-     */
-    public Map<String,Long> triggeringRules(@Param("filterVO")FilterVO filterVO);
-
-    /**
-     * 病案首页关联的出院病历
-     * @param filterVO
-     * @return
-     */
-    public List<Map<String,String>> getMedicalRecords(@Param("filterVO") FilterVO filterVO);
-
-    /**
-     * 首页恶性肿瘤人数
-     * @param filterVO
-     * @return
-     */
-    public List<Map<String,String>> malignancy(@Param("filterVO") FilterVO filterVO);
-
 }

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

@@ -3,14 +3,12 @@ package com.diagbot.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.AverageStatisticsDTO;
-import com.diagbot.dto.DeptEntryNumDTO;
 import com.diagbot.dto.DeptNumDTO;
 import com.diagbot.dto.EntryNumDTO;
 import com.diagbot.dto.EntryNumGroupDTO;
 import com.diagbot.dto.NumDTO;
 import com.diagbot.dto.QcResultPercentDTO;
 import com.diagbot.entity.QcresultInfo;
-import com.diagbot.vo.FilterPageByDeptVO;
 import com.diagbot.vo.FilterPageVO;
 import com.diagbot.vo.FilterVO;
 import com.diagbot.vo.QcresultFilterVO;

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

@@ -4,16 +4,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.*;
 import com.diagbot.entity.BehospitalInfo;
-import com.diagbot.entity.FilterRecordVO;
 import com.diagbot.mapper.BehospitalInfoMapper;
 import com.diagbot.service.BehospitalInfoService;
-import com.diagbot.util.ListUtil;
 import com.diagbot.vo.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 import javax.validation.Valid;
@@ -58,17 +54,6 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
         return baseMapper.entryByDept(filterVO);
     }
 
-    /**
-     * 质控结果缺陷总数查询
-     *
-     * @param filterVO
-     * @return
-     */
-    @Override
-    public int getTotleResultNum(FilterVO filterVO) {
-        return baseMapper.getTotleResultNum(filterVO);
-    }
-
     @Override
     public List<BehospitalInfo> getNoGrade(TaskVO taskVO) {
         return baseMapper.getNoGrade(taskVO);
@@ -186,32 +171,21 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
         return baseMapper.levelStatistics(filterOrderVO);
     }
 
-    @Override
-    public List<HomePageNumDTO> homePageLevelStatistics(FilterOrderVO filterOrderVO) {
-        return Collections.emptyList();
-    }
-
+//    @Override
+//    public List<HomePageNumDTO> homePageLevelStatistics(FilterOrderVO filterOrderVO) {
+//        return Collections.emptyList();
+//    }
     /**
-     * 病历质控报表-扣分项
+     * 病案首页合格率占比
      *
-     * @param caseScoreVO
+     * @param filterOrderVO
      * @return
      */
     @Override
-    public List<QualityControlDTO> getQualityCase(CaseScoreVO caseScoreVO) {
-        return baseMapper.getQualityCase(caseScoreVO);
+    public List<HomePageNumDTO> homePageLevelStatistics(FilterOrderVO filterOrderVO) {
+        return baseMapper.homePageLevelStatistics(filterOrderVO);
     }
 
-    /**
-     * 病历质控报表-扣分
-     *
-     * @param caseScoreVO
-     * @return
-     */
-    @Override
-    public List<QualityControlDTO> getQualitySorce(CaseScoreVO caseScoreVO) {
-        return baseMapper.getQualitySorce(caseScoreVO);
-    }
     /**
      * 病历质控报表-扣分数据
      *
@@ -245,35 +219,6 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
         return baseMapper.getQualityControl(behospitalPageVO);
     }
 
-    /**
-     * 病历质控报表-科室
-     *
-     * @param behospitalPageVO
-     * @return
-     */
-    @Override
-    public IPage<QualityControlDTO> getQualityControlExport(BehospitalPageVO behospitalPageVO) {
-        return baseMapper.getQualityControlExport(behospitalPageVO);
-    }
-
-
-    /**
-     * 各科室缺陷占比（主任医生）
-     *
-     * @param filterOrderVO
-     * @return
-     */
-    @Override
-    public List<LevelStsByDeptDTO> levelStatisticsByDept(FilterOrderVO filterOrderVO) {
-        return baseMapper.levelStatisticsByDept(filterOrderVO);
-    }
-
-    @Override
-    public List<AdmissionCountDTO> casesEntryStatisticsByDept(FilterVO filterVO) {
-        return Collections.emptyList();
-    }
-
-
     /**
      * 缺陷明细-科室（分页）
      *
@@ -284,28 +229,6 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
         return baseMapper.resultStatisticsByDeptAndDoctorPage(filterPageByDeptVO);
     }
 
-    /**
-     * 各科室缺陷占比（组合）-全院-根据内外科系统统计-关联上级科室
-     *
-     * @param filterOrderVO
-     * @return
-     */
-    @Override
-    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass(FilterOrderVO filterOrderVO) {
-        return baseMapper.levelStatisticsByDeptClass(filterOrderVO);
-    }
-
-    /**
-     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（台州）
-     *
-     * @param filterOrderVO
-     * @return
-     */
-    @Override
-    public List<LevelStatisticsTZDTO> levelStatisticsByDeptClass_TZ(FilterOrderVO filterOrderVO) {
-        return baseMapper.levelStatisticsByDeptClass_TZ(filterOrderVO);
-    }
-
 
     @Override
     public List<ExportExcelDTO> exportExcel() {
@@ -333,16 +256,6 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
         return baseMapper.qcResultShortPage(qcResultShortPageVO);
     }
 
-    /**
-     * 条目缺陷质控评分页-科室（内页）
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    public IPage<QcResultShortDeptDTO> qcResultShortByDeptPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO) {
-        return baseMapper.qcResultShortByDeptPage(qcResultShortPageVO);
-    }
-
     /**
      * 根据编码、医院编码批量更新
      *
@@ -366,17 +279,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
     public List<SjcfStatisticsDTO> sjcfStatistics(@Valid EntryStatisticsVO entryStatisticsVO) {
     	 return baseMapper.sjcfStatistics(entryStatisticsVO);
 	}
-    
-    /**
-     * 关键条目缺陷占比统计-科室
-     *
-     * @param entryStatisticsVO
-     * @return
-     */
-    @Override
-    public List<EntryStasByDeptDTO> entryStatisticsByDept(EntryStatisticsVO entryStatisticsVO) {
-        return baseMapper.entryStatisticsByDept(entryStatisticsVO);
-    }
+
 
     /**
      * 非医嘱离院病人记录
@@ -467,19 +370,6 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
         return baseMapper.leaveHosMRPageExport(qcResultShortPageVO);
     }
 
-    /**
-     * 离院病人质控评分详情页-科室导出到excel
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    @Override
-    public List<ExportExcelByDeptDTO> leaveHosMRPageExportByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO) {
-        return baseMapper.leaveHosMRPageExportByDept(qcResultShortPageVO);
-    }
-
-
-
     /**
      * 条目缺陷质控评分详情页导出到excel
      *
@@ -491,17 +381,6 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
         return baseMapper.qcResultShortPageExport(qcResultShortPageVO);
     }
 
-    /**
-     * 缺陷详情质控评分页导出-科室
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    @Override
-    public List<ExportExcelByDeptDTO> qcResultShortByDeptPageExport(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO) {
-        return baseMapper.qcResultShortByDeptPageExport(qcResultShortPageVO);
-    }
-
     /**
      * 未整改病历统计
      *
@@ -513,220 +392,6 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
         return baseMapper.unModifyMRStatistics(filterUnModifyMRVO);
     }
 
-    /**
-     * 病历稽查表
-     *
-     * @param filterVO
-     * @return
-     */
-    @Override
-    public IPage<MedicalCheckDTO> getMedicalCheck(@Param("filterVO") FilterMedicalCheckVO filterVO, @Param("casesEntryIds") List<Long> casesEntryIds) {
-        IPage<MedicalCheckDTO> medicalCheck = baseMapper.getMedicalCheck(filterVO);
-        List<MedicalCheckIdNameDTO> medicalEntryIds = baseMapper.getMedicalEntryIds(casesEntryIds);
-
-        List<MedicalCheckDTO> records = medicalCheck.getRecords();
-        for (MedicalCheckDTO record : records) {
-            for (MedicalCheckIdNameDTO medicalEntryId : medicalEntryIds) {
-                if ("2170".equals(medicalEntryId.getId())) {
-                    record.setEntry_2170_id(medicalEntryId.getId());
-                    record.setEntry_2170_name(medicalEntryId.getName());
-                }
-                if ("2217".equals(medicalEntryId.getId())) {
-                    record.setEntry_2217_id(medicalEntryId.getId());
-                    record.setEntry_2217_name(medicalEntryId.getName());
-                }
-                if ("2218".equals(medicalEntryId.getId())) {
-                    record.setEntry_2218_id(medicalEntryId.getId());
-                    record.setEntry_2218_name(medicalEntryId.getName());
-                }
-                if ("2220".equals(medicalEntryId.getId())) {
-                    record.setEntry_2220_id(medicalEntryId.getId());
-                    record.setEntry_2220_name(medicalEntryId.getName());
-                }
-                if ("2229".equals(medicalEntryId.getId())) {
-                    record.setEntry_2229_id(medicalEntryId.getId());
-                    record.setEntry_2229_name(medicalEntryId.getName());
-                }
-                if ("2287".equals(medicalEntryId.getId())) {
-                    record.setEntry_2287_id(medicalEntryId.getId());
-                    record.setEntry_2287_name(medicalEntryId.getName());
-                }
-                if ("2486".equals(medicalEntryId.getId())) {
-                    record.setEntry_2486_id(medicalEntryId.getId());
-                    record.setEntry_2486_name(medicalEntryId.getName());
-                }
-                if ("2495".equals(medicalEntryId.getId())) {
-                    record.setEntry_2495_id(medicalEntryId.getId());
-                    record.setEntry_2495_name(medicalEntryId.getName());
-                }
-                if ("2654".equals(medicalEntryId.getId())) {
-                    record.setEntry_2654_id(medicalEntryId.getId());
-                    record.setEntry_2654_name(medicalEntryId.getName());
-                }
-                if ("2655".equals(medicalEntryId.getId())) {
-                    record.setEntry_2655_id(medicalEntryId.getId());
-                    record.setEntry_2655_name(medicalEntryId.getName());
-                }
-                if ("2657".equals(medicalEntryId.getId())) {
-                    record.setEntry_2657_id(medicalEntryId.getId());
-                    record.setEntry_2657_name(medicalEntryId.getName());
-                }
-                if ("2658".equals(medicalEntryId.getId())) {
-                    record.setEntry_2658_id(medicalEntryId.getId());
-                    record.setEntry_2658_name(medicalEntryId.getName());
-                }
-                if ("2686".equals(medicalEntryId.getId())) {
-                    record.setEntry_2686_id(medicalEntryId.getId());
-                    record.setEntry_2686_name(medicalEntryId.getName());
-                }
-                if ("2852".equals(medicalEntryId.getId())) {
-                    record.setEntry_2852_id(medicalEntryId.getId());
-                    record.setEntry_2852_name(medicalEntryId.getName());
-                }
-                if ("2900".equals(medicalEntryId.getId())) {
-                    record.setEntry_2900_id(medicalEntryId.getId());
-                    record.setEntry_2900_name(medicalEntryId.getName());
-                }
-                if ("2930".equals(medicalEntryId.getId())) {
-                    record.setEntry_2930_id(medicalEntryId.getId());
-                    record.setEntry_2930_name(medicalEntryId.getName());
-                }
-                if ("3010".equals(medicalEntryId.getId())) {
-                    record.setEntry_3010_id(medicalEntryId.getId());
-                    record.setEntry_3010_name(medicalEntryId.getName());
-                }
-                if ("3025".equals(medicalEntryId.getId())) {
-                    record.setEntry_3025_id(medicalEntryId.getId());
-                    record.setEntry_3025_name(medicalEntryId.getName());
-                }
-                if ("3062".equals(medicalEntryId.getId())) {
-                    record.setEntry_3062_id(medicalEntryId.getId());
-                    record.setEntry_3062_name(medicalEntryId.getName());
-                }
-                if ("3063".equals(medicalEntryId.getId())) {
-                    record.setEntry_3063_id(medicalEntryId.getId());
-                    record.setEntry_3063_name(medicalEntryId.getName());
-                }
-            }
-        }
-
-        return medicalCheck;
-
-    }
-
-    /**
-     * 病历稽查表-科室
-     *
-     * @param filterVO
-     * @return
-     */
-    @Override
-    public IPage<MedicalCheckDTO> getMedicalChecks(@Param("filterVO") FilterMedicalCheckVO filterVO, @Param("casesEntryIds") List<Long> casesEntryIds) {
-        IPage<MedicalCheckDTO> medicalCheck = baseMapper.getMedicalCheckByDept(filterVO);
-        List<MedicalCheckIdNameDTO> medicalEntryIds = baseMapper.getMedicalEntryIds(casesEntryIds);
-
-        List<MedicalCheckDTO> records = medicalCheck.getRecords();
-        for (MedicalCheckDTO record : records) {
-            for (MedicalCheckIdNameDTO medicalEntryId : medicalEntryIds) {
-                if ("2170".equals(medicalEntryId.getId())) {
-                    record.setEntry_2170_id(medicalEntryId.getId());
-                    record.setEntry_2170_name(medicalEntryId.getName());
-                }
-                if ("2217".equals(medicalEntryId.getId())) {
-                    record.setEntry_2217_id(medicalEntryId.getId());
-                    record.setEntry_2217_name(medicalEntryId.getName());
-                }
-                if ("2218".equals(medicalEntryId.getId())) {
-                    record.setEntry_2218_id(medicalEntryId.getId());
-                    record.setEntry_2218_name(medicalEntryId.getName());
-                }
-                if ("2220".equals(medicalEntryId.getId())) {
-                    record.setEntry_2220_id(medicalEntryId.getId());
-                    record.setEntry_2220_name(medicalEntryId.getName());
-                }
-                if ("2229".equals(medicalEntryId.getId())) {
-                    record.setEntry_2229_id(medicalEntryId.getId());
-                    record.setEntry_2229_name(medicalEntryId.getName());
-                }
-                if ("2287".equals(medicalEntryId.getId())) {
-                    record.setEntry_2287_id(medicalEntryId.getId());
-                    record.setEntry_2287_name(medicalEntryId.getName());
-                }
-                if ("2486".equals(medicalEntryId.getId())) {
-                    record.setEntry_2486_id(medicalEntryId.getId());
-                    record.setEntry_2486_name(medicalEntryId.getName());
-                }
-                if ("2495".equals(medicalEntryId.getId())) {
-                    record.setEntry_2495_id(medicalEntryId.getId());
-                    record.setEntry_2495_name(medicalEntryId.getName());
-                }
-                if ("2654".equals(medicalEntryId.getId())) {
-                    record.setEntry_2654_id(medicalEntryId.getId());
-                    record.setEntry_2654_name(medicalEntryId.getName());
-                }
-                if ("2655".equals(medicalEntryId.getId())) {
-                    record.setEntry_2655_id(medicalEntryId.getId());
-                    record.setEntry_2655_name(medicalEntryId.getName());
-                }
-                if ("2657".equals(medicalEntryId.getId())) {
-                    record.setEntry_2657_id(medicalEntryId.getId());
-                    record.setEntry_2657_name(medicalEntryId.getName());
-                }
-                if ("2658".equals(medicalEntryId.getId())) {
-                    record.setEntry_2658_id(medicalEntryId.getId());
-                    record.setEntry_2658_name(medicalEntryId.getName());
-                }
-                if ("2686".equals(medicalEntryId.getId())) {
-                    record.setEntry_2686_id(medicalEntryId.getId());
-                    record.setEntry_2686_name(medicalEntryId.getName());
-                }
-                if ("2852".equals(medicalEntryId.getId())) {
-                    record.setEntry_2852_id(medicalEntryId.getId());
-                    record.setEntry_2852_name(medicalEntryId.getName());
-                }
-                if ("2900".equals(medicalEntryId.getId())) {
-                    record.setEntry_2900_id(medicalEntryId.getId());
-                    record.setEntry_2900_name(medicalEntryId.getName());
-                }
-                if ("2930".equals(medicalEntryId.getId())) {
-                    record.setEntry_2930_id(medicalEntryId.getId());
-                    record.setEntry_2930_name(medicalEntryId.getName());
-                }
-                if ("3010".equals(medicalEntryId.getId())) {
-                    record.setEntry_3010_id(medicalEntryId.getId());
-                    record.setEntry_3010_name(medicalEntryId.getName());
-                }
-                if ("3025".equals(medicalEntryId.getId())) {
-                    record.setEntry_3025_id(medicalEntryId.getId());
-                    record.setEntry_3025_name(medicalEntryId.getName());
-                }
-                if ("3062".equals(medicalEntryId.getId())) {
-                    record.setEntry_3062_id(medicalEntryId.getId());
-                    record.setEntry_3062_name(medicalEntryId.getName());
-                }
-                if ("3063".equals(medicalEntryId.getId())) {
-                    record.setEntry_3063_id(medicalEntryId.getId());
-                    record.setEntry_3063_name(medicalEntryId.getName());
-                }
-            }
-        }
-
-        return medicalCheck;
-
-    }
-
-    /**
-     * 病历稽查表导出
-     *
-     * @param filterVO
-     * @return
-     */
-    @Override
-    public List<MedicalCheckExportDTO> getMedicalCheckExport(@Param("filterVO") FilterMedicalCheckVO filterVO) {
-        List<MedicalCheckExportDTO> medicalCheckExport = baseMapper.getMedicalCheckExport(filterVO);
-        return medicalCheckExport;
-
-    }
 
     /**
      * 未整改病历质控评分页（内页）
@@ -739,18 +404,6 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
         return baseMapper.unModifyMRPage(qcResultShortPageVO);
     }
 
-    /**
-     * 未整改病历质控评分页-科室（内页）
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    @Override
-    public IPage<QcResultShortDeptDTO> unModifyMRByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO) {
-        return baseMapper.unModifyMRByDept(qcResultShortPageVO);
-    }
-
-
     /**
      * 不合格/合格数病历号（内页）
      *
@@ -773,17 +426,6 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
         return baseMapper.unModifyMRPageExport((qcResultShortPageVO));
     }
 
-    /**
-     * 未整改病历缺陷评分详情页导出-科室
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    @Override
-    public List<ExportExcelByDeptDTO> unModifyExportByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO) {
-        return baseMapper.unModifyExportByDept((qcResultShortPageVO));
-    }
-
 
     /**
      * 病案首页不合格/合格数病历详情页导出
@@ -795,18 +437,6 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
     public List<ExportExcelDTO> badLevelPagePageExport(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO) {
         return baseMapper.badLevelPagePageExport((qcResultShortPageVO));
     }
-    /**
-     * 病案首页不合格/合格数病历详情页导出-科室
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    @Override
-    public List<ExportExcelByDeptDTO> homePageOrLevelExportByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO) {
-        return baseMapper.homePageOrLevelExportByDept((qcResultShortPageVO));
-    }
-
-
 
     /**
      * 31天再入院详情页
@@ -852,17 +482,6 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
         return baseMapper.hmImproveMRPage(qcResultShortPageVO);
     }
 
-    /**
-     * 病案首页改善率质控评分页-科室（内页）
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    @Override
-    public IPage<QcResultShortDeptDTO> hmImproveMRPageByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO) {
-        return baseMapper.hmImproveMRPageByDept(qcResultShortPageVO);
-    }
-
     /**
      * 病案首页改善率质控评分页导出
      *
@@ -874,39 +493,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);
-    }
-
-    /**
-     * 病案管理指标获取基础数据
-     *
-     * @param timeVo
-     * @return
-     */
-    @Override
-    public Map<String,Object> getBaseIndex( MedIndexFilterVO timeVo) {
-        return baseMapper.getBaseIndex(timeVo);
-    }
-
-    /**
-     * 病案管理规则质控参数查询
-     *
-     * @param filterVO
-     * @return
-     */
-    @Override
-    public Map<String,Object> getCountByEntry( FilterVO filterVO) {
-        return baseMapper.getCountByEntry(filterVO);
-    }
-
     /**
      * 病案管理规则质控病历参数查询
      *
@@ -928,16 +514,6 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
     public IPage<QcResultShortDTO> qcCheckMRPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO) {
         return baseMapper.qcCheckMRPage(qcResultShortPageVO);
     }
-    /**
-     * 质控核查质控评分页-科室（内页）
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    @Override
-    public IPage<QcResultShortDeptDTO> qcCheckMRPageByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO) {
-        return baseMapper.qcCheckMRPageByDept(qcResultShortPageVO);
-    }
 
 
     /**
@@ -950,53 +526,4 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
     public List<ExportExcelDTO> qcCheckMRPageExport(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO) {
         return baseMapper.qcCheckMRPageExport(qcResultShortPageVO);
     }
-
-    /**
-     * 质控核查质控评分页-科室 导出
-     *
-     * @param qcResultShortPageVO
-     * @return
-     */
-    @Override
-    public List<ExportExcelByDeptDTO> qcCheckMRPageExportByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO) {
-        return baseMapper.qcCheckMRPageExportByDept(qcResultShortPageVO);
-    }
-
-    /**
-     * 手术费，抗菌药物，手术和病理费等含有人数
-     *
-     * @param  filterVO
-     * @return
-     */
-    public List<Map<String, String>> selectOperationNum(@Param("filterVO")FilterVO filterVO){
-        return  baseMapper.selectOperationNum(filterVO);
-
-    }
-
-    /**
-     * 触发规则人数
-     * @param filterVO
-     * @return
-     */
-    public Map<String,Long> triggeringRules(@Param("filterVO")FilterVO filterVO){
-        return  baseMapper.triggeringRules(filterVO);
-    }
-
-    /**
-     * 病案首页关联的出院病历
-     * @param filterVO
-     * @return
-     */
-    public List<Map<String,String>> getMedicalRecords(@Param("filterVO") FilterVO filterVO){
-        return  baseMapper.getMedicalRecords(filterVO);
-    }
-
-    /**
-     * 首页恶性肿瘤人数
-     * @param filterVO
-     * @return
-     */
-    public List<Map<String,String>> malignancy(@Param("filterVO") FilterVO filterVO){
-        return  baseMapper.malignancy(filterVO);
-    }
 }

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

@@ -3,7 +3,6 @@ package com.diagbot.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.AverageStatisticsDTO;
-import com.diagbot.dto.DeptEntryNumDTO;
 import com.diagbot.dto.DeptNumDTO;
 import com.diagbot.dto.EntryNumDTO;
 import com.diagbot.dto.EntryNumGroupDTO;
@@ -12,12 +11,10 @@ import com.diagbot.dto.QcResultPercentDTO;
 import com.diagbot.entity.QcresultInfo;
 import com.diagbot.mapper.QcresultInfoMapper;
 import com.diagbot.service.QcresultInfoService;
-import com.diagbot.vo.FilterPageByDeptVO;
 import com.diagbot.vo.FilterPageVO;
 import com.diagbot.vo.FilterVO;
 import com.diagbot.vo.QcresultFilterVO;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 

src/main/java/com/diagbot/task/MedIndexTask.java

@@ -1,83 +0,0 @@
-package com.diagbot.task;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.entity.SysTaskCron;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.ConsoleFacade;
-import com.diagbot.facade.SysTaskCronFacade;
-import com.diagbot.facade.data.ADoctorAdviceFacade;
-import com.diagbot.util.StringUtil;
-import com.diagbot.vo.FilterVO;
-import com.diagbot.vo.IndexTimeVO;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.Trigger;
-import org.springframework.scheduling.TriggerContext;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
-import org.springframework.scheduling.config.ScheduledTaskRegistrar;
-import org.springframework.scheduling.support.CronTrigger;
-
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.util.Date;
-
-@Configuration      //1.主要用于标记配置类，兼备Component的效果。
-@EnableScheduling   // 2.开启定时任务
-@Slf4j
-public class MedIndexTask implements SchedulingConfigurer{
-
-	@Autowired
-    private SysTaskCronFacade sysTaskCronFacade;
-
-    private SysTaskCron task001 = new SysTaskCron();
-
-    @Autowired
-    private ConsoleFacade consoleFacade;
-    
-    /**
-     * 执行定时任务.
-     */
-    @Override
-    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
-        taskRegistrar.addTriggerTask(new Runnable() {
-            @Override
-            public void run() {
-                //1.添加任务内容(Runnable)
-                if (null != task001
-                        && task001.getIsDeleted().equals(IsDeleteEnum.N.getKey())
-                        && task001.getIsUsed().equals(1)) {
-                    log.info("执行动态定时任务: " + LocalDateTime.now().toLocalTime());
-                    IndexTimeVO IndexTimeVO = new IndexTimeVO();
-                    String param = task001.getParam();
-                    String[] split = {param};
-                    if(param.contains(",")){
-                        split = param.split(",");
-                    }
-                    for (String str : split) {
-                        IndexTimeVO.setHospitalId(str);
-                        consoleFacade.saveMedicaIndicator(IndexTimeVO);
-                    }
-                }
-            }
-        }, new Trigger() {
-            @Override
-            public Date nextExecutionTime(TriggerContext triggerContext) {
-                //2.1 从数据库获取执行周期
-                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
-                        .eq("cron_code", "TASK_INDEX"), false);
-                String cron = "0 0 3 * * ?";
-                //2.2 合法性校验.
-                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
-                    cron = task001.getCron();
-                }
-                CronTrigger trigger = new CronTrigger(cron);
-                return trigger.nextExecutionTime(triggerContext);
-            }
-        });
-    }
-}

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

@@ -1,21 +0,0 @@
-package com.diagbot.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author wangfeng
- * @Description:
- * @time: 2024-07-06 13:30
- */
-@Getter
-@Setter
-public class MedCheckInfoAddVO {
-    private Long hospitalId;//医院id
-    private String behospitalCode; // 病历id
-    @ApiModelProperty(hidden = true)
-    private Integer checkStatus = 1;//核查状态（0未核查，1已核查）
-    private Integer checkType;
-
-}

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

@@ -1,34 +0,0 @@
-package com.diagbot.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author songxl
- * @Description:核查任务添加对象
- * @author songxl
- * @time: 2024-05-11
- */
-@Getter
-@Setter
-public class MedCheckWorkAddVO {
-    @ApiModelProperty(hidden = true)
-    private Long hospitalId;            //医院id
-    @ApiModelProperty("病历id集合")
-    private List<String> behospitalCodeList = new ArrayList<>(); // 病历id
-    @ApiModelProperty(hidden = true)
-    private String jobCreator;         // 创建用户编号
-    @ApiModelProperty("任务类型 0-科室任务 1-院级 1-质控科")
-    private Integer jobType;           // 任务类型 0-科室任务 1-院级 1-质控科
-    @ApiModelProperty("操作类型 0-取消，1-添加")
-    private Integer checkStatus;        // 操作类型 0-取消，1-添加
-    @ApiModelProperty("操作时间")
-    private String createTime;          // 操作时间
-    @ApiModelProperty("核查类型 0病历，1病案首页,2全部 默认")
-    private Integer checkType=2;          // 核查类型 0病历，1病案首页,2全部 默认
-}

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

@@ -42,22 +42,6 @@ public class QcResultShortPageVO extends Page {
     @NotNull(message = "导出天数选择不能为空")
     private String radioCheck = "1";
 
-    /**
-     * 主诊断
-     */
-    private String diagnose;
-
-    /**
-     * 病区name
-     */
-    private String wardName;
-
-
-    /**
-     * 医疗组name
-     */
-    private String medoupName;
-
     /**
      * title名称
      */
@@ -92,10 +76,7 @@ public class QcResultShortPageVO extends Page {
      * 医生编号
      */
     private String doctorId;
-    /**
-     * 病历等级
-     */
-    private String level;
+
     @NotNull(message = "请输入起始时间")
     private Date startDate;
     @NotNull(message = "请输入截止时间")
@@ -119,45 +100,13 @@ public class QcResultShortPageVO extends Page {
     /**
      * 核查状态（1：已核查，0：未核查）
      */
-    private Integer checkStatus;
-    /**
-     * 首页核查状态（1：已核查，0：未核查）
-     */
-    private Integer mrStatus;
-    /**
-     * 病历核查人员
-     */
-    private String chName;
-    /**
-     * 首页核查人员
-     */
-    private String mrName;
-    /**
-     * 病历核查起始时间
-     */
-    private Date chTimeStart;
-    /**
-     * 病历核查截止时间
-     */
-    private Date chTimeEnd;
-    /**
-     * 首页核查起始时间
-     */
-    private Date mrTimeStart;
-    /**
-     * 首页核查截止时间
-     */
-    private Date mrTimeEnd;
+    private Integer status;
+
     /**
      * 是否归档（0：未归档，1：已归档）
      */
     private String isPlacefile = "1";
 
-    /**
-     * 住院超过31日标志
-     */
-    private Integer beHosGT31Days;
-
     /**
      * 改善标志（1：病案首页改善病历，2：病案首页改善至合格病历，3：病案首页改善至满分病历）
      */

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

@@ -23,25 +23,17 @@ 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 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;
@@ -192,37 +184,6 @@ public class ConsoleController {
         return RespDTO.onSuc(consoleFacade.leaveHosCount(filterVO));
     }
 
-
-  /**
-     * 病案指标
-     * @param filterVO
-     * @return
-     */
-    @ApiOperation(value = "病案指标[by:zh]",
-            notes = "startDate： 起始时间 <br>" +
-                    "endDate： 结束时间 <br>" +
-                    "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
-    @PostMapping("/medicalRecordIndicator")
-    @SysLogger("medicalRecordIndicator")
-    public RespDTO<List<Map<String,String>>> medicalRecordIndicator(@RequestBody @Valid FilterVO filterVO) {
-        return RespDTO.onSuc(consoleFacade.medicalRecordIndicator(filterVO));
-    }
-
-    /**
-     * 病案指标后台维护接口
-     * @param indexTimeVO
-     * @return
-     */
-    @ApiOperation(value = "病案指标数据存储[by:cy]",
-            notes = "startDate： 起始时间-样例[2021-01-01]请严格按照日历时间传参！！！ <br>" +
-                    "endDate： 结束时间-样例[2021-01-01]请严格按照日历时间传参！！！<br>")
-    @PostMapping("/saveMedicaIndicator")
-    @SysLogger("saveMedicaIndicator")
-    public RespDTO<Boolean> saveMedicaIndicator(@RequestBody @Valid IndexTimeVO indexTimeVO) {
-        Boolean flag = consoleFacade.saveMedicaIndicator(indexTimeVO);
-        return RespDTO.onSuc(flag);
-    }
-
     /**
      * 质控病历统计
      *
@@ -485,26 +446,6 @@ public class ConsoleController {
         return RespDTO.onSuc(consoleFacade.levelStatistics(filterOrderVO));
     }
 
-    /**
-     * 各科室缺陷占比（组合）-全院-根据内外科系统统计（台州）
-     *
-     * @param filterOrderVO
-     * @return
-     */
-    @ApiOperation(value = "各科室缺陷占比（组合）-全院-根据内外科系统统计（台州）[by:zhaops]",
-            notes = "type： 统计维度 1-本月，2-本年(必填)<br>" +
-                    "level： 病历等级 <br>" +
-                    "name： 科室名称 <br>" +
-                    "deptClass： 科室分类：内科/外科，全部不传 <br>" +
-                    "asc： 排序（升序） <br>" +
-                    "desc： 排序（降序） <br>" +
-                    "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
-    @PostMapping("/levelStatisticsByDeptClass")
-    @SysLogger("levelStatisticsByDeptClass")
-    public RespDTO<List<LevelStatisticsTZDTO>> levelStatisticsByDeptClass(@RequestBody @Valid FilterOrderVO filterOrderVO) {
-        return RespDTO.onSuc(consoleFacade.levelStatisticsByDeptClass_TZ(filterOrderVO));
-    }
-
     /**
      * 病案首页不合格数病历详情(内页)
      * @param qcResultPageVO
@@ -573,18 +514,9 @@ public class ConsoleController {
                     "behDeptName：科室名称 <br>" +
                     "doctorId：医生工号 <br>" +
                     "doctorName：医生姓名 <br>" +
-                    "level： 病历等级 <br>" +
-                    "beHosGT31Days： 住院超过31日标志 <br>" +
                     "isReject： 单项否决 1-否决，0-非<br>" +
                     "ruleType： 规则类型 0：无，1：空项，2：错误<br>" +
-                    "checkStatus： 核查状态（1：已核查，0：未核查） <br>" +
-                    "mrStatus： 首页核查状态（1：已核查，0：未核查） <br>" +
-                    "chName： 病历核查人员 <br>" +
-                    "mrName： 首页核查人员 <br>" +
-                    "chTimeStart： 病历核查起始时间 <br>" +
-                    "chTimeEnd： 病历核查截止时间 <br>" +
-                    "mrTimeStart： 首页核查起始时间 <br>" +
-                    "mrTimeEnd： 首页核查截止时间 <br>" +
+                    "status： 审核状态（1-待审核 2-已通过 3-已驳回 4-未申诉 5-已申诉） <br>" +
                     "startDate： 起始时间 <br>" +
                     "endDate： 截止时间 <br>" +
                     "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")

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

@@ -90,24 +90,6 @@ public class ConsoleExportController {
         consoleExportFacade.levelExport(response, filterOrderVO);
     }
 
-    /**
-     * 各科室缺陷占比（组合）
-     *
-     * @param filterOrderVO
-     * @return
-     */
-    @ApiOperation(value = "各科室缺陷占比（组合）导出-台州[by:gaodm]",
-            notes = "type： 统计维度 1-本月，2-本年(必填)<br>" +
-                    "level： 病历等级 <br>" +
-                    "name： 科室名称 <br>" +
-                    "asc： 排序（升序） <br>" +
-                    "desc： 排序（降序） <br>" +
-                    "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
-    @PostMapping("/levelExport_TZ")
-    @SysLogger("levelExport_TZ")
-    public void levelExport_TZ(HttpServletResponse response, @RequestBody @Valid FilterOrderVO filterOrderVO) {
-        consoleExportFacade.levelExport_TZ(response, filterOrderVO);
-    }
 
     /**
      * 按科室统计平均住院天数导出

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -436,7 +436,8 @@
         tt2.cases_id as casesId,
         tt2.cases_name as casesName,
         tt1.num as num,
-        tt1.is_reject as isReject
+        tt1.is_reject as isReject,
+        tt2.rule_type as ruleType
         FROM
         (
         SELECT