diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs index 5be0bf124..0d26a06b7 100644 --- a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs @@ -122,7 +122,7 @@ namespace IRaCIS.Core.Application.Service { TrialId = filterObj.TrialId, - ReadingCategory = ReadingCategory.Consistent, + ReadingCategory = ReadingCategory.SelfConsistent, //产生的过滤掉已经生成的 GenerataConsistentTaskList = subject.VisitTaskList.Where(t => t.IsHaveGeneratedTask == false).ToList() diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs index 8f2a34cea..695bb62f6 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs @@ -355,7 +355,8 @@ namespace IRaCIS.Core.Application.Service //} break; - case ReadingCategory.Consistent: + case ReadingCategory.SelfConsistent: + case ReadingCategory.GroupConsistent: foreach (var task in generateTaskCommand.GenerataConsistentTaskList) { @@ -380,7 +381,9 @@ namespace IRaCIS.Core.Application.Service TaskAllocationState = TaskAllocationState.Allocated, AllocateTime = DateTime.Now, - ConsistentAnalysisOriginalTaskId=task.Id + ConsistentAnalysisOriginalTaskId=task.Id, + + IsSelfAnalysis= generateTaskCommand.ReadingCategory==ReadingCategory.SelfConsistent, }; diff --git a/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs b/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs index 60ddb1919..96d6493b9 100644 --- a/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs +++ b/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs @@ -27,7 +27,9 @@ namespace IRaCIS.Core.Domain.Share ReReading = 6, - Consistent = 7, + SelfConsistent = 7, + + GroupConsistent = 8, } public enum TaskAllocationState