Merge branch '20210512_yw_check' into test

# Conflicts:
#	src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

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

@@ -96,6 +96,8 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/console/homePageLevelLimit").permitAll()
                 .antMatchers("/console/homePageLevelStatistics").permitAll()
                 .antMatchers("/console/leaveHosCount").permitAll()
+                .antMatchers("/console/medicalRecordIndicator").permitAll()
+                .antMatchers("/console/codingMonthly").permitAll()
                 .antMatchers("/console/levelPercentGroupByDeptPage").permitAll()
                 .antMatchers("/console/levelStatistics").permitAll()
                 .antMatchers("/console/levelStatisticsByDeptClass").permitAll()
@@ -233,6 +235,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/consoleByDept/medicalCheckFormKs").permitAll()
                 .antMatchers("/print/export/medicalCheckExportByDept").permitAll()
                 .antMatchers("/consoleByDept/medicalCheckTitleKs").permitAll()
+                .antMatchers("/qc/medCheckInfo/createMedBeHospitalInfoType").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }
@@ -241,7 +244,6 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
         log.info("Configuring ResourceServerSecurityConfigurer");
         resources.resourceId("user-service").tokenStore(new JwtTokenStore(jwtTokenEnhancerClient()));
     }
-
     @Autowired
     private CustomAccessTokenConverter customAccessTokenConverter;
 

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

@@ -145,6 +145,8 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/console/levelStatisticsByDeptClass", request)
                 || matchers("/console/mrCount", request)
                 || matchers("/console/mrStatistics", request)
+                || matchers("/console/medicalRecordIndicator", request)
+                || matchers("/console/codingMonthly", request)
                 || matchers("/console/qcResultShortPage", request)
                 || matchers("/console/resultStatistics", request)
                 || matchers("/console/resultStatisticsByDeptPage", request)
@@ -277,6 +279,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/consoleByDept/medicalCheckFormKs", request)
                 || matchers("/print/export/medicalCheckExportByDept", request)
                 || matchers("/consoleByDept/medicalCheckTitleKs", request)
+                || matchers("/qc/medCheckInfo/createMedBeHospitalInfoType", request)
                 || matchers("/", request)) {
             return true;
         }

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

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

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

@@ -0,0 +1,28 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 科室核查人员输出类
+ * @Author:songxl
+ * @time: 2021/5/14 13:45
+ */
+@Getter
+@Setter
+public class CheckJobDTO {
+    //核查任务id
+    private int id;
+    //病人住院序号
+    private String behospitalCode;
+    //病人姓名
+    private String name;
+    //科室
+    private String behospitalDept;
+    //主管医生
+    private String attendingDoctor;
+    //出院日期
+    private String leaveHospitalDate;
+    //筛选分值
+    private int value;
+}

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

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

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

@@ -0,0 +1,112 @@
+package com.diagbot.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @Description:
+ * @author: wangsy
+ * @time: 2021/5/13 15:00
+ */
+@Getter
+@Setter
+public class CheckWorkDTO {
+
+    /**
+     * 病人住院序号
+     */
+    private String behospitalCode;
+
+    /**
+     * 病人姓名
+     */
+    private String name;
+
+
+    /**
+     * 病案号
+     */
+    private String fileCode;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 科室
+     */
+    private String behDeptName;
+
+    /**
+     * 出院日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date leaveHospitalDate;
+
+    /**
+     * 住院天数
+     */
+    private String behospitalDayNum;
+
+    /**
+     * 主管医生
+     */
+    private String doctorName;
+
+    /**
+     * 病历等级
+     */
+    private String level;
+
+    /**
+     * 病历得分
+     */
+    private String scoreRes;
+
+    /**
+     * 主诊断
+     */
+    private String diagnose;
+
+    /**
+     * 筛选分值
+     */
+    private String score;
+
+    /**
+     * 生成状态
+     */
+    private String creatStatus;
+
+    /**
+     * 生成日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date jobCreateTime;
+
+    /**
+     * 核查员
+     */
+    private String jobCreatorName;
+
+    /**
+     * 核查日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date checkTime;
+
+    /**
+     * 分配日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date jobDistributionTime;
+}

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

@@ -0,0 +1,129 @@
+package com.diagbot.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2021/5/17 18:47
+ */
+@Getter
+@Setter
+@ApiModel("核查任务列表-获取核查任务列表-接口出参")
+public class CheckedRecordListDTO {
+
+    /**
+     * 病人住院序号
+     */
+    @ApiModelProperty("病人住院序号")
+    private String behospitalCode;
+
+    /**
+     * 病历核查状态
+     */
+    @ApiModelProperty("病历核查状态")
+    private String status;
+
+    /**
+     * 科室Id
+     */
+    @ApiModelProperty("科室Id")
+    private String behDeptId;
+
+    /**
+     * 科室
+     */
+    @ApiModelProperty("科室")
+    private String behDeptName;
+
+    /**
+     * 病人姓名
+     */
+    @ApiModelProperty("病人姓名")
+    private String name;
+
+    /**
+     * 病案号
+     */
+    @ApiModelProperty("病案号")
+    private String fileCode;
+
+    /**
+     * 主管医生
+     */
+    @ApiModelProperty("主管医生")
+    private String doctorName;
+
+    /**
+     * 出院日期
+     */
+    @ApiModelProperty("出院日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date leaveHospitalDate;
+
+    /**
+     * 生成日期
+     */
+    @ApiModelProperty("生成日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date jobCreateTime;
+
+    /**
+     * 分配日期
+     */
+    @ApiModelProperty("分配日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date jobDistributionTime;
+
+    /**
+     * 任务月份
+     */
+    @ApiModelProperty("任务月份")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date month;
+
+    /**
+     * 核查员id
+     */
+    @ApiModelProperty("核查员id")
+    private Long checkId;
+
+    /**
+     * 核查员
+     */
+    @ApiModelProperty("核查员")
+    private String checkName;
+
+    /**
+     * 核查日期
+     */
+    @ApiModelProperty("核查日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date checkTime;
+
+    /**
+     * 缺陷数
+     */
+    @ApiModelProperty("缺陷数")
+    private int casesEntryNum;
+
+    /**
+     * 病历等级
+     */
+    @ApiModelProperty("病历等级")
+    private String level;
+
+    /**
+     * 病历得分
+     */
+    @ApiModelProperty("病历得分")
+    private BigDecimal scoreRes;
+
+}

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

@@ -0,0 +1,24 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 科室核查人员输出类
+ * @Author:songxl
+ * @time: 2021/5/14 13:45
+ */
+@Getter
+@Setter
+public class DeptCheckUserDTO {
+    //科室id
+    private String deptId;
+    //科室名称
+    private String deptName;
+    //医生id
+    private String doctorId;
+    //医生名称
+    private String doctorName;
+    //核查数
+    private int jobNum;
+}

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

@@ -3,6 +3,8 @@ package com.diagbot.dto;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * @Description: jwt 输出类
  * @author: gaodm
@@ -15,4 +17,6 @@ public class JwtDTO {
     private String refreshToken;
     private Integer type; //用户类型
     private String typeCn; //用户类型中文
+    //用户权限列表
+    private List<SysRoleDTO> selRoles;
 }

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

@@ -0,0 +1,47 @@
+package com.diagbot.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 病案管理指标病历
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+@Data
+public class MedManageParamsDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 病人住院ID
+     */
+    private String behospitalCode;
+
+   // 医嘱项目名称
+    private String daItemName;
+
+
+    //医嘱处方类型
+    private String doctorAdviceType;
+
+    //化验报告名称
+    private String repName;
+
+    //医嘱状态判别
+    private String daStatus;
+
+    /**
+     * 住院科室名称
+     */
+    private String behDeptName;
+
+
+
+}

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

@@ -0,0 +1,223 @@
+package com.diagbot.dto;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Getter;
+import lombok.Setter;
+
+
+/**
+ * @Description:医疗质量控制指标
+ * @Author:cy
+ * @time: 2021/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/MedicalRecordDTO.java

@@ -17,6 +17,10 @@ public class MedicalRecordDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 病人住院ID
+     */
+    private String behospitalCode;
     /**
      * 模块id
      */
@@ -31,4 +35,10 @@ public class MedicalRecordDTO implements Serializable {
      * 病历日期
      */
     private String recDate;
+
+    /**
+     *是否从结构化表中取数据(0-从文文书取 1-从结构化取)
+     */
+    private int isParsed = 0;
+
 }

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

@@ -52,6 +52,14 @@ public class MsgDTO {
     private Date gmtCreate;
     // 记录修改时间,如果时间是1970年则表示纪录未修改
     private Date gmtModified;
+    // 记录修改人id
+    private String modifier;
+    // 记录修改人姓名
+    private String linkman;
+    // 逻辑删除标志位
+    private String isDeleted;
+    // 缺陷说明
+    private String explainInfo;
     // 条目id对应页面数据的key值
     private List<Long> pageKeyList = new ArrayList<>();
 }

src/main/java/com/diagbot/entity/FilterRecordVO.java

@@ -0,0 +1,53 @@
+package com.diagbot.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+@Getter
+@Setter
+public class FilterRecordVO implements Serializable {
+        private Integer type;
+        /**
+         * 起始时间
+         */
+        @NotBlank(message = "请输入起始时间")
+        private String startDate;
+        /**
+         * 结束时间
+         */
+        @NotBlank(message = "请输入结束时间")
+        private String endDate;
+
+        /**
+         * 医院id
+         */
+        @ApiModelProperty(hidden = true)
+        private String hospitalId;
+        /**
+         * 限制条数
+         */
+        @ApiModelProperty(hidden = true)
+        private Integer limitCount = 10;
+
+        @ApiModelProperty(hidden = true)
+        private Long userId;
+
+        /**
+         * 科室分类
+         */
+        private String deptClass;
+        //科室名称
+        private String deptName;
+
+        private String level;
+        /**
+         * 是否归档（0：未归档，1：已归档）
+         */
+        private String isPlacefile = "1";
+
+
+}

src/main/java/com/diagbot/entity/MedBehospitalType.java

@@ -0,0 +1,71 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author songxl
+ * @since 2021-05-11
+ */
+@TableName("med_behospital_type")
+@Data
+public class MedBehospitalType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+
+    /**
+     * 患者类型
+     */
+    private String behospitalType;
+
+    /**
+     * 类型分值
+     */
+    private Integer value;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 是否删除
+     */
+    private String isDeleted;
+
+    @Override
+    public String toString() {
+        return "MedBehospitalType{" +
+            "id=" + id +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", behospitalType=" + behospitalType +
+            ", value=" + value +
+            ", createTime=" + createTime +
+            ", isDeleted=" + isDeleted +
+        "}";
+    }
+}

src/main/java/com/diagbot/entity/MedCheckInfo.java

@@ -2,8 +2,10 @@ package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -14,6 +16,7 @@ import java.util.Date;
  * @author wangfeng
  * @since 2020-07-06
  */
+@Data
 public class MedCheckInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -79,116 +82,70 @@ public class MedCheckInfo implements Serializable {
      */
     private Integer status;
 
-    private Integer checkType;
-
-    public Integer getCheckType() {
-        return checkType;
-    }
-
-    public void setCheckType(Integer checkType) {
-        this.checkType = checkType;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
+    /**
+     * 核查类型（0病历，1病案首页,2全部）
+     */
+    private Integer checkType = 2;
 
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
+    /**
+     * 核查任务创建人编号
+     */
+    private Long jobCreator;
 
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
+    /**
+     * 核查任务创建人
+     */
+    private String jobCreatorName;
 
-    public void setBehospitalCode(String behospitalCode) {
-        this.behospitalCode = behospitalCode;
-    }
-    public Long getHospitalId() {
-        return hospitalId;
-    }
+    /**
+     * 核查任务生成时间
+     */
+    private Date jobCreateTime;
 
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-    public Long getCheckId() {
-        return checkId;
-    }
+    /**
+     * 核查任务类型（0-科室任务 1-院级 2-质控科）
+     */
+    private Integer jobType;
 
-    public void setCheckId(Long checkId) {
-        this.checkId = checkId;
-    }
-    public String getCheckName() {
-        return checkName;
-    }
+    /**
+     * 核查任务分配人编号
+     */
+    private Long jobDistributor;
 
-    public void setCheckName(String checkName) {
-        this.checkName = checkName;
-    }
-    public Date getCheckTime() {
-        return checkTime;
-    }
+    /**
+     * 核查任务分配人姓名
+     */
+    private String jobDistributionName;
 
-    public void setCheckTime(Date checkTime) {
-        this.checkTime = checkTime;
-    }
-    public Integer getStatus() {
-        return status;
-    }
+    /**
+     * 核查任务分配时间
+     */
+    private Date jobDistributionTime;
 
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
 
     @Override
     public String toString() {
         return "MedCheckInfo{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", behospitalCode=" + behospitalCode +
-            ", hospitalId=" + hospitalId +
-            ", checkId=" + checkId +
-            ", checkName=" + checkName +
-            ", checkTime=" + checkTime +
-            ", status=" + status +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", behospitalCode=" + behospitalCode +
+                ", hospitalId=" + hospitalId +
+                ", checkId=" + checkId +
+                ", checkName=" + checkName +
+                ", checkTime=" + checkTime +
+                ", status=" + status +
+                ", checkType=" + checkType +
+                ", jobCreator=" + jobCreator +
+                ", jobCreatorName=" + jobCreatorName +
+                ", jobCreateTime=" + jobCreateTime +
+                ", jobType=" + jobType +
+                ", jobDistributor=" + jobDistributor +
+                ", jobDistributionName=" + jobDistributionName +
+                ", jobDistributionTime=" + jobDistributionTime +
+                "}";
     }
 }

src/main/java/com/diagbot/entity/MedIndexRelevance.java

@@ -0,0 +1,77 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2021-04-30
+ */
+@Data
+public class MedIndexRelevance implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 主缓存表id
+     */
+    private Integer indexResultId;
+
+    /**
+     * 病历条目关联表type
+     */
+    private Integer relevanceType;
+
+    /**
+     * 医院ID
+     */
+    private String hospitalId;
+
+    /**
+     * 病人病历号
+     */
+    private String behospitalCode;
+
+    private String startDate;
+
+    private String endDate;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+
+}

src/main/java/com/diagbot/entity/MedIndexResult.java

@@ -0,0 +1,164 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author cy
+ * @since 2021-04-26
+ */
+@Data
+public class MedIndexResult implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 医院id
+     */
+    private String hospitalId;
+
+    /**
+     * 入院记录24小时内完成率--分母
+     */
+    private Double admissionResult;
+
+    /**
+     * 手术记录24小时内完成率--分母
+     */
+    private Double operationResult;
+
+    /**
+     * 出院记录24小时内完成率--分母
+     */
+    private Double leaveHospitalResult;
+
+    /**
+     * 病案首页24小时内完成率--分母
+     */
+    private Double medHomeResult;
+
+    /**
+     * CT检查记录符合率--分母
+     */
+    private Double ctResult;
+
+    /**
+     * MRI检查记录符合率--分母
+     */
+    private Double mriResult;
+
+    /**
+     * 病理检查记录符合率--分母
+     */
+    private Double pathologyResult;
+
+    /**
+     * 细菌培养检查记录符合率--分母
+     */
+    private Double germResult;
+
+    /**
+     * 抗菌药物使用记录符合率--分母
+     */
+    private Double antibiosisResult;
+
+    /**
+     * 恶性肿瘤化学治疗记录符合率--分母
+     */
+    private Double tumorChemistryResult;
+
+    /**
+     * 恶性肿瘤放射治疗记录符合率--分母
+     */
+    private Double tumorRadiationResult;
+
+    /**
+     * 手术相关记录完成率--分母
+     */
+    private Double operationCompleteResult;
+
+    /**
+     * 植入物相关记录符合率--分母
+     */
+    private Double implantsResult;
+
+    /**
+     * 临床用血相关记录符合率--分母
+     */
+    private Double bloodResult;
+
+    /**
+     * 医师查房记录完整率--分母
+     */
+    private Double wardRoundResult;
+
+    /**
+     * 患者抢救记录及时完成率--分母
+     */
+    private Double rescueResult;
+
+    /**
+     * 出院患者病历2日归档率--分子
+     */
+    private Double secFileResult;
+
+    /**
+     * 出院患者病历归档完整率--分母
+     */
+    private Double fileCompleteResult;
+
+    /**
+     * 不合理复制病历发生率--分母
+     */
+    private Double noCopyResult;
+
+    /**
+     * 知情同意书规范签署率--分母
+     */
+    private Double recordSignResult;
+
+    /**
+     * 甲级病历率--分母
+     */
+    private Double firRecordResult;
+
+    private String startDate;
+
+    private String endDate;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+}

src/main/java/com/diagbot/entity/MedManagementInfo.java

@@ -0,0 +1,79 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 病案管理人员统计表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-04-13
+ */
+@Data
+public class MedManagementInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     *   1：住院病案管理人员 2：病案编码人员 3:门诊病案管理人员
+     */
+    private String positionId;
+
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDateTime startDate;
+
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDateTime endDate;
+
+    /**
+     * 单位时间内管理人员总人数
+     */
+    private Double workPerson;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+}

src/main/java/com/diagbot/entity/MedQcresultDetail.java

@@ -0,0 +1,260 @@
+package com.diagbot.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 质控评分明细信息
+每次评分增加一条信息，前面所有评分is_deleted全部设置为Y
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2021-03-26
+ */
+public class MedQcresultDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病人住院ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 模块id
+     */
+    private Long casesId;
+
+    /**
+     * 模块总分
+     */
+    private BigDecimal casesScore;
+
+    /**
+     * 条目ID
+     */
+    private Long casesEntryId;
+
+    /**
+     * 人工修改分值
+     */
+    private BigDecimal score;
+
+    /**
+     * 提示信息
+     */
+    private String msg;
+
+    /**
+     * 质控返回提示信息
+     */
+    private String info;
+
+    /**
+     * 单项否决（1-单项否决 0-非）
+     */
+    private Integer isReject;
+
+    /**
+     * 初始类型(1：机器，2：人工)
+     */
+    private Integer gradeType;
+
+    /**
+     * 操作类型(1：新增，2：删除，3：修改)
+     */
+    private Integer optType;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public Long getCasesId() {
+        return casesId;
+    }
+
+    public void setCasesId(Long casesId) {
+        this.casesId = casesId;
+    }
+    public BigDecimal getCasesScore() {
+        return casesScore;
+    }
+
+    public void setCasesScore(BigDecimal casesScore) {
+        this.casesScore = casesScore;
+    }
+    public Long getCasesEntryId() {
+        return casesEntryId;
+    }
+
+    public void setCasesEntryId(Long casesEntryId) {
+        this.casesEntryId = casesEntryId;
+    }
+    public BigDecimal getScore() {
+        return score;
+    }
+
+    public void setScore(BigDecimal score) {
+        this.score = score;
+    }
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+    public String getInfo() {
+        return info;
+    }
+
+    public void setInfo(String info) {
+        this.info = info;
+    }
+    public Integer getIsReject() {
+        return isReject;
+    }
+
+    public void setIsReject(Integer isReject) {
+        this.isReject = isReject;
+    }
+    public Integer getGradeType() {
+        return gradeType;
+    }
+
+    public void setGradeType(Integer gradeType) {
+        this.gradeType = gradeType;
+    }
+    public Integer getOptType() {
+        return optType;
+    }
+
+    public void setOptType(Integer optType) {
+        this.optType = optType;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public LocalDateTime getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(LocalDateTime gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public LocalDateTime getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "MedQcresultDetail{" +
+            "id=" + id +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", casesId=" + casesId +
+            ", casesScore=" + casesScore +
+            ", casesEntryId=" + casesEntryId +
+            ", score=" + score +
+            ", msg=" + msg +
+            ", info=" + info +
+            ", isReject=" + isReject +
+            ", gradeType=" + gradeType +
+            ", optType=" + optType +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", remark=" + remark +
+        "}";
+    }
+}

src/main/java/com/diagbot/entity/MedQcresultInfo.java

@@ -0,0 +1,221 @@
+package com.diagbot.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 质控评分主表信息
+每次评分增加一条信息，前面所有评分is_deleted全部设置为Y
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2021-03-26
+ */
+public class MedQcresultInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 病人住院ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 等级
+     */
+    private String level;
+
+    /**
+     * 页面数据
+     */
+    private String pageData;
+
+    /**
+     * 菜单数据
+     */
+    private String menuData;
+
+    /**
+     * 评分类型(1：机器，2：人工)
+     */
+    private Integer gradeType;
+
+    /**
+     * 最后得分
+     */
+    private BigDecimal scoreRes;
+
+    /**
+     * 是否有病案首页(0：无，1：有)
+     */
+    private Integer haveHomePage;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public String getBehospitalCode() {
+        return behospitalCode;
+    }
+
+    public void setBehospitalCode(String behospitalCode) {
+        this.behospitalCode = behospitalCode;
+    }
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+    public String getPageData() {
+        return pageData;
+    }
+
+    public void setPageData(String pageData) {
+        this.pageData = pageData;
+    }
+    public String getMenuData() {
+        return menuData;
+    }
+
+    public void setMenuData(String menuData) {
+        this.menuData = menuData;
+    }
+    public Integer getGradeType() {
+        return gradeType;
+    }
+
+    public void setGradeType(Integer gradeType) {
+        this.gradeType = gradeType;
+    }
+    public BigDecimal getScoreRes() {
+        return scoreRes;
+    }
+
+    public void setScoreRes(BigDecimal scoreRes) {
+        this.scoreRes = scoreRes;
+    }
+    public Integer getHaveHomePage() {
+        return haveHomePage;
+    }
+
+    public void setHaveHomePage(Integer haveHomePage) {
+        this.haveHomePage = haveHomePage;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public LocalDateTime getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(LocalDateTime gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public LocalDateTime getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "MedQcresultInfo{" +
+            "id=" + id +
+            ", hospitalId=" + hospitalId +
+            ", behospitalCode=" + behospitalCode +
+            ", level=" + level +
+            ", pageData=" + pageData +
+            ", menuData=" + menuData +
+            ", gradeType=" + gradeType +
+            ", scoreRes=" + scoreRes +
+            ", haveHomePage=" + haveHomePage +
+            ", isDeleted=" + isDeleted +
+            ", gmtCreate=" + gmtCreate +
+            ", gmtModified=" + gmtModified +
+            ", creator=" + creator +
+            ", modifier=" + modifier +
+            ", remark=" + remark +
+        "}";
+    }
+}

src/main/java/com/diagbot/entity/QcCasesRelevanceEntry.java

@@ -0,0 +1,54 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 质控关联条目表
+ * </p>
+ *
+ * @author cy
+ * @since 2021-04-16
+ */
+@Data
+public class QcCasesRelevanceEntry implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 指标编号
+     */
+    private Integer type;
+
+    /**
+     * 医院ID
+     */
+    private Long hospitalId;
+
+    /**
+     * 指标名称
+     */
+    private String casesName;
+
+    /**
+     * 关联质控条目
+     */
+    private Long relevanceId;
+
+    /**
+     * 条目
+     */
+    private String name;
+
+    private String isDeleted;
+}

src/main/java/com/diagbot/entity/QcresultDetail.java

@@ -111,4 +111,8 @@ public class QcresultDetail implements Serializable {
      * 备注
      */
     private String remark;
+    /**
+     * 质控条目说明
+     */
+    private String explainInfo;
 }

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

@@ -0,0 +1,51 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description: 核查任务类型
+ * @date 2018年11月21日 下午2:31:42
+ */
+public enum CheckJobTypeEnum implements KeyedNamed {
+    DEPT_SUPERVISOR(0, "科室任务"),
+    HOSP_SUPERVISOR(1, "院级"),
+    QUAT_SUPERVISOR(2, "质控科");
+
+    @Setter
+    private int key;
+
+    @Setter
+    private String name;
+
+    CheckJobTypeEnum(int key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static CheckJobTypeEnum getEnum(int key) {
+        for (CheckJobTypeEnum item : CheckJobTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(int key) {
+        CheckJobTypeEnum 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/CheckTypeEnum.java

@@ -0,0 +1,51 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description: 核查类型
+ * @date 2018年11月21日 下午2:31:42
+ */
+public enum CheckTypeEnum implements KeyedNamed {
+    COURSE(0, "病历"),
+    HOMEPAGE(1, "病案首页"),
+    ALL(2, "全部");
+
+    @Setter
+    private int key;
+
+    @Setter
+    private String name;
+
+    CheckTypeEnum(int key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static CheckTypeEnum getEnum(int key) {
+        for (CheckTypeEnum item : CheckTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(int key) {
+        CheckTypeEnum 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/CheckerRoleEnum.java

@@ -0,0 +1,54 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description: TODO
+ * @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/QualityContent.java

@@ -0,0 +1,161 @@
+package com.diagbot.enums;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 新指标常用常量
+ */
+public class QualityContent {
+    public static final String recordNumber = "关联首页表质控病历人数";
+    public static final String NoRecordNumberId = "无病案首页病历ID";
+    public static final String DISCHARGED_PATIENTS = "出院人数";
+    public static final String NUMBER_OF_HOSPITAL = "入院人数";
+    public static final String NO_RECORD_OPERATION = "无病案首页手术患者";
+    public static final String NO_RECORD_OPERATION_PATHOLOGY = "无病案首页手术病理患者";
+    public static final double pathologyFee = 68.00;
+    /**
+     * 是否需要用到医嘱的指标名称
+     */
+    public static List<String> NO_MEDICAL_ADVICE = Arrays.asList("",
+            "入院记录24小时内完成率","出院记录24小时内完成率","病案首页24小时内完成率"
+    );
+    public static List<String> NEED_MEDICAL_ADVICE = Arrays.asList("",
+            "手术记录24小时内完成率","手术相关记录完成率","患者抢救记录及时完成率","临床用血相关记录符合率","CT检查记录符合率","MRI检查记录符合率","病理检查记录符合率","抗菌药物使用记录符合率","恶性肿瘤化学治疗记录符合率"
+    );
+    /**
+     * 关联首页无code需要去医嘱查询指标
+     */
+    public static List<String> NORecord_NEED_MEDICAL_ADVICE = Arrays.asList("",
+            "手术记录24小时内完成率","病理检查记录符合率","抗菌药物使用记录符合率"
+    );
+    /**
+     * 所有指标名称
+     */
+
+    public static final String QB = "";
+    public static final String ZYBA_CYHZ = "住院病案管理人员月均负担出院患者病历数";
+    public static final String BABM_CYHZ = "病案编码人员月均负担出院患者病历数";
+    public static final String MZBA_CYHZ = "门诊病案管理人员月均负担门诊患者病历数";
+    public static final String RYJL_24H_WCL = "入院记录24小时内完成率";
+    public static final String CYJL_24H_WCL = "出院记录24小时内完成率";
+    public static final String BASY_24H_WCL = "病案首页24小时内完成率";
+    public static final String SSJL_24H_WCL = "手术记录24小时内完成率";
+    public static final String CT_JCJL_FHL = "CT检查记录符合率";
+    public static final String MR_JCJL_FHL = "MRI检查记录符合率";
+    public static final String BL_JCJL_FHL = "病理检查记录符合率";
+    public static final String XJPY_JCJL_FHL = "细菌培养检查记录符合率";
+    public static final String KJYW_SY_FHL = "抗菌药物使用记录符合率";
+    public static final String EXZL_HXZL_FHL = "恶性肿瘤化学治疗记录符合率";
+    public static final String EXZL_FSZL_FHL = "恶性肿瘤放射治疗记录符合率";
+    public static final String SS_XGJL_WCL = "手术相关记录完成率";
+    public static final String ZRW_XGJL_WCL = "植入物相关记录符合率";
+    public static final String LCYX_XGJL_WCL = "临床用血相关记录符合率";
+    public static final String YSCF_JL_WCL = "医师查房记录完成率";
+    public static final String HZQJ_JLJS_WCL = "患者抢救记录及时完成率";
+    public static final String CCHZ_2DAY_GDL = "出院患者病历2日归档率";
+    public static final String CCHZ_GD_WZL = "出院患者病历归档完整率";
+    public static final String BHL_FZ_FSL = "不合理复制病历发生率";
+    public static final String ZQTYS_GF_QSL = "知情同意书规范签署率";
+    public static final String JJBLL = "甲级病历率";
+    /**
+     * 触发规则指标
+     */
+    public static final String RYJLWWC_24H = "residentAdmitNote";
+    public static final String SSJLWCC_24H = "operationNote";
+    public static final String CYJLWWC_24H = "dischargeRecord";
+    public static final String BASYWWC_24H = "medicalRecord";
+    /**
+     * 医嘱类型
+     */
+    public static final String STANDING_ORDER = "长期医嘱";
+    public static final String STAT_ORDER = "临时医嘱";
+    /**
+     * 医嘱状态
+     */
+    public static final String EXECUTE_ORDER = "执行";
+    public static final String IN_USE = "在用";
+    public static final String CANCELLATION_ORDER = "作废";
+    /**
+     * 医嘱判断相关
+     */
+    public static final String STOP = "停";
+    public static final String LAST = "前一次";
+    public static final String COUNTERMAND = "取消";
+    public static final String PAUSE = "暂停";
+    public static final String BACTERIAL_CULTURE = "细菌培养";
+    /**
+     * 病理判断
+     */
+    public static String[][] BL_LIST = {{"病理"}};
+
+    /**
+     * 医嘱CT相关
+     */
+    public static String[][] CT_LIST = {{"CT"},{"X线"}};
+    public static String[][] CT_REGULATION = {{"ATCH"},{"TCT"},{"HCT"},{"OCT"},{"NCT"},{"LCT"},{"ACT"},{"取消"},{"暂停"}};
+
+    /**
+     * 医嘱手术相关
+     */
+    public static String[][] OPERATION_LIST={
+            {"手术"}
+    };
+    public static String[][] OPERATION_ARG={
+            {"非手术"},
+            {"手术室"},
+            {"手术","取消"},
+            {"暂停","手术"},
+            {"静脉穿刺置管术"},
+            {"停"},
+            {"前一次"},
+            {"特殊病人手术使用一次性卫生材料"},
+            {"人免疫缺陷病毒抗体检测免费"}
+    };
+
+
+    /**
+     * 医嘱MR相关
+     */
+    public static final String MR = "MR";
+    public static String[][] MR_LIST = {{"MR"},{"磁共振"}};
+    public static String[][] MR_REGULATION = {{"IMRT"},{"mrs评分"},{"取消"}};
+    /**
+     * 抗菌药物目录
+     */
+    public static List<String> Antimicrobial_Drug_List = Arrays.asList(
+            "呋喃妥因", "呋喃唑酮", "盐酸小檗碱", "大蒜素", "鱼腥草素钠", "磺胺嘧啶", "甲氧苄啶", "复方磺胺甲恶唑",
+            "磺胺嘧啶银", "磺胺嘧啶锌", "盐酸四环素", "盐酸土霉素", "盐酸多西环素", "盐酸米诺环素", "盐酸美他环素", "硫酸庆大霉素", "硫酸链霉素"
+    );
+    /**
+     * 化疗药物目录
+     */
+    public static List<String> Chemotherapy_Drug_List = Arrays.asList(
+            "注射用盐酸表柔比星", "注射用盐酸吡柔比星", "注射用环磷酰胺", "卡铂注射液", "注射用奥沙利铂", "注射用阿糖胞苷", "注射用盐酸吉西他滨", "注射用甲氨蝶呤",
+            "注射用盐酸伊立替康", "紫杉醇注射液", "注射用培美曲塞二钠", "高三尖杉酯碱注射液", "注射用硫酸长春地辛", "多西他赛注射液", "注射用曲普瑞林", "注射用盐酸博来霉素", "注射用地西他滨",
+            "盐酸伊立替康注射液", "注射用盐酸托泊替康", "注射用氟尿嘧啶", "注射用达卡巴嗪", "醋酸戈舍瑞林缓释植入剂", "顺铂注射液"
+    );
+
+    /**
+     * 抢救药物  维护修改
+     */
+
+    public static List<String> RESCUEDRUGLIST = Arrays.asList(
+            "尼可刹米","可拉明","盐酸洛贝林","山梗菜碱","肾上腺素","阿拉明", "重酒石酸间羟胺", "多巴胺", "利血平", "25%硫酸镁注射液", "垂体后叶素","注射用血凝酶", "阿托品","氯解磷定注射液","盐酸纳洛酮","异丙嗪", "非那更","地西泮", "安定","20%甘露醇");
+
+
+    /**
+     *   临床用血
+     */
+    public static List<String> BLOODLIST = Arrays.asList(
+            "交叉配血","血交叉","血常规");
+
+    /**
+     * 用于代码判断指标1、2、3执行路径
+     */
+    public static List<String> FOURSTR = Arrays.asList(
+            "住院病案管理人员月均负担出院患者病历数", "病案编码人员月均负担出院患者病历数", "门诊病案管理人员月均负担门诊患者病历数");
+}
+
+
+

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

@@ -0,0 +1,36 @@
+package com.diagbot.enums;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 新指标常用常量
+ */
+public class TimeContent {
+
+    public static List<String> HolidaysTimeList = Arrays.asList(
+            "2021-01-01", "2021-01-02", "2021-01-03",//元旦
+            "2021-02-11", "2021-02-12", "2021-02-13", "2021-02-14", "2021-02-15", "2021-02-16", "2021-02-17",//春节
+            "2021-04-03", "2021-04-04", "2021-04-05",//清明节
+            "2021-05-01",  "2021-05-02", "2021-05-03", "2021-05-04", "2021-05-05",//劳动节
+            "2021-06-12",  "2021-06-13", "2021-06-14",//端午节
+            "2021-09-19", "2021-09-20", "2021-09-21",//中秋节
+            "2021-10-01", "2021-10-02", "2021-10-03", "2021-10-04", "2021-10-05", "2021-10-06", "2021-10-07",//国庆节
+
+            "2021-01-09", "2021-01-10", "2021-01-16", "2021-01-17", "2021-01-23", "2021-01-24", "2021-01-30", "2021-01-31",//一月周末假日
+            "2021-02-06", "2021-02-21", "2021-02-27", "2021-02-28", //二月周末假日
+            "2021-03-06", "2021-03-07", "2021-03-13", "2021-03-14", "2021-03-20", "2021-03-21", "2021-03-27", "2021-03-28",//三月周末假日
+            "2021-04-10", "2021-04-11", "2021-04-17", "2021-04-18", "2021-04-24", //四月周末假日
+            "2021-05-09", "2021-05-15", "2021-05-16", "2021-05-22", "2021-05-23", "2021-05-29", "2021-05-30",//五月周末假日
+            "2021-06-05", "2021-06-06", "2021-06-19", "2021-06-20", "2021-06-26", "2021-06-27",//六月周末假日
+            "2021-07-03", "2021-07-04", "2021-07-10", "2021-07-11", "2021-07-17", "2021-07-18", "2021-07-24", "2021-07-25","2021-07-31",//七月周末假日
+            "2021-08-01", "2021-08-07", "2021-08-08", "2021-08-14", "2021-08-15", "2021-08-21", "2021-08-22", "2021-08-28", "2021-08-29",//八月周末假日
+            "2021-09-04", "2021-09-05", "2021-09-11", "2021-09-12", "2021-09-25",//九月周末假日
+            "2021-10-10", "2021-10-16", "2021-10-17", "2021-10-23", "2021-10-24", "2021-10-30", "2021-10-31", //十月周末假日
+            "2021-11-06", "2021-11-07", "2021-11-13", "2021-11-14", "2021-11-20", "2021-11-21", "2021-11-27", "2021-11-28",//十一月周末假日
+            "2021-12-04", "2021-12-06", "2021-12-11", "2021-12-12", "2021-12-18", "2021-12-19", "2021-12-25", "2021-12-26" //十二周末假日
+    );
+}
+
+
+

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

@@ -28,7 +28,7 @@ import java.util.Map;
  */
 @Component
 public class AlgorithmFacade {
-    private final static List<Integer> types = Arrays.asList(0, 1, 2, 3);
+    private final static List<Integer> types = Arrays.asList(0, 1, 2, 3,4);
 
     @Autowired
     private SysHospitalSetFacade sysHospitalSetFacade;

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

@@ -11,35 +11,12 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.BehospitalInfoServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EncrypDES;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.ExcelUtils;
-import com.diagbot.util.ListUtil;
-import com.diagbot.util.MapUtil;
-import com.diagbot.util.StringUtil;
-import com.diagbot.util.SysUserUtils;
-import com.diagbot.vo.AlgorithmVO;
-import com.diagbot.vo.AnalyzeApiVO;
-import com.diagbot.vo.AnalyzeCdsVO;
-import com.diagbot.vo.AnalyzeCodeVO;
-import com.diagbot.vo.AnalyzeRunVO;
-import com.diagbot.vo.AnalyzeVO;
-import com.diagbot.vo.BehospitalPageVO;
-import com.diagbot.vo.ExportQcresultVO;
-import com.diagbot.vo.GetDetailVO;
-import com.diagbot.vo.MedrecVo;
-import com.diagbot.vo.QcResultAlgQueryVO;
-import com.diagbot.vo.QcResultAlgVO;
-import com.diagbot.vo.QueryVo;
-import com.diagbot.vo.RecordContentVO;
-import com.diagbot.vo.TaskVO;
+import com.diagbot.util.*;
+import com.diagbot.vo.*;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.T;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -48,6 +25,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -159,6 +137,8 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
     MedNurseFacade medNurseFacade;
     @Autowired
     SysHospitalSetFacade sysHospitalSetFacade;
+    @Autowired
+    QcCasesRelevanceEntryFacade qcCasesRelevanceEntryFacade;
 
 
 
@@ -174,6 +154,50 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         return res;
     }
 
+    /**
+     * 分页
+     *
+     * @param
+     * @return
+     */
+    public List<ColumnDTO> getMedQualityControl(BasDeptInfoVO basDeptInfoVO) {
+        long hospitalId = Long.parseLong(SysUserUtils.getCurrentHospitalID());
+        //colums
+        QueryWrapper<SysHospitalSet> hospitalSetQueryWrapper = new QueryWrapper<>();
+        hospitalSetQueryWrapper.eq("is_deleted", 'N')
+                .eq("hospital_id", hospitalId)
+                .eq("code", "med_quality_control");
+        List<ColumnDTO> columns = Lists.newLinkedList();
+        SysHospitalSet hospitalSet = sysHospitalSetFacade.getOne(hospitalSetQueryWrapper);
+        if (hospitalSet == null || StringUtil.isBlank(hospitalSet.getValue())) {
+            return columns;
+        }
+       List<String> strings = new ArrayList<>();
+
+        //表头生成
+        List<String> columnSet = Arrays.asList(hospitalSet.getValue().split(","));
+        Integer orderNo = 1;
+        for (String valueStr : columnSet) {
+            String[] keyValue = valueStr.split("--");
+            if (keyValue != null || keyValue.length > 1) {
+                strings.add(keyValue[1]);
+            }
+        }
+        for (String str : strings) {
+            if(str.contains(basDeptInfoVO.getInputStr())){
+                ColumnDTO columnNum = new ColumnDTO();
+                columnNum.setOrderNo(orderNo);
+                columnNum.setColumnName(str);
+                columnNum.setFieldName("entry_" + str + "_name");
+                columnNum.setIsShow(1);
+                columns.add(columnNum);
+                orderNo++;
+            }
+        }
+
+        return columns;
+    }
+
     /**
      * 获取明细
      *
@@ -302,7 +326,16 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 EncrypDES encrypDES = new EncrypDES();
                 for (RecordContentDTO recordContentDTO : recordContentDTOList) {
                     recTitle = recordContentDTO.getRecTitle();
-                    recordContentDTO.setXmlText(encrypDES.decryptor(recordContentDTO.getXmlText()));
+                    if(StringUtils.isNotEmpty(recordContentDTO.getXmlText())){
+                        recordContentDTO.setXmlText(encrypDES.decryptor(recordContentDTO.getXmlText()));
+                    }
+                    try {
+                        if(StringUtils.isNotEmpty(recordContentDTO.getHtmlText())){
+                            recordContentDTO.setHtmlText(encrypDES.decryptor(recordContentDTO.getHtmlText()));
+                        }
+                    } catch (Exception e) {
+                        recordContentDTO.setHtmlText(null);
+                    }
                 }
             } catch (Exception e) {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
@@ -569,6 +602,16 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("behospital_code", analyzeVO.getBehospitalCode()), false
         );
 
+        //知情同意书
+        List<MedicalRecord> recordList = medicalRecordFacade.list(new QueryWrapper<MedicalRecord>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .eq("hospital_id", hospitalId)
+                .in("mode_id", Arrays.asList(53,16))
+                .orderByAsc("rec_date")
+        );
+        List<MedicalRecordDTO> medicalRecordDTOList = BeanUtil.listCopyTo(recordList, MedicalRecordDTO.class);
+
         List<HomeDiagnoseInfo> homePageList = new ArrayList<>();
         List<HomeOperationInfo> homeOperationInfoList = new ArrayList<>();
         if (homePage != null) {
@@ -879,7 +922,8 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
 
         addData("日常病程录", recMap, medrecVoList);
 
-        addDataWithInnerKey("知情同意书", recMap, medrecVoList);
+        DataWithKey("知情同意书", medicalRecordDTOList, medrecVoList);
+        //addDataWithInnerKey("知情同意书", recMap, medrecVoList);
         addDataWithInnerKey("谈话告知书", recMap, medrecVoList);
 
         //==============文书====================
@@ -1180,6 +1224,38 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         }
     }
 
+    /**
+     * 知情同意书 单独传
+     *
+     * @param key
+     * @param recordList
+     * @param medrecVoList
+     */
+    public void DataWithKey(String key, List<MedicalRecordDTO> recordList, List<MedrecVo> medrecVoList) {
+        MedrecVo medrecVo = new MedrecVo();
+        medrecVo.setTitle(key);
+        Map<String, Object> listMap = new HashMap<>();
+        if (ListUtil.isNotEmpty(recordList)) {
+            Map<String, List<MedicalRecordDTO>> keyMap =
+                    EntityUtil.makeEntityListMap(recordList, "recTitle");
+            Set<String> keyList = keyMap.keySet();
+            for (String k : keyList) {
+                List<MedicalRecordDTO> recordContentDTOS = keyMap.get(k);
+                if(ListUtil.isNotEmpty(recordContentDTOS)){
+                    for (MedicalRecordDTO recordContentDTO : recordContentDTOS) {
+                        recordContentDTO.setIsParsed(0);
+                    }
+                }
+
+                if (ListUtil.isNotEmpty(recordContentDTOS)) {
+                    listMap.put(k,recordContentDTOS);
+                }
+            }
+            medrecVo.setContent(listMap);
+            medrecVoList.add(medrecVo);
+        }
+    }
+
     /**
      * 1.5.0拼接数据
      *
@@ -1390,7 +1466,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         Map<String, Object> content = new HashMap<>();
         try {
             Map<String, Object> objectMap = MapUtil.objectToMap(homePage);
-            List<String> firstPageDate = Arrays.asList("birthday", "behospitalDate", "leaveHospitalDate", "qcDate");
+            List<String> firstPageDate = Arrays.asList("birthday", "behospitalDate", "leaveHospitalDate", "qcDate","gmtCreate");
             for (String objKey : objectMap.keySet()) {
                 if (map.containsKey(objKey)) {
                     if (firstPageDate.contains(objKey)) {
@@ -1599,6 +1675,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 = sysHospitalSetFacade.getOne(new QueryWrapper<SysHospitalSet>()
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
                         .eq("hospital_id", analyzeRunVO.getHospitalId())
+                        .eq("code", "score_type")
                 , false);
         if (null != sysHospitalSet && sysHospitalSet.getValue().equals("1")) {
             //百分制
@@ -2229,4 +2306,38 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         return ret;
     }
 
+
+    /**
+     * 手术费，抗菌药物，手术和病理费等含有人数
+     * @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/DoctorAdviceFacade.java

@@ -9,9 +9,12 @@ import com.diagbot.service.impl.DoctorAdviceServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.DoctorAdviceVO;
+import com.diagbot.vo.FilterVO;
 import org.springframework.stereotype.Component;
 
 import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:
@@ -42,4 +45,14 @@ public class DoctorAdviceFacade extends DoctorAdviceServiceImpl {
         }
         return this.getPage(doctorAdviceVO);
     }
+
+    /**
+     * 获取医嘱
+     * @param filterVO
+     * @return
+     */
+    public List<Map<String, String>> getDoctorAdviceNum(FilterVO filterVO){
+        return baseMapper.getDoctorAdviceNum(filterVO);
+
+    }
 }

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

@@ -7,11 +7,13 @@ import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
-
+import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description:
@@ -209,6 +211,84 @@ public class FilterFacade {
         }*/
     }
 
+    /**
+     * 入参拼接
+     *
+     * @param filterVO
+     */
+    public void filterSet(FilterVO filterVO) {
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        String userId = SysUserUtils.getCurrentPrincipleID();
+        filterVO.setHospitalId(hospitalId);
+        filterVO.setUserId(Long.valueOf(userId));
+        if (filterVO.getLimitCount() == null || filterVO.getLimitCount().equals(0)) {
+            filterVO.setLimitCount(10);
+        }
+        try {
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+            SimpleDateFormat dateFormatSec = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Date dateStart = dateFormat.parse(filterVO.getStartDate());
+            Date dateEnd = dateFormat.parse(filterVO.getEndDate());
+            filterVO.setStartDate(dateFormatSec.format(dateStart));
+            filterVO.setEndDate(dateFormatSec.format(dateEnd));
+        } catch (ParseException e) {
+
+        }
+
+    }
+
+
+    /**
+     * 入参拼接
+     *
+     * @param filterVO
+     */
+          List<String> getTimeList(FilterVO filterVO) {
+              DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+              // 返回的日期集合
+              List<String> days = new ArrayList<String>();
+              Date start =new Date();
+              Date end =new Date();
+              try {
+              if(StringUtils.isEmpty(filterVO.getHospitalId())){
+                  String hospitalId = SysUserUtils.getCurrentHospitalID();
+                  String userId = SysUserUtils.getCurrentPrincipleID();
+                  filterVO.setHospitalId(hospitalId);
+                  filterVO.setUserId(Long.valueOf(userId));
+                   start = dateFormat.parse(filterVO.getStartDate()+" 00:00:00");
+                   end = dateFormat.parse(filterVO.getEndDate()+" 00:00:00");
+              }else{
+                  //执行上一天的操作
+                  Date dNow = new Date(); //当前时间
+                  Date dBefore = new Date();
+                  Calendar calendar = Calendar.getInstance(); //得到日历
+                  calendar.setTime(dNow);//把当前时间赋给日历
+                  calendar.add(Calendar.DAY_OF_MONTH, -1); //设置为前一天
+                  dBefore = calendar.getTime(); //得到前一天的时间
+                  SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); //设置时间格式
+                  String defaultStartDate = sdf.format(dBefore); //格式化前一天
+                  filterVO.setStartDate(defaultStartDate);
+                  filterVO.setEndDate(defaultStartDate);
+                  defaultStartDate = defaultStartDate+" 00:00:00";
+                  String defaultEndDate = defaultStartDate;
+                   start = dateFormat.parse(defaultStartDate);
+                   end = dateFormat.parse(defaultEndDate);
+              }
+            Calendar tempStart = Calendar.getInstance();
+            tempStart.setTime(start);
+            Calendar tempEnd = Calendar.getInstance();
+            tempEnd.setTime(end);
+            tempEnd.add(Calendar.DATE, +1);
+            while (tempStart.before(tempEnd)) {
+                days.add(dateFormat.format(tempStart.getTime()));
+                tempStart.add(Calendar.DAY_OF_YEAR, 1);
+            }
+        } catch (ParseException e) {
+            throw new IllegalArgumentException("参数异常");
+        }
+        return days;
+    }
+
     /**
      * 分页入参拼接
      *

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

@@ -1,22 +1,47 @@
 package com.diagbot.facade;
 
+import com.alibaba.fastjson.JSONObject;
 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.diagbot.dto.CheckDeptDTO;
+import com.diagbot.dto.CheckJobDTO;
+import com.diagbot.dto.CheckUserDTO;
+import com.diagbot.dto.DeptCheckUserDTO;
+import com.diagbot.entity.BasDeptInfo;
+import com.diagbot.entity.BasDoctorInfo;
 import com.diagbot.entity.MedCheckInfo;
+import com.diagbot.entity.QcresultInfo;
+import com.diagbot.entity.SysRole;
 import com.diagbot.entity.SysUser;
+import com.diagbot.entity.SysUserDept;
+import com.diagbot.entity.SysUserRole;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.MedCheckInfoServiceImpl;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.util.SysUserUtils;
+import com.diagbot.vo.CheckJobPageVO;
+import com.diagbot.vo.CheckJobVO;
+import com.diagbot.vo.CheckUserVO;
+import com.diagbot.vo.DistributionJobVO;
 import com.diagbot.vo.MedCheckInfoAddVO;
+import com.google.common.collect.Lists;
+import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * @author wangfeng
@@ -28,6 +53,17 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
 
     @Autowired
     SysUserFacade sysUserFacade;
+    @Autowired
+    SysUserRoleFacade sysUserRoleFacade;
+    @Autowired
+    SysRoleFacade sysRoleFacade;
+    @Autowired
+    SysUserDeptFacade sysUserDeptFacade;
+    @Autowired
+    BasDoctorInfoFacade basDoctorInfoFacade;
+    @Autowired
+    BasDeptInfoFacade basDeptInfoFacade;
+
 
     /**
      * @param medCheckInfoAddVO
@@ -108,4 +144,578 @@ public class MedCheckInfoFacade extends MedCheckInfoServiceImpl {
         }
         return res;
     }
+    /**
+     * @Author songxl
+     * @Description 获取操作用户的核查科室以及人员
+     * @Date  2021/5/14
+     * @Param []
+     * @Return java.util.Map<java.lang.String,java.util.List<com.diagbot.dto.CheckDeptDTO>>
+     * @MethodName getCheckUserMap
+     */
+    public IPage<CheckJobDTO> getUserCheckList(CheckJobPageVO  checkJobVO) {
+        //校验
+        userCheckPageSet(checkJobVO);
+        //质控管理员要判断该角色是否是质控科
+        //1.获取质控科id
+        //获取人员id 和 该人员的医院id
+        Long hospitalId = Long.valueOf(SysUserUtils.getCurrentHospitalID());
+        Long principleId = Long.valueOf(SysUserUtils.getCurrentPrincipleID());
+        //获取核查监管相关角色id
+        List<Long> checkRoleIds = sysRoleFacade.list(new QueryWrapper<SysRole>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .like("name","监管人员")
+        ).stream().map(SysRole::getId).collect(Collectors.toList());
+        //查询该角色的所有角色id
+        List<Long> roleIds = sysUserRoleFacade.list(new QueryWrapper<SysUserRole>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("user_id", principleId)
+        ).stream().distinct().map(SysUserRole::getRoleId).collect(Collectors.toList());
+        List<Long> searchRoleIds = new ArrayList<>();
+        //当前用户是监管人员或者是超级管理员
+        if(roleIds.contains(-1L))
+        {
+            searchRoleIds.addAll(checkRoleIds);
+        }
+        else{
+            searchRoleIds.addAll(containsRole(checkRoleIds,roleIds));
+        }
+        if(searchRoleIds.isEmpty())
+        {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该用户不是核查监管人员!");
+        }
+        //质控科监管人员
+        if(searchRoleIds.contains(5L)&&"2".equals(checkJobVO.getJobType()))
+        {
+            //用户是不是质管科人员校验
+            String zkkDeptId = basDeptInfoFacade.getOne(new QueryWrapper<BasDeptInfo>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("hospital_id",hospitalId)
+                    .like("dept_name","质管科")).getDeptId();
+            if(StringUtil.isBlank(zkkDeptId))
+            {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "科室质管科不存在!");
+            }
+            //2.获取监管人员所在科室集合
+            List<String> deptIds = sysUserDeptFacade.list(new QueryWrapper<SysUserDept>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("hospital_id",hospitalId)
+                    .eq("user_id",principleId)
+            ).stream().map(SysUserDept::getDeptId).collect(Collectors.toList());
+            //3.判断这个人是否在质控科
+            if(deptIds.contains(zkkDeptId))
+            {
+                return getCheckList(checkJobVO);
+            }
+        }
+        //临床科室监管人员
+        else if(searchRoleIds.contains(4L)&&"0".equals(checkJobVO.getJobType()))
+        {
+            //获取监管人员所在科室集合
+            List<String> deptIds = sysUserDeptFacade.list(new QueryWrapper<SysUserDept>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("hospital_id",hospitalId)
+                    .eq("user_id",principleId)
+            ).stream().map(SysUserDept::getDeptId).collect(Collectors.toList());
+            if(deptIds!=null&&!deptIds.isEmpty()){
+                checkJobVO.setDeptList(deptIds);
+            }
+            return getCheckList(checkJobVO);
+        }
+        //院级监管人员
+        else if(searchRoleIds.contains(6L)&&"1".equals(checkJobVO.getJobType()))
+        {
+            //获取监管人员所在科室集合
+            List<String> deptIds = sysUserDeptFacade.list(new QueryWrapper<SysUserDept>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("hospital_id",hospitalId)
+                    .eq("user_id",principleId)
+            ).stream().map(SysUserDept::getDeptId).collect(Collectors.toList());
+            //分配除了监管人员以外其他科室的核查任务
+            if(deptIds!=null&&!deptIds.isEmpty()){
+                checkJobVO.setDeptList(deptIds);
+            }
+            return getCheckList(checkJobVO);
+        }
+        else
+        {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该用户的角色和任务类型不对应！");
+        }
+       return null;
+    }
+    /**
+     * @Author songxl
+     * @Description 待分配列表页面校验
+     * @Date  2021/5/18
+     * @Param [checkJobVO]
+     * @Return void
+     * @MethodName userCheckPageSet
+     */
+    private void userCheckPageSet(CheckJobPageVO  checkJobVO) {
+        if(StringUtil.isBlank(checkJobVO.getStartTime())&&StringUtil.isBlank(checkJobVO.getEndTime())
+                &&StringUtil.isBlank(checkJobVO.getBehosDateStart())&&StringUtil.isBlank(checkJobVO.getBehosDateEnd()))
+        {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "没有时间区间!");
+        }
+        if(StringUtil.isBlank(checkJobVO.getJobType()))
+        {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "没有任务类型!");
+        }
+        if(StringUtil.isNotBlank(checkJobVO.getBehosDateStart())&&StringUtil.isNotBlank(checkJobVO.getBehosDateEnd()))
+        {
+            if (DateUtil.after(DateUtil.parseDate(checkJobVO.getBehosDateStart()),
+                    DateUtil.parseDate(checkJobVO.getBehosDateEnd()))) {
+                throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "出院时间的开始时间必须小于结束时间！");
+            }
+        }
+        if(StringUtil.isNotBlank(checkJobVO.getStartTime())&&StringUtil.isNotBlank(checkJobVO.getEndTime()))
+        {
+            if (DateUtil.after(DateUtil.parseDate(checkJobVO.getStartTime()),
+                    DateUtil.parseDate(checkJobVO.getEndTime()))) {
+                throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "任务生成的开始时间必须小于结束时间！");
+            }
+        }
+
+    }
+
+    /**
+     * @Author songxl
+     * @Description 获取操作用户的核查科室以及科室核查人员
+     * @Date  2021/5/14
+     * @Param []
+     * @Return java.util.Map<java.lang.String,java.util.List<com.diagbot.dto.CheckDeptDTO>>
+     * @MethodName getCheckUserMap
+     */
+    public Map<String, List<CheckDeptDTO>> getCheckUserMap() {
+
+        //1.获取当前用户对应的管理员角色
+        //获取人员id 和 该人员的医院id
+        Long hospitalId = Long.valueOf(SysUserUtils.getCurrentHospitalID());
+        Long principleId = Long.valueOf(SysUserUtils.getCurrentPrincipleID());
+        //获取核查监管相关角色id
+        List<Long> checkRoleIds = sysRoleFacade.list(new QueryWrapper<SysRole>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .like("name","监管人员")
+        ).stream().map(SysRole::getId).collect(Collectors.toList());
+        //查询该角色的所有角色id
+        List<Long> roleIds = sysUserRoleFacade.list(new QueryWrapper<SysUserRole>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("user_id", principleId)
+        ).stream().distinct().map(SysUserRole::getRoleId).collect(Collectors.toList());
+        List<Long> searchRoleIds = new ArrayList<>();
+        //当前用户是监管人员或者是超级管理员
+        if(roleIds.contains(-1L))
+        {
+               searchRoleIds.addAll(checkRoleIds);
+        }
+        else{
+            searchRoleIds.addAll(containsRole(checkRoleIds,roleIds));
+        }
+        if(searchRoleIds.isEmpty())
+        {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该用户不是核查监管人员!");
+        }
+        //2.获取相应角色对应的科室以及核查人员
+        Map<String, List<CheckDeptDTO>> checkUserMap = getCheckRoleMap(searchRoleIds,hospitalId,principleId);
+        return checkUserMap;
+    }
+    /**
+     * @Author songxl
+     * @Description 获取相应角色对应的科室以及核查人员
+     * @Date  2021/5/14
+     * @Param [searchRoleIds]
+     * @Return java.util.Map<java.lang.String,java.util.List<java.util.Map<java.lang.String,java.lang.Object>>>
+     * @MethodName getCheckRoleMap
+     */
+
+    private Map<String, List<CheckDeptDTO>> getCheckRoleMap(List<Long> searchRoleIds,Long hospitalId,Long principleId) {
+        Map<String, List<CheckDeptDTO>> checkRoleMap = new HashMap<>();
+        for(Long id:searchRoleIds)
+        {
+            try
+            {
+                //不同角色不同查询方式
+                switch (id.intValue())
+                {
+                    //临床科室监管人员
+                    case 4:
+                        getDeptCheckInfo(checkRoleMap,hospitalId,principleId);
+                        break;
+                    //质控科监管人员
+                    case 5:
+                        getZKKCheckInfo(checkRoleMap,hospitalId,principleId);
+                        break;
+                    //院级监管人员
+                    case 6:
+                        getYQCheckInfo(checkRoleMap,hospitalId,principleId);
+                        break;
+                    default:
+                        break;
+                }
+            }
+            catch (Exception e)
+            {
+                e.printStackTrace();
+            }
+        }
+        return checkRoleMap;
+    }
+    /**
+     * @Author songxl
+     * @Description 院区管理员获取管理的科室以及科室包涵质控人员
+     * @Date  2021/5/17
+     * @Param [checkRoleMap, hospitalId, principleId]
+     * @Return void
+     * @MethodName getYQCheckInfo
+     */
+    private void getYQCheckInfo(Map<String, List<CheckDeptDTO>> checkRoleMap, Long hospitalId, Long principleId) {
+        //1.获取院级质控人员有哪些
+        //1.1获取院级质控人员角色id
+        Long roleId = sysRoleFacade.getOne(new QueryWrapper<SysRole>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("name","院级质控人员")).getId();
+        CheckUserVO checkUserVOS = new CheckUserVO();
+        checkUserVOS.setRoleIds(Lists.newArrayList(roleId));
+        checkUserVOS.setDeptStations(Lists.newArrayList("住院"));
+        checkUserVOS.setUserId(principleId);
+        checkUserVOS.setRoleId(6L);
+        checkUserVOS.setHospitalId(hospitalId);
+        List<CheckUserDTO> checkUserDTOS = baseMapper.getCheckUser(checkUserVOS);
+        //2.1获取科室详情
+        Map<String,String> deptMap = checkUserDTOS.stream()
+                .collect(Collectors.toMap(CheckUserDTO::getDeptId,CheckUserDTO::getDeptName, (v1, v2) -> v2));
+        //2.3获取所有医生信息的核查数
+        List<String> doctorIds = checkUserDTOS.stream().map(CheckUserDTO::getDoctorId).collect(Collectors.toList());
+        CheckUserVO checkUserVO = new CheckUserVO();
+        checkUserVO.setJobType(1);
+        checkUserVO.setUserList(doctorIds);
+        //通过核查人员id获取核查人员的核查任务数
+        List<DeptCheckUserDTO> userJobs = baseMapper.getJobNumByUserId(checkUserVO);
+        addCheckInfoMaps(checkRoleMap,deptMap,userJobs,checkUserDTOS,6);
+    }
+    /**
+     * @Author songxl
+     * @Description 质控科管理员获取管理的科室以及科室包涵质控人员
+     * @Date  2021/5/17
+     * @Param [checkRoleMap, hospitalId, principleId]
+     * @Return void
+     * @MethodName getZKKCheckInfo
+     */
+    private void getZKKCheckInfo(Map<String, List<CheckDeptDTO>> checkRoleMap, Long hospitalId, Long principleId) {
+        //1.获取质控科id
+        String zkkDeptId = basDeptInfoFacade.getOne(new QueryWrapper<BasDeptInfo>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id",hospitalId)
+                .like("dept_name","质管科")).getDeptId();
+        if(StringUtil.isBlank(zkkDeptId))
+        {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "科室质管科不存在!");
+        }
+        //2.获取监管人员所在科室集合
+        List<String> deptIds = sysUserDeptFacade.list(new QueryWrapper<SysUserDept>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id",hospitalId)
+                .eq("user_id",principleId)
+        ).stream().map(SysUserDept::getDeptId).collect(Collectors.toList());
+        //3.判断这个人是否在质控科
+        if(deptIds.contains(zkkDeptId))
+        {
+            CheckUserVO checkUserVOS = new CheckUserVO();
+            checkUserVOS.setRoleIds(Lists.newArrayList(7L,8L,9L));
+            checkUserVOS.setDeptStations(Lists.newArrayList("住院","质管"));
+            checkUserVOS.setUserId(principleId);
+            checkUserVOS.setRoleId(5L);
+            checkUserVOS.setHospitalId(hospitalId);
+            List<CheckUserDTO> checkUserDTOS = baseMapper.getCheckUser(checkUserVOS);
+            //2.1获取科室详情
+            Map<String,String> deptMap = checkUserDTOS.stream()
+                    .collect(Collectors.toMap(CheckUserDTO::getDeptId,CheckUserDTO::getDeptName, (v1, v2) -> v2));
+            //2.3获取所有医生信息的核查数
+            List<String> doctorIds = checkUserDTOS.stream().map(CheckUserDTO::getDoctorId).collect(Collectors.toList());
+            CheckUserVO checkUserVO = new CheckUserVO();
+            checkUserVO.setJobType(2);
+            checkUserVO.setUserList(doctorIds);
+            //通过核查人员id获取核查人员的核查任务数
+            List<DeptCheckUserDTO> userJobs = baseMapper.getJobNumByUserId(checkUserVO);
+            addCheckInfoMaps(checkRoleMap,deptMap,userJobs,checkUserDTOS,5);
+        }
+
+    }
+    /**
+     * @Author songxl
+     * @Description 临床科室管理员获取管理的科室以及科室包涵质控人员
+     * @Date  2021/5/17
+     * @Param [checkRoleMap, hospitalId, principleId]
+     * @Return void
+     * @MethodName getDeptCheckInfo
+     */
+    private void getDeptCheckInfo(Map<String, List<CheckDeptDTO>> checkRoleMap, Long hospitalId, Long principleId) {
+
+        //1.获取监管人员所在科室集合
+        List<String> deptIds = sysUserDeptFacade.list(new QueryWrapper<SysUserDept>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id",hospitalId)
+                .eq("user_id",principleId)
+        ).stream().map(SysUserDept::getDeptId).collect(Collectors.toList());
+        if(deptIds.isEmpty()){return;}
+        CheckUserVO checkUserVOS = new CheckUserVO();
+        checkUserVOS.setRoleIds(Lists.newArrayList(4L,7L));
+        checkUserVOS.setDeptIds(deptIds);
+        checkUserVOS.setDeptStations(Lists.newArrayList("住院"));
+        checkUserVOS.setHospitalId(hospitalId);
+        List<CheckUserDTO> checkUserDTOS = baseMapper.getCheckUser(checkUserVOS);
+        //2.1获取科室详情
+        Map<String,String> deptMap = checkUserDTOS.stream()
+                .collect(Collectors.toMap(CheckUserDTO::getDeptId,CheckUserDTO::getDeptName, (v1, v2) -> v2));
+        //2.3获取所有医生信息的核查数
+        List<String> doctorIds = checkUserDTOS.stream().map(CheckUserDTO::getDoctorId).collect(Collectors.toList());
+        CheckUserVO checkUserVO = new CheckUserVO();
+        checkUserVO.setJobType(0);
+        checkUserVO.setUserList(doctorIds);
+        //通过核查人员id获取核查人员的核查任务数
+        List<DeptCheckUserDTO> userJobs = baseMapper.getJobNumByUserId(checkUserVO);
+        addCheckInfoMaps(checkRoleMap,deptMap,userJobs,checkUserDTOS,4);
+    }
+
+    /**
+     * @Author songxl
+     * @Description 拼装科室、核查人员、任务数对象
+     * @Date  2021/5/17
+     * @Param [checkRoleMap, doctorInfos, userJobs, deptInfos, roleId]
+     * @Return void
+     * @MethodName addCheckInfoMap
+     */
+    private void addCheckInfoMaps(Map<String, List<CheckDeptDTO>> checkRoleMap, Map<String, String> deptMap,
+                                  List<DeptCheckUserDTO> userJobs, List<CheckUserDTO> checkUserDTOS, int roleId) {
+        if(deptMap.isEmpty()||checkUserDTOS.isEmpty()){}
+        checkRoleMap.put(roleId+"",new ArrayList<CheckDeptDTO>());
+        //遍历科室
+        for(String deptId:deptMap.keySet())
+        {
+            //科室对象
+            CheckDeptDTO checkDeptDTO = new CheckDeptDTO();
+            checkDeptDTO.setDeptId(deptId);
+            checkDeptDTO.setDeptName(deptMap.get(deptId));
+            checkDeptDTO.setDeptcheckUsers(new ArrayList<DeptCheckUserDTO>());
+            //遍历医生
+            for(CheckUserDTO checkUserDTO:checkUserDTOS)
+            {
+                //同一科室
+                if(checkDeptDTO.getDeptId().equals(checkUserDTO.getDeptId()))
+                {
+                    DeptCheckUserDTO deptCheckUserDTO = new DeptCheckUserDTO();
+                    deptCheckUserDTO.setDeptId(checkUserDTO.getDeptId());
+                    deptCheckUserDTO.setDeptName(checkUserDTO.getDeptName());
+                    deptCheckUserDTO.setDoctorId(checkUserDTO.getDoctorId());
+                    deptCheckUserDTO.setDoctorName(checkUserDTO.getDoctorName());
+                    checkDeptDTO.getDeptcheckUsers().add(deptCheckUserDTO);
+                }
+            }
+            for(DeptCheckUserDTO deptCheckUserDTO:checkDeptDTO.getDeptcheckUsers())
+            {
+                //遍历数量
+                for(DeptCheckUserDTO jobNumDto:userJobs)
+                {
+                    //有这个人
+                    if(deptCheckUserDTO.getDoctorId().equals(jobNumDto.getDoctorId()))
+                    {
+                        deptCheckUserDTO.setJobNum(jobNumDto.getJobNum());
+                    }
+                    //没有这个人
+                    else
+                    {
+                        deptCheckUserDTO.setJobNum(0);
+                    }
+                }
+            }
+            checkRoleMap.get(roleId+"").add(checkDeptDTO);
+        }
+    }
+
+
+    /**
+     * @Author songxl
+     * @Description 拼装科室、核查人员、任务数对象
+     * @Date  2021/5/17
+     * @Param [checkRoleMap, doctorInfos, userJobs, deptInfos, roleId]
+     * @Return void
+     * @MethodName addCheckInfoMap
+     */
+    private void addCheckInfoMap(Map<String, List<CheckDeptDTO>> checkRoleMap, List<BasDoctorInfo> doctorInfos,
+                                 List<DeptCheckUserDTO> userJobs, List<BasDeptInfo> deptInfos, int roleId) {
+        if(deptInfos.isEmpty()||doctorInfos.isEmpty()){}
+        checkRoleMap.put(roleId+"",new ArrayList<CheckDeptDTO>());
+        //遍历科室
+        for(BasDeptInfo deptInfo:deptInfos)
+        {
+            //科室对象
+            CheckDeptDTO checkDeptDTO = new CheckDeptDTO();
+            checkDeptDTO.setDeptId(deptInfo.getDeptId());
+            checkDeptDTO.setDeptName(deptInfo.getDeptName());
+            checkDeptDTO.setDeptcheckUsers(new ArrayList<DeptCheckUserDTO>());
+            //遍历医生
+            for(BasDoctorInfo doctorInfo:doctorInfos)
+            {
+                //同一科室
+                if(checkDeptDTO.getDeptId().equals(doctorInfo.getDeptId()))
+                {
+                    DeptCheckUserDTO deptCheckUserDTO = new DeptCheckUserDTO();
+                    deptCheckUserDTO.setDeptId(doctorInfo.getDeptId());
+                    deptCheckUserDTO.setDeptName(deptInfo.getDeptName());
+                    deptCheckUserDTO.setDoctorId(doctorInfo.getDoctorId());
+                    deptCheckUserDTO.setDoctorName(doctorInfo.getName());
+                    checkDeptDTO.getDeptcheckUsers().add(deptCheckUserDTO);
+                }
+            }
+            for(DeptCheckUserDTO deptCheckUserDTO:checkDeptDTO.getDeptcheckUsers())
+            {
+                //遍历数量
+                for(DeptCheckUserDTO jobNumDto:userJobs)
+                {
+                    //有这个人
+                    if(deptCheckUserDTO.getDoctorId().equals(jobNumDto.getDoctorId()))
+                    {
+                        deptCheckUserDTO.setJobNum(jobNumDto.getJobNum());
+                    }
+                    //没有这个人
+                    else
+                    {
+                        deptCheckUserDTO.setJobNum(0);
+                    }
+                }
+            }
+            checkRoleMap.get(roleId+"").add(checkDeptDTO);
+        }
+    }
+
+    /**
+     * @Author songxl
+     * @Description list求交集
+     * @Date  2021/5/14
+     * @Param [checkRoleIds, roleIds]
+     * @Return java.util.List<java.lang.Long>
+     * @MethodName containsRole
+     */
+    private  List<Long> containsRole(List<Long> checkRoleIds, List<Long> roleIds) {
+
+        List<Long> searchRoleIds = new ArrayList<>();
+        for(Long id:roleIds)
+        {
+            if(checkRoleIds.contains(id))
+            {
+                searchRoleIds.add(id);
+            }
+        }
+        return searchRoleIds;
+    }
+    /**
+     * @Author songxl
+     * @Description 分配/取消核查任务
+     * @Date  2021/5/17
+     * @Param [distributionJobVO]
+     * @Return boolean
+     * @MethodName distributionJobs
+     */
+    public boolean distributionJobs(DistributionJobVO distributionJobVO) {
+
+        //1非空校验
+        if(StringUtil.isBlank(distributionJobVO.getCheckId())||
+                StringUtil.isBlank(distributionJobVO.getCheckName())||
+                StringUtil.isBlank(distributionJobVO.getDistributionType())||
+                distributionJobVO.getBehospitalCodes()==null||
+                distributionJobVO.getBehospitalCodes().isEmpty())
+        {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL,"入参为空");
+        }
+        //获取人员id 和 该人员的医院id
+        Long hospitalId = Long.valueOf(SysUserUtils.getCurrentHospitalID());
+        Long principleId = Long.valueOf(SysUserUtils.getCurrentPrincipleID());
+        //2.获取任务类型 0分配 1取消
+        String distributionType = distributionJobVO.getDistributionType();
+        //3 分配
+        if(StringUtil.isNotBlank(distributionType)&&"0".equals(distributionType))
+        {
+            //3.1 任务未分配校验
+            List<String> distributionNames = this.list(new QueryWrapper<MedCheckInfo>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("hospital_id",hospitalId)
+                    .in("behospital_code",distributionJobVO.getBehospitalCodes())
+                    ).stream().filter(s-> s.getJobDistributionName() !=null).map(MedCheckInfo::getJobDistributionName)
+                    .collect(Collectors.toList());
+            if(distributionNames!=null&&distributionNames.size()>0)
+            {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "待分配任务列表存在已分配任务！");
+            }
+
+            //获取分配用户信息
+            QueryWrapper<SysUser> userQuer = new QueryWrapper<>();
+            userQuer.eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("id",principleId)
+                    .eq("status",1);
+            SysUser user = sysUserFacade.getOne(userQuer);
+            String principleName = user.getLinkman();
+            //用户名称如果是null(目的：分配用户名为null表示用户未分配)
+            if(principleName==null){principleName = "";}
+            Date now = DateUtil.now();
+            //3.2分配核查任务
+            return  this.update(new UpdateWrapper<MedCheckInfo>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("hospital_id", hospitalId)
+                    .in("behospital_code", distributionJobVO.getBehospitalCodes())
+                    .set("job_distributor", principleId)
+                    .set("job_distribution_name", principleName)
+                    .set("check_id", distributionJobVO.getCheckId())
+                    .set("check_name", distributionJobVO.getCheckName())
+                    .set("job_distribution_time", now));
+
+        }
+        //4 取消分配
+        else if(StringUtil.isNotBlank(distributionType)&&"1".equals(distributionType))
+        {
+            //4.1 任务已取消校验
+            Set<Long> checkIds = this.list(new QueryWrapper<MedCheckInfo>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("hospital_id",hospitalId)
+                    .in("behospital_code",distributionJobVO.getBehospitalCodes())
+            ).stream().map(MedCheckInfo::getCheckId).collect(Collectors.toSet());
+            //4.2获取出来的核查用户存在但不是一个
+            if(checkIds==null||checkIds.isEmpty()||
+                    (checkIds.size()!=1&&checkIds.contains(distributionJobVO.getCheckId())))
+            {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "待取消分配任务列表不存在或存在不是该用户的任务！");
+            }
+            else
+            {
+                Date now = DateUtil.now();
+                //4.3取消分配
+                return  this.update(new UpdateWrapper<MedCheckInfo>()
+                        .eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .eq("hospital_id", hospitalId)
+                        .eq("check_id",  distributionJobVO.getCheckId())
+                        .in("behospital_code", distributionJobVO.getBehospitalCodes())
+                        .set("job_distributor",-1)
+                        .set("job_distribution_name", null)
+                        .set("check_id", -1)
+                        .set("check_name", "")
+                        .set("job_distribution_time", now));
+            }
+        }
+
+        return false;
+    }
+    /**
+     * @Author songxl
+     * @Description 获取指定核查人员的核查任务
+     * @Date  2021/5/17
+     * @Param [checkJobVO]
+     * @Return java.util.List<com.diagbot.dto.CheckJobDTO>
+     * @MethodName getCheckListByUserId
+     */
+    public List<CheckJobDTO> getCheckListByUserId(CheckJobVO checkJobVO) {
+        //非空校验
+        if(StringUtil.isBlank(checkJobVO.getCheckId()))
+        {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "没有传核查用户id!");
+        }
+        return baseMapper.getCheckListByUserId(checkJobVO);
+    }
 }

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

@@ -0,0 +1,298 @@
+package com.diagbot.facade;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.CheckWorkDTO;
+import com.diagbot.dto.MedicalRecordDTO;
+import com.diagbot.entity.*;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.MedBehospitalTypeServiceImpl;
+import com.diagbot.service.impl.MedCheckInfoServiceImpl;
+import com.diagbot.service.impl.MedicalRecordServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.util.SysUserUtils;
+import com.diagbot.vo.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+
+/**
+ * @author songxl
+ * @since 2021-05-11
+ */
+@Slf4j
+@Component
+public class MedCheckWorkFacade {
+    @Autowired
+    SysUserFacade sysUserFacade;
+    @Autowired
+    private MedCheckInfoServiceImpl medCheckInfoServiceImpl;
+    @Autowired
+    private MedCheckInfoFacade medCheckInfoFacade;
+    @Autowired
+    private MedBehospitalTypeServiceImpl medBehospitalTypeServiceImpl;
+    @Autowired
+    private MedicalRecordServiceImpl medicalRecordServiceImpl;
+    @Autowired
+    private SysTaskCronFacade sysTaskCronFacade;
+
+    /**
+     * @Author songxl
+     * @Description 批量操作核查任务（增加和删除）
+     * @Date 2021/5/11
+     * @Param [medCheckWorkVO]
+     * @Return java.lang.Boolean
+     * @MethodName addCheck
+     */
+    public Boolean addCheckWork(MedCheckWorkAddVO medCheckWorkVO) {
+
+        boolean flag = false;
+        Date now = DateUtil.now();
+        //获取核查任务类型(0-科室任务 1-院级 2-质控科)
+        Integer workType = medCheckWorkVO.getJobType();
+        //获取操作类型（0-取消，1-添加）
+        Integer checkStatus = medCheckWorkVO.getCheckStatus();
+        Long hospitalId = Long.parseLong(SysUserUtils.getCurrentHospitalID());
+        Long principleId = Long.valueOf(SysUserUtils.getCurrentPrincipleID());
+        SysUser user = sysUserFacade.getOne(new QueryWrapper<SysUser>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", principleId)
+                .eq("status", 1));
+        String principleName = user.getLinkman();
+        //取消核查任务【操作类型（0-取消，1-添加）】
+        if (checkStatus != null && checkStatus == 0) {
+            //判断核查任务是否生成
+            QueryWrapper<MedCheckInfo> medicalRecordQe = new QueryWrapper<>();
+            medicalRecordQe.eq("hospital_id", hospitalId);
+            medicalRecordQe.eq("is_deleted", IsDeleteEnum.N.getKey());
+            if (medCheckWorkVO.getBehospitalCodeList().size() > 0) {
+                medicalRecordQe.in("behospital_code", medCheckWorkVO.getBehospitalCodeList());
+            }
+            List<MedCheckInfo> list = medCheckInfoFacade.list(medicalRecordQe);
+            if (ListUtil.isEmpty(list)) {
+                throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL, "存在未生成核查任务！");
+            }
+
+            int i = medCheckInfoFacade.getBaseMapper().deleteBatchCodes(medCheckWorkVO.getBehospitalCodeList());
+            if(i!=0)
+            {
+                return true;
+            }
+        } else if (checkStatus != null && checkStatus == 1) {
+            //生成核查任务
+            MedCheckInfo data = medCheckInfoFacade.getOne(new QueryWrapper<MedCheckInfo>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("hospital_id", hospitalId)
+                    .in("behospital_code", medCheckWorkVO.getBehospitalCodeList())
+            );
+            //任务是否存在
+            if (data != null) {
+                throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL, "核查任务已存在！");
+            }
+
+            //该病历没有核查的时候， 就添加核查记录
+            List<MedCheckInfo> medCheckInfoList = new ArrayList<>();
+            for (String behospitalCode : medCheckWorkVO.getBehospitalCodeList()) {
+                MedCheckInfo medCheckInfo = new MedCheckInfo();
+                medCheckInfo.setIsDeleted(IsDeleteEnum.N.getKey());
+                medCheckInfo.setGmtCreate(now);
+                medCheckInfo.setBehospitalCode(behospitalCode);
+                medCheckInfo.setHospitalId(hospitalId);
+                medCheckInfo.setCheckType(medCheckWorkVO.getCheckType());
+                medCheckInfo.setJobCreator(principleId);
+                medCheckInfo.setJobCreatorName(principleName);
+                medCheckInfo.setJobCreateTime(now);
+                medCheckInfo.setJobType(medCheckWorkVO.getJobType());
+                medCheckInfoList.add(medCheckInfo);
+            }
+            flag = medCheckInfoServiceImpl.saveBatch(medCheckInfoList);
+        }
+        return flag;
+    }
+
+    /**
+     * @Author songxl
+     * @Description 获取每日住院患者的类型（出院、病危、抢救。。。）
+     * @Date 2021/5/11
+     * @Param [param]
+     * @Return void
+     * @MethodName execute
+     */
+    public void execute(String param) {
+        JSONObject paramJson = JSONObject.parseObject(param);
+        Long hospiatlId = paramJson.getLong("hospital");
+        JSONObject typeValue = paramJson.getJSONObject("typeVal");
+        JSONObject typeName = paramJson.getJSONObject("typeName");
+        int searchSize = paramJson.getInteger("searchSize");
+        int batchSize = paramJson.getInteger("batchSize");
+
+
+        //定义批量插入的集合
+        HashMap<String, MedBehospitalType> medBehospitalTypeMap = null;
+        //1.判断患者类型表是否有记录
+        int count = medBehospitalTypeServiceImpl.count();
+        if (count > 0) {
+            medBehospitalTypeMap = new HashMap<>();
+            //2.1获取最近指定归档时间间隔的患者
+            RecordTypeVO recordContentVO = new RecordTypeVO();
+            recordContentVO.setHospitalId(hospiatlId);
+            recordContentVO.setModeList(new ArrayList<String>(typeValue.keySet()));
+            recordContentVO.setIsPlacefile(1l);//获取已归档的患者
+            recordContentVO.setStartTime(DateUtil.formatDateTime(DateUtil.addMinutes(DateUtil.now(), -30)));
+            recordContentVO.setEndTime(DateUtil.formatDateTime(DateUtil.now()));
+            putBehospitalTypeMap(medBehospitalTypeMap,recordContentVO,typeValue,typeName,hospiatlId,searchSize);
+        } else {
+            //2.2添加今天之前所有患者的类型
+            //2.2.1获取所有数据数量
+            medBehospitalTypeMap = new HashMap<>();
+            RecordTypeVO recordContentVO = new RecordTypeVO();
+            recordContentVO.setHospitalId(hospiatlId);
+            recordContentVO.setModeList(new ArrayList<String>(typeValue.keySet()));
+            recordContentVO.setIsPlacefile(1l);//获取已归档的患者
+            putBehospitalTypeMap(medBehospitalTypeMap,recordContentVO,typeValue,typeName,hospiatlId,searchSize);
+        }
+        //3.批量执行插入操作
+        try {
+            if (medBehospitalTypeMap!=null&&medBehospitalTypeMap.size() > 0) {
+                List<MedBehospitalType> medBehospitalTypeList = new ArrayList<>(medBehospitalTypeMap.values());
+                medBehospitalTypeServiceImpl.saveBatch(medBehospitalTypeList, batchSize);
+            }
+        }
+        catch(Exception e)
+        {
+            log.error(e.getMessage(),e);
+        }
+    }
+
+    private void putBehospitalTypeMap(HashMap<String, MedBehospitalType> medBehospitalTypeMap,
+                                      RecordTypeVO recordContentVO, JSONObject typeValue,
+                                      JSONObject typeName, Long hospiatlId,int searchSize) {
+        int num = medicalRecordServiceImpl.getRecordCount(recordContentVO);
+        if (num > 0) {
+
+            if (num < searchSize) {
+                //执行一次
+                recordContentVO.setStart(0L);
+                recordContentVO.setEnd(num + 0L);
+                getPatientRecordType(medBehospitalTypeMap,
+                        medicalRecordServiceImpl.getMedicalRecord(recordContentVO), typeValue, typeName, hospiatlId);
+            }
+            else
+            {
+                int i = num / searchSize + 1;
+                for (int j = 0; j < i; j++) {
+                    //5000个一次循环添加
+                    recordContentVO.setStart(j * searchSize * 1L);
+                    recordContentVO.setEnd(searchSize * 1L);
+                    getPatientRecordType(medBehospitalTypeMap,
+                            medicalRecordServiceImpl.getMedicalRecord(recordContentVO), typeValue, typeName, hospiatlId);
+                }
+            }
+        }
+    }
+
+    /**
+     * @Author songxl
+     * @Description 获取患者类型存入批量插入map
+     * @Date 2021/5/11
+     * @Param [medBehospitalTypeMap, medicalRecordList, typeValue, typeName, hospiatlId]
+     * @Return void
+     * @MethodName getPatientRecordType
+     */
+    private void getPatientRecordType(HashMap<String, MedBehospitalType> medBehospitalTypeMap,
+                                      List<MedicalRecordDTO> medicalRecordList,
+                                      JSONObject typeValue,
+                                      JSONObject typeName, Long hospiatlId) {
+
+        if (medicalRecordList == null || medicalRecordList.isEmpty()) {
+            return;
+        }
+        //1.遍历查询出来的结果
+        for (MedicalRecordDTO medicalRecordDTO : medicalRecordList) {
+            //2.判断批量插入map中有没有这个患者
+            if (medBehospitalTypeMap.containsKey(medicalRecordDTO.getBehospitalCode())) {
+                //3.比较这两次的分值大小
+                int lval = medBehospitalTypeMap.get(medicalRecordDTO.getBehospitalCode()).getValue();
+                int nval = typeValue.getInteger(medicalRecordDTO.getModeId() + "");
+                if (nval > lval) {
+                    medBehospitalTypeMap.get(medicalRecordDTO.getBehospitalCode()).setValue(nval);
+                    medBehospitalTypeMap.get(medicalRecordDTO.getBehospitalCode())
+                            .setBehospitalType(typeName.getString(medicalRecordDTO.getModeId() + ""));
+                }
+            } else {
+                //4.获取分值记录这个患者
+                MedBehospitalType medBehospitalType = new MedBehospitalType();
+                medBehospitalType.setBehospitalCode(medicalRecordDTO.getBehospitalCode());
+                medBehospitalType.setBehospitalType(typeName.getString(medicalRecordDTO.getModeId() + ""));
+                medBehospitalType.setValue(typeValue.getInteger(medicalRecordDTO.getModeId() + ""));
+                medBehospitalType.setCreateTime(DateUtil.now());
+                medBehospitalType.setHospitalId(hospiatlId);
+                medBehospitalTypeMap.put(medicalRecordDTO.getBehospitalCode(), medBehospitalType);
+            }
+        }
+    }
+
+
+    /**
+     * 分页
+     *
+     * @param checkWorkPageVO
+     * @return
+     */
+    public IPage<CheckWorkDTO> pageFac(CheckWorkPageVO checkWorkPageVO) {
+        checkWorkPageSet(checkWorkPageVO);
+        IPage<CheckWorkDTO> res = medCheckInfoFacade.getBaseMapper().getCheckWorkPage(checkWorkPageVO);
+        return res;
+    }
+
+    private void checkWorkPageSet(CheckWorkPageVO checkWorkPageVO) {
+        //入参验证
+        //出院时间
+        if (null != checkWorkPageVO && null != checkWorkPageVO.getStartDate()) {
+            checkWorkPageVO.setStartDate(DateUtil.getFirstTimeOfDay(checkWorkPageVO.getStartDate()));
+        }
+        if (null != checkWorkPageVO && null != checkWorkPageVO.getEndDate()) {
+            checkWorkPageVO.setEndDate(DateUtil.getFirstTimeOfDay(DateUtil.addDay(checkWorkPageVO.getEndDate(), 1)));
+        }
+        if (null != checkWorkPageVO && null != checkWorkPageVO.getStartDate() && null != checkWorkPageVO.getEndDate()) {
+            if (DateUtil.after(checkWorkPageVO.getStartDate(), checkWorkPageVO.getEndDate())) {
+                throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "出院时间的开始时间必须小于结束时间！");
+            }
+        }
+        //住院天数
+        if (null != checkWorkPageVO && null != checkWorkPageVO.getSmallDay() && null != checkWorkPageVO.getBigDay()) {
+            if (checkWorkPageVO.getSmallDay() > checkWorkPageVO.getBigDay()) {
+                throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "住院天数区间有误！");
+            }
+        }
+        checkWorkPageVO.setHospitalId(Long.parseLong(SysUserUtils.getCurrentHospitalID()));
+    }
+
+    public boolean getCheckListByUserId() {
+        //1.获取定时任务
+        SysTaskCron task = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
+                .eq("cron_code", "TASK019"), false);
+        //2.执行定时任务
+        if (null != task && StringUtil.isNotBlank(task.getCron())) {
+            try {
+                execute(task.getParam());
+            }
+            catch (Exception e)
+            {
+                e.printStackTrace();
+                return false;
+            }
+            return true;
+        }
+        return false;
+    }
+}

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

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+import com.diagbot.service.impl.MedIndexRelevanceServiceImpl;
+
+import org.springframework.stereotype.Component;
+
+
+/**
+ * @Description:
+ * @author: zhoutg
+ * @time: 2020/4/12 11:39
+ */
+@Component
+public class MedIndexRelevanceFacade extends MedIndexRelevanceServiceImpl {
+}

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

@@ -0,0 +1,13 @@
+package com.diagbot.facade;
+import com.diagbot.service.impl.MedIndexResultServiceImpl;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * @Description:
+ * @author: zhoutg
+ * @time: 2020/4/12 11:39
+ */
+@Component
+public class MedIndexResultFacade extends MedIndexResultServiceImpl {
+}

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

@@ -0,0 +1,19 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.SysHospitalSet;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.impl.QcCasesRelevanceEntryServiceImpl;
+import com.diagbot.service.impl.SysHospitalSetServiceImpl;
+import com.diagbot.util.StringUtil;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2021/4/16 12:29
+ */
+@Component
+public class QcCasesRelevanceEntryFacade extends QcCasesRelevanceEntryServiceImpl {
+
+}

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

@@ -34,7 +34,8 @@ public class QcClientFacade {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "配置表内找不到评分接口地址数据！");
         }
         try {
-            uri = new URI(url);
+//            uri = new URI(url);
+            uri = new URI("http://localhost:6010");
         } catch (Exception e) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR);
         }

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

@@ -250,6 +250,20 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
                         .set("opt_type", 3)
                         .set("modifier", useId)
                         .set("gmt_modified", now)
+                        .set("explain_info",algorithmVO.getOptResultAlgVO().getExplainInfo())
+                );
+                break;
+            case 4:
+                //逻辑删除质控明细
+                qcresultDetailServiceImpl.update(new UpdateWrapper<QcresultDetail>()
+                        .eq("id", algorithmVO.getOptResultAlgVO().getId())
+                        .eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .eq("hospital_id", analyzeVO.getHospitalId())
+                        .eq("behospital_code", analyzeVO.getBehospitalCode())
+                        .set("is_deleted", IsDeleteEnum.Y.getKey())
+                        .set("opt_type", 2)
+                        .set("modifier", useId)
+                        .set("gmt_modified", now)
                 );
                 break;
             default:

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

@@ -0,0 +1,126 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.CheckedRecordListDTO;
+import com.diagbot.entity.MedCheckInfo;
+import com.diagbot.entity.MedQcresultDetail;
+import com.diagbot.entity.SysUserDept;
+import com.diagbot.entity.SysUserRole;
+import com.diagbot.enums.CheckJobTypeEnum;
+import com.diagbot.enums.CheckTypeEnum;
+import com.diagbot.enums.CheckerRoleEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.MedQcresultDetailService;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.SysUserUtils;
+import com.diagbot.vo.CheckedRecordListVO;
+import com.diagbot.vo.RecordCheckVO;
+import com.diagbot.vo.SysUserBaseVO;
+import com.google.common.collect.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2021/5/17 18:43
+ */
+@Component
+public class RecordCheckFacade {
+
+    @Autowired
+    SysUserFacade sysUserFacade;
+    @Autowired
+    SysUserDeptFacade sysUserDeptFacade;
+    @Autowired
+    SysUserRoleFacade sysUserRoleFacade;
+    @Autowired
+    MedCheckInfoFacade medCheckInfoFacade;
+    @Autowired
+    MedQcresultDetailService medQcresultDetailService;
+
+    public IPage<CheckedRecordListDTO> checkedRecordList(CheckedRecordListVO checkedRecordListVO) {
+        Long hospitalId = Long.parseLong(SysUserUtils.getCurrentHospitalID());
+        Long userId = Long.parseLong(SysUserUtils.getCurrentPrincipleID());
+        SysUserBaseVO sysUserBaseVO = new SysUserBaseVO();
+        sysUserBaseVO.setUserId(userId);
+        List<Long> roleIds = sysUserFacade.getUserRoles(sysUserBaseVO).getSelRoles().stream().map(i -> i.getId()).collect(Collectors.toList());
+        List<String> deptIds = sysUserFacade.getUserDepts(sysUserBaseVO).getSelDepts().stream().map(i -> i.getDeptId()).collect(Collectors.toList());
+
+        List<Long> userIds = Lists.newArrayList();
+        roleIds.forEach(roleId -> {
+            if (roleId.intValue() == CheckerRoleEnum.HOSP_SUPERVISOR.getKey()
+                    && (ListUtil.isEmpty(checkedRecordListVO.getCheckJobTypes()) || checkedRecordListVO.getCheckJobTypes().contains(CheckJobTypeEnum.HOSP_SUPERVISOR.getKey() + ""))) {
+                userIds.addAll(getUserIdsOfRoleId(hospitalId, null, CheckerRoleEnum.HOSP_GENERAL.getKey()));
+            } else if (roleId.intValue() == CheckerRoleEnum.QUAT_SUPERVISOR.getKey()
+                    && (ListUtil.isEmpty(checkedRecordListVO.getCheckJobTypes()) || checkedRecordListVO.getCheckJobTypes().contains(CheckJobTypeEnum.QUAT_SUPERVISOR.getKey() + ""))) {
+                userIds.addAll(getUserIdsOfRoleId(hospitalId, deptIds, CheckerRoleEnum.QUAT_GENERAL.getKey()));
+            } else if (roleId.intValue() == CheckerRoleEnum.DEPT_SUPERVISOR.getKey()
+                    && (ListUtil.isEmpty(checkedRecordListVO.getCheckJobTypes()) || checkedRecordListVO.getCheckJobTypes().contains(CheckJobTypeEnum.DEPT_SUPERVISOR.getKey() + ""))) {
+                userIds.addAll(getUserIdsOfRoleId(hospitalId, deptIds, CheckerRoleEnum.DEPT_GENERAL.getKey()));
+            }
+        });
+
+        checkedRecordListVO.setCurrentDeptIds(String.join(",", deptIds));
+        checkedRecordListVO.setCurrentGeneralUserIds(userIds);
+        IPage<CheckedRecordListDTO> iPage = medCheckInfoFacade.getBaseMapper().checkedRecordList(checkedRecordListVO);
+
+        if (ListUtil.isNotEmpty(iPage.getRecords())) {
+            List<String> behospitalCodes = iPage.getRecords().stream().map(i -> i.getBehospitalCode()).collect(Collectors.toList());
+            QueryWrapper<MedQcresultDetail> medQcresultDetailQueryWrapper = new QueryWrapper<>();
+            medQcresultDetailQueryWrapper.eq("hospital_id", hospitalId);
+            medQcresultDetailQueryWrapper.in("behospital_code", behospitalCodes);
+            medQcresultDetailQueryWrapper.select("behospital_code", "cases_entry_id");
+            Map<String, Long> behospitalCodeCasesMap = medQcresultDetailService.list(medQcresultDetailQueryWrapper).stream().collect(Collectors.groupingBy(MedQcresultDetail::getBehospitalCode, Collectors.counting()));
+            iPage.getRecords().forEach(i -> {
+                i.setCasesEntryNum(behospitalCodeCasesMap.get(i.getBehospitalCode()).intValue());
+            });
+        }
+
+        return iPage;
+    }
+
+    private List<Long> getUserIdsOfRoleId(Long hospitalId, List<String> deptIds, long roleId) {
+        QueryWrapper<SysUserDept> sysUserDeptQueryWrapper = new QueryWrapper<>();
+        sysUserDeptQueryWrapper.eq("hospital_id", hospitalId);
+        sysUserDeptQueryWrapper.in(ListUtil.isNotEmpty(deptIds), "dept_id", deptIds);
+        List<Long> userIds = sysUserDeptFacade.list(sysUserDeptQueryWrapper).stream().map(i -> i.getUserId()).collect(Collectors.toList());
+
+        if (ListUtil.isEmpty(userIds)) {
+            return null;
+        }
+        QueryWrapper<SysUserRole> sysUserRoleQueryWrapper = new QueryWrapper<>();
+        sysUserRoleQueryWrapper.in("user_id", userIds);
+        sysUserRoleQueryWrapper.eq("role_id", roleId);
+        return sysUserRoleFacade.list(sysUserRoleQueryWrapper).stream().map(i -> i.getUserId()).collect(Collectors.toList());
+    }
+
+    public boolean recordCheck(RecordCheckVO recordCheckVO) {
+        Long hospitalId = Long.parseLong(SysUserUtils.getCurrentHospitalID());
+        Long userId = Long.parseLong(SysUserUtils.getCurrentPrincipleID());
+
+        QueryWrapper<MedCheckInfo> medCheckInfoQueryWrapper = new QueryWrapper<>();
+        medCheckInfoQueryWrapper.eq("behospital_code", recordCheckVO.getBehospitalCode());
+        medCheckInfoQueryWrapper.eq("hospital_id", hospitalId);
+        medCheckInfoQueryWrapper.eq("check_id", userId);
+        medCheckInfoQueryWrapper.eq("check_type", CheckTypeEnum.ALL.getKey());
+        MedCheckInfo medCheckInfo = medCheckInfoFacade.getOne(medCheckInfoQueryWrapper);
+        if (medCheckInfo == null) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据您暂无核查权限！");
+        }
+
+        medCheckInfo.setStatus(1);
+        medCheckInfo.setCheckTime(DateUtil.now());
+        medCheckInfoFacade.updateById(medCheckInfo);
+        
+        return true;
+    }
+
+}

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

@@ -129,6 +129,21 @@ public class SysUserFacade extends SysUserServiceImpl {
         data.setRefreshToken(jwt.getRefresh_token());
         data.setType(user.getType());
         data.setTypeCn(ConstantEnum.getName(user.getType()));//返回中文
+        //获取用户角色
+        try {
+            SysUserBaseVO sysUserBaseVO = new SysUserBaseVO();
+            sysUserBaseVO.setUserId(user.getId());
+            List<SysRoleDTO> selRoles =getlocalUserRoles(sysUserBaseVO);
+            if(selRoles!=null&&!selRoles.isEmpty())
+            {
+                data.setSelRoles(selRoles);
+            }
+
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
         //token存入redis
         JwtStore jwtStore = new JwtStore();
         jwtStore.setAccessToken(jwt.getAccess_token());
@@ -285,7 +300,7 @@ public class SysUserFacade extends SysUserServiceImpl {
         List<SysUserRole> sysUserRoleList = sysUserRoleFacade.list(sysUserRoleQueryWrapper);
         if(ListUtil.isNotEmpty(sysUserRoleList)){
             sysUserRoleList.forEach(sysUserRole ->{
-                    roleSet.add(sysUserRole.getRoleId()+"");
+                roleSet.add(sysUserRole.getRoleId()+"");
             } );
         }
         if (user == null) {
@@ -466,6 +481,36 @@ public class SysUserFacade extends SysUserServiceImpl {
 
         return sysUserRoleDTO;
     }
+    /**
+     * 获取用户角色
+     *
+     * @param sysUserBaseVO 获取用户角色入参
+     * @return 用户角色信息
+     */
+    private List<SysRoleDTO> getlocalUserRoles(SysUserBaseVO sysUserBaseVO) {
+        SysUserRoleDTO sysUserRoleDTO = new SysUserRoleDTO();
+        sysUserRoleDTO.setUserId(sysUserBaseVO.getUserId());
+        List<SysRoleDTO> sysRoleDTOList = sysRoleFacade.listFac();
+        List<SysUserRole> sysUserRoleList
+                = sysUserRoleService.list(new QueryWrapper<SysUserRole>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("user_id", sysUserBaseVO.getUserId())
+        );
+        List<SysRoleDTO> selRoles = new ArrayList<>();
+        if (ListUtil.isNotEmpty(sysUserRoleList)) {
+            Set<Long> selRoleIds = sysUserRoleList.stream()
+                    .map(SysUserRole::getRoleId)
+                    .collect(Collectors.toSet());
+            for (SysRoleDTO sysRoleDTO : sysRoleDTOList) {
+                if (selRoleIds.contains(sysRoleDTO.getId())) {
+                    selRoles.add(sysRoleDTO);
+                }
+            }
+            sysUserRoleDTO.setSelRoles(selRoles);
+        }
+
+        return selRoles;
+    }
 
     /**
      * 用户启用

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

@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.*;
 import com.diagbot.entity.BehospitalInfo;
+import com.diagbot.entity.FilterRecordVO;
 import com.diagbot.vo.*;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -626,6 +628,32 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      */
     public List<ExportExcelDTO> hmImproveMRPageExport(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
 
+    /**
+     * 病案管理指标获取基础数据
+     *
+     * @param timeVo
+     * @return
+     */
+    public Map<String,Object> getBaseIndex( MedIndexFilterVO timeVo);
+
+    /**
+     * 病案管理规则质控参数查询
+     *
+     * @param filterVO
+     * @return
+     */
+    public Map<String,Object> getCountByEntry( FilterVO filterVO);
+
+    /**
+     * 病案管理规则质控病历参数查询
+     *
+     * @param filterVO
+     * @return
+     */
+
+    public  List<MedManageParamsDTO> getMedManageParams( FilterVO filterVO);
+
+
     /**
      * 质控核查质控评分页（内页）
      *
@@ -666,4 +694,39 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      * @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/DoctorAdviceMapper.java

@@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.DoctorAdviceDTO;
 import com.diagbot.entity.DoctorAdvice;
 import com.diagbot.vo.DoctorAdviceVO;
+import com.diagbot.vo.FilterVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -23,4 +25,6 @@ public interface DoctorAdviceMapper extends BaseMapper<DoctorAdvice> {
     IPage<DoctorAdviceDTO> getPage(@Param("doctorAdviceVO")DoctorAdviceVO doctorAdviceVO, @Param("infos") Set<String> infos);
     List<String> getInfo(@Param("hospitalId")Long hospitalId, @Param("behospitalCode")String behospitalCode);
 
+    Map<String,Long> getCTAndMR( @Param("filterVO")FilterVO filterVO);
+    List<Map<String, String>> getDoctorAdviceNum(@Param("filterVO") FilterVO filterVO);
 }

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

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.MedBehospitalType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author songxl
+ * @since 2021-05-11
+ */
+public interface MedBehospitalTypeMapper extends BaseMapper<MedBehospitalType> {
+
+}

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

@@ -1,7 +1,20 @@
 package com.diagbot.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.CheckJobDTO;
+import com.diagbot.dto.CheckUserDTO;
+import com.diagbot.dto.CheckWorkDTO;
+import com.diagbot.dto.CheckedRecordListDTO;
+import com.diagbot.dto.DeptCheckUserDTO;
 import com.diagbot.entity.MedCheckInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.CheckJobPageVO;
+import com.diagbot.vo.CheckJobVO;
+import com.diagbot.vo.CheckUserVO;
+import com.diagbot.vo.CheckWorkPageVO;
+import com.diagbot.vo.CheckedRecordListVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +25,18 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2020-07-06
  */
 public interface MedCheckInfoMapper extends BaseMapper<MedCheckInfo> {
+    //获取未分配的核查任务
+    IPage<CheckJobDTO> getCheckList(CheckJobPageVO checkJobVO);
+    //通过核查人员id获取核查人员的核查任务数
+    List<DeptCheckUserDTO> getJobNumByUserId(CheckUserVO checkUserVO);
+    //核查任务列表
+    IPage<CheckWorkDTO> getCheckWorkPage(CheckWorkPageVO checkWorkPageVO);
+    //获取指定核查人员的核查任务
+    List<CheckJobDTO> getCheckListByUserId(CheckJobVO checkJobVO);
+    //取消核查任务
+    int deleteBatchCodes(List<String> list);
 
+    IPage<CheckedRecordListDTO> checkedRecordList(CheckedRecordListVO checkedRecordListVO);
+    //获取核查人员用户科室、姓名、角色
+    List<CheckUserDTO> getCheckUser(CheckUserVO checkUserVOS);
 }

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

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.MedIndexRelevance;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2021-04-30
+ */
+public interface MedIndexRelevanceMapper extends BaseMapper<MedIndexRelevance> {
+
+}

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

@@ -0,0 +1,27 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.MedIndexResult;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.FilterVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author cy
+ * @since 2021-04-26
+ */
+public interface MedIndexResultMapper extends BaseMapper<MedIndexResult> {
+
+    /**
+     * 指标分母人数
+     * @param filterVO
+     * @return
+     */
+    public Map<String, Double> medicalRecordIndicator(@Param("filterVO") FilterVO filterVO);
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.MedManagementInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 病案管理人员统计表 Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-04-13
+ */
+public interface MedManagementInfoMapper extends BaseMapper<MedManagementInfo> {
+
+}

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

@@ -17,6 +17,5 @@ import java.util.List;
  */
 public interface MedPacsResultMapper extends BaseMapper<MedPacsResult> {
     public List<MedPacsResultDTO> getMedPacsResults(BehospitalInfo behospitalInfo);
-
     void updateBatchByKey(List<MedPacsResult> list);
 }

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

@@ -0,0 +1,17 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.MedQcresultDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 质控评分明细信息
+每次评分增加一条信息，前面所有评分is_deleted全部设置为Y Mapper 接口
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2021-03-26
+ */
+public interface MedQcresultDetailMapper extends BaseMapper<MedQcresultDetail> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.MedQcresultInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 质控评分主表信息
+每次评分增加一条信息，前面所有评分is_deleted全部设置为Y Mapper 接口
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2021-03-26
+ */
+public interface MedQcresultInfoMapper extends BaseMapper<MedQcresultInfo> {
+
+}

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

@@ -1,10 +1,12 @@
 package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.dto.MedicalRecordDTO;
 import com.diagbot.dto.RecordContentDTO;
 import com.diagbot.entity.MedicalRecord;
 import com.diagbot.vo.RecordContentVO;
 import com.diagbot.vo.RecordDataVO;
+import com.diagbot.vo.RecordTypeVO;
 
 import java.util.List;
 
@@ -22,4 +24,7 @@ public interface MedicalRecordMapper extends BaseMapper<MedicalRecord> {
     public List<RecordContentDTO> getRecordData(RecordDataVO recordContentVO);
 
     public void updateBatchByKey(List<MedicalRecord> list);
+    public int getRecordCount(RecordTypeVO recordContentVO);
+
+    List<MedicalRecordDTO> getMedicalRecord(RecordTypeVO recordContentVO);
 }

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

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.QcCasesRelevanceEntry;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 质控关联条目表 Mapper 接口
+ * </p>
+ *
+ * @author cy
+ * @since 2021-04-16
+ */
+public interface QcCasesRelevanceEntryMapper extends BaseMapper<QcCasesRelevanceEntry> {
+
+}

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

@@ -4,10 +4,13 @@ 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>
@@ -81,6 +84,32 @@ 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);
+
+    /**
+     * 病案管理规则质控病历参数查询
+     *
+     * @param filterVO
+     * @return
+     */
+    public List<MedManageParamsDTO> getMedManageParams( FilterVO filterVO);
+
+
+
 
     /**
      * 出院总人数统计-科室-首页
@@ -627,4 +656,33 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      */
     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/DoctorAdviceService.java

@@ -5,6 +5,10 @@ import com.diagbot.dto.DoctorAdviceDTO;
 import com.diagbot.entity.DoctorAdvice;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.vo.DoctorAdviceVO;
+import com.diagbot.vo.FilterVO;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,4 +21,10 @@ import com.diagbot.vo.DoctorAdviceVO;
 public interface DoctorAdviceService extends IService<DoctorAdvice> {
 
     IPage<DoctorAdviceDTO> getPage(DoctorAdviceVO doctorAdviceVO);
+
+
+
+    List<Map<String, String>> getDoctorAdviceNum(FilterVO filterVO);
+
+
 }

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.MedBehospitalType;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author songxl
+ * @since 2021-05-11
+ */
+public interface MedBehospitalTypeService extends IService<MedBehospitalType> {
+
+}

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

@@ -1,7 +1,15 @@
 package com.diagbot.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.CheckJobDTO;
+import com.diagbot.dto.DeptCheckUserDTO;
 import com.diagbot.entity.MedCheckInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.vo.CheckJobPageVO;
+import com.diagbot.vo.CheckJobVO;
+import com.diagbot.vo.CheckUserVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +20,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2020-07-06
  */
 public interface MedCheckInfoService extends IService<MedCheckInfo> {
-
+    public IPage<CheckJobDTO> getCheckList(CheckJobPageVO checkJobVO);
 }

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.MedIndexRelevance;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2021-04-30
+ */
+public interface MedIndexRelevanceService extends IService<MedIndexRelevance> {
+
+}

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

@@ -0,0 +1,26 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.MedIndexResult;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.vo.FilterVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author cy
+ * @since 2021-04-26
+ */
+public interface MedIndexResultService extends IService<MedIndexResult> {
+    /**
+     * 指标分母人数
+     * @param filterVO
+     * @return
+     */
+    public Map<String, Double> medicalRecordIndicator(@Param("filterVO") FilterVO filterVO);
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.MedManagementInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 病案管理人员统计表 服务类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-04-13
+ */
+public interface MedManagementInfoService extends IService<MedManagementInfo> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.MedQcresultDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 质控评分明细信息
+每次评分增加一条信息，前面所有评分is_deleted全部设置为Y 服务类
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2021-03-26
+ */
+public interface MedQcresultDetailService extends IService<MedQcresultDetail> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.MedQcresultInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 质控评分主表信息
+每次评分增加一条信息，前面所有评分is_deleted全部设置为Y 服务类
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2021-03-26
+ */
+public interface MedQcresultInfoService extends IService<MedQcresultInfo> {
+
+}

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

@@ -1,10 +1,12 @@
 package com.diagbot.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.MedicalRecordDTO;
 import com.diagbot.dto.RecordContentDTO;
 import com.diagbot.entity.MedicalRecord;
 import com.diagbot.vo.RecordContentVO;
 import com.diagbot.vo.RecordDataVO;
+import com.diagbot.vo.RecordTypeVO;
 
 import java.util.List;
 
@@ -20,4 +22,7 @@ public interface MedicalRecordService extends IService<MedicalRecord> {
 
     public List<RecordContentDTO> getRecordContent(RecordContentVO recordContentVO);
     public List<RecordContentDTO> getRecordData(RecordDataVO recordContentVO);
+    public int getRecordCount(RecordTypeVO recordContentVO);
+
+    public List<MedicalRecordDTO> getMedicalRecord(RecordTypeVO recordContentVO);
 }

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.QcCasesRelevanceEntry;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 质控关联条目表 服务类
+ * </p>
+ *
+ * @author cy
+ * @since 2021-04-16
+ */
+public interface QcCasesRelevanceEntryService extends IService<QcCasesRelevanceEntry> {
+
+}

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

@@ -4,12 +4,16 @@ 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.*;
 
 /**
@@ -1013,6 +1017,40 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
     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);
+    }
+
+    /**
+     * 病案管理规则质控病历参数查询
+     *
+     * @param filterVO
+     * @return
+     */
+    @Override
+    public  List<MedManageParamsDTO> getMedManageParams( FilterVO filterVO) {
+        return baseMapper.getMedManageParams(filterVO);
+    }
+
     /**
      * 质控核查质控评分页（内页）
      *
@@ -1056,4 +1094,42 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
     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/DoctorAdviceServiceImpl.java

@@ -7,11 +7,13 @@ import com.diagbot.mapper.DoctorAdviceMapper;
 import com.diagbot.service.DoctorAdviceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.vo.DoctorAdviceVO;
+import com.diagbot.vo.FilterVO;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -57,4 +59,11 @@ public class DoctorAdviceServiceImpl extends ServiceImpl<DoctorAdviceMapper, Doc
         return page;
     }
 
+
+    /**
+     * 获取医嘱
+     */
+    public List<Map<String, String>> getDoctorAdviceNum(FilterVO filterVO){
+        return baseMapper.getDoctorAdviceNum(filterVO);
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.MedBehospitalType;
+import com.diagbot.mapper.MedBehospitalTypeMapper;
+import com.diagbot.service.MedBehospitalTypeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author songxl
+ * @since 2021-05-11
+ */
+@Service
+public class MedBehospitalTypeServiceImpl extends ServiceImpl<MedBehospitalTypeMapper, MedBehospitalType> implements MedBehospitalTypeService {
+
+}

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

@@ -1,11 +1,19 @@
 package com.diagbot.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.CheckJobDTO;
+import com.diagbot.dto.CheckWorkDTO;
 import com.diagbot.entity.MedCheckInfo;
 import com.diagbot.mapper.MedCheckInfoMapper;
 import com.diagbot.service.MedCheckInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.CheckJobPageVO;
+import com.diagbot.vo.CheckJobVO;
+import com.diagbot.vo.CheckWorkPageVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 核查表 服务实现类
@@ -17,4 +25,15 @@ import org.springframework.stereotype.Service;
 @Service
 public class MedCheckInfoServiceImpl extends ServiceImpl<MedCheckInfoMapper, MedCheckInfo> implements MedCheckInfoService {
 
+    public IPage<CheckWorkDTO> getCheckWorkPage(CheckWorkPageVO checkWorkPageVO) {
+        return baseMapper.getCheckWorkPage(checkWorkPageVO);
+    }
+
+    public int deleteBatchCodes(List<String> list){
+        return baseMapper.deleteBatchCodes(list);
+    }
+    @Override
+    public IPage<CheckJobDTO> getCheckList(CheckJobPageVO checkJobVO) {
+        return baseMapper.getCheckList(checkJobVO);
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.MedIndexRelevance;
+import com.diagbot.mapper.MedIndexRelevanceMapper;
+import com.diagbot.service.MedIndexRelevanceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2021-04-30
+ */
+@Service
+public class MedIndexRelevanceServiceImpl extends ServiceImpl<MedIndexRelevanceMapper, MedIndexRelevance> implements MedIndexRelevanceService {
+
+}

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

@@ -0,0 +1,32 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.MedIndexResult;
+import com.diagbot.mapper.MedIndexResultMapper;
+import com.diagbot.service.MedIndexResultService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.FilterVO;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author cy
+ * @since 2021-04-26
+ */
+@Service
+public class MedIndexResultServiceImpl extends ServiceImpl<MedIndexResultMapper, MedIndexResult> implements MedIndexResultService {
+    /**
+     * 各指标分母
+     * @param filterVO
+     * @return
+     */
+    public Map<String, Double> medicalRecordIndicator(@Param("filterVO") FilterVO filterVO){
+        return baseMapper.medicalRecordIndicator(filterVO);
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.MedManagementInfo;
+import com.diagbot.mapper.MedManagementInfoMapper;
+import com.diagbot.service.MedManagementInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 病案管理人员统计表 服务实现类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-04-13
+ */
+@Service
+public class MedManagementInfoServiceImpl extends ServiceImpl<MedManagementInfoMapper, MedManagementInfo> implements MedManagementInfoService {
+
+}

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

@@ -0,0 +1,21 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.MedQcresultDetail;
+import com.diagbot.mapper.MedQcresultDetailMapper;
+import com.diagbot.service.MedQcresultDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 质控评分明细信息
+每次评分增加一条信息，前面所有评分is_deleted全部设置为Y 服务实现类
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2021-03-26
+ */
+@Service
+public class MedQcresultDetailServiceImpl extends ServiceImpl<MedQcresultDetailMapper, MedQcresultDetail> implements MedQcresultDetailService {
+
+}

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

@@ -0,0 +1,21 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.MedQcresultInfo;
+import com.diagbot.mapper.MedQcresultInfoMapper;
+import com.diagbot.service.MedQcresultInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 质控评分主表信息
+每次评分增加一条信息，前面所有评分is_deleted全部设置为Y 服务实现类
+ * </p>
+ *
+ * @author zhanghang
+ * @since 2021-03-26
+ */
+@Service
+public class MedQcresultInfoServiceImpl extends ServiceImpl<MedQcresultInfoMapper, MedQcresultInfo> implements MedQcresultInfoService {
+
+}

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

@@ -1,5 +1,6 @@
 package com.diagbot.service.impl;
 
+import com.diagbot.dto.MedicalRecordDTO;
 import com.diagbot.dto.RecordContentDTO;
 import com.diagbot.entity.MedicalRecord;
 import com.diagbot.mapper.MedicalRecordMapper;
@@ -7,6 +8,7 @@ import com.diagbot.service.MedicalRecordService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.vo.RecordContentVO;
 import com.diagbot.vo.RecordDataVO;
+import com.diagbot.vo.RecordTypeVO;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -31,6 +33,16 @@ public class MedicalRecordServiceImpl extends ServiceImpl<MedicalRecordMapper, M
         return baseMapper.getRecordData(recordContentVO);
     }
 
+    @Override
+    public int getRecordCount(RecordTypeVO recordContentVO) {
+        return baseMapper.getRecordCount(recordContentVO);
+    }
+
+    @Override
+    public List<MedicalRecordDTO> getMedicalRecord(RecordTypeVO recordContentVO) {
+        return baseMapper.getMedicalRecord(recordContentVO);
+    }
+
     /**
      * 根据文书编码、医院编码、病人住院编码
      * @param list

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

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.QcCasesRelevanceEntry;
+import com.diagbot.mapper.QcCasesRelevanceEntryMapper;
+import com.diagbot.service.QcCasesRelevanceEntryService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 质控关联条目表 服务实现类
+ * </p>
+ *
+ * @author cy
+ * @since 2021-04-16
+ */
+@Service
+public class QcCasesRelevanceEntryServiceImpl extends ServiceImpl<QcCasesRelevanceEntryMapper, QcCasesRelevanceEntry> implements QcCasesRelevanceEntryService {
+
+}

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

@@ -0,0 +1,71 @@
+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.BehospitalInfoFacade;
+import com.diagbot.facade.MedCheckWorkFacade;
+import com.diagbot.facade.SysTaskCronFacade;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.TaskVO;
+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.time.LocalDateTime;
+import java.util.Date;
+
+@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+@EnableScheduling   // 2.开启定时任务(每隔半小时检查今天患者，然后修改今天的患者的类型）
+@Slf4j
+public class BehospitalInfoTypeTask implements SchedulingConfigurer{
+    @Autowired
+    private SysTaskCronFacade sysTaskCronFacade;
+
+    private SysTaskCron task001 = new SysTaskCron();
+
+    private String param = "";
+
+    //添加核查任务
+    @Autowired
+    private MedCheckWorkFacade medCheckWorkFacade;
+    /**
+     * 执行定时任务.
+     */
+    @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());
+                    medCheckWorkFacade.execute(param);
+                }
+            }
+        }, new Trigger() {
+            @Override
+            public Date nextExecutionTime(TriggerContext triggerContext) {
+                //2.1 从数据库获取执行周期
+                task001 = sysTaskCronFacade.getOne(new QueryWrapper<SysTaskCron>()
+                        .eq("cron_code", "TASK019"), false);
+                String cron = "0 0/30 * * * ?";
+                //2.2 合法性校验.
+                if (null != task001 && StringUtil.isNotBlank(task001.getCron())) {
+                    cron = task001.getCron();
+                    param = task001.getParam();
+                }
+                CronTrigger trigger = new CronTrigger(cron);
+                return trigger.nextExecutionTime(triggerContext);
+            }
+        });
+    }
+}

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

@@ -0,0 +1,76 @@
+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();
+                    IndexTimeVO.setHospitalId(task001.getParam());
+                    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/util/ExcelUtils.java

@@ -115,7 +115,7 @@ public class ExcelUtils {
 
     private static void userExport2(List<?> list, Class<?> pojoClass, String fileName, HttpServletResponse response,
                                     ExportParams exportParams, float height, Boolean havTitle) {
-        if(exportParams.getTitle().equals("病历质控报表")){
+        if(StringUtils.isNotEmpty(exportParams.getTitle()) && exportParams.getTitle().equals("病历质控报表")){
             exportParams.setTitleHeight(Short.valueOf("20"));
         };
         Workbook workbook = ExcelExportUtil.exportExcel(exportParams, pojoClass, list);

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

@@ -15,7 +15,7 @@ public class BasDeptInfoVO {
     /**
      * 搜索参数
      */
-    private String inputStr;
+    private String inputStr = "";
 
     @ApiModelProperty(hidden = true)
     private Long hospitalId;

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

@@ -0,0 +1,51 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @description: 分配任务入参对象-分页
+ * @author: songxl
+ * @time: 2021/05/17
+ */
+@Data
+public class CheckJobPageVO extends Page implements Serializable {
+    private static final long serialVersionUID = 1L;
+    //生成任务开始时间
+    @ApiModelProperty("生成任务开始时间，格式为：yyyy-MM-dd")
+    private String startTime;
+    //生成任务结束时间
+    @ApiModelProperty("生成任务结束时间，格式为：yyyy-MM-dd")
+    private String endTime;
+    //出院开始时间
+    @ApiModelProperty("出院开始时间，格式为：yyyy-MM-dd")
+    private String behosDateStart;
+    //出院结束时间
+    @ApiModelProperty("出院结束时间，格式为：yyyy-MM-dd")
+    private String behosDateEnd;
+    //任务类型
+    @ApiModelProperty("任务类型 0-科室任务 1-院级 2-质控科")
+    private String jobType;
+    //核查用户id
+    @ApiModelProperty("核查用户id")
+    private String checkId;
+    //病人姓名
+    @ApiModelProperty("病人姓名")
+    private String name;
+    //病人住院序号
+    @ApiModelProperty("病人住院序号")
+    private String behospitalCode;
+    //主诊断医生
+    @ApiModelProperty("主诊断医生")
+    private String doctorName;
+    //科室id集合
+    @ApiModelProperty(hidden = true)
+    private List<String> deptList;
+
+
+
+}

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

@@ -0,0 +1,51 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @description: 分配任务入参对象
+ * @author: songxl
+ * @time: 2021/05/17
+ */
+@Data
+public class CheckJobVO {
+    //生成任务开始时间
+    @ApiModelProperty("生成任务开始时间，格式为：yyyy-MM-dd")
+    private String startTime;
+    //生成任务结束时间
+    @ApiModelProperty("生成任务结束时间，格式为：yyyy-MM-dd")
+    private String endTime;
+    //出院开始时间
+    @ApiModelProperty("出院开始时间，格式为：yyyy-MM-dd")
+    private String behosDateStart;
+    //出院结束时间
+    @ApiModelProperty("出院结束时间，格式为：yyyy-MM-dd")
+    private String behosDateEnd;
+    //核查用户id
+    @ApiModelProperty("核查用户id")
+    private String checkId;
+    //任务类型
+    @ApiModelProperty(hidden = true)
+    private String jobType;
+    //病人姓名
+    @ApiModelProperty(hidden = true)
+    private String name;
+    //病人住院序号
+    @ApiModelProperty(hidden = true)
+    private String behospitalCode;
+    //主诊断医生
+    @ApiModelProperty(hidden = true)
+    private String doctorName;
+    //科室id集合
+    @ApiModelProperty(hidden = true)
+    private List<String> deptList;
+
+
+
+}

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

@@ -0,0 +1,31 @@
+package com.diagbot.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: zhoutg
+ * @time: 2020/4/13 18:31
+ */
+@Data
+public class CheckUserVO {
+    //任务类型
+    private Integer jobType;
+    //核查用户id集合
+    private List<String> userList;
+    //用户角色集合
+    private List<Long> roleIds;
+    //用户科室集合
+    private List<String> deptIds;
+    //医院
+    private Long hospitalId;
+    //科室类型集合
+    private List<String> deptStations;
+    //角色id
+    private  Long roleId;
+    //用户id
+    private  Long userId;
+
+}

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

@@ -0,0 +1,108 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 核查患者病历信息
+ * </p>
+ *
+ * @author wangsy
+ * @since 2021-05-13
+ */
+@Data
+public class CheckWorkPageVO extends Page implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 出院开始时间
+     */
+    @ApiModelProperty("出院开始时间")
+    private Date startDate;
+
+    /**
+     * 出院结束时间
+     */
+    @ApiModelProperty("出院结束时间")
+    private Date endDate;
+
+    /**
+     * 生成状态[0-未生成 1-已生成（默认未生成）]
+     */
+    @ApiModelProperty("生成状态[0-未生成 1-已生成（默认未生成）]")
+    private String creatStatus="0";
+
+    /**
+     * 核查任务类型(0-科室任务 1-院级 1-质控科)
+     */
+    private String jobType;
+
+    /**
+     * 医院ID
+     */
+
+    @ApiModelProperty(hidden = true)
+    private Long hospitalId;
+
+    /**
+     * 病人住院序号
+     */
+    @ApiModelProperty("病人住院序号")
+    private String behospitalCode;
+
+    /**
+     * 科室编号集合
+     */
+    @ApiModelProperty("科室编号集合")
+    private List<String> departments;
+
+    /**
+     * 病历等级
+     */
+    @ApiModelProperty("病历等级")
+    private String level;
+
+    /**
+     * 病人姓名
+     */
+    @ApiModelProperty("病人姓名")
+    private String name;
+
+    /**
+     * 医生姓名
+     */
+    @ApiModelProperty("医生姓名")
+    private String doctorName;
+
+    /**
+     * 主诊断
+     */
+    @ApiModelProperty("主诊断")
+    private String diagnose;
+
+    /**
+     * 最小天数
+     */
+    @ApiModelProperty("最小天数")
+    private Integer smallDay;
+
+    /**
+     * 最大天数
+     */
+    @ApiModelProperty("最大天数")
+    private Integer bigDay;
+
+    /**
+     * 是否归档（0：未归档，1：已归档）
+     */
+    @ApiModelProperty("是否归档（0：未归档，1：已归档）")
+    private String isPlacefile = "1";
+
+}

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

@@ -0,0 +1,104 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2021/5/17 18:48
+ */
+@Getter
+@Setter
+@ApiModel("核查任务列表-获取核查任务列表-接口入参")
+public class CheckedRecordListVO extends Page implements Serializable {
+
+    /**
+     * 病历核查状态
+     */
+    @ApiModelProperty("病历核查状态，0-未核查，1-已核查")
+    private Integer status;
+
+    /**
+     * 任务类型
+     */
+    @ApiModelProperty("任务类型，0-科室任务 1-院级 2-质控科")
+    private List<String> checkJobTypes;
+
+    /**
+     * 科室
+     */
+    @ApiModelProperty("科室")
+    private String behDeptId;
+
+    /**
+     * 病人姓名
+     */
+    @ApiModelProperty("病人姓名")
+    private String name;
+
+    /**
+     * 病人住院序号
+     */
+    @ApiModelProperty("病人住院序号")
+    private String behospitalCode;
+
+    /**
+     * 医生姓名
+     */
+    @ApiModelProperty("医生姓名")
+    private String doctorName;
+
+    /**
+     * 分配日期起始日期
+     */
+    @ApiModelProperty("分配日期起始日期，格式为：2018-11-28")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date jobDistributionTimeStart;
+
+    /**
+     * 分配日期终止日期
+     */
+    @ApiModelProperty("分配日期终止日期，格式为：2018-11-28")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date jobDistributionTimeEnd;
+
+    /**
+     * 核查员
+     */
+    @ApiModelProperty("核查员")
+    private String checkName;
+
+    /**
+     * 病历等级
+     */
+    @ApiModelProperty("病历等级")
+    private String level;
+
+    /**
+     * 当前用户归属科室Id集合，多个科室用英文逗号隔开
+     */
+    @ApiModelProperty(hidden = true)
+    private String currentDeptIds;
+
+    /**
+     * 当前用户下级普通质控员Id集合
+     */
+    @ApiModelProperty(hidden = true)
+    private List<Long> currentGeneralUserIds;
+
+    /**
+     * 当前用户归属医院Id
+     */
+    @ApiModelProperty(hidden = true)
+    private long hospitalId;
+
+}

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

@@ -0,0 +1,36 @@
+package com.diagbot.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description: 分配核查任务入参对象
+ * @author: songxl
+ * @time: 2021/05/17
+ */
+@Data
+public class DistributionJobVO {
+    //病人住院序号集合
+    @ApiModelProperty("病人住院序号集合")
+    private List<String> behospitalCodes;
+    //医院id
+    @ApiModelProperty(hidden = true)
+    private String hospitalId;
+    //分配用户id
+    @ApiModelProperty(hidden = true)
+    private String jobDistributor;
+    //核查用户id
+    @ApiModelProperty("核查用户id")
+    private String checkId;
+    //核查用户姓名
+    @ApiModelProperty("核查用户姓名")
+    private String checkName;
+    //操作类型 分配或取消 0-分配，1-取消分配
+    @ApiModelProperty("操作类型 分配或取消 0-分配，1-取消分配")
+    private String distributionType;
+
+
+
+}

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

@@ -67,4 +67,14 @@ public class FilterVO {
      * 是否归档（0：未归档，1：已归档）
      */
     private String isPlacefile = "1";
+
+    /**
+     * 辅助标识
+     */
+    private String flagStr = "0";
+
+    /**
+     * 指标名称
+     */
+    private String indexName = "";
 }

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

@@ -0,0 +1,38 @@
+package com.diagbot.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2020/4/15 16:04
+ */
+@Getter
+@Setter
+public class IndexTimeVO {
+
+    /**
+     * 起始时间
+     */
+    @NotBlank(message = "请输入起始时间")
+    private String startDate;
+    /**
+     * 结束时间
+     */
+    @NotBlank(message = "请输入结束时间")
+    private String endDate;
+
+    /**
+     * 医院id
+     */
+    @ApiModelProperty(hidden = true)
+    private String hospitalId;
+
+    @ApiModelProperty(hidden = true)
+    private Long userId;
+
+}

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

@@ -0,0 +1,34 @@
+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
+ * @since 2021-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;          // 核查类型 0病历，1病案首页,2全部 默认
+}

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

@@ -0,0 +1,80 @@
+package com.diagbot.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2020/4/15 16:04
+ */
+@Getter
+@Setter
+public class MedIndexFilterVO {
+    /**
+     * 统计维度 1-本月，2-本年
+     */
+    //@NotNull(message = "请输入本年或本月")
+    private Integer type;
+    /**
+     * 起始时间
+     */
+    @NotBlank(message = "请输入起始时间")
+    private String startDate;
+    /**
+     * 结束时间
+     */
+    @NotBlank(message = "请输入结束时间")
+    private String endDate;
+
+    /**
+     * 开始时间转化当月的第一天
+     */
+    @ApiModelProperty(hidden = true)
+    private String lastStartDate;
+    /**
+     * 结束时间转化当月的最后天
+     */
+    @ApiModelProperty(hidden = true)
+    private String lastEndDate;
+
+    /**
+     * 医院id
+     */
+    @ApiModelProperty(hidden = true)
+    private String hospitalId;
+    /**
+     * 限制条数
+     */
+    @ApiModelProperty(hidden = true)
+    private Integer limitCount = 10;
+
+    @ApiModelProperty(hidden = true)
+    private Long userId;
+
+    /**
+     * 科室分类
+     */
+    private String deptClass;
+    //科室名称
+    private String deptName;
+
+    private String level;
+    /**
+     * 是否归档（0：未归档，1：已归档）
+     */
+    private String isPlacefile = "1";
+
+    /**
+     * 辅助标识
+     */
+    private String flagStr = "0";
+
+    /**
+     * 指标名称
+     */
+    private String indexName = "";
+}

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

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -29,6 +30,9 @@ public class QcResultAlgVO {
     private String code;
     //质控返回info
     private String info;
+    //质控条目说明
+    @ApiModelProperty(hidden = true)
+    private String explainInfo;
     //单项否决（1-单项否决 0-非）
     private Integer isReject;
 }

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

@@ -0,0 +1,24 @@
+package com.diagbot.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2021/5/18 20:15
+ */
+@Getter
+@Setter
+@ApiModel("核查任务列表-病历核查-接口入参")
+public class RecordCheckVO {
+
+    /**
+     * 病人住院序号
+     */
+    @ApiModelProperty("病人住院序号")
+    private String behospitalCode;
+
+}

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

@@ -0,0 +1,24 @@
+package com.diagbot.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: zhoutg
+ * @time: 2020/4/13 18:31
+ */
+@Data
+public class RecordTypeVO {
+
+    private String behospitalCode; // 病历id
+    private Long hospitalId; //医院ID
+    private Long start; //开始
+    private Long end; //结束
+    private List<String> modeList;//所属模块
+    private Long isPlacefile;//是否归档
+    private String startTime;//筛选开始时间
+    private String endTime;//结束时间
+
+}

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

@@ -2,22 +2,11 @@ package com.diagbot.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.AnalyzeDTO;
-import com.diagbot.dto.AnalyzeRunDTO;
-import com.diagbot.dto.BehospitalInfoDTO;
-import com.diagbot.dto.OutputInfo;
-import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.*;
+import com.diagbot.entity.QcCasesRelevanceEntry;
 import com.diagbot.facade.BehospitalInfoFacade;
 import com.diagbot.facade.QcresultInfoFacade;
-import com.diagbot.vo.AnalyzeApiVO;
-import com.diagbot.vo.AnalyzeCdsVO;
-import com.diagbot.vo.AnalyzeRunVO;
-import com.diagbot.vo.AnalyzeVO;
-import com.diagbot.vo.BehospitalPageVO;
-import com.diagbot.vo.ExportQcresultVO;
-import com.diagbot.vo.GetDetailVO;
-import com.diagbot.vo.QcresultVO;
-import com.diagbot.vo.TaskVO;
+import com.diagbot.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +19,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -79,6 +69,16 @@ public class BehospitalInfoController {
         return RespDTO.onSuc(data);
     }
 
+
+    @ApiOperation(value = "质量控制指标title获取[by:cy]",
+            notes = "")
+    @PostMapping("/getMedQualityCoList")
+    @SysLogger("getMedQualityCoList")
+    public RespDTO<List<ColumnDTO>> getMedQualityControl(@RequestBody BasDeptInfoVO basDeptInfoVO) {
+        List<ColumnDTO> data = behospitalInfoFacade.getMedQualityControl(basDeptInfoVO);
+        return  RespDTO.onSuc(data);
+    }
+
     @ApiOperation(value = "评分[by:zhoutg]",
             notes = "")
     @PostMapping("/analyze")
@@ -148,6 +148,17 @@ public class BehospitalInfoController {
         return RespDTO.onSuc(qcresultInfoFacade.changeQcResult(qcresultVO));
     }
 
+    @ApiOperation(value = "逻辑删除质控条目[by:songxl]",
+            notes = "behospitalCode：病历号，必填<br>" +
+                    "id：明细id，必填<br>")
+    @PostMapping("/logicDelCase")
+    @SysLogger("logicDelCase")
+    @Transactional
+    public RespDTO<AnalyzeDTO> logicDelCase(@RequestBody QcresultVO qcresultVO) {
+        qcresultVO.setType(4);
+        return RespDTO.onSuc(qcresultInfoFacade.changeQcResult(qcresultVO));
+    }
+
     @ApiOperation(value = "修改质控条目[by:zhoutg]",
             notes = "")
     @PostMapping("/updCase")

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

@@ -3,6 +3,7 @@ package com.diagbot.web;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.*;
+import com.diagbot.entity.FilterRecordVO;
 import com.diagbot.facade.ConsoleFacade;
 import com.diagbot.vo.*;
 import io.swagger.annotations.Api;
@@ -160,6 +161,37 @@ 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);
+    }
+
     /**
      * 质控病历统计
      *
@@ -432,7 +464,7 @@ public class ConsoleController {
     @ApiOperation(value = "病案首页合格率占比[by:zhaops]",
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>" +
                     "level： 病历等级 <br>" +
-                    "name： 科室名称 <br>" +
+                    "deptName： 科室名称 <br>" +
                     "asc： 排序（升序） <br>" +
                     "desc： 排序（降序） <br>" +
                     "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
@@ -827,4 +859,5 @@ public class ConsoleController {
     public RespDTO<List<ColumnDTO>> getMedicalCheckTitle() {
         return RespDTO.onSuc(consoleFacade.getMedicalCheckTitle());
     }
+
 }

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

@@ -1,9 +1,16 @@
 package com.diagbot.web;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.CheckDeptDTO;
+import com.diagbot.dto.CheckJobDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.MedCheckInfoFacade;
+import com.diagbot.facade.MedCheckWorkFacade;
+import com.diagbot.vo.CheckJobPageVO;
+import com.diagbot.vo.CheckJobVO;
+import com.diagbot.vo.DistributionJobVO;
 import com.diagbot.vo.MedCheckInfoAddVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -12,6 +19,10 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,14 +40,71 @@ public class MedCheckInfoController {
 
     @Autowired
     MedCheckInfoFacade medCheckInfoFacade;
+    @Autowired
+    MedCheckWorkFacade medCheckWorkFacade;
 
     @ApiOperation(value = "核查数据接口[by:wangfeng]",
             notes = "核查数据接口")
     @PostMapping("/addMedCheckInfo")
     @SysLogger("addMedCheckInfo")
+    @ApiIgnore
     public RespDTO<Boolean> addMedCheckInfo(@RequestBody MedCheckInfoAddVO medCheckInfoAddVO) {
         Boolean res = medCheckInfoFacade.addMedCheckInfos(medCheckInfoAddVO);
         return RespDTO.onSuc(res);
     }
 
+
+
+    @ApiOperation(value = "分配核查任务--获取核查人员列表[by:songxl]",
+            notes = "获取核查人员列表")
+    @PostMapping("/getCheckUserMap")
+    @SysLogger("getCheckUserMap")
+    public RespDTO<Map<String, List<CheckDeptDTO>>> getCheckUserMap() {
+        Map<String, List<CheckDeptDTO>> userInfoMap = medCheckInfoFacade.getCheckUserMap();
+        return RespDTO.onSuc(userInfoMap);
+    }
+
+
+    @ApiOperation(value = "分配核查任务--获取待分配核查任务列表[by:songxl]",
+            notes = "startTime：任务生成开始时间 必填<br>" +
+                    "endTime：  任务生成结束时间 必填<br>" +
+                    "或<br>" +
+                    "behosDateStart：  出院开始时间 必填<br>" +
+                    "behosDateEnd：  出院结束时间 必填<br>" +
+                    "jobType：核查任务类型 必填 0-科室任务 1-院级 2-质控科<br>" )
+    @PostMapping("/getCheckList")
+    @SysLogger("getCheckList")
+    public RespDTO<IPage<CheckJobDTO>> getCheckList(@RequestBody CheckJobPageVO checkJobPageVO) {
+        IPage<CheckJobDTO> userInfos = medCheckInfoFacade.getUserCheckList(checkJobPageVO);
+        return RespDTO.onSuc(userInfos);
+    }
+
+    @ApiOperation(value = "分配核查任务--分配/取消核查任务[by:songxl]",
+            notes = "behospitalCodes：病人住院序号集合 必填<br>" +
+                    "checkId：  核查用户id 必填<br>" +
+                    "checkName：  核查用户姓名 必填<br>" +
+                    "distributionType：操作类型 必填 分配或取消 0-分配，1-取消分配<br>")
+    @PostMapping("/updateDistributionCheck")
+    @SysLogger("updateDistributionCheck")
+    public RespDTO<Boolean> distributionJobs(@RequestBody DistributionJobVO distributionJobVO) {
+        return RespDTO.onSuc(medCheckInfoFacade.distributionJobs(distributionJobVO));
+    }
+
+
+    @ApiOperation(value = "分配核查任务--获取指定核查人员的核查任务[by:songxl]",
+            notes = "checkId：核查用户id")
+    @PostMapping("/getCheckListByUserId")
+    @SysLogger("getCheckListByUserId")
+    public RespDTO<List<CheckJobDTO>> getCheckListByUserId(@RequestBody CheckJobVO checkJobVO) {
+        List<CheckJobDTO> userInfos = medCheckInfoFacade.getCheckListByUserId(checkJobVO);
+        return RespDTO.onSuc(userInfos);
+    }
+
+    @ApiOperation(value = "质控核查--生成患者病历类型[by:songxl]",
+            notes = "生成患者病历类型")
+    @PostMapping("/createMedBeHospitalInfoType")
+    @SysLogger("createMedBeHospitalInfoType")
+    public RespDTO<Boolean> getCheckListByUserId() {
+        return RespDTO.onSuc(medCheckWorkFacade.getCheckListByUserId());
+    }
 }

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

@@ -0,0 +1,67 @@
+package com.diagbot.web;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.CheckWorkDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.MedCheckWorkFacade;
+import com.diagbot.vo.CheckWorkPageVO;
+import com.diagbot.vo.MedCheckWorkAddVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * @author songxl
+ * @since 2021-05-11
+ */
+@RestController
+@RequestMapping("/qc/medCheckWork")
+@Api(value = "生成核查任务--相关接口API", tags = { "生成核查任务--相关接口API" })
+public class MedCheckWorkController {
+    @Autowired
+    MedCheckWorkFacade medCheckworkFacade;
+
+    @ApiOperation(value = "生成/取消核查任务[by:wangsy]",
+            notes = "生成/取消核查任务 <br>" +
+            "behospitalCodeList：病历id(List) 【必填】<br>" +
+            "jobType：核查任务类型(0-科室任务 1-院级 1-质控科) 【必填】<br>" +
+            "checkStatus：操作类型(0-取消，1-添加) 【必填】<br>" +
+            "createTime: 操作时间<br>" +
+            "checkType：核查类型(0病历，1病案首页,2全部 默认)<br>")
+    @PostMapping("/addCheckWork")
+    @SysLogger("addCheckWork")
+    public RespDTO<Boolean> addCheckTask(@RequestBody MedCheckWorkAddVO medCheckWorkVO) {
+        Boolean res = medCheckworkFacade.addCheckWork(medCheckWorkVO);
+        return RespDTO.onSuc(res);
+    }
+
+    @ApiOperation(value = "获取患者病历列表[by:wangsy]",
+            notes = "startDate：出院开始时间 【必填】<br>" +
+                    "endDate：出院结束时间 【必填】<br>" +
+                    "creatStatus：生成状态(0-未生成 1-已生成) 【必填】<br>" +
+                    "jobType：核查任务类型(0-科室任务 1-院级 1-质控科) <br>" +
+                    "hospitalId: 医院ID<br>" +
+                    "behospitalCode：病人住院序号<br>" +
+                    "departments：科室<br>" +
+                    "level：病历等级<br>" +
+                    "name：病人姓名<br>" +
+                    "doctorName：医生姓名<br>" +
+                    "diagnose：主诊断<br>" +
+                    "smallDay：最小天数<br>" +
+                    "bigDay：最大天数<br>" +
+                    "isPlacefile：是否归档<br>")
+    @PostMapping("/getUserList")
+    @SysLogger("getUserList")
+    public RespDTO<IPage<CheckWorkDTO>> checkWorkPage(@RequestBody CheckWorkPageVO checkWorkPageVO) {
+        IPage<CheckWorkDTO> data = medCheckworkFacade.pageFac(checkWorkPageVO);
+        return RespDTO.onSuc(data);
+    }
+}