Compare commits

..

No commits in common. "6a17c2a9a8e1cc74cdf3471434f68a70e3f90be3" and "cd62a8741a66053d133697027aaa209997d9a368" have entirely different histories.

1 changed files with 2 additions and 22 deletions

View File

@ -3212,6 +3212,7 @@ namespace IRaCIS.Application.Services
// 冻结任务Id
List<Guid> reportRelatedTaskIdList = new List<Guid>();
if (isReadingTaskViewInOrder == ReadingOrder.InOrder)
{
@ -3278,28 +3279,7 @@ namespace IRaCIS.Application.Services
{
if (taskInfo.ReadingCategory == ReadingCategory.Visit)
{
switch(isReadingTaskViewInOrder)
{
case ReadingOrder.SubjectRandom:
relatedVisitTaskIdList = await _visitTaskRepository.Where(x =>
x.TrialId == taskInfo.TrialId &&
x.SubjectId == taskInfo.SubjectId &&
x.ReadingCategory == ReadingCategory.Visit &&
x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId &&
x.ReadingTaskState == ReadingTaskState.HaveSigned &&
x.IsAnalysisCreate == taskInfo.IsAnalysisCreate &&
x.ArmEnum == taskInfo.ArmEnum &&
x.IsSelfAnalysis == taskInfo.IsSelfAnalysis &&
x.DoctorUserId == taskInfo.DoctorUserId &&
x.TaskState == TaskState.Effect).Select(x => x.Id).ToListAsync();
break;
default:
relatedVisitTaskIdList.Add(taskInfo.Id);
break;
}
relatedVisitTaskIdList.Add(taskInfo.Id);
}
}