From 691ab5cf777ac2e1334266919403b5cb92672723 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 25 Aug 2022 15:24:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Reading/Dto/ReadingClinicalDataDto.cs  | 14 +++++++-------
 .../Service/Reading/ReadingClinicalDataService.cs  |  1 +
 IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs  |  9 +++++++--
 IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs    |  2 ++
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
index b14823c9..95b40b70 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
 		/// <summary>
 		/// 文件数量
 		/// </summary>
-		public int FileCount
-		{ 
-			get 
-			{
-				return this.FileList.Count();
-			} 
-		} 
+		public int FileCount { get; set; }
+		//{ 
+		//	get 
+		//	{
+		//		return this.FileList.Count();
+		//	} 
+		//} 
 
 		public List<GetFileDto> FileList { get; set; } = new List<GetFileDto>();
 
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
index a2a87fad..3d0e0c98 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 56d42061..13bc1f96 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs
@@ -64,20 +64,24 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		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
 		/// <summary>
 		/// PDF文件
 		/// </summary>
+		[JsonIgnore]
 		public List<ReadingClinicalDataPDF> ReadingClinicalDataPDFList { get; set; }
 
 
diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index 0776d651..80ec8d36 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
                 {