diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs index b14823c93..95b40b70d 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs @@ -389,13 +389,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 文件数量 /// - public int FileCount - { - get - { - return this.FileList.Count(); - } - } + public int FileCount { get; set; } + //{ + // get + // { + // return this.FileList.Count(); + // } + //} public List FileList { get; set; } = new List(); diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs index a2a87fada..3d0e0c980 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs @@ -488,6 +488,7 @@ namespace IRaCIS.Application.Services IsCRCUpload = x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC, IsBlind=x.IsBlind, IsComplete=x.IsComplete, + FileCount=x.FileCount, ReadingClinicalDataState=x.ReadingClinicalDataState, diff --git a/IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs b/IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs index 56d420619..13bc1f96f 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs @@ -64,20 +64,24 @@ namespace IRaCIS.Core.Domain.Models /// public Guid CreateUserId { get; set; } + public int FileCount { get; set; } + + [JsonIgnore] //临床数据状态 public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; } + [JsonIgnore] [ForeignKey("ClinicalDataTrialSetId")] public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; } - + [JsonIgnore] [ForeignKey("ReadingId")] public SubjectVisit SubjectVisit { get; set; } - + [JsonIgnore] [ForeignKey("ReadingId")] public ReadModule ReadModule { get; set; } @@ -85,6 +89,7 @@ namespace IRaCIS.Core.Domain.Models /// /// PDF文件 /// + [JsonIgnore] public List ReadingClinicalDataPDFList { get; set; } diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 0776d651b..80ec8d367 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -821,6 +821,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common SubjectId = x.SubjectId, IsDistinctionInterface = false, + + ObjectRelationParentId = entity.ReadingClinicalDataId }, new {