diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs index c7a69efe3..c7e6d215d 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs @@ -330,13 +330,13 @@ namespace IRaCIS.Core.Domain.Models [Projectable] [JsonIgnore] - public bool IsConvertedTask => Subject.SubjectVisitTaskList.Where(t => (t.TrialReadingCriterionId == TrialReadingCriterionId + public bool IsConvertedTask => BeforeConvertedTaskId != null || IsHistoryConvertedTask|| Subject.SubjectVisitTaskList.Where(t => t.TrialReadingCriterionId == TrialReadingCriterionId && t.DoctorUserId == DoctorUserId && t.BeforeConvertedTaskId != null && t.TaskState == TaskState.Effect && t.VisitTaskNum < VisitTaskNum && t.IsSelfAnalysis == IsSelfAnalysis - && t.ArmEnum == ArmEnum) || BeforeConvertedTaskId != null|| IsHistoryConvertedTask - ).Any(); + && t.ArmEnum == ArmEnum + ).Any();