|
@@ -9,6 +9,7 @@ import com.diagbot.entity.MedBehospitalType;
|
|
import com.diagbot.entity.MedCheckInfo;
|
|
import com.diagbot.entity.MedCheckInfo;
|
|
import com.diagbot.entity.SysTaskCron;
|
|
import com.diagbot.entity.SysTaskCron;
|
|
import com.diagbot.entity.SysUser;
|
|
import com.diagbot.entity.SysUser;
|
|
|
|
+import com.diagbot.enums.CheckJobTypeEnum;
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
import com.diagbot.exception.CommonException;
|
|
import com.diagbot.exception.CommonException;
|
|
@@ -280,7 +281,7 @@ public class MedCheckWorkFacade {
|
|
}
|
|
}
|
|
checkWorkPageVO.setHospitalId(Long.parseLong(SysUserUtils.getCurrentHospitalID()));
|
|
checkWorkPageVO.setHospitalId(Long.parseLong(SysUserUtils.getCurrentHospitalID()));
|
|
|
|
|
|
- if (StringUtil.isNotBlank(checkWorkPageVO.getJobType()) && checkWorkPageVO.getJobType().equals("0")) {
|
|
|
|
|
|
+ if (StringUtil.isNotBlank(checkWorkPageVO.getJobType()) && (CheckJobTypeEnum.DEPT_SUPERVISOR.getKey() + "").equals(checkWorkPageVO.getJobType())) {
|
|
SysUserBaseVO sysUserBaseVO = new SysUserBaseVO();
|
|
SysUserBaseVO sysUserBaseVO = new SysUserBaseVO();
|
|
sysUserBaseVO.setUserId(Long.parseLong(SysUserUtils.getCurrentPrincipleID()));
|
|
sysUserBaseVO.setUserId(Long.parseLong(SysUserUtils.getCurrentPrincipleID()));
|
|
checkWorkPageVO.setDepartments(sysUserFacade.getUserDepts(sysUserBaseVO).getSelDepts().stream().map(i -> i.getDeptId()).collect(Collectors.toList()));
|
|
checkWorkPageVO.setDepartments(sysUserFacade.getUserDepts(sysUserBaseVO).getSelDepts().stream().map(i -> i.getDeptId()).collect(Collectors.toList()));
|