diff --git a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs index b2da89918..1e97e2663 100644 --- a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs @@ -159,21 +159,21 @@ namespace IRaCIS.Core.Application.Service .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName)); - CreateMap().IncludeBase() - .ForMember(o => o.LesionList, t => t.MapFrom(u => u.LesionList)); + //CreateMap().IncludeBase() + // .ForMember(o => o.LesionList, t => t.MapFrom(u => u.LesionList)); - CreateMap() - .ForMember(o => o.LessionCode, t => t.MapFrom(u => u.RowMark)) - .ForMember(o => o.LessionType, t => t.MapFrom(u => u.ReadingQuestionTrial.QuestionName)) - .ForMember(o => o.IsLymph, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.IsLymph).FirstOrDefault().Answer)) + //CreateMap() + // .ForMember(o => o.LessionCode, t => t.MapFrom(u => u.RowMark)) + // .ForMember(o => o.LessionType, t => t.MapFrom(u => u.ReadingQuestionTrial.QuestionName)) + // .ForMember(o => o.IsLymph, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.IsLymph).FirstOrDefault().Answer)) - .ForMember(o => o.LessionLocation, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Location).FirstOrDefault().Answer)) - .ForMember(o => o.LessionOrgan, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Organ).FirstOrDefault().Answer)) - .ForMember(o => o.BodyPartDescription, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Part).FirstOrDefault().Answer)) - .ForMember(o => o.MeasurementResult, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Location).FirstOrDefault().Answer)) - .ForMember(o => o.LongDiameter, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.MajorAxis).FirstOrDefault().Answer)) - .ForMember(o => o.ShortDiameter, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.ShortAxis).FirstOrDefault().Answer)) - .ForMember(o => o.LessionState, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State).FirstOrDefault().Answer)); + // .ForMember(o => o.LessionLocation, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Location).FirstOrDefault().Answer)) + // .ForMember(o => o.LessionOrgan, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Organ).FirstOrDefault().Answer)) + // .ForMember(o => o.BodyPartDescription, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Part).FirstOrDefault().Answer)) + // .ForMember(o => o.MeasurementResult, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Location).FirstOrDefault().Answer)) + // .ForMember(o => o.LongDiameter, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.MajorAxis).FirstOrDefault().Answer)) + // .ForMember(o => o.ShortDiameter, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.ShortAxis).FirstOrDefault().Answer)) + // .ForMember(o => o.LessionState, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State).FirstOrDefault().Answer)); #endregion diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs index 20bebc85b..91da6c0b4 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs @@ -233,13 +233,13 @@ namespace IRaCIS.Core.Domain.Models public List ReadingTaskQuestionAnswerList { get; set; } = new List(); - //病灶表 - [JsonIgnore] - public List LesionList { get; set; } = new List(); + ////病灶表 + //[JsonIgnore] + //public List LesionList { get; set; } = new List(); - //病灶答案表 - [JsonIgnore] - public List LesionAnswerList { get; set; } = new List(); + ////病灶答案表 + //[JsonIgnore] + //public List LesionAnswerList { get; set; } = new List(); diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs index 4ef821884..e7d93d043 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs @@ -21,6 +21,8 @@ namespace IRaCIS.Core.Domain.Models [ForeignKey("InstanceId")] public DicomInstance Instance { get; set; } + + /// /// 第一层的Question /// @@ -150,11 +152,15 @@ namespace IRaCIS.Core.Domain.Models public string RowMark { get; set; } = string.Empty; - //病灶答案表 - [JsonIgnore] - public List LesionAnswerList { get; set; } = new List(); + //[JsonIgnore] + //[ForeignKey("VisitTaskId")] + //public VisitTask VisitTask { get; set; } - } + //病灶答案表 + [JsonIgnore] + public List LesionAnswerList { get; set; } = new List(); + + } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs index 87957982f..a998b442c 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs @@ -73,13 +73,18 @@ namespace IRaCIS.Core.Domain.Models public Guid? DeleteUserId { get; set; } - [JsonIgnore] - [ForeignKey("RowId")] + [JsonIgnore] + [ForeignKey("RowId")] - public ReadingTableAnswerRowInfo Lesion { get; set; } + public ReadingTableAnswerRowInfo Lesion { get; set; } - [JsonIgnore] + //[JsonIgnore] + //[ForeignKey("VisitTaskId")] + //public VisitTask VisitTask { get; set; } + + + [JsonIgnore] [ForeignKey("QuestionId")] public ReadingQuestionTrial ReadingQuestionTrial { get; set; }