Uat_Study
he 2022-10-18 14:17:23 +08:00
parent 791a311528
commit 8fc168680e
2 changed files with 27 additions and 0 deletions

View File

@ -5964,6 +5964,16 @@
阅片平台 阅片平台
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingQuestionCriterionSystemId">
<summary>
系统标准ID
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingType">
<summary>
阅片模式
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingTaskViewEnum"> <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingTaskViewEnum">
<summary> <summary>
任务组织级别 任务组织级别

View File

@ -394,6 +394,8 @@ namespace IRaCIS.Application.Services
[HttpPost] [HttpPost]
public async Task<GetReadingReportEvaluationOutDto> GetReadingReportEvaluation(GetReadingReportEvaluationInDto indto) public async Task<GetReadingReportEvaluationOutDto> GetReadingReportEvaluation(GetReadingReportEvaluationInDto indto)
{ {
GetReadingReportEvaluationOutDto result = new GetReadingReportEvaluationOutDto(); GetReadingReportEvaluationOutDto result = new GetReadingReportEvaluationOutDto();
result.CalculateResult = await _readingCalculateService.GetReportVerify(new GetReportVerifyInDto() { result.CalculateResult = await _readingCalculateService.GetReportVerify(new GetReportVerifyInDto() {
@ -401,6 +403,11 @@ namespace IRaCIS.Application.Services
}); });
var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).FirstNotNullAsync(); var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).FirstNotNullAsync();
if (visitTaskInfo.TaskState != TaskState.Effect)
{
throw new BusinessValidationFailedException($"当前任务已失效!");
}
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
&&x.ArmEnum== visitTaskInfo.ArmEnum &&x.ArmEnum== visitTaskInfo.ArmEnum
@ -590,6 +597,11 @@ namespace IRaCIS.Application.Services
var result = new GetReadingQuestionAndAnswerOutDto(); var result = new GetReadingQuestionAndAnswerOutDto();
var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync(); var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
if (visitTaskInfo.TaskState != TaskState.Effect)
{
throw new BusinessValidationFailedException($"当前任务已失效!");
}
result.ReadingTaskState = taskinfo.ReadingTaskState; result.ReadingTaskState = taskinfo.ReadingTaskState;
var baseLineVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == taskinfo.SubjectId && x.IsBaseLine).Select(x => x.Id).FirstOrDefaultAsync(); var baseLineVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == taskinfo.SubjectId && x.IsBaseLine).Select(x => x.Id).FirstOrDefaultAsync();
@ -779,6 +791,11 @@ namespace IRaCIS.Application.Services
public async Task<(List<GetRelatedVisitTaskOutDto>, object)> GetRelatedVisitTask(GetRelatedVisitTaskInDto inDto) public async Task<(List<GetRelatedVisitTaskOutDto>, object)> GetRelatedVisitTask(GetRelatedVisitTaskInDto inDto)
{ {
var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync(); var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
if (visitTaskInfo.TaskState != TaskState.Effect)
{
throw new BusinessValidationFailedException($"当前任务已失效!");
}
var baselineVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == taskInfo.SubjectId && x.IsBaseLine && !x.IsLostVisit).Select(x => x.Id).FirstNotNullAsync(); var baselineVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == taskInfo.SubjectId && x.IsBaseLine && !x.IsLostVisit).Select(x => x.Id).FirstNotNullAsync();
var result = await _visitTaskRepository.Where(x => var result = await _visitTaskRepository.Where(x =>
(x.TrialId == taskInfo.TrialId && (x.TrialId == taskInfo.TrialId &&