diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 14b1b310a..74965fa7a 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1531,7 +1531,7 @@ TrialEmailNoticeConfigService - + TrialEmailNoticeConfigService diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index a462dbfd6..0af8e743f 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -1215,7 +1215,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 问题Id /// - public Guid QuestionId { get; set; } + public Guid? QuestionId { get; set; } /// /// InstanceId diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 9549eae8d..c1ad12ded 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -1898,6 +1898,24 @@ namespace IRaCIS.Core.Application.Service [HttpPost] public async Task SaveTaskQuestion(ChangeDicomReadingQuestionAnswerInDto inDto, string param) { + // 当 param == -10 时,为自定义标准 需要区分 绑定 更改 标记 + //if (param == "-10") + //{ + // var questionMarkList = inDto.QuestionMarkInfoList.Select(x => x.QuestionId ).ToList(); + // if (!(await _readingTaskQuestionMarkRepository.AnyAsync(x => x.VisitTaskId == inDto.VisitTaskId && questionMarkList.Contains(x.QuestionId))) && inDto.QuestionMarkInfoList.Count() > 0) + // { + // _userInfo.AuditIdentification = "AddMark"; + // } + // else if (await _readingTaskQuestionMarkRepository.AnyAsync(x => x.VisitTaskId == inDto.VisitTaskId && questionMarkList.Contains(x.QuestionId))) + // { + // _userInfo.AuditIdentification = "UpdateMark"; + // } + // else + // { + // _userInfo.AuditIdentification = "DeleteMark"; + // } + //} + var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Include(x => x.TrialReadingCriterion).FirstNotNullAsync(); try { @@ -1994,7 +2012,7 @@ namespace IRaCIS.Core.Application.Service }).ToList(); await _readingTaskQuestionAnswerRepository.AddRangeAsync(needAddAnswer); - + if (inDto.UpdateMark) { var questionMarkList = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId).Select(x => new