diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index ecb452a10..8fc76543b 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -7067,6 +7067,13 @@ IR影像阅片 + + + 获取阅片报告 + + + + 获取表格答案行信息 diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index badebaf7e..4e4403518 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -113,6 +113,7 @@ namespace IRaCIS.Application.Services /// /// /// + [HttpPost] public async Task GetReadingReportEvaluation(GetReadingReportEvaluationInDto indto) { GetReadingReportEvaluationOutDto result = new GetReadingReportEvaluationOutDto(); @@ -170,10 +171,10 @@ namespace IRaCIS.Application.Services { RowIndex = 0, - OrderMark = String.Empty, + OrderMark = string.Empty, TableQuestionList = tableQuestionList.Where(x => x.ReadingQuestionId == question.QuestionId).OrderBy(x => x.ShowOrder).Select(x => new VistTaskTableQuestionInfo() { - Answer = String.Empty, + Answer = string.Empty, QuestionId = question.QuestionId, TableQuestionId = x.Id, ShowOrder = x.ShowOrder, @@ -1813,25 +1814,25 @@ namespace IRaCIS.Application.Services /// private async Task FinishReadUpdateState(Guid visitTaskId) { - var taskInfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync(); - if (!await _visitTaskRepository.AnyAsync(x => x.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && x.SouceReadModuleId == taskInfo.SouceReadModuleId && x.ReadingTaskState != ReadingTaskState.HaveSigned)) - { - if (taskInfo.SouceReadModuleId != null) - { - await _readModuleRepository.UpdatePartialFromQueryAsync(taskInfo.SouceReadModuleId.Value, x => new ReadModule - { - ReadingStatus = ReadingStatusEnum.ReadCompleted - }); - } - else if (taskInfo.SourceSubjectVisitId != null) - { - await _subjectVisitRepository.UpdatePartialFromQueryAsync(taskInfo.SourceSubjectVisitId.Value, x => new SubjectVisit - { - ReadingStatus = ReadingStatusEnum.ReadCompleted - }); - } - await _subjectVisitRepository.SaveChangesAsync(); - } + //var taskInfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync(); + //if (!await _visitTaskRepository.AnyAsync(x => x.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && x.SouceReadModuleId == taskInfo.SouceReadModuleId && x.ReadingTaskState != ReadingTaskState.HaveSigned)) + //{ + // if (taskInfo.SouceReadModuleId != null) + // { + // await _readModuleRepository.UpdatePartialFromQueryAsync(taskInfo.SouceReadModuleId.Value, x => new ReadModule + // { + // ReadingStatus = ReadingStatusEnum.ReadCompleted + // }); + // } + // else if (taskInfo.SourceSubjectVisitId != null) + // { + // await _subjectVisitRepository.UpdatePartialFromQueryAsync(taskInfo.SourceSubjectVisitId.Value, x => new SubjectVisit + // { + // ReadingStatus = ReadingStatusEnum.ReadCompleted + // }); + // } + // await _subjectVisitRepository.SaveChangesAsync(); + //} } ///