XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

Uat_Study
hang 2022-07-28 14:44:12 +08:00
parent 9e678e9509
commit e6dd471031
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs
View File

@ -156,6 +156,9 @@ namespace IRaCIS.Core.Application.ViewModel
public string FullName { get; set; } public string FullName { get; set; }
public UserTypeEnum UserTypeEnum { get; set; } public UserTypeEnum UserTypeEnum { get; set; }
public List<ReadingCategory> ReadingCategoryList { get; set; }
} }
public class GenerateTaskCommand public class GenerateTaskCommand

7
IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
View File

@ -146,7 +146,9 @@ namespace IRaCIS.Core.Application.Service
FullName = user.FullName, FullName = user.FullName,
UserCode = user.UserCode, UserCode = user.UserCode,
UserName = user.UserName, UserName = user.UserName,
UserTypeEnum = user.UserTypeRole.UserTypeEnum UserTypeEnum = user.UserTypeRole.UserTypeEnum,
ReadingCategoryList=enroll.EnrollReadingCategoryList.Select(t=>t.ReadingCategory).ToList()
}; };
return query.ToList(); return query.ToList();
@ -167,7 +169,8 @@ namespace IRaCIS.Core.Application.Service
FullName = user.FullName, FullName = user.FullName,
UserCode = user.UserCode, UserCode = user.UserCode,
UserName = user.UserName, UserName = user.UserName,
UserTypeEnum = user.UserTypeRole.UserTypeEnum UserTypeEnum = user.UserTypeRole.UserTypeEnum,
ReadingCategoryList = allocationRule.Enroll.EnrollReadingCategoryList.Select(t => t.ReadingCategory).ToList()
}; };
return await query.ToListAsync(); return await query.ToListAsync();

8
IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
View File

@ -163,8 +163,8 @@ namespace IRaCIS.Core.Application.Service
TrialId = lastTask.TrialId, TrialId = lastTask.TrialId,
ArmEnum = lastTask.ArmEnum, ArmEnum = lastTask.ArmEnum,
ReadingCategory = ReadingCategory.Global, ReadingCategory = ReadingCategory.Global,
TaskName= lastTask.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global] + "Global", TaskName= lastTask.VisitTaskNum + "Global",
TaskBlindName= lastTask.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global] + "Global" TaskBlindName= lastTask.VisitTaskNum + "Global"
}; };
} }
@ -399,8 +399,8 @@ namespace IRaCIS.Core.Application.Service
SubjectId = lastTask.SubjectId, SubjectId = lastTask.SubjectId,
TrialId = lastTask.TrialId, TrialId = lastTask.TrialId,
ReadingCategory = ReadingCategory.Global, ReadingCategory = ReadingCategory.Global,
TaskBlindName= lastTask.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global]+ "Global", TaskBlindName= lastTask.VisitTaskNum + "Global",
TaskName= lastTask.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global] + "Global" TaskName= lastTask.VisitTaskNum+ "Global"
}; };
} }