diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 6ff4e8b2d..44c889e99 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -10,7 +10,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto { public class SaveGlobalReadingInfoInDto { - public Guid VisitTaskId { get; set; } + public Guid GlobalTaskId { get; set; } public Guid SubjectId { get; set; } @@ -38,7 +38,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public class GetGlobalReadingInfoOutDto { - public Guid VisitTaskId { get; set; } + public Guid GlobalTaskId { get; set; } public List TaskList { get; set; } } @@ -65,6 +65,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public string Answer { get; set; } + public Guid VisitTaskId { get; set; } + /// /// 类型值 /// diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index 55b586e14..6f8af3304 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -86,13 +86,13 @@ namespace IRaCIS.Application.Services [HttpPost] public async Task SaveGlobalReadingInfo(SaveGlobalReadingInfoInDto inDto) { - await _readingGlobalTaskInfoRepository.BatchDeleteNoTrackingAsync(x => x.GlobalTaskId == inDto.VisitTaskId); + await _readingGlobalTaskInfoRepository.BatchDeleteNoTrackingAsync(x => x.GlobalTaskId == inDto.GlobalTaskId); await _readingGlobalTaskInfoRepository.AddRangeAsync(inDto.QuestionList.Select(x => new ReadingGlobalTaskInfo() { Answer=x.Answer, QuestionId=x.QuestionId, SubjectId=inDto.SubjectId, - GlobalTaskId=inDto.VisitTaskId, + GlobalTaskId=inDto.GlobalTaskId, TaskId=x.visitTaskId, TrialId=inDto.TrialId, }).ToList()); @@ -117,7 +117,7 @@ namespace IRaCIS.Application.Services throw new BusinessValidationFailedException("当前任务不是全局阅片任务"); } GetGlobalReadingInfoOutDto result = new GetGlobalReadingInfoOutDto() { - VisitTaskId = inDto.VisitTaskId, + GlobalTaskId = inDto.VisitTaskId, }; result.TaskList = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit && @@ -133,6 +133,7 @@ namespace IRaCIS.Application.Services QuestionId = y.ReadingQuestionTrialId, QuestionName = y.ReadingQuestionTrial.QuestionName, Type=y.ReadingQuestionTrial.Type, + VisitTaskId=x.Id, TypeValue=y.ReadingQuestionTrial.TypeValue, Answer = y.Answer }).ToList() @@ -154,6 +155,7 @@ namespace IRaCIS.Application.Services QuestionId =lr.question.QuestionId, QuestionName=lr.question.QuestionName, Type = lr.question.Type, + VisitTaskId=x.VisitTaskId, TypeValue = lr.question.TypeValue, }).ToList();