diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 4074cace3..38126cc1f 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -133,6 +133,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public ReadingTaskState ReadingTaskState { get; set; } } + public class GetReadingPastResultListOutDto + { + public Guid TaskId { get; set; } + public string TaskName { get; set; } + } + + public class GetReadingPastResultListInDto + { + public Guid TrialId { get; set; } + } + public class SaveJudgeVisitTaskResult { public Guid VisitTaskId { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index 33d04ed51..ef8d267c4 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -379,6 +379,18 @@ namespace IRaCIS.Application.Services return ResponseOutput.Ok(result); } + /// + /// 获取既往结果 + /// + /// + [HttpPost] + public async Task> GetReadingPastResultList(GetReadingPastResultListInDto inDto) + { + var readingPastResultListawait =await _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId && x.DoctorUserId == _userInfo.Id) + .ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); + return readingPastResultListawait; + } + /// /// 找子问题 /// diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs index c627d3dbe..9b2107ab4 100644 --- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs @@ -75,6 +75,8 @@ namespace IRaCIS.Core.Application.Service #region IR阅片 CreateMap() .ForMember(x=>x.ReadingQuestionTrialId, y=>y.MapFrom(z=>z.Id)); + + CreateMap(); #endregion diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs index b31c40d5b..f695157b3 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs @@ -194,6 +194,16 @@ namespace IRaCIS.Core.Application.Contracts public bool IsFollowJudgeTaskAutoAssign { get; set; } + /// + /// 阅片是否显示受试者信息 + /// + public bool IsReadingShowSubjectInfo { get; set; } + + /// + /// 阅片是否显示既往结果 + /// + public bool IsReadingShowPreviousResults { get; set; } + public TaskAllocateDefaultState FollowJudgeTaskAutoAssignDefaultState { get; set; } } @@ -204,6 +214,16 @@ namespace IRaCIS.Core.Application.Contracts public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; } public bool IsReadingTaskViewInOrder { get; set; } = true; + + /// + /// 阅片是否显示受试者信息 + /// + public bool IsReadingShowSubjectInfo { get; set; } + + /// + /// 阅片是否显示既往结果 + /// + public bool IsReadingShowPreviousResults { get; set; } } public class TrialJudgeTaskConfig diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index d512037d6..472ee1236 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/IRaCIS.Core.Domain/Trial/Trial.cs @@ -345,6 +345,16 @@ namespace IRaCIS.Core.Domain.Models //ƬʾǷ˳ public bool IsReadingTaskViewInOrder { get; set; } = true; + /// + /// ƬǷʾϢ + /// + public bool IsReadingShowSubjectInfo { get; set; } = false; + + /// + /// ƬǷʾ + /// + public bool IsReadingShowPreviousResults { get; set; } = false; + //public Guid? ReviewTypeId { get; set; } = Guid.Empty;