IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs

@@ -192,7 +192,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     public class GetReadingReportEvaluationOutDto
     {
-        public Guid? VisitTaskId { get; set; }
 
         public object ReportCalculateResult { get; set; }
 
@@ -567,8 +566,6 @@ 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

IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs

@@ -30,7 +30,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository,
         IRepository<OrganInfo> _organInfoRepository,
         IRepository<ReadingGlobalTaskInfo> _readingGlobalTaskInfoRepository,
-        IRepository<ReadingJudgeInfo> _readingJudgeInfoRepository,
         IRepository<SubjectVisit> _subjectVisitRepository,
         IRepository<TumorAssessment_IRECIST1Point1> _tumorAssessmentRepository,
         IGeneralCalculateService _generalCalculateService,
@@ -509,14 +508,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         TrialId = task.TrialId,
                         VisitTaskId = task.Id,
                     });
-
-                    data.VisitTaskId= task.Id;
                 }
                 return data;
             }
 
 
-           async Task<EvaluationColumn> BuildEvaluationTable(GetReadingReportEvaluationOutDto r1, GetReadingReportEvaluationOutDto r2)
+            EvaluationColumn BuildEvaluationTable(GetReadingReportEvaluationOutDto r1, GetReadingReportEvaluationOutDto r2)
             {
                 EvaluationColumn result = new EvaluationColumn()
                 {
@@ -540,17 +537,6 @@ 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()
@@ -693,7 +679,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             }
 
 
-            result.Evaluation =await BuildEvaluationTable(r1Data, r2Data);
+            result.Evaluation = BuildEvaluationTable(r1Data, r2Data);
             if (r1Data != null)
             {
                 var r1Target = await BuildTargetChart(r1Data, Arm.DoubleReadingArm1);