diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 6ebae3bf4..feb6c728e 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -105,14 +105,14 @@ namespace IRaCIS.Core.Application.Service /// /// [HttpPost] - [Route("/ReadingImageTask/SaveTableQuestionMark")] - public async Task SaveTableQuestionMark(SaveTableQuestionMarkInDto inDto) + [Route("/ReadingImageTask/SaveTableQuestionMark/{param}")] + public async Task SaveTableQuestionMark(SaveTableQuestionMarkInDto inDto, string param) { inDto.FirstAddTaskId = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.TableQuestionId == inDto.TableQuestionId && x.RowId == inDto.RowId).Select(x => x.FirstAddTaskId).FirstOrDefaultAsync(); - inDto.FirstAddTaskId=inDto.FirstAddTaskId==null?inDto.VisitTaskId:inDto.FirstAddTaskId; - var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync(); - await _readingTableQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x =>x.VisitTaskId==inDto.VisitTaskId&&x.QuestionId==inDto.QuestionId&& x.RowId == inDto.RowId.Value && x.TableQuestionId == inDto.TableQuestionId); + inDto.FirstAddTaskId = inDto.FirstAddTaskId == null ? inDto.VisitTaskId : inDto.FirstAddTaskId; + var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync(); + await _readingTableQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.QuestionId == inDto.QuestionId && x.RowId == inDto.RowId.Value && x.TableQuestionId == inDto.TableQuestionId); await _readingTableQuestionAnswerRepository.AddAsync(new ReadingTableQuestionAnswer() { Answer = inDto.Answer, @@ -125,7 +125,7 @@ namespace IRaCIS.Core.Application.Service }); - await _readingTaskQuestionMarkRepository.BatchDeleteNoTrackingAsync(x=>x.VisitTaskId == inDto.VisitTaskId && x.QuestionId == inDto.QuestionId && x.RowId == inDto.RowId.Value && x.TableQuestionId == inDto.TableQuestionId); + await _readingTaskQuestionMarkRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.QuestionId == inDto.QuestionId && x.RowId == inDto.RowId.Value && x.TableQuestionId == inDto.TableQuestionId); var readingTaskQuestionMark = _mapper.Map(inDto); @@ -136,7 +136,7 @@ namespace IRaCIS.Core.Application.Service { IsChangeOtherTask = false, VisitTaskId = inDto.VisitTaskId, - ComputationTrigger = ComputationTrigger.SaveTableQuestionMark, + ComputationTrigger = (ComputationTrigger)int.Parse(param), }); return inDto;