修改了报销校验

yxh

22 小时以前 8c215c8be0f5076e8c95daf1b2203440ca7dfcad

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java

@@ -216,57 +216,64 @@
    public List<ServiceDonatebaseinfo> selectServiceDonatebaseinfoList(ServiceDonatebaseinfo serviceDonatebaseinfo) {

        SysUser user = SecurityUtils.getLoginUser().getUser();
        List<SysRole> l = user.getRoles();
        int b = 0;
        // 超级管理员不受"只看本人报送 / 只看本部门"的数据范围限制，可查看全部数据
        if (!isSuperAdmin(user)) {
            List<SysRole> l = user.getRoles();
            int b = 0;

        for (SysRole r : l) {
            if (r.getRoleId().longValue() == 3) {
                b = 1;
            for (SysRole r : l) {
                if (r.getRoleId().longValue() == 3) {
                    b = 1;
                }
                if (r.getRoleId().longValue() == 13) {
                    b = 2;
                }
            }
            if (r.getRoleId().longValue() == 13) {
                b = 2;
            }
        }
        if (b == 1) {
            if (b == 1) {
//            serviceDonatebaseinfo.setCreateBy(user.getUserName());
            log.info("user.getUserName()的值为 ---- ：{}", user.getUserName());
            serviceDonatebaseinfo.setReporterno(user.getUserName());
        }
        if (b == 2) {
            serviceDonatebaseinfo.setDeptid(user.getDeptId());
                log.info("user.getUserName()的值为 ---- ：{}", user.getUserName());
                serviceDonatebaseinfo.setReporterno(user.getUserName());
            }
            if (b == 2) {
                serviceDonatebaseinfo.setDeptid(user.getDeptId());
            }
        }
        List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoMapper.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);

        // 一次性取出各捐献基础对应的死亡时间，避免在循环里按 InfoID 逐条查见证表（N+1）
        List<Long> infoIds = new ArrayList<>();
        for (ServiceDonatebaseinfo item : serviceDonatebaseinfos) {
            if (item.getId() != null) {
                infoIds.add(item.getId());
            }
        }
        Map<Long, Date> deathTimeMap = new HashMap<>();
        if (!infoIds.isEmpty()) {
            for (ServiceDonationwitness witness : serviceDonationwitnessMapper.selectDeathTimeByInfoIds(infoIds)) {
                if (witness.getInfoid() != null && !deathTimeMap.containsKey(witness.getInfoid())) {
                    deathTimeMap.put(witness.getInfoid(), witness.getDeathtime());
                }
            }
        }

        for (ServiceDonatebaseinfo serviceDonatebaseinfo1 : serviceDonatebaseinfos) {
            //这里不能再通过当前时间算年龄了，患者可能已经死亡了
//            if (serviceDonatebaseinfo1.getBirthday() != null) {
//                Map<String, String> map = CalculateDateUtils.calculateAge(serviceDonatebaseinfo1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());
//                serviceDonatebaseinfo1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
//                serviceDonatebaseinfo1.setAgeunit(map.get("ageUnit"));
//                serviceDonatebaseinfo1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
//                serviceDonatebaseinfo1.setAgeunit2(map.get("ageUnit2"));
//            }
            //先给个年龄默认值（因为age是数字类型，不能放横杠，所以就所横扛放到单位上）
            serviceDonatebaseinfo1.setAgeunit("-");
            serviceDonatebaseinfo1.setAge(null);
            serviceDonatebaseinfo1.setAge2(null);

            //获取死亡时间，如果获取见证里有死亡时间，则进行计算他的年龄
            ServiceDonationwitness sdw = new ServiceDonationwitness();
            sdw.setInfoid(serviceDonatebaseinfo1.getId());
            List<ServiceDonationwitness> serviceDonationwitnessList = serviceDonationwitnessMapper.selectServiceDonationwitnessList(sdw);
            if (!CollectionUtils.isEmpty(serviceDonationwitnessList) && serviceDonatebaseinfo1.getBirthday() != null) {
                Date deathtime = serviceDonationwitnessList.get(0).getDeathtime();
                if (ObjectUtils.isNotEmpty(deathtime)) {
                    Map<String, String> map = CalculateDateUtils.calculateAge(serviceDonatebaseinfo1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), deathtime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
                    if (Objects.isNull(map)) {
                        log.error("ServiceDonationwitness出生日期：{},ServiceDonationwitness死亡日期：{}", serviceDonatebaseinfo1.getBirthday(), deathtime);
                        continue;
                    }
                    serviceDonatebaseinfo1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
                    serviceDonatebaseinfo1.setAgeunit(map.get("ageUnit"));
                    serviceDonatebaseinfo1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
                    serviceDonatebaseinfo1.setAgeunit2(map.get("ageUnit2"));
            Date deathtime = deathTimeMap.get(serviceDonatebaseinfo1.getId());
            if (ObjectUtils.isNotEmpty(deathtime) && serviceDonatebaseinfo1.getBirthday() != null) {
                Map<String, String> map = CalculateDateUtils.calculateAge(serviceDonatebaseinfo1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), deathtime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
                if (Objects.isNull(map)) {
                    log.error("ServiceDonationwitness出生日期：{},ServiceDonationwitness死亡日期：{}", serviceDonatebaseinfo1.getBirthday(), deathtime);
                    continue;
                }
                serviceDonatebaseinfo1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
                serviceDonatebaseinfo1.setAgeunit(map.get("ageUnit"));
                serviceDonatebaseinfo1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
                serviceDonatebaseinfo1.setAgeunit2(map.get("ageUnit2"));
            }

        }
@@ -275,17 +282,50 @@
    }

    @Override
    public List<ServiceDonatebaseinfo> listForSearch(ServiceDonatebaseinfo serviceDonatebaseinfo) {
    public List<ServiceDonatebaseinfo> getPatName(ServiceDonatebaseinfo serviceDonatebaseinfo) {

        SysUser user = SecurityUtils.getLoginUser().getUser();
        List<SysRole> l = user.getRoles();
        Boolean b = false;
        for (SysRole r : l) {
            if (r.getRoleId().longValue() == 3) {
                b = true;
        // 超级管理员不受数据范围限制，可查看全部数据
        if (!isSuperAdmin(user)) {
            List<SysRole> l = user.getRoles();
            int b = 0;

            for (SysRole r : l) {
                if (r.getRoleId().longValue() == 3) {
                    b = 1;
                }
                if (r.getRoleId().longValue() == 13) {
                    b = 2;
                }
            }
            if (b == 1) {
                log.info("user.getUserName()的值为 ---- ：{}", user.getUserName());
                serviceDonatebaseinfo.setReporterno(user.getUserName());
            }
            if (b == 2) {
                serviceDonatebaseinfo.setDeptid(user.getDeptId());
            }
        }
        if (b) {
            serviceDonatebaseinfo.setCreateBy(user.getUserName());
        List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoMapper.getPatName(serviceDonatebaseinfo);

        return serviceDonatebaseinfos;
    }

    @Override
    public List<ServiceDonatebaseinfo> listForSearch(ServiceDonatebaseinfo serviceDonatebaseinfo) {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        // 超级管理员不受数据范围限制，可查看全部数据
        if (!isSuperAdmin(user)) {
            List<SysRole> l = user.getRoles();
            Boolean b = false;
            for (SysRole r : l) {
                if (r.getRoleId().longValue() == 3) {
                    b = true;
                }
            }
            if (b) {
                serviceDonatebaseinfo.setCreateBy(user.getUserName());
            }
        }

        return serviceDonatebaseinfoMapper.listForSearch(serviceDonatebaseinfo);
@@ -550,4 +590,33 @@
        //将数据封闭，并返回
        return map;
    }

    /**
     * 是否超级管理员。
     *
     * <p>判定为超级管理员的情形：
     * <ul>
     *   <li>内置管理员账号（userId = 1）；</li>
     *   <li>账号被授予"超级管理员"角色（roleId = 1）。</li>
     * </ul>
     * 超级管理员不受"只看本人报送（角色3 专职人员）/ 只看本部门（角色13 业务组长）"的数据范围限制，
     * 可查看全部数据。
     */
    private boolean isSuperAdmin(SysUser user) {
        if (user == null) {
            return false;
        }
        if (SysUser.isAdmin(user.getUserId())) {
            return true;
        }
        List<SysRole> roles = user.getRoles();
        if (roles != null) {
            for (SysRole role : roles) {
                if (role.getRoleId() != null && role.getRoleId().longValue() == 1L) {
                    return true;
                }
            }
        }
        return false;
    }
}