diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs index a6e6862ff..2690e56d1 100644 --- a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs @@ -74,6 +74,7 @@ namespace IRaCIS.Core.Application.Service .WhereIf(queryVisitTask.SiteId != null, t => t.Subject.SiteId == queryVisitTask.SiteId) .WhereIf(queryVisitTask.SubjectId != null, t => t.SubjectId == queryVisitTask.SubjectId) + .WhereIf(queryVisitTask.TaskState != null, t => t.TaskState == queryVisitTask.TaskState) .WhereIf(queryVisitTask.IsUrgent != null, t => t.IsUrgent == queryVisitTask.IsUrgent) .WhereIf(queryVisitTask.DoctorUserId != null, t => t.DoctorUserId == queryVisitTask.DoctorUserId) .WhereIf(queryVisitTask.ReadingCategory != null, t => t.ReadingCategory == queryVisitTask.ReadingCategory) @@ -338,6 +339,8 @@ namespace IRaCIS.Core.Application.Service }; } + + existGlobal.ArmEnum = Arm.GroupConsistentArm; existGlobal.DoctorUserId = needAddDoctorUserId; diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs index df4d34b8a..0aa262a5d 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs @@ -254,8 +254,9 @@ namespace IRaCIS.Core.Application.Service IsSelfAnalysis = latestTask.IsSelfAnalysis, TaskAllocationState = TaskAllocationState.Allocated, AllocateTime = DateTime.Now, - DoctorUserId = task1.DoctorUserId - }); + DoctorUserId = task1.DoctorUserId, + SuggesteFinishedTime=DateTime.Now.AddDays(7), + }); currentMaxCodeInt = currentMaxCodeInt + 1; @@ -297,7 +298,8 @@ namespace IRaCIS.Core.Application.Service IsSelfAnalysis = latestTask.IsSelfAnalysis, TaskAllocationState = TaskAllocationState.Allocated, AllocateTime = DateTime.Now, - DoctorUserId = task2.DoctorUserId + DoctorUserId = task2.DoctorUserId, + SuggesteFinishedTime = DateTime.Now.AddDays(7), }); currentMaxCodeInt = currentMaxCodeInt + 1;