|
|
@@ -3,6 +3,7 @@ package com.diagbot.facade;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
+import com.diagbot.dto.BasDeptInfoDTO;
|
|
|
import com.diagbot.dto.CheckWorkDTO;
|
|
|
import com.diagbot.dto.MedicalRecordDTO;
|
|
|
import com.diagbot.entity.MedBehospitalType;
|
|
|
@@ -24,6 +25,7 @@ import com.diagbot.vo.CheckWorkPageVO;
|
|
|
import com.diagbot.vo.MedCheckWorkAddVO;
|
|
|
import com.diagbot.vo.RecordTypeVO;
|
|
|
import com.diagbot.vo.SysUserBaseVO;
|
|
|
+import com.google.common.collect.Lists;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
@@ -258,7 +260,11 @@ public class MedCheckWorkFacade {
|
|
|
if (StringUtil.isNotBlank(checkWorkPageVO.getJobType()) && (CheckJobTypeEnum.DEPT_SUPERVISOR.getKey() + "").equals(checkWorkPageVO.getJobType())) {
|
|
|
SysUserBaseVO sysUserBaseVO = new SysUserBaseVO();
|
|
|
sysUserBaseVO.setUserId(Long.parseLong(SysUserUtils.getCurrentPrincipleID()));
|
|
|
- List<String> deptIds = sysUserFacade.getUserDepts(sysUserBaseVO).getSelDepts().stream().map(i -> i.getDeptId()).collect(Collectors.toList());
|
|
|
+ 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());
|
|
|
}
|
rengb