增加质控核查接口

common/src/main/java/com/lantone/common/dto/report/SysUserDeptDTO.java

@@ -0,0 +1,19 @@
+package com.lantone.common.dto.report;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/4/28 9:26
+ */
+@Getter
+@Setter
+public class SysUserDeptDTO {
+    private Long userId;
+    private List<BasDeptInfoDTO> notSelDepts;
+    private List<BasDeptInfoDTO> selDepts;
+}

common/src/main/java/com/lantone/common/enums/CheckJobTypeEnum.java

@@ -0,0 +1,51 @@
+package com.lantone.common.enums;
+
+import com.lantone.common.constant.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description: 核查任务类型
+ * @date 2018年11月21日 下午2:31:42
+ */
+public enum CheckJobTypeEnum implements KeyedNamed {
+    DEPT_SUPERVISOR(0, "科室任务"),
+    QUAT_SUPERVISOR(1, "质控科任务"),
+    HOSP_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;
+    }
+}
+

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/Role.java

@@ -0,0 +1,90 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 系统角色表 实体类
+ * </p>
+ */
+@Data
+@TableName("sys_role")
+public class Role implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 角色ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    @TableField("modifier")
+    private String modifier;
+
+    /**
+     * 角色名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 角色等级
+     */
+    @TableField("roleLevel")
+    private Integer roleLevel;
+
+    /**
+     * 角色描述
+     */
+    @TableField("descritpion")
+    private String descritpion;
+
+    /**
+     * 菜单ID：对应角色ID(暂无用处)
+     */
+    @TableField("menuItems")
+    private String menuItems;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/User.java

@@ -0,0 +1,96 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 系统用户表 实体类
+ * </p>
+ */
+@Data
+@TableName("sys_user")
+public class User implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    @TableField("modifier")
+    private String modifier;
+
+    /**
+     * 用户名
+     */
+    @TableField("username")
+    private String username;
+
+    /**
+     * 用户密码
+     */
+    @TableField("password")
+    private String password;
+
+    /**
+     * 联系人
+     */
+    @TableField("linkman")
+    private String linkman;
+
+    /**
+     * 是否启用(0:停用，1：启用)
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 1内部用户，0外部用户（默认0）
+     */
+    @TableField("type")
+    private Integer type;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/UserDept.java

@@ -0,0 +1,84 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户-医院科室映射表 实体类
+ * </p>
+ */
+@Data
+@TableName("sys_user_dept")
+public class UserDept implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    @TableField("modifier")
+    private String modifier;
+
+    /**
+     * 用户主键
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 科室编码（HIS导入）
+     */
+    @TableField("dept_id")
+    private String deptId;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/UserHospital.java

@@ -0,0 +1,78 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户-机构表映射表 实体类
+ * </p>
+ */
+@Data
+@TableName("sys_user_hospital")
+public class UserHospital implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    @TableField("modifier")
+    private String modifier;
+
+    /**
+     * 用户主键
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/report/UserRole.java

@@ -0,0 +1,78 @@
+package com.lantone.dblayermbg.entity.report;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 系统用户角色关联表 实体类
+ * </p>
+ */
+@Data
+@TableName("sys_user_role")
+public class UserRole implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户和角色关联ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    @TableField("modifier")
+    private String modifier;
+
+    /**
+     * 系统用户表.用户ID
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 系统角色表.角色ID
+     */
+    @TableField("role_id")
+    private Long roleId;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/BehospitalInfoFacade.java

@@ -1,8 +1,14 @@
 package com.lantone.dblayermbg.facade.report;
 
+import com.lantone.common.dto.report.BehospitalInfoAgeDTO;
+import com.lantone.common.util.ListUtil;
+import com.lantone.common.util.StringUtil;
 import com.lantone.dblayermbg.service.impl.report.BehospitalInfoServiceImpl;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 表名：med_behospital_info 业务类
@@ -10,5 +16,33 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
+    /**
+     * 获取患者年龄信息(通过出生日期和入院日期重新计算)
+     *
+     * @param hospitalId
+     * @param behospitalCodes
+     * @return
+     */
+    public List<BehospitalInfoAgeDTO> getBehospitalInfoAge(Long hospitalId, List<String> behospitalCodes) {
+        if (hospitalId == null || ListUtil.isEmpty(behospitalCodes)) {
+            return new ArrayList<>();
+        }
+        List<BehospitalInfoAgeDTO> behospitalInfoAgeDTOList = this.baseMapper.getBehospitalInfoAge(hospitalId, behospitalCodes);
+        if (behospitalInfoAgeDTOList == null) {
+            return new ArrayList<>();
+        }
+
+        behospitalInfoAgeDTOList.forEach(behospitalInfoAgeDTO -> {
+            String age = "";
+            if (StringUtil.isNotBlank(behospitalInfoAgeDTO.getAgeYear()) && !behospitalInfoAgeDTO.getAgeYear().equals("0")) {
+                age += behospitalInfoAgeDTO.getAgeYear() + "岁";
+            } else {
+                age += (StringUtil.isNotBlank(behospitalInfoAgeDTO.getAgeMon()) && !behospitalInfoAgeDTO.getAgeMon().equals("0") ? (behospitalInfoAgeDTO.getAgeMon() + "个月") : "")
+                        + (StringUtil.isNotBlank(behospitalInfoAgeDTO.getAgeDay()) && !behospitalInfoAgeDTO.getAgeDay().equals("0") ? (behospitalInfoAgeDTO.getAgeDay() + "天") : "");
+            }
+            behospitalInfoAgeDTO.setAge(age);
+        });
 
+        return behospitalInfoAgeDTOList;
+    }
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/RoleFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.RoleServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：sys_role 业务类
+ * </p>
+ */
+@Component
+public class RoleFacade extends RoleServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/UserDeptFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.UserDeptServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：sys_user_dept 业务类
+ * </p>
+ */
+@Component
+public class UserDeptFacade extends UserDeptServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/UserFacade.java

@@ -0,0 +1,95 @@
+
+package com.lantone.dblayermbg.facade.report;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.lantone.common.dto.report.BasDeptInfoDTO;
+import com.lantone.common.dto.report.SysUserDeptDTO;
+import com.lantone.common.enums.IsDeleteEnum;
+import com.lantone.common.exception.ApiException;
+import com.lantone.common.util.ListUtil;
+import com.lantone.common.util.SysUserUtils;
+import com.lantone.common.vo.report.BasDeptInfoVO;
+import com.lantone.common.vo.report.SysUserBaseVO;
+import com.lantone.dblayermbg.entity.report.UserDept;
+import com.lantone.dblayermbg.entity.report.UserHospital;
+
+import com.lantone.dblayermbg.service.impl.report.UserServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 表名：sys_user 业务类
+ * </p>
+ */
+@Component
+public class UserFacade extends UserServiceImpl {
+    @Autowired
+    private UserHospitalFacade sysUserHospitalFacade;
+    @Autowired
+    private DeptInfoFacade basDeptInfoFacade;
+    @Autowired
+    private UserDeptFacade userDeptFacade;
+
+    /**
+     * 获取用户科室
+     *
+     * @param sysUserBaseVO 获取用户科室入参
+     * @return 用户科室信息
+     */
+    public SysUserDeptDTO getUserDepts(SysUserBaseVO sysUserBaseVO) {
+        checkUser(sysUserBaseVO.getUserId());
+        SysUserDeptDTO sysUserDeptDTO = new SysUserDeptDTO();
+        sysUserDeptDTO.setUserId(sysUserBaseVO.getUserId());
+        BasDeptInfoVO basDeptInfoVO = new BasDeptInfoVO();
+        basDeptInfoVO.setHospitalId(SysUserUtils.getCurrentHospitalId());
+        List<BasDeptInfoDTO> basDeptInfoDTOList = basDeptInfoFacade.getBaseMapper().getList(basDeptInfoVO);
+        List<UserDept> sysUserDeptList
+                = userDeptFacade.list(new QueryWrapper<UserDept>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("user_id", sysUserBaseVO.getUserId())
+        );
+
+        if (ListUtil.isNotEmpty(sysUserDeptList)) {
+            List<BasDeptInfoDTO> notSelDepts = new ArrayList<>();
+            List<BasDeptInfoDTO> selDepts = new ArrayList<>();
+            Set<String> selDeptIds = sysUserDeptList.stream()
+                    .map(UserDept::getDeptId)
+                    .collect(Collectors.toSet());
+            for (BasDeptInfoDTO basDeptInfoDTO : basDeptInfoDTOList) {
+                if (selDeptIds.contains(basDeptInfoDTO.getDeptId())) {
+                    selDepts.add(basDeptInfoDTO);
+                } else {
+                    notSelDepts.add(basDeptInfoDTO);
+                }
+            }
+            sysUserDeptDTO.setNotSelDepts(notSelDepts);
+            sysUserDeptDTO.setSelDepts(selDepts);
+
+        } else {
+            sysUserDeptDTO.setNotSelDepts(basDeptInfoDTOList);
+        }
+
+        return sysUserDeptDTO;
+    }
+
+    /**
+     * 确认用户是否是管理员下的用户
+     *
+     * @param userId 用户Id
+     */
+    private void checkUser(Long userId) {
+        //确认用户是否是管理员统一医院下的用户
+        Integer cnt = sysUserHospitalFacade.count(new QueryWrapper<UserHospital>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("user_id", userId)
+                .eq("hospital_id", SysUserUtils.getCurrentHospitalId())
+        );
+        if (cnt < 1) {
+            throw new ApiException( "该医院下无该用户");
+        }
+    }
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/UserHospitalFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.UserHospitalServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：sys_user_hospital 业务类
+ * </p>
+ */
+@Component
+public class UserHospitalFacade extends UserHospitalServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/report/UserRoleFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.report;
+
+import com.lantone.dblayermbg.service.impl.report.UserRoleServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：sys_user_role 业务类
+ * </p>
+ */
+@Component
+public class UserRoleFacade extends UserRoleServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/BehospitalInfoMapper.java

@@ -2,6 +2,7 @@ package com.lantone.dblayermbg.mapper.report;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.common.dto.report.BehospitalInfoAgeDTO;
 import com.lantone.common.dto.report.BehospitalInfoDTO;
 import com.lantone.common.dto.report.CaseScoreDTO;
 import com.lantone.common.dto.report.EntryStatisticsDTO;
@@ -375,5 +376,13 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
      */
     public List<Map<String,String>> malignancy(@Param("filterVO") FilterVO filterVO);
 
+    /**
+     * 获取患者年龄信息(通过出生日期和入院日期重新计算)
+     * @param hospitalId
+     * @param behospitalCodes
+     * @return
+     */
+    List<BehospitalInfoAgeDTO> getBehospitalInfoAge(Long hospitalId, List<String> behospitalCodes);
+
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/CheckInfoMapper.java

@@ -1,13 +1,39 @@
 package com.lantone.dblayermbg.mapper.report;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.common.dto.report.CheckJobDTO;
+import com.lantone.common.dto.report.CheckUserDTO;
+import com.lantone.common.dto.report.CheckWorkDTO;
+import com.lantone.common.dto.report.CheckedRecordListDTO;
+import com.lantone.common.dto.report.DeptCheckUserDTO;
+import com.lantone.common.vo.report.CheckJobPageVO;
+import com.lantone.common.vo.report.CheckUserVO;
+import com.lantone.common.vo.report.CheckWorkPageVO;
+import com.lantone.common.vo.report.CheckedRecordListVO;
 import com.lantone.dblayermbg.entity.report.CheckInfo;
 
+import java.util.List;
+
 /**
  * <p>
  * 表名：med_check_info Mapper接口
  * </p>
  */
 public interface CheckInfoMapper extends BaseMapper<CheckInfo> {
+    //获取未分配的核查任务
+    IPage<CheckJobDTO> getCheckList(CheckJobPageVO checkJobVO);
+    //临床科室核查人员通过id获取核查人员的核查任务数
+    List<DeptCheckUserDTO> getDeptJobNumByUserId(CheckUserVO checkUserVO);
+    //核查任务列表
+    IPage<CheckWorkDTO> getCheckWorkPage(CheckWorkPageVO checkWorkPageVO);
+    //获取指定核查人员的核查任务
+    IPage<CheckJobDTO> getCheckListByUserId(CheckJobPageVO checkJobVO);
+    //取消核查任务
+    int deleteBatchCodes(List<String> list);
+
+    IPage<CheckedRecordListDTO> checkedRecordList(CheckedRecordListVO checkedRecordListVO);
+    //获取核查人员用户科室、姓名、角色
+    List<CheckUserDTO> getCheckUser(CheckUserVO checkUserVOS);
 
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/DeptInfoMapper.java

@@ -1,8 +1,12 @@
 package com.lantone.dblayermbg.mapper.report;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.common.dto.report.BasDeptInfoDTO;
+import com.lantone.common.vo.report.BasDeptInfoVO;
 import com.lantone.dblayermbg.entity.report.DeptInfo;
 
+import java.util.List;
+
 /**
  * <p>
  * 表名：bas_dept_info Mapper接口
@@ -10,4 +14,5 @@ import com.lantone.dblayermbg.entity.report.DeptInfo;
  */
 
 public interface DeptInfoMapper extends BaseMapper<DeptInfo> {
+    List<BasDeptInfoDTO> getList(BasDeptInfoVO basDeptInfoVO);
 }

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/RoleMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapper.report;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.report.Role;
+
+/**
+ * <p>
+ * 表名：sys_role Mapper接口
+ * </p>
+ */
+public interface RoleMapper extends BaseMapper<Role> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/UserDeptMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapper.report;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.report.UserDept;
+
+/**
+ * <p>
+ * 表名：sys_user_dept Mapper接口
+ * </p>
+ */
+public interface UserDeptMapper extends BaseMapper<UserDept> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/UserHospitalMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapper.report;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.report.UserHospital;
+
+/**
+ * <p>
+ * 表名：sys_user_hospital Mapper接口
+ * </p>
+ */
+public interface UserHospitalMapper extends BaseMapper<UserHospital> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/UserMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapper.report;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.report.User;
+
+/**
+ * <p>
+ * 表名：sys_user Mapper接口
+ * </p>
+ */
+public interface UserMapper extends BaseMapper<User> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/report/UserRoleMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapper.report;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.report.UserRole;
+
+/**
+ * <p>
+ * 表名：sys_user_role Mapper接口
+ * </p>
+ */
+public interface UserRoleMapper extends BaseMapper<UserRole> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/report/RoleServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.dblayermbg.service.impl.report;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.dblayermbg.entity.report.Role;
+import com.lantone.dblayermbg.mapper.report.RoleMapper;
+import com.lantone.dblayermbg.service.report.RoleService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统角色表 Service实现类
+ * </p>
+ */
+@Service
+public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/report/UserDeptServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.dblayermbg.service.impl.report;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.dblayermbg.entity.report.UserDept;
+import com.lantone.dblayermbg.mapper.report.UserDeptMapper;
+import com.lantone.dblayermbg.service.report.UserDeptService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户-医院科室映射表 Service实现类
+ * </p>
+ */
+@Service
+public class UserDeptServiceImpl extends ServiceImpl<UserDeptMapper, UserDept> implements UserDeptService {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/report/UserHospitalServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.dblayermbg.service.impl.report;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.dblayermbg.entity.report.UserHospital;
+import com.lantone.dblayermbg.mapper.report.UserHospitalMapper;
+import com.lantone.dblayermbg.service.report.UserHospitalService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户-机构表映射表 Service实现类
+ * </p>
+ */
+@Service
+public class UserHospitalServiceImpl extends ServiceImpl<UserHospitalMapper, UserHospital> implements UserHospitalService {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/report/UserRoleServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.dblayermbg.service.impl.report;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.dblayermbg.entity.report.UserRole;
+import com.lantone.dblayermbg.mapper.report.UserRoleMapper;
+import com.lantone.dblayermbg.service.report.UserRoleService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统用户角色关联表 Service实现类
+ * </p>
+ */
+@Service
+public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> implements UserRoleService {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/report/UserServiceImpl.java

@@ -0,0 +1,18 @@
+package com.lantone.dblayermbg.service.impl.report;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.dblayermbg.entity.report.User;
+import com.lantone.dblayermbg.mapper.report.UserMapper;
+import com.lantone.dblayermbg.service.report.UserService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统用户表 Service实现类
+ * </p>
+ */
+@Service
+public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/report/RoleService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service.report;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.report.Role;
+
+/**
+ * <p>
+ * 系统角色表 Service类
+ * </p>
+ */
+public interface RoleService extends IService<Role> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/report/UserDeptService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service.report;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.report.UserDept;
+
+/**
+ * <p>
+ * 用户-医院科室映射表 Service类
+ * </p>
+ */
+public interface UserDeptService extends IService<UserDept> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/report/UserHospitalService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service.report;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.report.UserHospital;
+
+/**
+ * <p>
+ * 用户-机构表映射表 Service类
+ * </p>
+ */
+public interface UserHospitalService extends IService<UserHospital> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/report/UserRoleService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service.report;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.report.UserRole;
+
+/**
+ * <p>
+ * 系统用户角色关联表 Service类
+ * </p>
+ */
+public interface UserRoleService extends IService<UserRole> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/report/UserService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service.report;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.report.User;
+
+/**
+ * <p>
+ * 系统用户表 Service类
+ * </p>
+ */
+public interface UserService extends IService<User> {
+
+}

dblayer-mbg/src/main/resources/mapper/base/report/BaseRoleMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapper.report.RoleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.report.Role">
+        <id column="id" property="id"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="name" property="name"/>
+        <result column="roleLevel" property="roleLevel"/>
+        <result column="descritpion" property="descritpion"/>
+        <result column="menuItems" property="menuItems"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+</mapper>

dblayer-mbg/src/main/resources/mapper/base/report/BaseUserDeptMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapper.report.UserDeptMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.report.UserDept">
+        <id column="id" property="id"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="user_id" property="userId"/>
+        <result column="hospital_id" property="hospitalId"/>
+        <result column="dept_id" property="deptId"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+</mapper>

dblayer-mbg/src/main/resources/mapper/base/report/BaseUserHospitalMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapper.report.UserHospitalMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.report.UserHospital">
+        <id column="id" property="id"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="user_id" property="userId"/>
+        <result column="hospital_id" property="hospitalId"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+</mapper>

dblayer-mbg/src/main/resources/mapper/base/report/BaseUserMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapper.report.UserMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.report.User">
+        <id column="id" property="id"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="username" property="username"/>
+        <result column="password" property="password"/>
+        <result column="linkman" property="linkman"/>
+        <result column="status" property="status"/>
+        <result column="type" property="type"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+</mapper>

dblayer-mbg/src/main/resources/mapper/base/report/BaseUserRoleMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapper.report.UserRoleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.report.UserRole">
+        <id column="id" property="id"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="user_id" property="userId"/>
+        <result column="role_id" property="roleId"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+</mapper>

dblayer-mbg/src/main/resources/mapper/report/BehospitalInfoMapper.xml

@@ -7524,4 +7524,25 @@
         and d.diagnose_name like '%恶性肿瘤%'
         and d.icd_code like 'C%'
     </select>
+
+    <!-- 获取患者年龄信息(通过出生日期和入院日期重新计算) -->
+    <select id="getBehospitalInfoAge" resultType="com.lantone.common.dto.report.BehospitalInfoAgeDTO">
+        SELECT
+        mbi.behospital_code behospitalCode,
+        mhp.age,
+        TIMESTAMPDIFF(year,ifnull(mhp.birthday,mbi.birthday),mbi.behospital_date) as ageYear,
+        TIMESTAMPDIFF(day,ifnull(mhp.birthday,mbi.birthday),mbi.behospital_date) as ageDay
+        FROM
+        med_behospital_info mbi
+        LEFT JOIN med_home_page mhp
+        ON mbi.behospital_code=mhp.behospital_code
+        AND mbi.hospital_id = mhp.hospital_id AND mhp.is_deleted = 'N'
+        WHERE mbi.hospital_id=#{hospitalId} AND mbi.is_deleted = 'N'
+        <if test="behospitalCodes !=null and behospitalCodes.size > 0">
+            and mbi.behospital_code in
+            <foreach collection="behospitalCodes" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </select>
 </mapper>

dblayer-mbg/src/main/resources/mapper/report/CheckInfoMapper.xml

@@ -1,5 +1,176 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.report.CheckInfoMapper">
+    <select id="getCheckWorkPage" resultType="com.lantone.common.dto.report.CheckWorkDTO">
+        SELECT
+        mbi.behospital_code behospitalCode,
+        mbi.`name`,
+        mbi.file_code fileCode,
+        mbi.sex,
+        TIMESTAMPDIFF(day,ifnull(mhp.birthday,mbi.birthday),mbi.behospital_date) as birthday,
+        mhp.age,
+        mbi.beh_dept_name behDeptName,
+        mbi.leave_hospital_date leaveHospitalDate,
+        mhp.behospital_day_num+0 behospitalDayNum,
+        mbi.doctor_name doctorName,
+        mqi.score_res scoreRes,
+        mqi.`level`,
+        mbi.diagnose,
+        CASE WHEN mbt.behospital_type='出院病人' THEN '6'
+        WHEN mbt.behospital_type='死亡病人' THEN '6'
+        WHEN mbt.behospital_type='危重病人' THEN '4'
+        WHEN mbt.behospital_type='抢救病人' THEN '5'
+        WHEN mbt.behospital_type='手术病人' THEN '2'
+        WHEN mbt.behospital_type='疑难病人' THEN '3'
+        WHEN mbt.behospital_type='输血病人' THEN '4' ELSE '0' END AS score,
+        CASE WHEN ISNULL(mci.job_create_time) THEN '未生成' ELSE '已生成' END AS creatStatus,
+        mci.job_create_time jobCreateTime,
+        mci.job_creator jobCreator,
+        mci.job_creator_name jobCreatorName,
+        mci.check_time checkTime,
+        mci.job_distribution_time jobDistributionTime
+        FROM
+        med_behospital_info mbi
+        LEFT JOIN med_home_page mhp
+        ON mbi.behospital_code=mhp.behospital_code
+        AND mbi.hospital_id = mhp.hospital_id AND mhp.is_deleted = 'N'
+        LEFT JOIN med_check_info mci
+        ON mbi.behospital_code = mci.behospital_code
+        AND mbi.hospital_id = mci.hospital_id AND mci.is_deleted = 'N'
+        LEFT JOIN med_qcresult_info mqi
+        ON mbi.behospital_code = mqi.behospital_code
+        AND mbi.hospital_id = mqi.hospital_id AND mqi.is_deleted = 'N'
+        JOIN med_behospital_type mbt ON mbi.behospital_code = mbt.behospital_code
+        AND mbi.hospital_id = mbt.hospital_id AND mbt.is_deleted = 'N'
+        WHERE mbi.hospital_id=#{hospitalId} AND mbi.is_deleted = 'N' and mqi.score_res is not null
+        AND mci.check_id is null
+        <if test="startDate != null">
+            <![CDATA[ AND mbi.leave_hospital_date >= #{startDate}]]>
+        </if>
+        <if test="endDate != null">
+            <![CDATA[ AND mbi.leave_hospital_date < #{endDate}]]>
+        </if>
+        <if test="creatStatus != null and creatStatus == '1'.toString()">
+            AND mci.job_create_time is not null
+            <if test="jobType != null and jobType != ''">
+                AND mci.job_type=#{jobType}
+            </if>
+        </if>
+        <if test="creatStatus != null and creatStatus == '0'.toString()">
+            AND mci.job_create_time is null
+        </if>
+        <if test="name != null and name != ''">
+            AND mbi.`name` like CONCAT('%',#{name},'%')
+        </if>
+        <if test="behospitalCode != null and behospitalCode != ''">
+            AND mbi.behospital_code like CONCAT('%',#{behospitalCode},'%')
+        </if>
+        <if test="department !=null and department.size > 0">
+            and mbi.beh_dept_id in
+            <foreach collection="department" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="smallDay != null">
+            <![CDATA[ AND mhp.behospital_day_num >= #{smallDay}]]>
+        </if>
+        <if test="bigDay != null">
+            <![CDATA[ AND mhp.behospital_day_num <= #{bigDay}]]>
+        </if>
+        <if test="doctorName != null and doctorName != ''">
+            AND mbi.doctor_name LIKE CONCAT( '%', #{doctorName}, '%' )
+        </if>
+        <if test="diagnose != null and diagnose != ''">
+            AND mbi.diagnose LIKE CONCAT( '%', #{diagnose}, '%' )
+        </if>
+        <if test="level != null and level != ''">
+            AND mqi.`level`= #{level}
+        </if>
+        <if test="isPlacefile != null and isPlacefile != ''">
+            AND mbi.is_placefile = #{isPlacefile}
+        </if>
+        <if test="values !=null and values.size > 0">
+            and mbt.`value` in
+            <foreach collection="values" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </select>
 
+    <!--通过住院号，取消核查任务-->
+    <update id="deleteBatchCodes">
+        <foreach collection="list" item="item"  separator=";">
+            delete from
+            med_check_info
+            where behospital_code = #{item} and is_deleted = 'N'
+        </foreach>
+    </update>
+
+    <!--获取待分配核查任务列表-->
+    <select id="getCheckList" resultType="com.lantone.common.dto.report.CheckJobDTO">
+        SELECT
+        a.behospital_code behospitalCode,
+        a.beh_dept_name behospitalDept,
+        a.doctor_name attendingDoctor,
+        a.leave_hospital_date leaveHospitalDate,
+        a.`name`,
+        b.`value`,
+        a.id,
+        a.beh_dept_id behospitalDeptId,
+        a.job_create_time jobCreateTime
+        from
+        (select
+        a.behospital_code,
+        a.`name`,
+        a.beh_dept_name,
+        a.doctor_name,
+        a.leave_hospital_date,
+        a.hospital_id,
+        a.beh_dept_id,
+        b.job_create_time,
+        b.id
+        from
+        med_behospital_info a ,med_check_info b
+        where a.behospital_code = b.behospital_code and a.hospital_id = b.hospital_id and a.is_deleted = 'N'
+        and b.is_deleted = 'N' and b.job_distribution_name is NULL  and b.`status` = 0
+        <if test="jobType !=null and jobType != ''">
+            and b.job_type = #{jobType}
+        </if>
+        <if test="startTime != null and startTime != ''">
+            <![CDATA[ AND b.job_create_time >= #{startTime}]]>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            <![CDATA[ AND b.job_create_time <= #{endTime}]]>
+        </if>
+
+        <if test="behosDateStart != null and behosDateStart != ''">
+            <![CDATA[ AND a.leave_hospital_date >= #{behosDateStart}]]>
+        </if>
+        <if test="behosDateEnd != null and behosDateEnd != ''">
+            <![CDATA[ AND a.leave_hospital_date <= #{behosDateEnd}]]>
+        </if>
+        <if test="doctorName !=null and doctorName != ''">
+            and a.doctor_name LIKE CONCAT('%',#{doctorName},'%')
+        </if>
+        <if test="behospitalCode !=null and behospitalCode != ''">
+            and a.behospital_code LIKE CONCAT('%',#{behospitalCode},'%')
+        </if>
+        <if test="name !=null and name != ''">
+            and a.`name` LIKE CONCAT('%',#{name},'%')
+        </if>
+        <if test="deptList !=null and deptList.size()!=0 ">
+            and a.beh_dept_id in
+            <foreach collection="deptList" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        ) a  JOIN med_behospital_type b on a.behospital_code = b.behospital_code
+        and a.hospital_id = b.hospital_id and b.is_deleted = 'N' and  b.`value` is not null
+        <if test="values !=null and values.size()!=0 ">
+            and b.`value` in
+            <foreach collection="values" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </select>
 </mapper>

dblayer-mbg/src/main/resources/mapper/report/DeptInfoMapper.xml

@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.dblayermbg.mapper.report.DeptInfoMapper">
+    <select id="getList" resultType="com.lantone.common.dto.report.BasDeptInfoDTO">
+        SELECT DISTINCT
+        t.dept_id AS deptId,
+        dept_name AS deptName
+        FROM
+        `bas_dept_info` t
+        WHERE
+        t.is_deleted = 'N'
+        AND (t.station = '住院' or t.station = '质管')
+        AND t.hospital_id = #{hospitalId}
+        <if test="inputStr !=null and inputStr != ''">
+            AND (UPPER(t.spell) LIKE CONCAT('%', UPPER(TRIM(#{inputStr})),'%') OR UPPER(t.dept_name) LIKE CONCAT('%', UPPER(TRIM(#{inputStr})),'%'))
+        </if>
+        ORDER BY t.dept_name ASC
+    </select>
 </mapper>

dblayer-mbg/src/main/resources/mapper/report/RoleMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapper.report.RoleMapper">
+
+</mapper>

dblayer-mbg/src/main/resources/mapper/report/UserDeptMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapper.report.UserDeptMapper">
+
+</mapper>

dblayer-mbg/src/main/resources/mapper/report/UserHospitalMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapper.report.UserHospitalMapper">
+
+</mapper>

dblayer-mbg/src/main/resources/mapper/report/UserMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapper.report.UserMapper">
+
+</mapper>

dblayer-mbg/src/main/resources/mapper/report/UserRoleMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapper.report.UserRoleMapper">
+
+</mapper>

report-service/src/main/java/com/lantone/report/aggregate/LeaveHosStatisticsAggregate.java

@@ -6,7 +6,7 @@ import com.lantone.common.dto.report.ReBeHosDTO;
 import com.lantone.common.vo.report.FilterVO;
 import com.lantone.common.vo.report.ReBeHosPageVO;
 import com.lantone.dblayermbg.facade.report.BehospitalInfoFacade;
-import com.lantone.report.facade.ReHos31DaysManagementFacade;
+import com.lantone.report.facade.ReHos31DaysFacade;
 import io.github.lvyahui8.spring.annotation.DataConsumer;
 import io.github.lvyahui8.spring.annotation.DataProvider;
 import io.github.lvyahui8.spring.annotation.InvokeParameter;
@@ -32,7 +32,7 @@ public class LeaveHosStatisticsAggregate {
     @Autowired
     private BehospitalInfoFacade behospitalInfoFacade;
     @Autowired
-    private ReHos31DaysManagementFacade reHos31DaysManagementFacade;
+    private ReHos31DaysFacade reHos31DaysFacade;
 
 
     @DataProvider("setAllLeaveHos")
@@ -124,7 +124,7 @@ public class LeaveHosStatisticsAggregate {
         reBeHosPageVO.setStartDate(timeTrans(filterVO.getStartDate()));
         reBeHosPageVO.setEndDate(timeTrans(filterVO.getEndDate()));
         reBeHosPageVO.setFlag(31);
-        IPage<ReBeHosDTO> reBeHosDTOIPage = reHos31DaysManagementFacade.reHos31DaysPage(reBeHosPageVO);
+        IPage<ReBeHosDTO> reBeHosDTOIPage = reHos31DaysFacade.reHos31DaysPage(reBeHosPageVO);
         List<ReBeHosDTO> records = reBeHosDTOIPage.getRecords();
         Set<String> codeList = new HashSet<>();
         records.forEach(obj -> {

report-service/src/main/java/com/lantone/report/facade/EntryCaseManagementFacade.java

@@ -31,7 +31,7 @@ import java.util.Set;
 
 
 @Component
-public class EntryCaseManagementFacade {
+public class EntryCaseFacade {
 
     @Autowired
     private FilterFacade filterFacade;

report-service/src/main/java/com/lantone/report/facade/HomePageManagementFacade.java

@@ -23,7 +23,7 @@ import java.util.Map;
 
 
 @Component
-public class HomePageManagementFacade {
+public class HomePageFacade {
 
     @Autowired
     private FilterFacade filterFacade;

report-service/src/main/java/com/lantone/report/facade/LeaveBeHospitalManagementFacade.java

@@ -30,7 +30,7 @@ import java.util.Map;
 
 
 @Component
-public class LeaveBeHospitalManagementFacade {
+public class LeaveBeHospitalFacade {
 
     @Autowired
     private FilterFacade filterFacade;

report-service/src/main/java/com/lantone/report/facade/ModuleCaseManagementFacade.java

@@ -17,7 +17,7 @@ import java.util.Map;
 
 
 @Component
-public class ModuleCaseManagementFacade {
+public class ModuleCaseFacade {
 
     @Autowired
     private FilterFacade filterFacade;

report-service/src/main/java/com/lantone/report/facade/MrIndicatorManagementFacade.java

@@ -50,7 +50,7 @@ import java.util.stream.Collectors;
 
 
 @Component
-public class MrIndicatorManagementFacade {
+public class MrIndicatorFacade {
 
     @Autowired
     private FilterFacade filterFacade;
@@ -1341,13 +1341,11 @@ public class MrIndicatorManagementFacade {
         Set<String> manageList= new CopyOnWriteArraySet<>();
         List<String> blood_list = QualityContent.BLOODLIST;
         //lis项目存在用血住院病历号
-        long xx1 = System.currentTimeMillis();
         List<String> beCode = medManageParams.stream()
                 .filter(obj -> StringUtils.isNotEmpty(obj.getRepName()) && blood_list.contains(obj.getRepName()))
                 .map(MedManageParamsDTO::getBehospitalCode).distinct()
                 .collect(Collectors.toList());
-        long xx2= System.currentTimeMillis();
-        System.out.println("lis项目存在用血住院病历号 = " + (xx2-xx1));
+
         //advice体现lis项目存在用血的住院病历号
         doctorAdviceList.parallelStream()
                 .filter(obj -> beCode.contains(obj.getBehospitalCode()) && StringUtils.isNotEmpty(obj.getDoctorAdviceType()) && obj.getDoctorAdviceType()
@@ -1357,8 +1355,6 @@ public class MrIndicatorManagementFacade {
                 .distinct()
                 .map(obj -> {manageList.add(obj.getBehospitalCode());return bloodCode.add(obj.getBehospitalCode());})
                 .collect(Collectors.toList());
-        long xx3= System.currentTimeMillis();
-        System.out.println("advice体现lis项目存在用血的住院病历号 = " + (xx3-xx2));
 
         //临床用血的质控病历总数
         double count = manageList.size();

report-service/src/main/java/com/lantone/report/facade/MrInfoManagementFacade.java

@@ -61,7 +61,7 @@ import java.util.stream.Collectors;
 
 
 @Component
-public class MrInfoManagementFacade {
+public class MrInfoFacade {
 
     @Autowired
     private FilterFacade filterFacade;

report-service/src/main/java/com/lantone/report/facade/MrQcCaseManagementFacade.java

@@ -30,7 +30,7 @@ import java.util.Map;
 
 
 @Component
-public class MrQcCaseManagementFacade {
+public class MrQcCaseFacade {
 
     @Autowired
     private FilterFacade filterFacade;

report-service/src/main/java/com/lantone/report/facade/MrQcInfoManagementFacade.java

@@ -22,7 +22,7 @@ import java.util.Date;
 import java.util.List;
 
 @Component
-public class MrQcInfoManagementFacade {
+public class MrQcInfoFacade {
 
     @Autowired
     private FilterFacade filterFacade;

report-service/src/main/java/com/lantone/report/facade/QcCheckFacade.java

@@ -0,0 +1,377 @@
+package com.lantone.report.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.collect.Lists;
+import com.lantone.common.dto.report.BasDeptInfoDTO;
+import com.lantone.common.dto.report.BehospitalInfoAgeDTO;
+import com.lantone.common.dto.report.CheckJobDTO;
+import com.lantone.common.dto.report.CheckWorkDTO;
+import com.lantone.common.enums.CheckJobTypeEnum;
+import com.lantone.common.enums.CheckerRoleEnum;
+import com.lantone.common.enums.IsDeleteEnum;
+import com.lantone.common.exception.ApiException;
+import com.lantone.common.util.DateUtil;
+import com.lantone.common.util.ListUtil;
+import com.lantone.common.util.StringUtil;
+import com.lantone.common.util.SysUserUtils;
+import com.lantone.common.vo.report.CheckJobPageVO;
+import com.lantone.common.vo.report.CheckWorkPageVO;
+import com.lantone.common.vo.report.MedCheckWorkAddVO;
+import com.lantone.common.vo.report.SysUserBaseVO;
+import com.lantone.dblayermbg.entity.report.UserRole;
+import com.lantone.dblayermbg.entity.report.CheckInfo;
+import com.lantone.dblayermbg.entity.report.DeptInfo;
+import com.lantone.dblayermbg.entity.report.Role;
+import com.lantone.dblayermbg.entity.report.User;
+import com.lantone.dblayermbg.entity.report.UserDept;
+import com.lantone.dblayermbg.facade.report.RoleFacade;
+import com.lantone.dblayermbg.facade.report.DeptInfoFacade;
+import com.lantone.dblayermbg.facade.report.UserDeptFacade;
+import com.lantone.dblayermbg.facade.report.UserFacade;
+import com.lantone.dblayermbg.facade.report.BehospitalInfoFacade;
+import com.lantone.dblayermbg.facade.report.CheckInfoFacade;
+import com.lantone.dblayermbg.facade.report.UserRoleFacade;
+import com.lantone.dblayermbg.service.impl.report.CheckInfoServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+
+@Component
+public class QcCheckFacade {
+
+    @Autowired
+    private BehospitalInfoFacade behospitalInfoFacade;
+    @Autowired
+    private CheckInfoFacade medCheckInfoFacade;
+    @Autowired
+    private UserFacade sysUserFacade;
+    @Autowired
+    private CheckInfoServiceImpl checkInfoServiceImpl;
+    @Autowired
+    private RoleFacade roleFacade;
+    @Autowired
+    private DeptInfoFacade deptInfoFacade;
+    @Autowired
+    private UserDeptFacade sysUserDeptFacade;
+    @Autowired
+    private UserRoleFacade userRoleFacade;
+    /**
+     * 分页
+     *
+     * @param checkWorkPageVO
+     * @return
+     */
+    public IPage<CheckWorkDTO> pageFac(CheckWorkPageVO checkWorkPageVO) {
+        checkWorkPageSet(checkWorkPageVO);
+        IPage<CheckWorkDTO> res = medCheckInfoFacade.getBaseMapper().getCheckWorkPage(checkWorkPageVO);
+        if (res == null || ListUtil.isEmpty(res.getRecords())) {
+            return res;
+        }
+
+        List<String> behospitalCodes = res.getRecords().stream().map(CheckWorkDTO::getBehospitalCode).collect(Collectors.toList());
+        Map<String, BehospitalInfoAgeDTO> ageMap = behospitalInfoFacade.getBehospitalInfoAge(checkWorkPageVO.getHospitalId(), behospitalCodes).stream().collect(Collectors.toMap(i -> i.getBehospitalCode(), i -> i));
+        res.getRecords().forEach(i -> {
+            i.setAge(ageMap.get(i.getBehospitalCode()) == null ? "" : ageMap.get(i.getBehospitalCode()).getAge());
+        });
+
+        //更新delFlag
+        Long principleId = Long.valueOf(SysUserUtils.getCurrentPrincipleId());
+        res.getRecords().stream().forEach(checkWorkDTO -> {
+            if (principleId.equals(checkWorkDTO.getJobCreator())) {
+                checkWorkDTO.setDelFlag(true);
+            }
+        });
+        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 ApiException( "出院时间的开始时间必须小于结束时间！");
+            }
+        }
+        //住院天数
+        if (null != checkWorkPageVO && null != checkWorkPageVO.getSmallDay() && null != checkWorkPageVO.getBigDay()) {
+            if (checkWorkPageVO.getSmallDay() > checkWorkPageVO.getBigDay()) {
+                throw new ApiException( "住院天数区间有误！");
+            }
+        }
+        checkWorkPageVO.setHospitalId(SysUserUtils.getCurrentHospitalId());
+
+        if (StringUtil.isNotBlank(checkWorkPageVO.getJobType()) && (CheckJobTypeEnum.DEPT_SUPERVISOR.getKey() + "").equals(checkWorkPageVO.getJobType())) {
+            SysUserBaseVO sysUserBaseVO = new SysUserBaseVO();
+            sysUserBaseVO.setUserId(SysUserUtils.getCurrentPrincipleId());
+            List<String> deptIds = Lists.newArrayList();
+            List<BasDeptInfoDTO> selDepts = sysUserFacade.getUserDepts(sysUserBaseVO).getSelDepts();
+            if (ListUtil.isNotEmpty(selDepts)) {
+                deptIds = selDepts.stream().map(i -> i.getDeptId()).collect(Collectors.toList());
+            }
+            if (ListUtil.isNotEmpty(checkWorkPageVO.getDepartment())) {
+                deptIds.retainAll(checkWorkPageVO.getDepartment());
+            }
+            if (ListUtil.isEmpty(deptIds)) {
+                deptIds.add("999999999999");
+            }
+            checkWorkPageVO.setDepartment(deptIds);
+        }
+    }
+
+    /**
+     * @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 = SysUserUtils.getCurrentHospitalId();
+        Long principleId = SysUserUtils.getCurrentPrincipleId();
+        User user = sysUserFacade.getOne(new QueryWrapper<User>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("id", principleId)
+                .eq("status", 1));
+        String principleName = user.getLinkman();
+        //取消核查任务【操作类型（0-取消，1-添加）】
+        if (checkStatus != null && checkStatus == 0) {
+            //判断核查任务是否生成
+            QueryWrapper<CheckInfo> 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<CheckInfo> list = medCheckInfoFacade.list(medicalRecordQe);
+            if (ListUtil.isEmpty(list)) {
+                throw new ApiException( "存在未生成核查任务！");
+            }
+
+            //创建用户集合
+            Set<Long> creaters = list.stream().map(CheckInfo::getJobCreator).collect(Collectors.toSet());
+            if (creaters != null) {
+                //移除当前用户如果还有其他用户
+                creaters.remove(principleId);
+                if (creaters.size() > 0) {
+                    throw new ApiException("无法取消他人生成任务！");
+                }
+            }
+            int i = medCheckInfoFacade.getBaseMapper().deleteBatchCodes(medCheckWorkVO.getBehospitalCodeList());
+            if (i != 0) {
+                return true;
+            }
+        } else if (checkStatus != null && checkStatus == 1) {
+            //生成核查任务
+            CheckInfo data = medCheckInfoFacade.getOne(new QueryWrapper<CheckInfo>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("hospital_id", hospitalId)
+                    .in("behospital_code", medCheckWorkVO.getBehospitalCodeList())
+            );
+            //任务是否存在
+            if (data != null) {
+                throw new ApiException( "核查任务已存在！");
+            }
+
+            //该病历没有核查的时候， 就添加核查记录
+            List<CheckInfo> medCheckInfoList = new ArrayList<>();
+            for (String behospitalCode : medCheckWorkVO.getBehospitalCodeList()) {
+                CheckInfo medCheckInfo = new CheckInfo();
+                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 = checkInfoServiceImpl.saveBatch(medCheckInfoList);
+        }
+        return flag;
+    }
+
+    /**
+     * @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 = SysUserUtils.getCurrentHospitalId();
+        Long principleId = SysUserUtils.getCurrentPrincipleId();
+        //获取核查监管相关角色id
+        List<Long> checkRoleIds = roleFacade.list(new QueryWrapper<Role>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .like("name", "监管人员")
+        ).stream().map(Role::getId).collect(Collectors.toList());
+        //查询该角色的所有角色id
+        List<Long> roleIds = userRoleFacade.list(new QueryWrapper<UserRole>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("user_id", principleId)
+        ).stream().distinct().map(UserRole::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 ApiException("该用户不是核查监管人员!");
+        }
+        //质控科监管人员
+        if (searchRoleIds.contains(CheckerRoleEnum.QUAT_SUPERVISOR.getKey() * 1l)
+                && (CheckJobTypeEnum.QUAT_SUPERVISOR.getKey() + "").equals(checkJobVO.getJobType())) {
+            //用户是不是质管科人员校验
+            DeptInfo deptInfo = deptInfoFacade.getOne(new QueryWrapper<DeptInfo>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("hospital_id", hospitalId)
+                    .eq("station", "质管"));
+            if (deptInfo == null || deptInfo.getDeptId() == null) {
+                throw new ApiException( "科室质管科不存在,请联系管理员!");
+            }
+            //2.获取监管人员所在科室集合
+            List<String> deptIds = sysUserDeptFacade.list(new QueryWrapper<UserDept>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("hospital_id", hospitalId)
+                    .eq("user_id", principleId)
+            ).stream().map(UserDept::getDeptId).collect(Collectors.toList());
+            //3.判断这个人是否在质控科
+//            if(deptIds.contains(zkkDeptId))
+//            {
+//
+//            }
+            //质控科任务分配列表是任务类型是质控科的任务与科室无关
+            return medCheckInfoFacade.getBaseMapper().getCheckList(checkJobVO);
+        }
+        //临床科室监管人员 或 院级监管人员
+        else if (searchRoleIds.contains(CheckerRoleEnum.DEPT_SUPERVISOR.getKey() * 1l)
+                || searchRoleIds.contains(CheckerRoleEnum.HOSP_SUPERVISOR.getKey() * 1l)) {
+            //查询没有指定科室
+            if (checkJobVO.getDeptList() == null || checkJobVO.getDeptList().isEmpty()) {
+                //科室获取待分配任务所在科室集合
+                if (CheckJobTypeEnum.DEPT_SUPERVISOR.getKey() == Integer.parseInt(checkJobVO.getJobType())) {
+                    List<String> deptIds = sysUserDeptFacade.list(new QueryWrapper<UserDept>()
+                            .eq("is_deleted", IsDeleteEnum.N.getKey())
+                            .eq("hospital_id", hospitalId)
+                            .eq("user_id", principleId)
+                    ).stream().map(UserDept::getDeptId).collect(Collectors.toList());
+
+                    if (deptIds != null && !deptIds.isEmpty()) {
+                        checkJobVO.setDeptList(deptIds);
+                        return medCheckInfoFacade.getBaseMapper().getCheckList(checkJobVO);
+                    } else {
+                        return new CheckJobPageVO();
+                    }
+                }
+                //院区获取
+                if (CheckJobTypeEnum.HOSP_SUPERVISOR.getKey() == Integer.parseInt(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());
+//                    //获取所有院区核查人员所在科室
+//                    CheckUserVO checkUserVOS = new CheckUserVO();
+//                    checkUserVOS.setRoleIds(Lists.newArrayList(CheckerRoleEnum.HOSP_GENERAL.getKey()*1l));
+//                    checkUserVOS.setDeptStations(Lists.newArrayList("住院"));
+//                    checkUserVOS.setHospitalId(hospitalId);
+//                    List<CheckUserDTO> checkUserDTOS = baseMapper.getCheckUser(checkUserVOS);
+//                    Set<String> hospGeneralDeptIds= checkUserDTOS.stream()
+//                            .map(CheckUserDTO::getDeptId).collect(Collectors.toSet());
+//                    //去除管理员所在科室
+//                    if(hospGeneralDeptIds!=null&&!hospGeneralDeptIds.isEmpty()&&deptIds!=null){
+//                        hospGeneralDeptIds.removeAll(deptIds);
+//                        checkJobVO.setDeptList(new ArrayList<>(hospGeneralDeptIds));
+//                    }
+                    return medCheckInfoFacade.getBaseMapper().getCheckList(checkJobVO);
+                }
+            }
+            return medCheckInfoFacade.getBaseMapper().getCheckList(checkJobVO);
+        } else {
+            throw new ApiException("该用户的角色和任务类型不对应！");
+        }
+    }
+    /**
+     * @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/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 ApiException( "没有时间区间!");
+        }
+        if (StringUtil.isBlank(checkJobVO.getJobType())) {
+            throw new ApiException( "没有任务类型!");
+        }
+        if (StringUtil.isNotBlank(checkJobVO.getBehosDateStart()) && StringUtil.isNotBlank(checkJobVO.getBehosDateEnd())) {
+            if (DateUtil.after(DateUtil.parseDate(checkJobVO.getBehosDateStart()),
+                    DateUtil.parseDate(checkJobVO.getBehosDateEnd()))) {
+                throw new ApiException( "出院时间的开始时间必须小于结束时间！");
+            }
+        }
+        if (StringUtil.isNotBlank(checkJobVO.getStartTime()) && StringUtil.isNotBlank(checkJobVO.getEndTime())) {
+            if (DateUtil.after(DateUtil.parseDate(checkJobVO.getStartTime()),
+                    DateUtil.parseDate(checkJobVO.getEndTime()))) {
+                throw new ApiException("任务生成的开始时间必须小于结束时间！");
+            }
+        }
+
+    }
+
+}

report-service/src/main/java/com/lantone/report/facade/QcCheckManagementFacade.java

@@ -28,7 +28,7 @@ import java.util.List;
 
 
 @Component
-public class QcCheckManagementFacade {
+public class QcCheckStatisticsFacade {
 
     @Autowired
     private FilterFacade filterFacade;

report-service/src/main/java/com/lantone/report/facade/QcScoreManagementFacade.java

@@ -29,7 +29,7 @@ import java.util.Map;
 
 
 @Component
-public class QcScoreManagementFacade {
+public class QcScoreFacade {
 
     @Autowired
     private FilterFacade filterFacade;

report-service/src/main/java/com/lantone/report/facade/ReHos31DaysManagementFacade.java

@@ -23,7 +23,7 @@ import java.util.Set;
 
 
 @Component
-public class ReHos31DaysManagementFacade {
+public class ReHos31DaysFacade {
 
     @Autowired
     private FilterFacade filterFacade;

report-service/src/main/java/com/lantone/report/facade/TimelinessManagementFacade.java

@@ -33,7 +33,7 @@ import java.util.Map;
 
 
 @Component
-public class TimelinessManagementFacade {
+public class TimelinessFacade {
 
     @Autowired
     private FilterFacade filterFacade;

report-service/src/main/java/com/lantone/report/web/EntryCaseManagementController.java

@@ -9,7 +9,7 @@ import com.lantone.common.dto.report.NumDTO;
 import com.lantone.common.vo.report.EntryStatisticsVO;
 import com.lantone.common.vo.report.FilterPageVO;
 import com.lantone.common.vo.report.FilterVO;
-import com.lantone.report.facade.EntryCaseManagementFacade;
+import com.lantone.report.facade.EntryCaseFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,9 +37,9 @@ import java.util.Map;
 @RequestMapping("/console")
 @Api(value = "条目缺陷管理统计相关API", tags = { "条目缺陷管理统计相关API" })
 @SuppressWarnings("unchecked")
-public class EntryCaseManagementController {
+public class EntryCaseController {
     @Autowired
-    private EntryCaseManagementFacade entryCaseManagementFacade;
+    private EntryCaseFacade entryCaseFacade;
 
     /**
      * 条目缺陷占比-控制台
@@ -50,7 +50,7 @@ public class EntryCaseManagementController {
     @ApiOperation(value = "条目缺陷占比-控制台[by:zhaops]")
     @PostMapping("/entryCountGroupByEntry")
     public CommonResult<Map<String, Object>> entryCountGroupByEntry(@RequestBody @Valid FilterVO filterVO) {
-        return CommonResult.success(entryCaseManagementFacade.entryCountGroupByEntry(filterVO));
+        return CommonResult.success(entryCaseFacade.entryCountGroupByEntry(filterVO));
     }
 
     /**
@@ -62,7 +62,7 @@ public class EntryCaseManagementController {
     @ApiOperation(value = "条目缺陷占比-控制台-运行质控[by:zhaops]")
     @PostMapping("/run/entryCountGroupByEntry")
     public CommonResult<Map<String, Object>> runEntryCountGroupByEntry(@RequestBody @Valid FilterVO filterVO) {
-        return CommonResult.success(entryCaseManagementFacade.entryCountGroupByEntry(filterVO));
+        return CommonResult.success(entryCaseFacade.entryCountGroupByEntry(filterVO));
     }
 
     /**
@@ -74,7 +74,7 @@ public class EntryCaseManagementController {
     @ApiOperation(value = "条目缺陷占比-报表[by:zhaops]")
     @PostMapping("/entryGroupByEntryInnerPage")
     public CommonResult<IPage<EntryNumDTO>> entryGroupByEntryInnerPage(@RequestBody @Valid FilterPageVO filterPageVO) {
-        return CommonResult.success(entryCaseManagementFacade.entryGroupByEntryInnerPage(filterPageVO));
+        return CommonResult.success(entryCaseFacade.entryGroupByEntryInnerPage(filterPageVO));
     }
 
     /**
@@ -86,7 +86,7 @@ public class EntryCaseManagementController {
     @ApiOperation(value = "条目缺陷占比-报表-运行质控[by:zhaops]")
     @PostMapping("/run/entryGroupByEntryInnerPage")
     public CommonResult<IPage<EntryNumDTO>> runEntryGroupByEntryInnerPage(@RequestBody @Valid FilterPageVO filterPageVO) {
-        return CommonResult.success(entryCaseManagementFacade.entryGroupByEntryInnerPage(filterPageVO));
+        return CommonResult.success(entryCaseFacade.entryGroupByEntryInnerPage(filterPageVO));
     }
 
     /**
@@ -98,7 +98,7 @@ public class EntryCaseManagementController {
     @ApiOperation(value = "条目缺陷占比-报表导出[by:gaodm]")
     @PostMapping("/entryGroupByEntryExport")
     public void entryGroupByEntryExport(HttpServletResponse response, @RequestBody @Valid FilterPageVO filterPageVO) {
-        entryCaseManagementFacade.entryGroupByEntryExport(response, filterPageVO);
+        entryCaseFacade.entryGroupByEntryExport(response, filterPageVO);
     }
 
     /**
@@ -110,7 +110,7 @@ public class EntryCaseManagementController {
     @ApiOperation(value = "条目缺陷占比-报表导出-运行质控[by:gaodm]")
     @PostMapping("/run/entryGroupByEntryExport")
     public void runEntryGroupByEntryExport(HttpServletResponse response, @RequestBody @Valid FilterPageVO filterPageVO) {
-        entryCaseManagementFacade.entryGroupByEntryExport(response, filterPageVO);
+        entryCaseFacade.entryGroupByEntryExport(response, filterPageVO);
     }
 
     /**
@@ -122,7 +122,7 @@ public class EntryCaseManagementController {
     @ApiOperation(value = "单项否决缺陷占比-控制台[by:zhaops]")
     @PostMapping("/entryRejectPercent")
     public CommonResult<List<EntryNumDTO>> entryRejectPercent(@RequestBody @Valid FilterVO filterVO) {
-        return CommonResult.success(entryCaseManagementFacade.entryRejectPercent(filterVO));
+        return CommonResult.success(entryCaseFacade.entryRejectPercent(filterVO));
     }
 
     /**
@@ -134,7 +134,7 @@ public class EntryCaseManagementController {
     @ApiOperation(value = "单项否决缺陷占比-控制台-运行质控[by:zhaops]")
     @PostMapping("/run/entryRejectPercent")
     public CommonResult<List<EntryNumDTO>> runEntryRejectPercent(@RequestBody @Valid FilterVO filterVO) {
-        return CommonResult.success(entryCaseManagementFacade.entryRejectPercent(filterVO));
+        return CommonResult.success(entryCaseFacade.entryRejectPercent(filterVO));
     }
 
     /**
@@ -146,7 +146,7 @@ public class EntryCaseManagementController {
     @ApiOperation(value = "入院记录24h内未完成-控制台[by:zhaops]")
     @PostMapping("/casesEntryStatisticsById")
     public CommonResult<List<NumDTO>> casesEntryStatisticsById(@RequestBody @Valid FilterVO filterVO) {
-        return CommonResult.success(entryCaseManagementFacade.casesEntryStatisticsById(filterVO));
+        return CommonResult.success(entryCaseFacade.casesEntryStatisticsById(filterVO));
     }
 
     /**
@@ -158,7 +158,7 @@ public class EntryCaseManagementController {
     @ApiOperation(value = "关键条目缺陷占比-报表[by:zhaops]")
     @PostMapping("/entryStatistics")
     public CommonResult<List<EntryStatisticsDTO>> entryStatistics(@RequestBody @Valid EntryStatisticsVO entryStatisticsVO) {
-        return CommonResult.success(entryCaseManagementFacade.entryStatistics(entryStatisticsVO));
+        return CommonResult.success(entryCaseFacade.entryStatistics(entryStatisticsVO));
     }
 
     /**
@@ -170,7 +170,7 @@ public class EntryCaseManagementController {
     @ApiOperation(value = "关键条目缺陷占比-报表-运行质控[by:zhaops]")
     @PostMapping("/run/entryStatistics")
     public CommonResult<List<EntryStatisticsDTO>> runEntryStatistics(@RequestBody @Valid EntryStatisticsVO entryStatisticsVO) {
-        return CommonResult.success(entryCaseManagementFacade.entryStatistics(entryStatisticsVO));
+        return CommonResult.success(entryCaseFacade.entryStatistics(entryStatisticsVO));
     }
 
     /**
@@ -182,7 +182,7 @@ public class EntryCaseManagementController {
     @ApiOperation(value = "关键条目缺陷占比-报表导出[by:gaodm]")
     @PostMapping("/entryStatisticsExport")
     public void entryStatisticsExport(HttpServletResponse response, @RequestBody @Valid EntryStatisticsVO entryStatisticsVO) {
-        entryCaseManagementFacade.entryStatisticsExport(response, entryStatisticsVO);
+        entryCaseFacade.entryStatisticsExport(response, entryStatisticsVO);
     }
 
     /**
@@ -194,7 +194,7 @@ public class EntryCaseManagementController {
     @ApiOperation(value = "关键条目缺陷占比-报表导出-运行质控[by:gaodm]")
     @PostMapping("/run/entryStatisticsExport")
     public void runEntryStatisticsExport(HttpServletResponse response, @RequestBody @Valid EntryStatisticsVO entryStatisticsVO) {
-        entryCaseManagementFacade.entryStatisticsExport(response, entryStatisticsVO);
+        entryCaseFacade.entryStatisticsExport(response, entryStatisticsVO);
     }
 
     /**
@@ -206,7 +206,7 @@ public class EntryCaseManagementController {
     @ApiOperation(value = "关键条目缺陷占比-缺陷列表-报表[by:zhaops]")
     @PostMapping("/entryCountGroupByEntryPage")
     public CommonResult<IPage<EntryNumGroupDTO>> entryCountGroupByEntryPage(@RequestBody @Valid FilterPageVO filterPageVO) {
-        return CommonResult.success(entryCaseManagementFacade.entryCountGroupByEntryPage(filterPageVO));
+        return CommonResult.success(entryCaseFacade.entryCountGroupByEntryPage(filterPageVO));
     }
 
     /**
@@ -218,6 +218,6 @@ public class EntryCaseManagementController {
     @ApiOperation(value = "关键条目缺陷占比-缺陷列表-报表导出[by:gaodm]")
     @PostMapping("/entryCountGroupByEntryExport")
     public void entryCountGroupByEntryExport(HttpServletResponse response, @RequestBody @Valid FilterPageVO filterPageVO) {
-        entryCaseManagementFacade.entryCountGroupByEntryExport(response, filterPageVO);
+        entryCaseFacade.entryCountGroupByEntryExport(response, filterPageVO);
     }
 }

report-service/src/main/java/com/lantone/report/web/HomePageManagementController.java

@@ -4,7 +4,7 @@ import com.lantone.common.api.CommonResult;
 import com.lantone.common.dto.report.HomePageNumDTO;
 import com.lantone.common.vo.report.FilterOrderVO;
 import com.lantone.common.vo.report.FilterVO;
-import com.lantone.report.facade.HomePageManagementFacade;
+import com.lantone.report.facade.HomePageFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,9 +32,9 @@ import java.util.Map;
 @RequestMapping("/console")
 @Api(value = "病案首页管理统计相关API", tags = { "病案首页管理统计相关API" })
 @SuppressWarnings("unchecked")
-public class HomePageManagementController {
+public class HomePageController {
     @Autowired
-    private HomePageManagementFacade homePageManagementFacade;
+    private HomePageFacade homePageFacade;
 
     /**
      * 病案首页病历统计-控制台
@@ -45,7 +45,7 @@ public class HomePageManagementController {
     @ApiOperation(value = "病案首页病历统计-控制台[by:zhaops]")
     @PostMapping("/homePageMRCount")
     public CommonResult<Map<String, Object>> homePageMRCount(@RequestBody @Valid FilterVO filterVO) {
-        return CommonResult.success(homePageManagementFacade.homePageMRCount(filterVO));
+        return CommonResult.success(homePageFacade.homePageMRCount(filterVO));
     }
 
     /**
@@ -57,7 +57,7 @@ public class HomePageManagementController {
     @ApiOperation(value = "病案首页合格率占比-报表[by:zhaops]")
     @PostMapping("/homePageLevelStatistics")
     public CommonResult<List<HomePageNumDTO>> homePageLevelStatistics(@RequestBody @Valid FilterOrderVO filterOrderVO) {
-        return CommonResult.success(homePageManagementFacade.homePageLevelStatistics(filterOrderVO));
+        return CommonResult.success(homePageFacade.homePageLevelStatistics(filterOrderVO));
     }
 
     /**
@@ -69,6 +69,6 @@ public class HomePageManagementController {
     @ApiOperation(value = "病案首页合格率占比-报表导出[by:gaodm]")
     @PostMapping("/homePageLevelExport")
     public void homePageLevelExport(HttpServletResponse response, @RequestBody @Valid FilterOrderVO filterOrderVO) {
-        homePageManagementFacade.homePageLevelExport(response, filterOrderVO);
+        homePageFacade.homePageLevelExport(response, filterOrderVO);
     }
 }

report-service/src/main/java/com/lantone/report/web/LeaveBeHospitalManagementController.java

@@ -6,7 +6,7 @@ import com.lantone.common.dto.report.NumDTO;
 import com.lantone.common.dto.report.QcResultShortDTO;
 import com.lantone.common.vo.report.FilterVO;
 import com.lantone.common.vo.report.QcResultShortPageVO;
-import com.lantone.report.facade.LeaveBeHospitalManagementFacade;
+import com.lantone.report.facade.LeaveBeHospitalFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,9 +34,9 @@ import java.util.Map;
 @RequestMapping("/console")
 @Api(value = "出入院管理统计相关API", tags = { "出入院管理统计相关API" })
 @SuppressWarnings("unchecked")
-public class LeaveBeHospitalManagementController {
+public class LeaveBeHospitalController {
     @Autowired
-    private LeaveBeHospitalManagementFacade leaveHospitalManagementFacade;
+    private LeaveBeHospitalFacade leaveHospitalFacade;
 
     /**
      * 出院人数统计
@@ -47,7 +47,7 @@ public class LeaveBeHospitalManagementController {
     @ApiOperation(value = "出院人数统计-控制台[by:zhaops]")
     @PostMapping("/leaveHosCount")
     public CommonResult<Map<String, Object>> leaveHosCount(@RequestBody @Valid FilterVO filterVO) {
-        return CommonResult.success(leaveHospitalManagementFacade.leaveHosCount(filterVO));
+        return CommonResult.success(leaveHospitalFacade.leaveHosCount(filterVO));
     }
 
     /**
@@ -59,7 +59,7 @@ public class LeaveBeHospitalManagementController {
     @ApiOperation(value = "出院人数统计-报表[by:zhaops]")
     @PostMapping("/leaveHosMRPage")
     public CommonResult<IPage<QcResultShortDTO>> leaveHosMRPage(@RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
-        return CommonResult.success(leaveHospitalManagementFacade.leaveHosMRPage(qcResultShortPageVO));
+        return CommonResult.success(leaveHospitalFacade.leaveHosMRPage(qcResultShortPageVO));
     }
 
     /**
@@ -71,7 +71,7 @@ public class LeaveBeHospitalManagementController {
     @ApiOperation(value = "出院人数统计-报表导出[by:zhaops]")
     @PostMapping("/leaveHosMrPageExport")
     public void leaveHosMrPageExport(HttpServletResponse response, @RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
-        leaveHospitalManagementFacade.leaveHosMrPageExportMethod(response, qcResultShortPageVO);
+        leaveHospitalFacade.leaveHosMrPageExportMethod(response, qcResultShortPageVO);
     }
 
     /**
@@ -83,7 +83,7 @@ public class LeaveBeHospitalManagementController {
     @ApiOperation(value = "入院人数统计-控制台-运行质控[by:zhaops]")
     @PostMapping("/beHosCount")
     public CommonResult<List<NumDTO>> beHosCount(@RequestBody @Valid FilterVO filterVO) {
-        return CommonResult.success(leaveHospitalManagementFacade.beHosCount(filterVO));
+        return CommonResult.success(leaveHospitalFacade.beHosCount(filterVO));
     }
 
     /**
@@ -95,7 +95,7 @@ public class LeaveBeHospitalManagementController {
     @ApiOperation(value = "出院人数统计-报表-运行质控[by:zhaops]")
     @PostMapping("/run/leaveHosMRPage")
     public CommonResult<IPage<QcResultShortDTO>> runLeaveHosMRPage(@RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
-        return CommonResult.success(leaveHospitalManagementFacade.leaveHosMRPage(qcResultShortPageVO));
+        return CommonResult.success(leaveHospitalFacade.leaveHosMRPage(qcResultShortPageVO));
     }
 
     /**
@@ -107,6 +107,6 @@ public class LeaveBeHospitalManagementController {
     @ApiOperation(value = "出院人数统计-报表导出-运行质控[by:zhaops]")
     @PostMapping("/run/leaveHosMrPageExport")
     public void runLeaveHosMrPageExport(HttpServletResponse response, @RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
-        leaveHospitalManagementFacade.leaveHosMrPageExportMethod(response, qcResultShortPageVO);
+        leaveHospitalFacade.leaveHosMrPageExportMethod(response, qcResultShortPageVO);
     }
 }

report-service/src/main/java/com/lantone/report/web/ModuleCaseManagementController.java

@@ -5,7 +5,7 @@ import com.lantone.common.api.CommonResult;
 import com.lantone.common.dto.report.NumDTO;
 import com.lantone.common.vo.report.FilterPageVO;
 import com.lantone.common.vo.report.FilterVO;
-import com.lantone.report.facade.ModuleCaseManagementFacade;
+import com.lantone.report.facade.ModuleCaseFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,9 +32,9 @@ import java.util.Map;
 @RequestMapping("/console")
 @Api(value = "模块缺陷管理统计相关API", tags = { "模块缺陷管理统计相关API" })
 @SuppressWarnings("unchecked")
-public class ModuleCaseManagementController {
+public class ModuleCaseController {
     @Autowired
-    private ModuleCaseManagementFacade moduleCaseManagementFacade;
+    private ModuleCaseFacade moduleCaseFacade;
 
     /**
      * 各模块缺陷占比排行-控制台
@@ -45,7 +45,7 @@ public class ModuleCaseManagementController {
     @ApiOperation(value = "各模块缺陷占比排行-控制台[by:zhaops]")
     @PostMapping("/entryCountGroupByCase")
     public CommonResult<Map<String, Object>> entryCountGroupByCase(@RequestBody @Valid FilterVO filterVO) {
-        return CommonResult.success(moduleCaseManagementFacade.entryCountGroupByCase(filterVO));
+        return CommonResult.success(moduleCaseFacade.entryCountGroupByCase(filterVO));
     }
 
     /**
@@ -57,7 +57,7 @@ public class ModuleCaseManagementController {
     @ApiOperation(value = "各模块缺陷占比排行-控制台-运行质控[by:zhaops]")
     @PostMapping("/run/entryCountGroupByCase")
     public CommonResult<Map<String, Object>> runEntryCountGroupByCase(@RequestBody @Valid FilterVO filterVO) {
-        return CommonResult.success(moduleCaseManagementFacade.entryCountGroupByCase(filterVO));
+        return CommonResult.success(moduleCaseFacade.entryCountGroupByCase(filterVO));
     }
 
     /**
@@ -69,7 +69,7 @@ public class ModuleCaseManagementController {
     @ApiOperation(value = "各模块缺陷占比排行-报表[by:zhaops]")
     @PostMapping("/entryCountGroupByCasePage")
     public CommonResult<IPage<NumDTO>> entryCountGroupByCasePage(@RequestBody @Valid FilterPageVO filterPageVO) {
-        return CommonResult.success(moduleCaseManagementFacade.entryCountGroupByCasePage(filterPageVO));
+        return CommonResult.success(moduleCaseFacade.entryCountGroupByCasePage(filterPageVO));
     }
 
     /**
@@ -81,7 +81,7 @@ public class ModuleCaseManagementController {
     @ApiOperation(value = "各模块缺陷占比排行-报表-运行质控[by:zhaops]")
     @PostMapping("/run/entryCountGroupByCasePage")
     public CommonResult<IPage<NumDTO>> runEntryCountGroupByCasePage(@RequestBody @Valid FilterPageVO filterPageVO) {
-        return CommonResult.success(moduleCaseManagementFacade.entryCountGroupByCasePage(filterPageVO));
+        return CommonResult.success(moduleCaseFacade.entryCountGroupByCasePage(filterPageVO));
     }
 
     /**
@@ -93,7 +93,7 @@ public class ModuleCaseManagementController {
     @ApiOperation(value = "各模块缺陷占比排行-报表导出[by:gaodm]")
     @PostMapping("/entryCountGroupByCaseExport")
     public void entryCountGroupByCaseExport(HttpServletResponse response, @RequestBody @Valid FilterPageVO filterPageVO) {
-        moduleCaseManagementFacade.entryCountGroupByCaseExport(response, filterPageVO);
+        moduleCaseFacade.entryCountGroupByCaseExport(response, filterPageVO);
     }
 
     /**
@@ -105,6 +105,6 @@ public class ModuleCaseManagementController {
     @ApiOperation(value = "各模块缺陷占比排行-报表导出-运行质控[by:gaodm]")
     @PostMapping("/run/entryCountGroupByCaseExport")
     public void runEntryCountGroupByCaseExport(HttpServletResponse response, @RequestBody @Valid FilterPageVO filterPageVO) {
-        moduleCaseManagementFacade.entryCountGroupByCaseExport(response, filterPageVO);
+        moduleCaseFacade.entryCountGroupByCaseExport(response, filterPageVO);
     }
 }

report-service/src/main/java/com/lantone/report/web/MrIndicatorManagementController.java

@@ -1,7 +1,7 @@
 package com.lantone.report.web;
 import com.lantone.common.api.CommonResult;
 import com.lantone.common.vo.report.FilterVO;
-import com.lantone.report.facade.MrIndicatorManagementFacade;
+import com.lantone.report.facade.MrIndicatorFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,9 +27,9 @@ import java.util.Map;
 @RequestMapping("/console")
 @Api(value = "病案指标管理统计相关API", tags = { "病案指标管理统计相关API" })
 @SuppressWarnings("unchecked")
-public class MrIndicatorManagementController {
+public class MrIndicatorController {
     @Autowired
-    private MrIndicatorManagementFacade mrIndicatorManagementFacade;
+    private MrIndicatorFacade mrIndicatorFacade;
 
     /**
      * 病案指标管理统计相关API
@@ -39,6 +39,6 @@ public class MrIndicatorManagementController {
     @ApiOperation(value = "病案指标管理统计相关API[by:zh]")
     @PostMapping("/medicalRecordIndicator")
     public CommonResult<List<Map<String,String>>> medicalRecordIndicator(@RequestBody @Valid FilterVO filterVO) {
-        return CommonResult.success(mrIndicatorManagementFacade.medicalRecordIndicator(filterVO));
+        return CommonResult.success(mrIndicatorFacade.medicalRecordIndicator(filterVO));
     }
 }

report-service/src/main/java/com/lantone/report/web/MrInfoManagementController.java

@@ -16,7 +16,7 @@ import com.lantone.common.vo.report.ExportQcresultVO;
 import com.lantone.common.vo.report.GetDetailVO;
 import com.lantone.common.vo.report.MedNurseInfoVO;
 import com.lantone.dblayermbg.entity.report.Nurse;
-import com.lantone.report.facade.MrInfoManagementFacade;
+import com.lantone.report.facade.MrInfoFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,57 +41,57 @@ import java.util.Map;
 @RequestMapping("/qc")
 @Api(value = "病历列表相关API", tags = { "病历列表相关API" })
 @SuppressWarnings("unchecked")
-public class MrInfoManagementController {
+public class MrInfoController {
     @Autowired
-    private MrInfoManagementFacade mrInfoManagementFacade;
+    private MrInfoFacade mrInfoFacade;
 
     @ApiOperation(value = "病历列表-报表[by:zhoutg]")
     @PostMapping("/behospitalInfo/page")
     public CommonResult<IPage<BehospitalInfoDTO>> page(@RequestBody BehospitalPageVO behospitalPageVO) {
-        IPage<BehospitalInfoDTO> data = mrInfoManagementFacade.pageFac(behospitalPageVO);
+        IPage<BehospitalInfoDTO> data = mrInfoFacade.pageFac(behospitalPageVO);
         return CommonResult.success(data);
     }
 
     @ApiOperation(value = "病历列表-报表导出[by:zhaops]")
     @PostMapping("/behospitalInfo/exportQcresult")
     public void exportQcresult(HttpServletResponse response, @RequestBody ExportQcresultVO exportQcresultVO) {
-        mrInfoManagementFacade.exportQcresult(response, exportQcresultVO);
+        mrInfoFacade.exportQcresult(response, exportQcresultVO);
     }
 
     @ApiOperation(value = "根据病历id获取详情[by:zhoutg]")
     @PostMapping("/behospitalInfo/getByBehospitalCode")
     public CommonResult<Map<String, Object>> getByBehospitalCode(@RequestBody GetDetailVO getDetailVO) {
-        Map<String, Object> data = mrInfoManagementFacade.getByBehospitalCode(getDetailVO);
+        Map<String, Object> data = mrInfoFacade.getByBehospitalCode(getDetailVO);
         return CommonResult.success(data);
     }
 
     @ApiOperation(value = "护理信息API[by:cy]")
     @PostMapping("/medNurse/getMedNursePage")
     public CommonResult<IPage<Nurse>> getMedNursePage(@RequestBody @Valid MedNurseInfoVO medNurseInfoVO) {
-        return  CommonResult.success(mrInfoManagementFacade.getMedNursePage(medNurseInfoVO));
+        return  CommonResult.success(mrInfoFacade.getMedNursePage(medNurseInfoVO));
     }
 
     @ApiOperation(value = "获取检查信息[by:cy]")
     @PostMapping("/medPacsInfo/getCheckPage")
     public CommonResult<IPage<CheckInfoDTO>> getCheckPage(@RequestBody @Valid CheckInfoVO checkInfoVO) {
-        return  CommonResult.success(mrInfoManagementFacade.getCheckPage(checkInfoVO));
+        return  CommonResult.success(mrInfoFacade.getCheckPage(checkInfoVO));
     }
 
     @ApiOperation(value = "获取检验信息[by:cy]")
     @PostMapping("/medLisInfo/getExaminePage")
     public CommonResult<IPage<ExamineInfoDTO>> getExaminePage(@RequestBody @Valid ExamineInfoVO examineInfoVO) {
-        return CommonResult.success(mrInfoManagementFacade.getExaminePage(examineInfoVO));
+        return CommonResult.success(mrInfoFacade.getExaminePage(examineInfoVO));
     }
 
     @ApiOperation(value = "获取检验子项信息[by:cy]")
     @PostMapping("/medLisInfo/getExamineSonPage")
     public CommonResult<IPage<ExamineSonInfoDTO>> getExamineSonPage(@RequestBody @Valid ExamineSonInfoVO examineSonInfoVO) {
-        return CommonResult.success(mrInfoManagementFacade.getExamineSonPage(examineSonInfoVO));
+        return CommonResult.success(mrInfoFacade.getExamineSonPage(examineSonInfoVO));
     }
 
     @ApiOperation(value = "获取医嘱信息[by:gaodm]")
     @PostMapping("/doctoradvice/getPage")
     public CommonResult<IPage<DoctorAdviceDTO>> getPage(@RequestBody @Valid DoctorAdviceVO doctorAdviceVO) {
-        return CommonResult.success(mrInfoManagementFacade.getPageFac(doctorAdviceVO));
+        return CommonResult.success(mrInfoFacade.getPageFac(doctorAdviceVO));
     }
 }

report-service/src/main/java/com/lantone/report/web/MrQcCaseManagementController.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.api.CommonResult;
 import com.lantone.common.dto.report.QualityControlDTO;
 import com.lantone.common.vo.report.BehospitalPageVO;
-import com.lantone.report.facade.MrQcCaseManagementFacade;
+import com.lantone.report.facade.MrQcCaseFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,9 +29,9 @@ import javax.servlet.http.HttpServletResponse;
 @RequestMapping("/console")
 @Api(value = "病历质控报表管理统计相关API", tags = { "病历质控报表管理统计相关API" })
 @SuppressWarnings("unchecked")
-public class MrQcCaseManagementController {
+public class MrQcCaseController {
     @Autowired
-    private MrQcCaseManagementFacade mrQcCaseManagementFacade;
+    private MrQcCaseFacade mrQcCaseFacade;
 
     /**
      * 病历质控报表-报表
@@ -42,7 +42,7 @@ public class MrQcCaseManagementController {
     @ApiOperation(value = "病历质控报表-报表[by:cy]")
     @PostMapping("/qualityControl")
     public CommonResult<IPage<QualityControlDTO>> getQualityControl(@RequestBody BehospitalPageVO behospitalPageVO) {
-        return CommonResult.success(mrQcCaseManagementFacade.getQualityControl(behospitalPageVO));
+        return CommonResult.success(mrQcCaseFacade.getQualityControl(behospitalPageVO));
     }
 
     /**
@@ -54,6 +54,6 @@ public class MrQcCaseManagementController {
     @ApiOperation(value = "病历质控报表-报表导出[by:cy]")
     @PostMapping("/qualityControlExport")
     public void qualityControlExport(HttpServletResponse response, @RequestBody BehospitalPageVO behospitalPageVO) {
-        mrQcCaseManagementFacade.qualityControlExport(response, behospitalPageVO);
+        mrQcCaseFacade.qualityControlExport(response, behospitalPageVO);
     }
 }

report-service/src/main/java/com/lantone/report/web/MrQcInfoManagementController.java

@@ -5,7 +5,7 @@ import com.lantone.common.api.CommonResult;
 import com.lantone.common.dto.report.QcResultShortDTO;
 import com.lantone.common.vo.report.QcResultPageVO;
 import com.lantone.common.vo.report.QcResultShortPageVO;
-import com.lantone.report.facade.MrQcInfoManagementFacade;
+import com.lantone.report.facade.MrQcInfoFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,9 +30,9 @@ import javax.validation.Valid;
 @RequestMapping("/console")
 @Api(value = "病历质控列表相关API", tags = { "病历质控列表相关API" })
 @SuppressWarnings("unchecked")
-public class MrQcInfoManagementController {
+public class MrQcInfoController {
     @Autowired
-    private MrQcInfoManagementFacade mrQcInfoManagementFacade;
+    private MrQcInfoFacade mrQcInfoFacade;
 
     /**
      * 条目缺陷病历列表-报表
@@ -43,7 +43,7 @@ public class MrQcInfoManagementController {
     @ApiOperation(value = "条目缺陷病历列表-报表[by:zhaops]")
     @PostMapping("/qcResultShortPage")
     public CommonResult<IPage<QcResultShortDTO>> qcResultShortPage(@RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
-        return CommonResult.success(mrQcInfoManagementFacade.qcResultShortPage(qcResultShortPageVO));
+        return CommonResult.success(mrQcInfoFacade.qcResultShortPage(qcResultShortPageVO));
     }
 
     /**
@@ -55,7 +55,7 @@ public class MrQcInfoManagementController {
     @ApiOperation(value = "条目缺陷病历列表-报表[by:zhaops]")
     @PostMapping("/qcResultShortPageExport")
     public void qcResultShortPageExport(HttpServletResponse response, @RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
-        mrQcInfoManagementFacade.qcResultShortPageExport(response, qcResultShortPageVO);
+        mrQcInfoFacade.qcResultShortPageExport(response, qcResultShortPageVO);
     }
 
     /**
@@ -66,7 +66,7 @@ public class MrQcInfoManagementController {
     @ApiOperation(value = "病案首页合格|不合格病历列表-报表[by:cy]")
     @PostMapping("/badLevelPage")
     public CommonResult<IPage<QcResultShortDTO>> badLevelPage(@RequestBody @Valid QcResultPageVO qcResultPageVO) {
-        return CommonResult.success(mrQcInfoManagementFacade.badLevelPage(qcResultPageVO));
+        return CommonResult.success(mrQcInfoFacade.badLevelPage(qcResultPageVO));
     }
 
     /**
@@ -78,7 +78,7 @@ public class MrQcInfoManagementController {
     @ApiOperation(value = " 病案首页合格|不合格病历列表-报表导出[by:cy]")
     @PostMapping("/badLevelPagePageExport")
     public void badLevelPagePageExport(HttpServletResponse response, @RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
-        mrQcInfoManagementFacade.badLevelPagePageExport(response, qcResultShortPageVO);
+        mrQcInfoFacade.badLevelPagePageExport(response, qcResultShortPageVO);
     }
 
     /**
@@ -90,7 +90,7 @@ public class MrQcInfoManagementController {
     @ApiOperation(value = "质控核查统计病历列表-报表[by:zhaops]")
     @PostMapping("/qcCheckMRPage")
     public CommonResult<IPage<QcResultShortDTO>> qcCheckMRPage(@RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
-        return CommonResult.success(mrQcInfoManagementFacade.qcCheckMRPage(qcResultShortPageVO));
+        return CommonResult.success(mrQcInfoFacade.qcCheckMRPage(qcResultShortPageVO));
     }
 
     /**
@@ -102,7 +102,7 @@ public class MrQcInfoManagementController {
     @ApiOperation(value = "质控核查改善相关统计病历列表-报表[by:zhaops]")
     @PostMapping("/hmImproveMRPage")
     public CommonResult<IPage<QcResultShortDTO>> hmImproveMRPage(@RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
-        return CommonResult.success(mrQcInfoManagementFacade.hmImproveMRPage(qcResultShortPageVO));
+        return CommonResult.success(mrQcInfoFacade.hmImproveMRPage(qcResultShortPageVO));
     }
 
     /**
@@ -114,7 +114,7 @@ public class MrQcInfoManagementController {
     @ApiOperation(value = "质控核查统计病历AB列表-报表导出[by:zhaops]")
     @PostMapping("/qcCheckMRPageExport")
     public void qcCheckMRPageExport(HttpServletResponse response, @RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
-        mrQcInfoManagementFacade.qcCheckMRPageExport(response, qcResultShortPageVO);
+        mrQcInfoFacade.qcCheckMRPageExport(response, qcResultShortPageVO);
     }
 
     /**
@@ -126,7 +126,7 @@ public class MrQcInfoManagementController {
     @ApiOperation(value = "时效性|稽查条目病历列表-报表[by:zhaops]")
     @PostMapping("/unModifyMRPage")
     public CommonResult<IPage<QcResultShortDTO>> unModifyMRPage(@RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
-        return CommonResult.success(mrQcInfoManagementFacade.unModifyMRPage(qcResultShortPageVO));
+        return CommonResult.success(mrQcInfoFacade.unModifyMRPage(qcResultShortPageVO));
     }
 
     /**
@@ -138,7 +138,7 @@ public class MrQcInfoManagementController {
     @ApiOperation(value = "时效性|稽查条目病历列表-报表导出[by:zhaops]")
     @PostMapping("/unModifyMRPageExport")
     public void unModifyMRPageExport(HttpServletResponse response, @RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
-        mrQcInfoManagementFacade.unModifyMRPageExport(response, qcResultShortPageVO);
+        mrQcInfoFacade.unModifyMRPageExport(response, qcResultShortPageVO);
     }
 
 }

report-service/src/main/java/com/lantone/report/web/QcCheckController.java

@@ -0,0 +1,58 @@
+package com.lantone.report.web;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.common.api.CommonResult;
+import com.lantone.common.dto.report.CheckJobDTO;
+import com.lantone.common.dto.report.CheckWorkDTO;
+import com.lantone.common.vo.report.CheckJobPageVO;
+import com.lantone.common.vo.report.CheckWorkPageVO;
+import com.lantone.common.vo.report.MedCheckWorkAddVO;
+import com.lantone.report.facade.QcCheckFacade;
+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;
+
+
+/**
+ * <p>
+ * 质控核查管理相关API
+ * </p>
+ *
+ * @author zhaops
+ * @since 2020-04-27
+ */
+
+@RestController
+@RequestMapping("/qc")
+@Api(value = "质控核查管理相关API", tags = { "质控核查管理相关API" })
+@SuppressWarnings("unchecked")
+public class QcCheckController {
+    @Autowired
+    private QcCheckFacade qcCheckFacade;
+
+    @ApiOperation(value = "获取患者病历列表[by:wangsy]")
+    @PostMapping("/medCheckWork/getUserList")
+    public CommonResult<IPage<CheckWorkDTO>> checkWorkPage(@RequestBody CheckWorkPageVO checkWorkPageVO) {
+        IPage<CheckWorkDTO> data = qcCheckFacade.pageFac(checkWorkPageVO);
+        return CommonResult.success(data);
+    }
+
+    @ApiOperation(value = "生成/取消核查任务[by:wangsy]")
+    @PostMapping("/medCheckWork/addCheckWork")
+    public CommonResult<Boolean> addCheckTask(@RequestBody MedCheckWorkAddVO medCheckWorkVO) {
+        Boolean res = qcCheckFacade.addCheckWork(medCheckWorkVO);
+        return CommonResult.success(res);
+    }
+
+    @ApiOperation(value = "分配核查任务--获取待分配核查任务列表[by:songxl]" )
+    @PostMapping("/medCheckInfo/getCheckList")
+    public CommonResult<IPage<CheckJobDTO>> getCheckList(@RequestBody CheckJobPageVO checkJobPageVO) {
+        IPage<CheckJobDTO> userInfos = qcCheckFacade.getUserCheckList(checkJobPageVO);
+        return CommonResult.success(userInfos);
+    }
+
+}

report-service/src/main/java/com/lantone/report/web/QcCheckManagementController.java

@@ -6,7 +6,7 @@ import com.lantone.common.dto.report.HomePageImproveDTO;
 import com.lantone.common.dto.report.MedicalCheckDTO;
 import com.lantone.common.vo.report.FilterMedicalCheckVO;
 import com.lantone.common.vo.report.FilterOrderVO;
-import com.lantone.report.facade.QcCheckManagementFacade;
+import com.lantone.report.facade.QcCheckStatisticsFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,9 +33,9 @@ import java.util.List;
 @RequestMapping("/console")
 @Api(value = "病历稽查|核查管理统计相关API", tags = { "病历稽查|核查管理统计相关API" })
 @SuppressWarnings("unchecked")
-public class QcCheckManagementController {
+public class QcCheckStatisticsController {
     @Autowired
-    private QcCheckManagementFacade qcCheckManagementFacade;
+    private QcCheckStatisticsFacade qcCheckStatisticsFacade;
 
 
     /**
@@ -47,7 +47,7 @@ public class QcCheckManagementController {
     @ApiOperation(value = "病历稽查统计[by:cy]")
     @PostMapping("/medicalCheckForm")
     public CommonResult<IPage<MedicalCheckDTO>> medicalCheckForm(@RequestBody @Valid FilterMedicalCheckVO filterVO) {
-        return CommonResult.success((qcCheckManagementFacade.getMedicalCheck(filterVO)));
+        return CommonResult.success(qcCheckStatisticsFacade.getMedicalCheck(filterVO));
     }
 
     /**
@@ -59,7 +59,7 @@ public class QcCheckManagementController {
     @ApiOperation(value = "病历稽查统计-运行质控[by:cy]")
     @PostMapping("/run/medicalCheckForm")
     public CommonResult<IPage<MedicalCheckDTO>> runMedicalCheckForm(@RequestBody @Valid FilterMedicalCheckVO filterVO) {
-        return CommonResult.success((qcCheckManagementFacade.getMedicalCheck(filterVO)));
+        return CommonResult.success(qcCheckStatisticsFacade.getMedicalCheck(filterVO));
     }
 
     /**
@@ -71,7 +71,7 @@ public class QcCheckManagementController {
     @ApiOperation(value = "病历稽查表-报表导出[by:cy]")
     @PostMapping("/medicalCheckExport")
     public void medicalCheckExport(HttpServletResponse response, @RequestBody @Valid FilterMedicalCheckVO filterVO) {
-        qcCheckManagementFacade.medicalCheckExport(response, filterVO);
+        qcCheckStatisticsFacade.medicalCheckExport(response, filterVO);
     }
 
     /**
@@ -83,7 +83,7 @@ public class QcCheckManagementController {
     @ApiOperation(value = "病历稽查表-报表导出-运行质控[by:cy]")
     @PostMapping("/run/medicalCheckExport")
     public void runMedicalCheckExport(HttpServletResponse response, @RequestBody @Valid FilterMedicalCheckVO filterVO) {
-        qcCheckManagementFacade.medicalCheckExport(response, filterVO);
+        qcCheckStatisticsFacade.medicalCheckExport(response, filterVO);
     }
 
 
@@ -96,7 +96,7 @@ public class QcCheckManagementController {
     @ApiOperation(value = "质控核查统计-报表[by:zhaops]")
     @PostMapping("/qcCheckStatistics")
     public CommonResult<List<HomePageImproveDTO>> qcCheckStatistics(@RequestBody @Valid FilterOrderVO filterOrderVO) {
-        return CommonResult.success(qcCheckManagementFacade.qcCheckStatistics(filterOrderVO));
+        return CommonResult.success(qcCheckStatisticsFacade.qcCheckStatistics(filterOrderVO));
     }
 
     /**
@@ -108,6 +108,6 @@ public class QcCheckManagementController {
     @ApiOperation(value = "质控核查统计-报表导出[by:zhaops]")
     @PostMapping("/qcCheckStatisticsExport")
     public void qcCheckStatisticsExport(HttpServletResponse response, @RequestBody @Valid FilterOrderVO filterOrderVO) {
-        qcCheckManagementFacade.qcCheckStatisticsExport(response, filterOrderVO);
+        qcCheckStatisticsFacade.qcCheckStatisticsExport(response, filterOrderVO);
     }
 }

report-service/src/main/java/com/lantone/report/web/QcScoreManagementController.java

@@ -8,7 +8,7 @@ import com.lantone.common.dto.report.LevelStatisticsTZDTO;
 import com.lantone.common.vo.report.FilterOrderVO;
 import com.lantone.common.vo.report.FilterVO;
 
-import com.lantone.report.facade.QcScoreManagementFacade;
+import com.lantone.report.facade.QcScoreFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,9 +36,9 @@ import java.util.Map;
 @RequestMapping("/console")
 @Api(value = "质控病历分数|等级管理统计相关API", tags = { "质控病历分数|等级管理统计相关API" })
 @SuppressWarnings("unchecked")
-public class QcScoreManagementController {
+public class QcScoreController {
     @Autowired
-    private QcScoreManagementFacade qcScoreManagementFacade;
+    private QcScoreFacade qcScoreFacade;
 
     /**
      * 病历评分等级占比-控制台
@@ -49,7 +49,7 @@ public class QcScoreManagementController {
     @ApiOperation(value = "病历评分等级占比-控制台[by:zhaops]")
     @PostMapping("/mrCount")
     public CommonResult<Map<String, Object>> mrCount(@RequestBody @Valid FilterVO filterVO) {
-        return CommonResult.success(qcScoreManagementFacade.mrCount(filterVO));
+        return CommonResult.success(qcScoreFacade.mrCount(filterVO));
     }
 
     /**
@@ -61,7 +61,7 @@ public class QcScoreManagementController {
     @ApiOperation(value = "病历评分等级占比-控制台-运行质控[by:zhaops]")
     @PostMapping("/run/mrCount")
     public CommonResult<Map<String, Object>> runMrCount(@RequestBody @Valid FilterVO filterVO) {
-        return CommonResult.success(qcScoreManagementFacade.mrCount(filterVO));
+        return CommonResult.success(qcScoreFacade.mrCount(filterVO));
     }
 
     /**
@@ -73,7 +73,7 @@ public class QcScoreManagementController {
     @ApiOperation(value = "各科室病历等级占比-控制台[by:zhaops]")
     @PostMapping("/qcResultLevelPercent")
     public CommonResult<List<DeptNumDTO>> qcResultLevelPercent(@RequestBody @Valid FilterVO filterVO) {
-        return CommonResult.success(qcScoreManagementFacade.qcResultLevelPercent(filterVO));
+        return CommonResult.success(qcScoreFacade.qcResultLevelPercent(filterVO));
     }
 
     /**
@@ -85,7 +85,7 @@ public class QcScoreManagementController {
     @ApiOperation(value = "各科室病历等级占比-控制台-运行质控[by:zhaops]")
     @PostMapping("/run/qcResultLevelPercent")
     public CommonResult<List<DeptNumDTO>> runQcResultLevelPercent(@RequestBody @Valid FilterVO filterVO) {
-        return CommonResult.success(qcScoreManagementFacade.qcResultLevelPercent(filterVO));
+        return CommonResult.success(qcScoreFacade.qcResultLevelPercent(filterVO));
     }
 
     /**
@@ -97,7 +97,7 @@ public class QcScoreManagementController {
     @ApiOperation(value = "各科室缺陷占比-报表[by:zhaops]")
     @PostMapping("/levelStatistics")
     public CommonResult<List<LevelStatisticsDTO>> levelStatistics(@RequestBody @Valid FilterOrderVO filterOrderVO) {
-        return CommonResult.success(qcScoreManagementFacade.levelStatistics(filterOrderVO));
+        return CommonResult.success(qcScoreFacade.levelStatistics(filterOrderVO));
     }
 
     /**
@@ -109,7 +109,7 @@ public class QcScoreManagementController {
     @ApiOperation(value = "各科室缺陷占比-报表-运行质控[by:zhaops]")
     @PostMapping("/run/levelStatistics")
     public CommonResult<List<LevelStatisticsDTO>> runLevelStatistics(@RequestBody @Valid FilterOrderVO filterOrderVO) {
-        return CommonResult.success(qcScoreManagementFacade.levelStatistics(filterOrderVO));
+        return CommonResult.success(qcScoreFacade.levelStatistics(filterOrderVO));
     }
 
     /**
@@ -121,7 +121,7 @@ public class QcScoreManagementController {
     @ApiOperation(value = "各科室缺陷占比-报表导出[by:gaodm]")
     @PostMapping("/levelExport")
     public void levelExport(HttpServletResponse response, @RequestBody @Valid FilterOrderVO filterOrderVO) {
-        qcScoreManagementFacade.levelExport(response, filterOrderVO);
+        qcScoreFacade.levelExport(response, filterOrderVO);
     }
 
     /**
@@ -133,7 +133,7 @@ public class QcScoreManagementController {
     @ApiOperation(value = "各科室缺陷占比-报表导出-运行质控[by:gaodm]")
     @PostMapping("/run/levelExport")
     public void runLevelExport(HttpServletResponse response, @RequestBody @Valid FilterOrderVO filterOrderVO) {
-        qcScoreManagementFacade.levelExport(response, filterOrderVO);
+        qcScoreFacade.levelExport(response, filterOrderVO);
     }
 
 
@@ -146,7 +146,7 @@ public class QcScoreManagementController {
     @ApiOperation(value = "各科室缺陷占比（台州）-报表[by:zhaops]")
     @PostMapping("/levelStatisticsByDeptClass")
     public CommonResult<List<LevelStatisticsTZDTO>> levelStatisticsByDeptClass(@RequestBody @Valid FilterOrderVO filterOrderVO) {
-        return CommonResult.success(qcScoreManagementFacade.levelStatisticsByDeptClass_TZ(filterOrderVO));
+        return CommonResult.success(qcScoreFacade.levelStatisticsByDeptClass_TZ(filterOrderVO));
     }
 
     /**
@@ -158,7 +158,7 @@ public class QcScoreManagementController {
     @ApiOperation(value = "各科室缺陷占比（台州）-报表-运行质控[by:zhaops]")
     @PostMapping("/run/levelStatisticsByDeptClass")
     public CommonResult<List<LevelStatisticsTZDTO>> runLevelStatisticsByDeptClass(@RequestBody @Valid FilterOrderVO filterOrderVO) {
-        return CommonResult.success(qcScoreManagementFacade.levelStatisticsByDeptClass_TZ(filterOrderVO));
+        return CommonResult.success(qcScoreFacade.levelStatisticsByDeptClass_TZ(filterOrderVO));
     }
 
     /**
@@ -170,7 +170,7 @@ public class QcScoreManagementController {
     @ApiOperation(value = "各科室缺陷占比（台州）-报表导出[by:gaodm]")
     @PostMapping("/levelExport_TZ")
     public void levelExport_TZ(HttpServletResponse response, @RequestBody @Valid FilterOrderVO filterOrderVO) {
-        qcScoreManagementFacade.levelExport_TZ(response, filterOrderVO);
+        qcScoreFacade.levelExport_TZ(response, filterOrderVO);
     }
 
     /**
@@ -182,7 +182,7 @@ public class QcScoreManagementController {
     @ApiOperation(value = "各科室缺陷占比（台州）-报表导出-运行质控[by:gaodm]")
     @PostMapping("/run/levelExport_TZ")
     public void runLevelExport_TZ(HttpServletResponse response, @RequestBody @Valid FilterOrderVO filterOrderVO) {
-        qcScoreManagementFacade.levelExport_TZ(response, filterOrderVO);
+        qcScoreFacade.levelExport_TZ(response, filterOrderVO);
     }
 
     /**
@@ -194,7 +194,7 @@ public class QcScoreManagementController {
     @ApiOperation(value = "各科室质控平均分柱状图-控制台[by:zhaops]")
     @PostMapping("/getAverageScore")
     public CommonResult<Map<String, Object>> getAverageScore(@RequestBody @Valid FilterVO filterVO) {
-        return CommonResult.success(qcScoreManagementFacade.getAverageScore(filterVO));
+        return CommonResult.success(qcScoreFacade.getAverageScore(filterVO));
     }
 
     /**
@@ -206,7 +206,7 @@ public class QcScoreManagementController {
     @ApiOperation(value = "各科室质控平均分柱状图-控制台-运行质控[by:zhaops]")
     @PostMapping("/run/getAverageScore")
     public CommonResult<Map<String, Object>> runGetAverageScore(@RequestBody @Valid FilterVO filterVO) {
-        return CommonResult.success(qcScoreManagementFacade.getAverageScore(filterVO));
+        return CommonResult.success(qcScoreFacade.getAverageScore(filterVO));
     }
 
     /**
@@ -218,7 +218,7 @@ public class QcScoreManagementController {
     @ApiOperation(value = "各科室质控平均分柱状图（台州）-控制台[by:zhaops]")
     @PostMapping("/getAverageScoreByDeptClass")
     public CommonResult<List<AverageStatisticsDTO>> getAverageScoreByDeptClass(@RequestBody @Valid FilterVO filterVO) {
-        return CommonResult.success(qcScoreManagementFacade.getAverageScoreByDeptClass(filterVO));
+        return CommonResult.success(qcScoreFacade.getAverageScoreByDeptClass(filterVO));
     }
 
     /**
@@ -230,6 +230,6 @@ public class QcScoreManagementController {
     @ApiOperation(value = "各科室质控平均分柱状图（台州）-控制台-运行质控[by:zhaops]")
     @PostMapping("/run/getAverageScoreByDeptClass")
     public CommonResult<List<AverageStatisticsDTO>> runGetAverageScoreByDeptClass(@RequestBody @Valid FilterVO filterVO) {
-        return CommonResult.success(qcScoreManagementFacade.getAverageScoreByDeptClass(filterVO));
+        return CommonResult.success(qcScoreFacade.getAverageScoreByDeptClass(filterVO));
     }
 }

report-service/src/main/java/com/lantone/report/web/ReHos31DaysManagementController.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.api.CommonResult;
 import com.lantone.common.dto.report.ReBeHosDTO;
 import com.lantone.common.vo.report.ReBeHosPageVO;
-import com.lantone.report.facade.ReHos31DaysManagementFacade;
+import com.lantone.report.facade.ReHos31DaysFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,9 +30,9 @@ import javax.validation.Valid;
 @RequestMapping("/console")
 @Api(value = "31日再入院病人数管理统计相关API", tags = { "31日再入院病人数管理统计相关API" })
 @SuppressWarnings("unchecked")
-public class ReHos31DaysManagementController {
+public class ReHos31DaysController {
     @Autowired
-    private ReHos31DaysManagementFacade reHos31DaysManagementFacade;
+    private ReHos31DaysFacade reHos31DaysFacade;
 
     /**
      * 31日再入院病人数统计-报表
@@ -43,7 +43,7 @@ public class ReHos31DaysManagementController {
     @ApiOperation(value = "31日再入院病人数统计-报表[by:zhaops]")
     @PostMapping("/reHos31DaysPage")
     public CommonResult<IPage<ReBeHosDTO>> reHos31DaysPage(@RequestBody @Valid ReBeHosPageVO reBeHosPageVO) {
-        return CommonResult.success(reHos31DaysManagementFacade.reHos31DaysPage(reBeHosPageVO));
+        return CommonResult.success(reHos31DaysFacade.reHos31DaysPage(reBeHosPageVO));
     }
 
     /**
@@ -55,7 +55,7 @@ public class ReHos31DaysManagementController {
     @ApiOperation(value = "31日再入院病人数统计-报表-运行质控[by:zhaops]")
     @PostMapping("/run/reHos31DaysPage")
     public CommonResult<IPage<ReBeHosDTO>> runReHos31DaysPage(@RequestBody @Valid ReBeHosPageVO reBeHosPageVO) {
-        return CommonResult.success(reHos31DaysManagementFacade.reHos31DaysPage(reBeHosPageVO));
+        return CommonResult.success(reHos31DaysFacade.reHos31DaysPage(reBeHosPageVO));
     }
 
     /**
@@ -67,7 +67,7 @@ public class ReHos31DaysManagementController {
     @ApiOperation(value = "31日再入院病人数统计-报表导出[by:zhaops]")
     @PostMapping("/reHos31DaysPageExport")
     public void reHos31DaysPageExport(HttpServletResponse response, @RequestBody @Valid ReBeHosPageVO reBeHosPageVO) {
-        reHos31DaysManagementFacade.reHos31DaysPageExport(response, reBeHosPageVO);
+        reHos31DaysFacade.reHos31DaysPageExport(response, reBeHosPageVO);
     }
 
     /**
@@ -79,6 +79,6 @@ public class ReHos31DaysManagementController {
     @ApiOperation(value = "31日再入院病人数统计-报表导出-运行质控[by:zhaops]")
     @PostMapping("/run/reHos31DaysPageExport")
     public void runReHos31DaysPageExport(HttpServletResponse response, @RequestBody @Valid ReBeHosPageVO reBeHosPageVO) {
-        reHos31DaysManagementFacade.reHos31DaysPageExport(response, reBeHosPageVO);
+        reHos31DaysFacade.reHos31DaysPageExport(response, reBeHosPageVO);
     }
 }

report-service/src/main/java/com/lantone/report/web/TimelinessManagementController.java

@@ -3,7 +3,7 @@ package com.lantone.report.web;
 import com.lantone.common.api.CommonResult;
 import com.lantone.common.dto.report.UnModifyMRDTO;
 import com.lantone.common.vo.report.FilterUnModifyMRVO;
-import com.lantone.report.facade.TimelinessManagementFacade;
+import com.lantone.report.facade.TimelinessFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,9 +29,9 @@ import javax.validation.Valid;
 @RequestMapping("/console")
 @Api(value = "时效性管理统计相关API", tags = { "时效性管理统计相关API" })
 @SuppressWarnings("unchecked")
-public class TimelinessManagementController {
+public class TimelinessController {
     @Autowired
-    private TimelinessManagementFacade timelinessManagementFacade;
+    private TimelinessFacade timelinessFacade;
 
     /**
      * 时效性相关统计-报表
@@ -42,7 +42,7 @@ public class TimelinessManagementController {
     @ApiOperation(value = "时效性相关统计[by:zhaops]")
     @PostMapping("/unModifyMRStatistics")
     public CommonResult<UnModifyMRDTO> unModifyMRStatistics(@RequestBody @Valid FilterUnModifyMRVO filterUnModifyMRVO) {
-        return CommonResult.success(timelinessManagementFacade.unModifyMRStatistics(filterUnModifyMRVO));
+        return CommonResult.success(timelinessFacade.unModifyMRStatistics(filterUnModifyMRVO));
     }
 
     /**
@@ -54,7 +54,7 @@ public class TimelinessManagementController {
     @ApiOperation(value = "时效性相关统计-运行质控[by:zhaops]")
     @PostMapping("/run/unModifyMRStatistics")
     public CommonResult<UnModifyMRDTO> runUnModifyMRStatistics(@RequestBody @Valid FilterUnModifyMRVO filterUnModifyMRVO) {
-        return CommonResult.success(timelinessManagementFacade.unModifyMRStatistics(filterUnModifyMRVO));
+        return CommonResult.success(timelinessFacade.unModifyMRStatistics(filterUnModifyMRVO));
     }
 
     /**
@@ -66,7 +66,7 @@ public class TimelinessManagementController {
     @ApiOperation(value = "时效性相关统计-报表导出[by:zhaops]")
     @PostMapping("/unModifyMRStatisticsExport")
     public void unModifyMRStatisticsExport(HttpServletResponse response, @RequestBody @Valid FilterUnModifyMRVO filterUnModifyMRVO) {
-        timelinessManagementFacade.unModifyMRStatisticsExport(response, filterUnModifyMRVO);
+        timelinessFacade.unModifyMRStatisticsExport(response, filterUnModifyMRVO);
     }
 
     /**
@@ -78,6 +78,6 @@ public class TimelinessManagementController {
     @ApiOperation(value = "时效性相关统计-报表导出-运行质控[by:zhaops]")
     @PostMapping("/run/unModifyMRStatisticsExport")
     public void runUnModifyMRStatisticsExport(HttpServletResponse response, @RequestBody @Valid FilterUnModifyMRVO filterUnModifyMRVO) {
-        timelinessManagementFacade.unModifyMRStatisticsExport(response, filterUnModifyMRVO);
+        timelinessFacade.unModifyMRStatisticsExport(response, filterUnModifyMRVO);
     }
 }