XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改影响列表

Uat_Study
hang 2022-07-21 17:18:51 +08:00
parent 9ac7ed7bf4
commit b994e12178
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -1226,10 +1226,10 @@ namespace IRaCIS.Core.Application.Service.Allocation
//访视影响当前以及当前之后的 两个阅片人的 //访视影响当前以及当前之后的 两个阅片人的
filterExpression = filterExpression.And(t => t.VisitTaskNum > origenalTask.VisitTaskNum && t.DoctorUserId == origenalTask.DoctorUserId || t.VisitTaskNum >= origenalTask.VisitTaskNum && t.DoctorUserId != origenalTask.DoctorUserId); filterExpression = filterExpression.And(t => t.VisitTaskNum >= origenalTask.VisitTaskNum );
#region 影响的任务（排除申请的任务） #region 影响的任务
var influenceTaskList = await _visitTaskRepository.Where(filterExpression, true).ToListAsync(); var influenceTaskList = await _visitTaskRepository.Where(filterExpression, true).ToListAsync();
@ -1267,7 +1267,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
influenceTask.TaskAllocationState = TaskAllocationState.NotAllocate; influenceTask.TaskAllocationState = TaskAllocationState.NotAllocate;
} }
} }
//另外一个人当前访视 //当前访视
else else
{ {
if (influenceTask.ReadingTaskState == ReadingTaskState.HaveSigned) if (influenceTask.ReadingTaskState == ReadingTaskState.HaveSigned)
@ -2294,7 +2294,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
/// <returns></returns> /// <returns></returns>
public async Task<List<InfluenceTaskInfo>> GetInfluencedTaskList(Guid taskId) public async Task<List<InfluenceTaskInfo>> GetInfluencedTaskList(Guid taskId)
{ {
var list = await _repository.Where<TaskInfluence>(t => t.OriginalTaskId == taskId).Select(t => t.OriginalTask).ProjectTo<InfluenceTaskInfo>(_mapper.ConfigurationProvider).ToListAsync(); var list = await _repository.Where<TaskInfluence>(t => t.OriginalTaskId == taskId).Select(t => t.InfluenceTask).ProjectTo<InfluenceTaskInfo>(_mapper.ConfigurationProvider).ToListAsync();
return list; return list;
} }

2
IRaCIS.Core.Domain/Allocation/TaskInfluence.cs
View File

@ -28,6 +28,8 @@ namespace IRaCIS.Core.Domain.Models
public VisitTask OriginalTask { get; set; } public VisitTask OriginalTask { get; set; }
public VisitTask InfluenceTask { get; set; }
public Guid InfluenceTaskId { get; set; } public Guid InfluenceTaskId { get; set; }