diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs index 276672440..02b308b7d 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs @@ -111,32 +111,14 @@ namespace IRaCIS.Core.Application.ViewModel public Guid VisitTaskId { get; set; } + public Guid TrialId { get; set; } + public Guid QuestionId { get; set; } - public Guid? InstanceId { get; set; } - - public Guid? SeriesId { get; set; } - public Guid? StudyId { get; set; } - - public string MarkTool { get; set; } = string.Empty; - - - public string PicturePath { get; set; } = string.Empty; - - public int? NumberOfFrames { get; set; } - - public string MeasureData { get; set; } = string.Empty; public Guid? FirstAddTaskId { get; set; } public QuestionType? QuestionType { get; set; } public string OrderMarkName { get; set; } = string.Empty; - - public Guid? OtherInstanceId { get; set; } - - public Guid? OtherSeriesId { get; set; } - - public Guid? OtherStudyId { get; set; } - /// /// 表格问题标记 /// @@ -145,12 +127,7 @@ namespace IRaCIS.Core.Application.ViewModel public Guid? TableQuestionId { get; set; } public decimal? RowIndex { get; set; } - - public string OtherMarkTool { get; set; } = string.Empty; - - public string OtherPicturePath { get; set; } = string.Empty; - public int? OtherNumberOfFrames { get; set; } - public string OtherMeasureData { get; set; } = string.Empty; + } public class AddTaskLesionAnswerFromLastTaskOutDto diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFCalculateService.cs index 65ca4852b..1fc132da2 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFCalculateService.cs @@ -384,8 +384,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate marks.ForEach(x => { x.VisitTaskId = visitTaskId; - - }); List rowlist = new List();