diff --git a/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs b/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs index 532b43cc..e1b8179e 100644 --- a/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs @@ -143,6 +143,7 @@ namespace IRaCIS.Core.Application.Service CreateMap() + .ForMember(o => o.TrialReadingCriterionName, t => t.MapFrom(u => u.TrialReadingCriterion.CriterionName)) .ForMember(o => o.SiteId, t => t.MapFrom(u => u.Subject.SiteId)) .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.IsSelfAnalysis == true ? u.BlindTrialSiteCode : u.Subject.TrialSite.TrialSiteCode)) .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.IsSelfAnalysis == true ? u.BlindSubjectCode : u.Subject.Code)); diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs index b2adabdb..d7f7958c 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs @@ -76,6 +76,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 无效的 为True无效 /// public bool? IsInvalid { get; set; } + + public Guid? TrialReadingCriterionId { get; set; } } public class GetIRMedicalFeedbackListOutDto @@ -143,6 +145,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public TaskState TaskState { get; set; } + + public string TrialReadingCriterionName { get; set; } } public class FinishMedicalReviewInDto diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs index 3fcc87ef..7ca34756 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs @@ -587,6 +587,7 @@ namespace IRaCIS.Core.Application.Service .WhereIf(inDto.IsHaveQuestion != null, x => x.IsHaveQuestion == inDto.IsHaveQuestion!) .WhereIf(inDto.MedicalDialogCloseEnum != null, x => x.MedicalDialogCloseEnum == inDto.MedicalDialogCloseEnum!) .WhereIf(inDto.IsInvalid != null, x => x.IsInvalid == inDto.IsInvalid!) + .WhereIf(inDto.TrialReadingCriterionId != null, x => x.VisitTask.TrialReadingCriterionId == inDto.TrialReadingCriterionId!) .Select(x => new GetIRMedicalFeedbackListOutDto { TaskState=x.VisitTask.TaskState, @@ -607,6 +608,8 @@ namespace IRaCIS.Core.Application.Service MedicalDialogCloseEnum=x.MedicalDialogCloseEnum, IsInvalid=x.IsInvalid, + TrialReadingCriterionName=x.VisitTask.TrialReadingCriterion.CriterionName + }).WhereIf(!inDto.SubjectCode.IsNullOrEmpty(), x => x.SubjectCode == inDto.SubjectCode); var result=await taskMedicalReviewquery.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField.IsNullOrEmpty() ? nameof(GetIRMedicalFeedbackListOutDto.AuditState) : inDto.SortField,