Uat_Study
he 2022-09-16 14:51:55 +08:00
parent 6be2b2183a
commit 405b0c6e59
5 changed files with 18 additions and 1 deletions

View File

@ -1026,6 +1026,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
#endregion #endregion
var readingTool = await _trialRepository.Where(x => x.Id == iRUnReadSubjectQuery.TrialId).Select(x => x.ReadingTool).FirstNotNullAsync();
#region 按照Subject 维度 #region 按照Subject 维度
var isReadingTaskViewInOrder = await _trialRepository.Where(x => x.Id == iRUnReadSubjectQuery.TrialId).Select(x => x.IsReadingTaskViewInOrder).FirstOrDefaultAsync(); var isReadingTaskViewInOrder = await _trialRepository.Where(x => x.Id == iRUnReadSubjectQuery.TrialId).Select(x => x.IsReadingTaskViewInOrder).FirstOrDefaultAsync();
if (isReadingTaskViewInOrder) if (isReadingTaskViewInOrder)
@ -1064,6 +1066,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
{ {
RandomReadInfo = new IRUnReadOutDto(), RandomReadInfo = new IRUnReadOutDto(),
IsReadingTaskViewInOrder = isReadingTaskViewInOrder, IsReadingTaskViewInOrder = isReadingTaskViewInOrder,
ReadingTool = readingTool,
}); });
} }
else else
@ -1086,6 +1089,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
{ {
IsReadingTaskViewInOrder = isReadingTaskViewInOrder, IsReadingTaskViewInOrder = isReadingTaskViewInOrder,
RandomReadInfo = iRUnReadOut, RandomReadInfo = iRUnReadOut,
ReadingTool= readingTool,
}); });
} }

View File

@ -84,6 +84,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class GetReadingReportEvaluationOutDto public class GetReadingReportEvaluationOutDto
{ {
public string TumorEvaluate { get; set; }
public ReadingTaskState ReadingTaskState { get; set; } public ReadingTaskState ReadingTaskState { get; set; }
public List<VisitTaskInfo> VisitTaskList { get; set; } public List<VisitTaskInfo> VisitTaskList { get; set; }

View File

@ -17,5 +17,7 @@ namespace IRaCIS.Core.Application.Interfaces
Task<VerifyVisitTaskQuestionsOutDto> VerifyVisitTaskQuestions(VerifyVisitTaskQuestionsInDto inDto); Task<VerifyVisitTaskQuestionsOutDto> VerifyVisitTaskQuestions(VerifyVisitTaskQuestionsInDto inDto);
Task<string> GetReportTumor(Guid visitTaskId);
} }
} }

View File

@ -212,6 +212,16 @@ namespace IRaCIS.Core.Application.Service
} }
/// <summary>
/// 获取报告整体整体评估
/// </summary>
/// <param name="visitTaskId"></param>
/// <returns></returns>
public async Task<string> GetReportTumor(Guid visitTaskId)
{
return await GetTumor(await GetReadingCalculateDto(visitTaskId));
}
/// <summary> /// <summary>
/// 验证访视提交 /// 验证访视提交
/// </summary> /// </summary>

View File

@ -305,7 +305,7 @@ namespace IRaCIS.Application.Services
{ {
GetReadingReportEvaluationOutDto result = new GetReadingReportEvaluationOutDto(); GetReadingReportEvaluationOutDto result = new GetReadingReportEvaluationOutDto();
result.TumorEvaluate = await _readingCalculateService.GetReportTumor(indto.VisitTaskId);
var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).FirstNotNullAsync(); var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).FirstNotNullAsync();
result.ReadingTaskState = visitTaskInfo.ReadingTaskState; result.ReadingTaskState = visitTaskInfo.ReadingTaskState;
var taskInfoList = await _visitTaskRepository.Where(x => (x.SubjectId == visitTaskInfo.SubjectId && x.TaskState == TaskState.Effect var taskInfoList = await _visitTaskRepository.Where(x => (x.SubjectId == visitTaskInfo.SubjectId && x.TaskState == TaskState.Effect