diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index d0898bfe9..e17955dd1 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -5841,6 +5841,21 @@ 仲裁阅片 + + + 阅片模式 + + + + + 全局阅片 + + + + + 肿瘤学阅片 原字段 IsClinicalReading + + pageId @@ -6116,6 +6131,26 @@ 仲裁规则/对象 + + + 阅片模式 + + + + + 全局阅片 + + + + + 仲裁阅片 + + + + + 肿瘤学阅片 原字段 IsClinicalReading + + QC流程 0 不审,1 单审,2双审 diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index 5c7f40b3b..9a8d7520b 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -2142,7 +2142,9 @@ namespace IRaCIS.Application.Services public async Task VerifyVisitTaskQuestions(VerifyVisitTaskQuestionsInDto inDto) { - var tableAnswerList = (await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId&&x.Answer.IsNullOrEmpty()) + var tableAnswerList = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId&&(x.Answer==string.Empty|| x.Answer==null) + && x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State + ) .Select(x => new { x.ReadingQuestionTrial.OrderMark, @@ -2150,12 +2152,12 @@ namespace IRaCIS.Application.Services QuestionMark = x.ReadingTableQuestionTrial.QuestionMark, Answer = x.Answer, - }).ToListAsync()).Where(x=> x.QuestionMark == QuestionMark.State).ToList(); + }).ToListAsync(); string errorMassage = string.Empty; - var rowAnswerList = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.MeasureData.IsNullOrEmpty()) + var rowAnswerList = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && (x.MeasureData == string.Empty || x.MeasureData == null)) .Select(x => new { x.ReadingQuestionTrial.OrderMark,