diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index cb1f35c6b..408234a2d 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -192,6 +192,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public class GetReadingReportEvaluationOutDto { + public Guid? VisitTaskId { get; set; } public object ReportCalculateResult { get; set; } @@ -566,6 +567,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public string Value { get; set; } public string DictionaryCode { get; set; } + + public bool IsHighlight { get; set; } = false; } public class ChartItem diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs index e99eba672..428ea3d82 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs @@ -30,6 +30,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate IRepository _readingQuestionTrialRepository, IRepository _organInfoRepository, IRepository _readingGlobalTaskInfoRepository, + IRepository _readingJudgeInfoRepository, IRepository _subjectVisitRepository, IRepository _tumorAssessmentRepository, IGeneralCalculateService _generalCalculateService, @@ -508,12 +509,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate TrialId = task.TrialId, VisitTaskId = task.Id, }); + + data.VisitTaskId= task.Id; } return data; } - EvaluationColumn BuildEvaluationTable(GetReadingReportEvaluationOutDto r1, GetReadingReportEvaluationOutDto r2) + async Task BuildEvaluationTable(GetReadingReportEvaluationOutDto r1, GetReadingReportEvaluationOutDto r2) { EvaluationColumn result = new EvaluationColumn() { @@ -537,6 +540,17 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate break; } + if (r1.VisitTaskId != null && r2.VisitTaskList != null) + { + var judgeInfo = _visitTaskRepository.Where(x => x.SubjectId == inDto.SubjectId && x.TrialReadingCriterionId == inDto.TrialCriterionId + && x.TaskState == TaskState.Effect && x.ReadingTaskState == ReadingTaskState.HaveSigned + && x.ReadingCategory== ReadingCategory.Judge + + ).OrderByDescending(x => x.VisitTaskNum).Include(x=>x.JudgeResultTask).FirstOrDefaultAsync(); + + + + } result.Evaluation.Add(visitTaskName.Select(x => new EvaluationValue() @@ -679,7 +693,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate } - result.Evaluation = BuildEvaluationTable(r1Data, r2Data); + result.Evaluation =await BuildEvaluationTable(r1Data, r2Data); if (r1Data != null) { var r1Target = await BuildTargetChart(r1Data, Arm.DoubleReadingArm1);