代码提交

liusheng

2 天以前 86b103f926cf92fff3d591c6ba07099ad8db3ad1

代码提交

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java

@@ -68,12 +68,13 @@
    @PostMapping("/selectPatMedOuthospCount")
    @ApiOperation("查询门诊看病人次和人数")
    public AjaxResult selectPatMedOuthospCount(@RequestBody PatMedReq patMedReq) {
        SysUser user = getLoginUser().getUser();
        List<String> deptCode = new ArrayList<>();
        for (Map<String, Object> map : user.getBelongDepts()) {
            if (ObjectUtils.isNotEmpty(map.get("deptCode"))) deptCode.add(map.get("deptCode").toString());
        }
        patMedReq.setDeptcodeList(deptCode);
//        SysUser user = getLoginUser().getUser();
//        List<String> deptCode = new ArrayList<>();
//        for (Map<String, Object> map : user.getBelongDepts()) {
//            if (ObjectUtils.isNotEmpty(map.get("deptCode"))) deptCode.add(map.get("deptCode").toString());
//        }
//        patMedReq.setDeptcodeList(deptCode);

        PatMedRes patMedRes = patMedOuthospService.selectPatMedOuthospCount(patMedReq);
        return success(patMedRes);
    }

 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java

@@ -130,15 +130,16 @@
        PatMedRes patMedRes = null;
        // 获取当前登陆人的部门权限
        if (org.springframework.util.CollectionUtils.isEmpty(patMedReq.getDeptcodeList())) {
            Long userId = SecurityUtils.getUserId();
            List<SysDept> sysDepts = sysUserDeptMapper.selectDeptListByUserId(userId);
            List<String> deptCode = new ArrayList<>();
            for (SysDept sysDept : sysDepts) {
                deptCode.add(sysDept.getDeptId().toString());
//            Long userId = SecurityUtils.getUserId();
//            List<SysDept> sysDepts = sysUserDeptMapper.selectDeptListByUserId(userId);
//            List<String> deptCode = new ArrayList<>();
//            for (SysDept sysDept : sysDepts) {
//                deptCode.add(sysDept.getDeptId().toString());
//            }
//            patMedReq.setDeptcodeList(deptCode);
//            patMedRes = patMedInhospMapper.selectPatMedInhospCount(patMedReq);
            }
            patMedReq.setDeptcodeList(deptCode);
            patMedRes = patMedInhospMapper.selectPatMedInhospCount(patMedReq);
        }
        return patMedRes;
    }


 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java

@@ -279,6 +279,7 @@

    @Override
    public Map<String, Object> patItemCount(ServiceSubtaskVO serviceSubtaskVO) {
        serviceSubtaskVO.setSendstate(null);
        serviceSubtaskVO.setPageSize(99999999);
        serviceSubtaskVO.setPageNum(1);
        List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskVO);