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

IR 医学审核增加标准列信息

Uat_Study
hang 2022-09-30 14:14:25 +08:00
parent 63a49e4799
commit de812534b6
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,6 +143,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<VisitTask, IRHaveReadView>() CreateMap<VisitTask, IRHaveReadView>()
.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.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.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)); .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.IsSelfAnalysis == true ? u.BlindSubjectCode : u.Subject.Code));

4
IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
View File

@ -76,6 +76,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 无效的 为True无效 /// 无效的 为True无效
/// </summary> /// </summary>
public bool? IsInvalid { get; set; } public bool? IsInvalid { get; set; }
public Guid? TrialReadingCriterionId { get; set; }
} }
public class GetIRMedicalFeedbackListOutDto public class GetIRMedicalFeedbackListOutDto
@ -143,6 +145,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public TaskState TaskState { get; set; } public TaskState TaskState { get; set; }
public string TrialReadingCriterionName { get; set; }
} }
public class FinishMedicalReviewInDto public class FinishMedicalReviewInDto

3
IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
View File

@ -587,6 +587,7 @@ namespace IRaCIS.Core.Application.Service
.WhereIf(inDto.IsHaveQuestion != null, x => x.IsHaveQuestion == inDto.IsHaveQuestion!) .WhereIf(inDto.IsHaveQuestion != null, x => x.IsHaveQuestion == inDto.IsHaveQuestion!)
.WhereIf(inDto.MedicalDialogCloseEnum != null, x => x.MedicalDialogCloseEnum == inDto.MedicalDialogCloseEnum!) .WhereIf(inDto.MedicalDialogCloseEnum != null, x => x.MedicalDialogCloseEnum == inDto.MedicalDialogCloseEnum!)
.WhereIf(inDto.IsInvalid != null, x => x.IsInvalid == inDto.IsInvalid!) .WhereIf(inDto.IsInvalid != null, x => x.IsInvalid == inDto.IsInvalid!)
.WhereIf(inDto.TrialReadingCriterionId != null, x => x.VisitTask.TrialReadingCriterionId == inDto.TrialReadingCriterionId!)
.Select(x => new GetIRMedicalFeedbackListOutDto .Select(x => new GetIRMedicalFeedbackListOutDto
{ {
TaskState=x.VisitTask.TaskState, TaskState=x.VisitTask.TaskState,
@ -607,6 +608,8 @@ namespace IRaCIS.Core.Application.Service
MedicalDialogCloseEnum=x.MedicalDialogCloseEnum, MedicalDialogCloseEnum=x.MedicalDialogCloseEnum,
IsInvalid=x.IsInvalid, IsInvalid=x.IsInvalid,
TrialReadingCriterionName=x.VisitTask.TrialReadingCriterion.CriterionName
}).WhereIf(!inDto.SubjectCode.IsNullOrEmpty(), x => x.SubjectCode == inDto.SubjectCode); }).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, var result=await taskMedicalReviewquery.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField.IsNullOrEmpty() ? nameof(GetIRMedicalFeedbackListOutDto.AuditState) : inDto.SortField,