条目缺陷占比、病历评分等级占比sql调整

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

@@ -50,7 +50,7 @@ public class InformedConsent implements Serializable {
      * 文书内容（blob）
      */
     @TableField("content")
-    private Blob content;
+    private String content;
 
     /**
      * 文书类别

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

@@ -1,90 +0,0 @@
-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

@@ -1,96 +0,0 @@
-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/UserRole.java

@@ -1,78 +0,0 @@
-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

@@ -23,7 +23,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
      * @param behospitalCodes
      * @return
      */
-    public List<BehospitalInfoAgeDTO> getBehospitalInfoAge(Long hospitalId, List<String> behospitalCodes) {
+   /* public List<BehospitalInfoAgeDTO> getBehospitalInfoAge(Long hospitalId, List<String> behospitalCodes) {
         if (hospitalId == null || ListUtil.isEmpty(behospitalCodes)) {
             return new ArrayList<>();
         }
@@ -44,5 +44,5 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         });
 
         return behospitalInfoAgeDTOList;
-    }
+    }*/
 }

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

@@ -1,32 +0,0 @@
-package com.lantone.dblayermbg.facade.report;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.lantone.common.dto.report.SysRoleDTO;
-import com.lantone.common.enums.IsDeleteEnum;
-import com.lantone.common.util.BeanUtil;
-import com.lantone.dblayermbg.entity.report.Role;
-import com.lantone.dblayermbg.service.impl.report.RoleServiceImpl;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * <p>
- * 表名：sys_role 业务类
- * </p>
- */
-@Component
-public class RoleFacade extends RoleServiceImpl {
-    /**
-     * 获取角色列表信息
-     *
-     * @return 角色列表信息
-     */
-    public List<SysRoleDTO> listFac() {
-        List<Role> sysRoleList = this.list(new QueryWrapper<Role>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .gt("id", -1L)
-        );
-        return BeanUtil.listCopyTo(sysRoleList, SysRoleDTO.class);
-    }
-}

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

@@ -1,142 +0,0 @@
-
-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.SysRoleDTO;
-import com.lantone.common.dto.report.SysUserDeptDTO;
-import com.lantone.common.dto.report.SysUserRoleDTO;
-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.entity.report.UserRole;
-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;
-    @Autowired
-    private UserRoleFacade userRoleFacade;
-    @Autowired
-    private RoleFacade roleFacade;
-
-    /**
-     * 获取用户科室
-     *
-     * @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( "该医院下无该用户");
-        }
-    }
-
-    /**
-     * 获取用户角色
-     *
-     * @param sysUserBaseVO 获取用户角色入参
-     * @return 用户角色信息
-     */
-    public SysUserRoleDTO getUserRoles(SysUserBaseVO sysUserBaseVO) {
-        checkUser(sysUserBaseVO.getUserId());
-        SysUserRoleDTO sysUserRoleDTO = new SysUserRoleDTO();
-        sysUserRoleDTO.setUserId(sysUserBaseVO.getUserId());
-        List<SysRoleDTO> sysRoleDTOList = roleFacade.listFac();
-        List<UserRole> sysUserRoleList
-                = userRoleFacade.list(new QueryWrapper<UserRole>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("user_id", sysUserBaseVO.getUserId())
-        );
-
-        if (ListUtil.isNotEmpty(sysUserRoleList)) {
-            List<SysRoleDTO> notSelRoles = new ArrayList<>();
-            List<SysRoleDTO> selRoles = new ArrayList<>();
-            Set<Long> selRoleIds = sysUserRoleList.stream()
-                    .map(UserRole::getRoleId)
-                    .collect(Collectors.toSet());
-            for (SysRoleDTO sysRoleDTO : sysRoleDTOList) {
-                if (selRoleIds.contains(sysRoleDTO.getId())) {
-                    selRoles.add(sysRoleDTO);
-                } else {
-                    notSelRoles.add(sysRoleDTO);
-                }
-            }
-            sysUserRoleDTO.setNotSelRoles(notSelRoles);
-            sysUserRoleDTO.setSelRoles(selRoles);
-
-        } else {
-            sysUserRoleDTO.setNotSelRoles(sysRoleDTOList);
-        }
-
-        return sysUserRoleDTO;
-    }
-}

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

@@ -1,14 +0,0 @@
-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/QcresultInfoMapper.java

@@ -14,6 +14,7 @@ import com.lantone.dblayermbg.entity.report.QcresultInfo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -74,7 +75,7 @@ public interface QcresultInfoMapper extends BaseMapper<QcresultInfo> {
      * @param qcresultFilterVO
      * @return
      */
-    public int resultCount(QcresultFilterVO qcresultFilterVO);
+    public Map resultCount(QcresultFilterVO qcresultFilterVO);
 
     /**
      * 各科室甲/乙/丙级病历占比

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

@@ -1,13 +0,0 @@
-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/UserMapper.java

@@ -1,13 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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/UserRoleServiceImpl.java

@@ -1,17 +0,0 @@
-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

@@ -1,18 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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/UserRoleService.java

@@ -1,13 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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/application.yml

@@ -3,7 +3,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      url: jdbc:mysql://192.168.2.237:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: root
       password: lantone
       # 连接池的配置信息

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

@@ -1,20 +0,0 @@
-<?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/BaseUserMapper.xml

@@ -1,21 +0,0 @@
-<?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

@@ -1,18 +0,0 @@
-<?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/QcresultInfoMapper.xml

@@ -2,134 +2,6 @@
 <!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.QcresultInfoMapper">
 
-    <!-- 按模块统计质控缺陷数 -->
-   <!-- <select id="entryCountGroupByCase" parameterType="com.lantone.common.vo.report.FilterVO"
-            resultType="com.lantone.common.dto.report.NumDTO">
-        SELECT
-        t1.id AS id,
-        t1.NAME AS NAME,
-        t1.num AS num,
-        t2.mrNum AS mrNum,
-        t3.standardNum AS standardNum,
-        t2.mrNum * t3.standardNum AS totleNum,
-        ROUND( t1.num /( t2.mrNum * t3.standardNum ), 4 ) AS percent,
-        CONCAT( ROUND( t1.num /( t2.mrNum * t3.standardNum )* 100, 2 ), '%' ) AS percentStr
-        FROM
-        (
-        SELECT
-        e.id,
-        f.NAME AS NAME,
-        e.num
-        FROM
-        (
-        SELECT
-        d.cases_id AS id,
-        count(*) AS num
-        FROM
-        med_behospital_info a,
-        med_qcresult_info c,
-        med_qcresult_detail d
-        WHERE
-        a.is_deleted = 'N'
-        AND c.is_deleted = 'N'
-        AND d.is_deleted = 'N'
-        AND a.hospital_id = c.hospital_id
-        AND a.hospital_id = d.hospital_id
-        AND a.behospital_code = c.behospital_code
-        AND a.behospital_code = d.behospital_code
-        <if test="isPlacefile != null and isPlacefile != ''">
-            and a.is_placefile = #{isPlacefile}
-        </if>
-        AND a.qc_type_id != 0
-        <if test="hospitalId != null and hospitalId != ''">
-            AND a.hospital_id = #{hospitalId}
-        </if>
-        <if test="isPlacefile != null and isPlacefile == 0">
-            <if test="startDate != null and startDate != ''">
-                <![CDATA[ AND a.behospital_date >= #{startDate}]]>
-            </if>
-            <if test="endDate != null and endDate != ''">
-                <![CDATA[ AND a.behospital_date <= #{endDate}]]>
-            </if>
-        </if>
-        <if test="isPlacefile != null and isPlacefile == 1">
-            <if test="startDate != null and startDate != ''">
-                <![CDATA[ AND a.leave_hospital_date >= #{startDate}]]>
-            </if>
-            <if test="endDate != null and endDate != ''">
-                <![CDATA[ AND a.leave_hospital_date <= #{endDate}]]>
-            </if>
-        </if>
-        GROUP BY
-        d.cases_id
-        ) e,
-        qc_cases f
-        WHERE
-        f.is_deleted = 'N'
-        AND e.id = f.id
-        ) t1,
-        (
-        SELECT
-        COUNT(*) AS mrNum
-        FROM
-        med_behospital_info a,
-        med_qcresult_info c
-        WHERE
-        a.is_deleted = 'N'
-        AND c.is_deleted = 'N'
-        AND a.hospital_id = c.hospital_id
-        AND a.behospital_code = c.behospital_code
-        <if test="isPlacefile != null and isPlacefile != ''">
-            and a.is_placefile = #{isPlacefile}
-        </if>
-        AND a.qc_type_id != 0
-        <if test="hospitalId != null and hospitalId != ''">
-            AND a.hospital_id = #{hospitalId}
-        </if>
-        <if test="isPlacefile != null and isPlacefile == 0">
-            <if test="startDate != null and startDate != ''">
-                <![CDATA[ AND a.behospital_date >= #{startDate}]]>
-            </if>
-            <if test="endDate != null and endDate != ''">
-                <![CDATA[ AND a.behospital_date <= #{endDate}]]>
-            </if>
-        </if>
-        <if test="isPlacefile != null and isPlacefile == 1">
-            <if test="startDate != null and startDate != ''">
-                <![CDATA[ AND a.leave_hospital_date >= #{startDate}]]>
-            </if>
-            <if test="endDate != null and endDate != ''">
-                <![CDATA[ AND a.leave_hospital_date <= #{endDate}]]>
-            </if>
-        </if>
-        ) t2,
-        (
-        SELECT
-        a.id,
-        a.NAME,
-        count(*) AS standardNum
-        FROM
-        qc_cases a,
-        qc_cases_entry b
-        WHERE
-        a.is_deleted = 'N'
-        AND b.is_deleted = 'N'
-        AND a.id = b.cases_id
-        GROUP BY
-        a.id,
-        a.`name`
-        ) t3
-        WHERE
-        t1.id = t3.id
-        AND t1.NAME = t3.NAME
-        ORDER BY
-        percent DESC
-        <if test="limitCount != null">
-            LIMIT 0,
-            #{limitCount}
-        </if>
-    </select>-->
-
     <!-- 按模块统计质控缺陷数 -->
     <select id="entryCountGroupByCase" parameterType="com.lantone.common.vo.report.FilterVO"
             resultType="com.lantone.common.dto.report.NumDTO">
@@ -155,7 +27,7 @@
         FROM
         med_qcresult_report a
         WHERE
-        AND a.is_deleted ='N'
+        a.is_deleted ='N'
         AND a.cases_id is not null
         <if test="isPlacefile != null and isPlacefile != ''">
             and a.is_placefile = #{isPlacefile}
@@ -258,26 +130,13 @@
         FROM
         (
         SELECT
-        tt2.id,
-        tt2.NAME,
-        tt1.num
-        FROM
-        (
-        SELECT
-        d.cases_entry_id,
+        a.cases_entry_id,
+        a.msg as NAME,
         count(*) AS num
         FROM
-        med_behospital_info a,
-        med_qcresult_info c,
-        med_qcresult_detail d
+        med_qcresult_report a
         WHERE
         a.is_deleted = 'N'
-        AND c.is_deleted = 'N'
-        AND d.is_deleted = 'N'
-        AND a.hospital_id = c.hospital_id
-        AND a.hospital_id = d.hospital_id
-        AND a.behospital_code = c.behospital_code
-        AND a.behospital_code = d.behospital_code
         <if test="isPlacefile != null and isPlacefile != ''">
             and a.is_placefile = #{isPlacefile}
         </if>
@@ -302,24 +161,15 @@
             </if>
         </if>
         GROUP BY
-        d.cases_entry_id
-        ) tt1,
-        qc_cases_entry tt2
-        WHERE
-        tt2.is_deleted = 'N'
-        AND tt1.cases_entry_id = tt2.id
+        a.cases_entry_id
         ) t1,
         (
         SELECT
-        count(*) AS mrNum
+        count(DISTINCT a.behospital_code) AS mrNum
         FROM
-        med_behospital_info a,
-        med_qcresult_info c
+        med_qcresult_report a
         WHERE
         a.is_deleted = 'N'
-        AND c.is_deleted = 'N'
-        AND a.hospital_id = c.hospital_id
-        AND a.behospital_code = c.behospital_code
         <if test="isPlacefile != null and isPlacefile != ''">
             and a.is_placefile = #{isPlacefile}
         </if>
@@ -621,17 +471,16 @@
     </select>
 
     <!-- 质控病历数统计 -->
-    <select id="resultCount" parameterType="com.lantone.common.vo.report.QcresultFilterVO" resultType="int">
+    <select id="resultCount" parameterType="com.lantone.common.vo.report.QcresultFilterVO" resultType="map">
         SELECT
-        COUNT(*)
+        COUNT(distinct a.behospital_code) as totleNum,
+        count(DISTINCT case when a.`level` = '甲' then a.behospital_code end) as firstLevelNum,
+        count(DISTINCT case when a.`level` = '乙' then a.behospital_code end) as secondLevelNum,
+        count(DISTINCT case when a.`level` = '丙' then a.behospital_code end) as thirdLevelNum
         FROM
-        med_behospital_info a,
-        med_qcresult_info c
+        med_qcresult_report a
         WHERE
         a.is_deleted = 'N'
-        AND c.is_deleted = 'N'
-        AND a.hospital_id = c.hospital_id
-        AND a.behospital_code = c.behospital_code
         <if test="isPlacefile != null and isPlacefile != ''">
             and a.is_placefile = #{isPlacefile}
         </if>
@@ -656,10 +505,7 @@
             </if>
         </if>
         <if test="gradeType != null and gradeType != ''">
-            AND c.grade_type = #{gradeType}
-        </if>
-        <if test="level != null and level != ''">
-            AND c.level = #{level}
+            AND a.grade_type = #{gradeType}
         </if>
     </select>
 

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

@@ -1,5 +0,0 @@
-<?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/UserMapper.xml

@@ -1,5 +0,0 @@
-<?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

@@ -1,5 +0,0 @@
-<?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/facade/HomePageFacade.java

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

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

@@ -1,3 +1,4 @@
+/*
 package com.lantone.report.facade;
 
 import com.alibaba.fastjson.JSONObject;
@@ -37,21 +38,15 @@ import com.lantone.common.vo.report.RecordTypeVO;
 import com.lantone.common.vo.report.SysUserBaseVO;
 import com.lantone.dblayermbg.entity.report.BehospitalType;
 import com.lantone.dblayermbg.entity.report.TaskCron;
-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.BehospitalTypeFacade;
-import com.lantone.dblayermbg.facade.report.RoleFacade;
 import com.lantone.dblayermbg.facade.report.DeptInfoFacade;
 import com.lantone.dblayermbg.facade.report.TaskCronFacade;
 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.BehospitalTypeServiceImpl;
 import com.lantone.dblayermbg.service.impl.report.CheckInfoServiceImpl;
 import com.lantone.dblayermbg.service.impl.report.MedicalRecordServiceImpl;
@@ -101,12 +96,14 @@ public class QcCheckFacade {
     private BehospitalTypeServiceImpl behospitalTypeServiceImpl;
 
 
-    /**
+    */
+/**
      * 分页
      *
      * @param checkWorkPageVO
      * @return
-     */
+     *//*
+
     public IPage<CheckWorkDTO> pageFac(CheckWorkPageVO checkWorkPageVO) {
         checkWorkPageSet(checkWorkPageVO);
         IPage<CheckWorkDTO> res = medCheckInfoFacade.getBaseMapper().getCheckWorkPage(checkWorkPageVO);
@@ -170,14 +167,16 @@ public class QcCheckFacade {
         }
     }
 
-    /**
+    */
+/**
      * @Author songxl
      * @Description 批量操作核查任务（增加和删除）
      * @Date 2021/5/11
      * @Param [medCheckWorkVO]
      * @Return java.lang.Boolean
      * @MethodName addCheck
-     */
+     *//*
+
     public Boolean addCheckWork(MedCheckWorkAddVO medCheckWorkVO) {
 
         boolean flag = false;
@@ -252,14 +251,16 @@ public class QcCheckFacade {
         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);
@@ -363,14 +364,16 @@ public class QcCheckFacade {
         }
     }
 
-    /**
+    */
+/**
      * @Author songxl
      * @Description 获取操作用户的核查科室以及科室核查人员
      * @Date 2021/5/14
      * @Param []
      * @Return java.util.Map<java.lang.String, java.util.List < com.diagbot.dto.CheckDeptDTO>>
      * @MethodName getCheckUserMap
-     */
+     *//*
+
     public Map<String, List<CheckDeptDTO>> getCheckUserMap() {
 
         //1.获取当前用户对应的管理员角色
@@ -402,14 +405,16 @@ public class QcCheckFacade {
         return checkUserMap;
     }
 
-    /**
+    */
+/**
      * @Author songxl
      * @Description 获取相应角色对应的科室以及核查人员
      * @Date 2021/5/14
      * @Param [searchRoleIds]
      * @Return java.util.Map<java.lang.String, java.util.List < java.util.Map < java.lang.String, java.lang.Object>>>
      * @MethodName getCheckRoleMap
-     */
+     *//*
+
 
     private Map<String, List<CheckDeptDTO>> getCheckRoleMap(List<Long> searchRoleIds, Long hospitalId, Long principleId) {
         Map<String, List<CheckDeptDTO>> checkRoleMap = new HashMap<>();
@@ -439,14 +444,16 @@ public class QcCheckFacade {
         return checkRoleMap;
     }
 
-    /**
+    */
+/**
      * @Author songxl
      * @Description 院区管理员获取管理的科室以及科室包涵质控人员
      * @Date 2021/5/17
      * @Param [checkRoleMap, hospitalId, principleId]
      * @Return void
      * @MethodName getYQCheckInfo
-     */
+     *//*
+
     private void getYQCheckInfo(Map<String, List<CheckDeptDTO>> checkRoleMap, Long hospitalId, Long principleId) {
         //1.获取院级质控人员有哪些
         //1.1获取院级质控人员角色id
@@ -471,14 +478,16 @@ public class QcCheckFacade {
     }
 
 
-    /**
+    */
+/**
      * @Author songxl
      * @Description 质控科管理员获取管理的科室以及科室包涵质控人员
      * @Date 2021/5/17
      * @Param [checkRoleMap, hospitalId, principleId]
      * @Return void
      * @MethodName getZKKCheckInfo
-     */
+     *//*
+
     private void getZKKCheckInfo(Map<String, List<CheckDeptDTO>> checkRoleMap, Long hospitalId, Long principleId) {
         //1.获取质控科id
         DeptInfo deptInfo = deptInfoFacade.getOne(new QueryWrapper<DeptInfo>()
@@ -533,14 +542,16 @@ public class QcCheckFacade {
     }
 
 
-    /**
+    */
+/**
      * @Author songxl
      * @Description 院区人员用户科室合并
      * @Date 2021/6/1
      * @Param [checkRoleMap, checkUserDTOS, s]
      * @Return void
      * @MethodName margeDept
-     */
+     *//*
+
     private void margeDept(Map<String, List<CheckDeptDTO>> checkRoleMap, List<CheckUserDTO> checkUserDTOS, String roleId) {
         if (ListUtil.isEmpty(checkUserDTOS)) {
             return;
@@ -612,14 +623,16 @@ public class QcCheckFacade {
 
     }
 
-    /**
+    */
+/**
      * @Author songxl
      * @Description 临床科室管理员获取管理的科室以及科室包涵质控人员
      * @Date 2021/5/17
      * @Param [checkRoleMap, hospitalId, principleId]
      * @Return void
      * @MethodName getDeptCheckInfo
-     */
+     *//*
+
     private void getDeptCheckInfo(Map<String, List<CheckDeptDTO>> checkRoleMap, Long hospitalId, Long principleId) {
 
         //1.获取监管人员所在科室集合
@@ -670,14 +683,16 @@ public class QcCheckFacade {
         }
     }
 
-    /**
+    */
+/**
      * @Author songxl
      * @Description 拼装科室、核查人员、任务数对象
      * @Date 2021/5/17
      * @Param [checkRoleMap, doctorInfos, userJobs, deptInfos, roleId]
      * @Return void
      * @MethodName addCheckInfoMap
-     */
+     *//*
+
     private void addCheckInfoMaps(Map<String, List<CheckDeptDTO>> checkRoleMap, Map<String, String> deptMap,
                                   List<DeptCheckUserDTO> userJobs, List<CheckUserDTO> checkUserDTOS, int roleId, int jobType) {
         //非院区任务
@@ -747,14 +762,16 @@ public class QcCheckFacade {
         }
     }
 
-    /**
+    */
+/**
      * @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<>();
@@ -766,14 +783,16 @@ public class QcCheckFacade {
         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())) {
@@ -796,14 +815,16 @@ public class QcCheckFacade {
         }
     }
 
-    /**
+    */
+/**
      * @Author songxl
      * @Description 获取指定核查人员的核查任务
      * @Date 2021/5/17
      * @Param [checkJobVO]
      * @Return java.util.List<com.diagbot.dto.CheckJobDTO>
      * @MethodName getCheckListByUserId
-     */
+     *//*
+
     public IPage<CheckJobDTO> getCheckListByUserId(CheckJobPageVO checkJobVO) {
         //非空校验
         if (StringUtil.isBlank(checkJobVO.getCheckId())) {
@@ -826,14 +847,16 @@ public class QcCheckFacade {
         return checkJobDTOS;
     }
 
-    /**
+    */
+/**
      * @Author songxl
      * @Description 分配/取消核查任务
      * @Date 2021/5/17
      * @Param [distributionJobVO]
      * @Return boolean
      * @MethodName distributionJobs
-     */
+     *//*
+
     public boolean distributionJobs(DistributionJobVO distributionJobVO) {
 
         //1非空校验
@@ -1031,14 +1054,16 @@ public class QcCheckFacade {
         return userRoleFacade.list(sysUserRoleQueryWrapper).stream().map(i -> i.getUserId()).collect(Collectors.toList());
     }
 
-    /**
+    */
+/**
      * @Author songxl
      * @Description获取当前用户的任务来源 和筛选分值
      * @Date 2021/5/28
      * @Param []
      * @Return java.util.Map<java.lang.String, java.lang.String>
      * @MethodName getCheckType
-     */
+     *//*
+
     public Map<String, Object> getCheckType() {
         Map<String, Object> out = Maps.newLinkedHashMap();
         Map<Integer, String> checkTypes = Maps.newLinkedHashMap();
@@ -1105,14 +1130,16 @@ public class QcCheckFacade {
         return false;
     }
 
-    /**
+    */
+/**
      * @Author songxl
      * @Description 获取每日住院患者的类型（出院、病危、抢救。。。）
      * @Date 2021/5/11
      * @Param [param]
      * @Return void
      * @MethodName execute
-     */
+     *//*
+
     public void execute(String param) {
         JSONObject paramJson = JSONObject.parseObject(param);
         JSONObject typeValue = paramJson.getJSONObject("typeVal");
@@ -1141,14 +1168,16 @@ public class QcCheckFacade {
         }
     }
 
-    /**
+    */
+/**
      * @Author songxl
      * @Description 获取患者类型存入批量插入map
      * @Date 2021/5/11
      * @Param [medBehospitalTypeMap, medicalRecordList, typeValue, typeName, hospiatlId]
      * @Return void
      * @MethodName getPatientRecordType
-     */
+     *//*
+
     private void getPatientRecordType(HashMap<String, BehospitalType> medBehospitalTypeMap,
                                       List<MedicalRecordDTO> medicalRecordList,
                                       JSONObject typeValue,
@@ -1181,4 +1210,4 @@ public class QcCheckFacade {
             }
         }
     }
-}
+}*/

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

@@ -16,6 +16,7 @@ import com.lantone.common.vo.report.FilterVO;
 import com.lantone.common.vo.report.QcresultFilterVO;
 import com.lantone.dblayermbg.facade.report.BehospitalInfoFacade;
 import com.lantone.dblayermbg.facade.report.QcresultInfoFacade;
+import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -85,62 +86,60 @@ public class QcScoreFacade {
      * @return
      */
     public List<NumDTO> mrCounts(FilterVO filterVO) {
-        DecimalFormat df = new DecimalFormat("#0.00");
         List<NumDTO> retList = Lists.newLinkedList();
         QcresultFilterVO qcresultFilterVO = new QcresultFilterVO();
         BeanUtil.copyProperties(filterVO, qcresultFilterVO);
-
-        int totleNum = qcresultInfoFacade.getBaseMapper().resultCount(qcresultFilterVO);
-        if (totleNum == 0) {
-            return retList;
-        }
-        qcresultFilterVO.setLevel("甲");
-        int firstLevelNum = qcresultInfoFacade.getBaseMapper().resultCount(qcresultFilterVO);
-        qcresultFilterVO.setLevel("乙");
-        int secondLevelNum = qcresultInfoFacade.getBaseMapper().resultCount(qcresultFilterVO);
-        qcresultFilterVO.setLevel("丙");
-        int thirdLevelNum = qcresultInfoFacade.getBaseMapper().resultCount(qcresultFilterVO);
         NumDTO totleNumDTO = new NumDTO();
-        totleNumDTO.setName("累计质控病历数");
-        totleNumDTO.setTotleNum(totleNum);
-        totleNumDTO.setNum(totleNum);
         NumDTO firstLevelNumDTO = new NumDTO();
-        firstLevelNumDTO.setName("甲级病历");
-        firstLevelNumDTO.setNum(firstLevelNum);
-        firstLevelNumDTO.setTotleNum(totleNum);
-        Double firstPercent = BigDecimal.valueOf(firstLevelNum)
-                .divide(BigDecimal.valueOf(totleNum), 4, RoundingMode.HALF_UP)
-                .doubleValue();
-        String firstPercentStr = df.format(BigDecimal.valueOf(firstPercent).multiply(BigDecimal.valueOf(100))) + "%";
-        firstLevelNumDTO.setPercent(firstPercent);
-        firstLevelNumDTO.setPercentStr(firstPercentStr);
         NumDTO secondLevelNumDTO = new NumDTO();
-        secondLevelNumDTO.setName("乙级病历");
-        secondLevelNumDTO.setNum(secondLevelNum);
-        secondLevelNumDTO.setTotleNum(totleNum);
-        Double secondPercent = BigDecimal.valueOf(secondLevelNum)
-                .divide(BigDecimal.valueOf(totleNum), 4, RoundingMode.HALF_UP)
-                .doubleValue();
-        String secondPercentStr = df.format(BigDecimal.valueOf(secondPercent).multiply(BigDecimal.valueOf(100))) + "%";
-        secondLevelNumDTO.setPercent(secondPercent);
-        secondLevelNumDTO.setPercentStr(secondPercentStr);
         NumDTO thirdLevelNumDTO = new NumDTO();
-        thirdLevelNumDTO.setName("丙级病历");
-        thirdLevelNumDTO.setNum(thirdLevelNum);
-        thirdLevelNumDTO.setTotleNum(totleNum);
-        Double thirdPercent = BigDecimal.valueOf(thirdLevelNum)
-                .divide(BigDecimal.valueOf(totleNum), 4, RoundingMode.HALF_UP)
-                .doubleValue();
-        String thirdPercentStr = df.format(BigDecimal.valueOf(thirdPercent).multiply(BigDecimal.valueOf(100))) + "%";
-        thirdLevelNumDTO.setPercent(thirdPercent);
-        thirdLevelNumDTO.setPercentStr(thirdPercentStr);
-        retList.add(totleNumDTO);
-        retList.add(firstLevelNumDTO);
-        retList.add(secondLevelNumDTO);
-        retList.add(thirdLevelNumDTO);
+        Map<String,Long> resultMap = qcresultInfoFacade.getBaseMapper().resultCount(qcresultFilterVO);
+        if(MapUtils.isNotEmpty(resultMap)){
+            if(resultMap.containsKey("totleNum")){
+                Long value = resultMap.get("totleNum");
+                if(null == value){
+                    return retList;
+                }
+                totleNumDTO.setName("累计质控病历数");
+                totleNumDTO.setTotleNum(value.intValue());
+                totleNumDTO.setNum(value.intValue());
+                retList.add(totleNumDTO);
+            }
+            resultMap.forEach((key,value)->{
+                if("firstLevelNum".equals(key)){
+                    firstLevelNumDTO.setName("甲级病历");
+                    firstLevelNumDTO.setNum(value.intValue());
+                    countNumDto(firstLevelNumDTO, totleNumDTO, value.intValue());
+                }
+
+                if("secondLevelNum".equals(key)){
+                    secondLevelNumDTO.setName("乙级病历");
+                    countNumDto(secondLevelNumDTO, totleNumDTO, value.intValue());
+                }
+                if("thirdLevelNum".equals(key)){
+                    thirdLevelNumDTO.setName("丙级病历");
+                    countNumDto(thirdLevelNumDTO, totleNumDTO, value.intValue());
+                }
+            });
+                retList.add(firstLevelNumDTO);
+                retList.add(secondLevelNumDTO);
+                retList.add(thirdLevelNumDTO);
+        }
         return retList;
     }
 
+    private void countNumDto(NumDTO numDTO,NumDTO totleNum,Integer value){
+        numDTO.setNum(value);
+        DecimalFormat df = new DecimalFormat("#0.00");
+        numDTO.setTotleNum(totleNum.getTotleNum());
+        Double percent = BigDecimal.valueOf(value)
+                .divide(BigDecimal.valueOf(totleNum.getTotleNum()), 4, RoundingMode.HALF_UP)
+                .doubleValue();
+        String percentStr = df.format(BigDecimal.valueOf(percent).multiply(BigDecimal.valueOf(100))) + "%";
+        numDTO.setPercent(percent);
+        numDTO.setPercentStr(percentStr);
+    }
+
     /**
      * 各科室缺陷占比（组合）
      *

report-service/src/main/java/com/lantone/report/web/HomePageController.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.HomePageFacade;
+import com.lantone.report.facade.HomePageInfoFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,7 +34,7 @@ import java.util.Map;
 @SuppressWarnings("unchecked")
 public class HomePageController {
     @Autowired
-    private HomePageFacade homePageFacade;
+    private HomePageInfoFacade homePageInfoFacade;
 
     /**
      * 病案首页病历统计-控制台
@@ -45,7 +45,7 @@ public class HomePageController {
     @ApiOperation(value = "病案首页病历统计-控制台[by:zhaops]")
     @PostMapping("/homePageMRCount")
     public CommonResult<Map<String, Object>> homePageMRCount(@RequestBody @Valid FilterVO filterVO) {
-        return CommonResult.success(homePageFacade.homePageMRCount(filterVO));
+        return CommonResult.success(homePageInfoFacade.homePageMRCount(filterVO));
     }
 
     /**
@@ -57,7 +57,7 @@ public class HomePageController {
     @ApiOperation(value = "病案首页病历统计-控制台-运行质控[by:zhaops]")
     @PostMapping("/run/homePageMRCount")
     public CommonResult<Map<String, Object>> runHomePageMRCount(@RequestBody @Valid FilterVO filterVO) {
-        return CommonResult.success(homePageFacade.homePageMRCount(filterVO));
+        return CommonResult.success(homePageInfoFacade.homePageMRCount(filterVO));
     }
 
 
@@ -70,7 +70,7 @@ public class HomePageController {
     @ApiOperation(value = "病案首页合格率占比-报表[by:zhaops]")
     @PostMapping("/homePageLevelStatistics")
     public CommonResult<List<HomePageNumDTO>> homePageLevelStatistics(@RequestBody @Valid FilterOrderVO filterOrderVO) {
-        return CommonResult.success(homePageFacade.homePageLevelStatistics(filterOrderVO));
+        return CommonResult.success(homePageInfoFacade.homePageLevelStatistics(filterOrderVO));
     }
 
     /**
@@ -82,7 +82,7 @@ public class HomePageController {
     @ApiOperation(value = "病案首页合格率占比-报表-运行质控[by:zhaops]")
     @PostMapping("/run/homePageLevelStatistics")
     public CommonResult<List<HomePageNumDTO>> runHomePageLevelStatistics(@RequestBody @Valid FilterOrderVO filterOrderVO) {
-        return CommonResult.success(homePageFacade.homePageLevelStatistics(filterOrderVO));
+        return CommonResult.success(homePageInfoFacade.homePageLevelStatistics(filterOrderVO));
     }
 
     /**
@@ -94,7 +94,7 @@ public class HomePageController {
     @ApiOperation(value = "病案首页合格率占比-报表导出[by:gaodm]")
     @PostMapping("/homePageLevelExport")
     public void homePageLevelExport(HttpServletResponse response, @RequestBody @Valid FilterOrderVO filterOrderVO) {
-        homePageFacade.homePageLevelExport(response, filterOrderVO);
+        homePageInfoFacade.homePageLevelExport(response, filterOrderVO);
     }
 
     /**
@@ -106,6 +106,6 @@ public class HomePageController {
     @ApiOperation(value = "病案首页合格率占比-报表导出-运行质控[by:gaodm]")
     @PostMapping("/run/homePageLevelExport")
     public void runHomePageLevelExport(HttpServletResponse response, @RequestBody @Valid FilterOrderVO filterOrderVO) {
-        homePageFacade.homePageLevelExport(response, filterOrderVO);
+        homePageInfoFacade.homePageLevelExport(response, filterOrderVO);
     }
 }

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

@@ -1,3 +1,4 @@
+/*
 package com.lantone.report.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -26,6 +27,7 @@ import java.util.List;
 import java.util.Map;
 
 
+*/
 /**
  * <p>
  * 质控核查管理相关API
@@ -33,7 +35,8 @@ import java.util.Map;
  *
  * @author zhaops
  * @since 2020-04-27
- */
+ *//*
+
 
 @RestController
 @RequestMapping("/qc")
@@ -115,3 +118,4 @@ public class QcCheckController {
         return CommonResult.success(qcCheckFacade.createMedBeHospitalInfoType());
     }
 }
+*/

report-service/src/main/resources/bootstrap.yml

@@ -48,4 +48,7 @@ ribbon:
 
 swagger.title: 报表管理服务
 swagger.des: 报表管理服务
-swagger.version: 0.0.1-SNAPSHOT
+swagger.version: 0.0.1-SNAPSHOT
+
+encrypt:
+  enable: true