diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 8bf5c14fb..74ab87a5f 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -155,6 +155,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto [NotDefault] public Guid SubjectId { get; set; } + + [NotDefault] + public Guid VisitTaskId { get; set; } } public class SaveJudgeVisitTaskResult diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index fac8d82e3..0a82a4898 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -402,8 +402,8 @@ namespace IRaCIS.Application.Services [HttpPost] public async Task> GetReadingPastResultList(GetReadingPastResultListInDto inDto) { - var readingPastResultList =await _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId&&x.SubjectId==inDto.SubjectId && x.DoctorUserId == _userInfo.Id) - .ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); + var readingPastResultList =await _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId&&x.SubjectId==inDto.SubjectId && x.DoctorUserId == _userInfo.Id + &&x.Id!=inDto.VisitTaskId&&x.ReadingTaskState== ReadingTaskState.HaveSigned).ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); return readingPastResultList; } diff --git a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousSurgery.cs b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousSurgery.cs index bc4724be6..db4ba9cc3 100644 --- a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousSurgery.cs +++ b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousSurgery.cs @@ -71,6 +71,7 @@ namespace IRaCIS.Core.Domain.Models public string OperationName { get; set; } = String.Empty; + //[Required] //public Guid SubjectId { get; set; }