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

x

Uat_Study
hang 2022-10-13 15:29:00 +08:00
parent 232b6017e1
commit 988ac22ef6
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ using IRaCIS.Core.Domain.Share;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using IRaCIS.Application.Contracts;
using Newtonsoft.Json;
namespace IRaCIS.Core.Application.ViewModel
{
@ -103,18 +104,19 @@ namespace IRaCIS.Core.Application.ViewModel
public List<ReadingCategory> ReadingCategoryList { get; set; }
//public List<TrialReadingCriterionDto> TrialReadingCriterionList { get; set; }
public List<TrialReadingCriterionDto> TrialReadingCriterionList { get; set; }
//public List<TrialCriterionReadingCategory> CriterionReadingCategoryList { get; set; }
[JsonIgnore]
public List<TrialCriterionReadingCategory> CriterionReadingCategoryList { get; set; }
//public List<CriterionReadingCategory> CriterionCategoryList =>
public List<CriterionReadingCategory> CriterionCategoryList =>
// TrialReadingCriterionList.Select(t =>
// new CriterionReadingCategory() {
// EnrollId = EnrollId,
// TrialReadingCriterionId = t.TrialReadingCriterionId,
// ReadingCategorys = CriterionReadingCategoryList.Where(c => c.TrialReadingCriterionId == t.TrialReadingCriterionId).Select(t => t.ReadingCategory).OrderBy(c => c).ToList()
// }).ToList();
TrialReadingCriterionList.Select(t =>
new CriterionReadingCategory() {
EnrollId = EnrollId,
TrialReadingCriterionId = t.TrialReadingCriterionId,
ReadingCategorys = CriterionReadingCategoryList.Where(c => c.TrialReadingCriterionId == t.TrialReadingCriterionId).Select(t => t.ReadingCategory).OrderBy(c => c).ToList()
}).ToList();

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

@ -165,7 +165,10 @@ namespace IRaCIS.Core.Application.Service
UserCode = user.UserCode,
UserName = user.UserName,
UserTypeEnum = user.UserTypeRole.UserTypeEnum,
ReadingCategoryList = allocationRule.Enroll.EnrollReadingCategoryList.Select(t => t.ReadingCategory).ToList()
ReadingCategoryList = allocationRule.Enroll.EnrollReadingCategoryList.AsQueryable()
.WhereIf(selectQuery.ReadingCategory != null,t=> t.ReadingCategory == selectQuery.ReadingCategory)
.WhereIf(selectQuery.TrialReadingCriterionId != null, t => t.TrialReadingCriterionId == selectQuery.TrialReadingCriterionId)
.Select(t => t.ReadingCategory).OrderBy(t=>t).ToList()
};
return await query.ToListAsync();

4
IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
View File

@ -68,8 +68,8 @@ namespace IRaCIS.Core.Application.Service
var trialReadingCriterionId = Guid.Empty;
CreateMap<TaskAllocationRule, TaskAllocationRuleDTO>()
.ForMember(o => o.DoctorUser, t => t.MapFrom(u => u.Enroll.DoctorUser))
//.ForMember(o => o.CriterionReadingCategoryList, t => t.MapFrom(u => u.Enroll.EnrollReadingCategoryList.Select(t => new TrialCriterionReadingCategory() { EnrollId = t.EnrollId, ReadingCategory = t.ReadingCategory, TrialReadingCriterionId = t.TrialReadingCriterionId })))
//.ForMember(o => o.TrialReadingCriterionList, t => t.MapFrom(u => u.Trial.ReadingQuestionCriterionTrialList.Where(t => t.IsConfirm).Select(t => new TrialReadingCriterionDto() { TrialReadingCriterionId = t.Id, TrialReadingCriterionName = t.CriterionName })))
.ForMember(o => o.CriterionReadingCategoryList, t => t.MapFrom(u => u.Enroll.EnrollReadingCategoryList.Select(t => new TrialCriterionReadingCategory() { EnrollId = t.EnrollId, ReadingCategory = t.ReadingCategory, TrialReadingCriterionId = t.TrialReadingCriterionId })))
.ForMember(o => o.TrialReadingCriterionList, t => t.MapFrom(u => u.Trial.ReadingQuestionCriterionTrialList.Where(t => t.IsConfirm).Select(t => new TrialReadingCriterionDto() { TrialReadingCriterionId = t.Id, TrialReadingCriterionName = t.CriterionName })))
.ForMember(o => o.ReadingCategoryList, t => t.MapFrom(u => u.Enroll.EnrollReadingCategoryList.Where(t=>t.TrialReadingCriterionId== trialReadingCriterionId).OrderBy(t => t.ReadingCategory).Select(t => t.ReadingCategory).ToList()))
;