diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index f1704831e..3db244469 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -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();
@@ -1267,7 +1267,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
influenceTask.TaskAllocationState = TaskAllocationState.NotAllocate;
}
}
- //另外一个人当前访视
+ //当前访视
else
{
if (influenceTask.ReadingTaskState == ReadingTaskState.HaveSigned)
@@ -2294,7 +2294,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
///
public async Task> GetInfluencedTaskList(Guid taskId)
{
- var list = await _repository.Where(t => t.OriginalTaskId == taskId).Select(t => t.OriginalTask).ProjectTo(_mapper.ConfigurationProvider).ToListAsync();
+ var list = await _repository.Where(t => t.OriginalTaskId == taskId).Select(t => t.InfluenceTask).ProjectTo(_mapper.ConfigurationProvider).ToListAsync();
return list;
}
diff --git a/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs b/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs
index 4de0093cd..5a5d9dc10 100644
--- a/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs
+++ b/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs
@@ -27,7 +27,9 @@ namespace IRaCIS.Core.Domain.Models
public Guid OriginalTaskId { get; set; }
public VisitTask OriginalTask { get; set; }
-
+
+ public VisitTask InfluenceTask { get; set; }
+
public Guid InfluenceTaskId { get; set; }