From e6dd471031472479f477305357dfe139421ba2bf Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 28 Jul 2022 14:44:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Allocation/DTO/TaskAllocationRuleViewModel.cs | 3 +++ .../Service/Allocation/TaskAllocationRuleService.cs | 7 +++++-- .../Service/Allocation/TaskConsistentRuleService.cs | 8 ++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs index e22200d5d..abd0401d8 100644 --- a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs +++ b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs @@ -156,6 +156,9 @@ namespace IRaCIS.Core.Application.ViewModel public string FullName { get; set; } public UserTypeEnum UserTypeEnum { get; set; } + + + public List ReadingCategoryList { get; set; } } public class GenerateTaskCommand diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs index 6c9ab3c98..aea6d2331 100644 --- a/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs @@ -146,7 +146,9 @@ namespace IRaCIS.Core.Application.Service FullName = user.FullName, UserCode = user.UserCode, UserName = user.UserName, - UserTypeEnum = user.UserTypeRole.UserTypeEnum + UserTypeEnum = user.UserTypeRole.UserTypeEnum, + ReadingCategoryList=enroll.EnrollReadingCategoryList.Select(t=>t.ReadingCategory).ToList() + }; return query.ToList(); @@ -167,7 +169,8 @@ namespace IRaCIS.Core.Application.Service FullName = user.FullName, UserCode = user.UserCode, UserName = user.UserName, - UserTypeEnum = user.UserTypeRole.UserTypeEnum + UserTypeEnum = user.UserTypeRole.UserTypeEnum, + ReadingCategoryList = allocationRule.Enroll.EnrollReadingCategoryList.Select(t => t.ReadingCategory).ToList() }; return await query.ToListAsync(); diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs index dfe7d7e96..77d804b4f 100644 --- a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs @@ -163,8 +163,8 @@ namespace IRaCIS.Core.Application.Service TrialId = lastTask.TrialId, ArmEnum = lastTask.ArmEnum, ReadingCategory = ReadingCategory.Global, - TaskName= lastTask.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global] + "Global", - TaskBlindName= lastTask.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global] + "Global" + TaskName= lastTask.VisitTaskNum + "Global", + TaskBlindName= lastTask.VisitTaskNum + "Global" }; } @@ -399,8 +399,8 @@ namespace IRaCIS.Core.Application.Service SubjectId = lastTask.SubjectId, TrialId = lastTask.TrialId, ReadingCategory = ReadingCategory.Global, - TaskBlindName= lastTask.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global]+ "Global", - TaskName= lastTask.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global] + "Global" + TaskBlindName= lastTask.VisitTaskNum + "Global", + TaskName= lastTask.VisitTaskNum+ "Global" }; }