S-36

IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs

@@ -203,13 +203,18 @@ namespace IRaCIS.Application.Services
                     Path = x.ClinicalDataTrialSet.Path,
                     IsBlind = x.IsBlind,
                     IsComplete = x.IsComplete,
+                    ClinicalFromList=x.ClinicalFormList.Select(y=> new ClinicalFromData() { 
+                    CheckDate=y.CheckDate,
+                    ClinicalFormId=y.Id
+                    }).ToList(),
                     PDFFileList = x.ReadingClinicalDataPDFList.Select(y => new GetFileDto()
                     {
                         Id = y.Id,
                         FileName = y.FileName,
                         Path = y.Path,
                         CreateTime = y.CreateTime,
-                    }).ToList()
+                    }).ToList(),
+                 
                 }).ToListAsync();
 
             List<GetReadingClinicalDataListOutDto> clinicalData = (await this.GetReadingClinicalDataList(new GetReadingClinicalDataListIndto()

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

@@ -113,9 +113,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public bool? IsComplete { get; set; }
 
-		//public List<GetReadingClinicalDataListOutDto> ReadingClinicalDataList { get; set; }
+        public List<ClinicalFromData> ClinicalFromList { get; set; }
 
-		public List<GetFileDto> PDFFileList { get; set; } = new List<GetFileDto>();
+        //public List<GetReadingClinicalDataListOutDto> ReadingClinicalDataList { get; set; }
+
+        public List<GetFileDto> PDFFileList { get; set; } = new List<GetFileDto>();
 
 		public ClinicalDataTable ClinicalTableData { get; set; }
 	}

IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs

@@ -96,8 +96,14 @@ namespace IRaCIS.Core.Domain.Models
 		[JsonIgnore]
 		public List<ReadingClinicalDataPDF> ReadingClinicalDataPDFList { get; set; }
 
+        /// <summary>
+        /// 临床数据表单
+        /// </summary>
+        [JsonIgnore]
+        public List<ClinicalForm> ClinicalFormList { get; set; }
 
-	}
+
+    }
 
 
 	

IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs

@@ -54,6 +54,10 @@ namespace IRaCIS.Core.Domain.Models
 		[ForeignKey("ClinicalDataTrialSetId")]
 		public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; }
 
-	}
+        [JsonIgnore]
+       
+        public ReadingClinicalData ReadingClinicalData { get; set; }
+
+    }
 
 }	 

IRaCIS.Core.Infra.EFCore/EntityConfigration/ClinicalFromConfigration.cs

@@ -0,0 +1,27 @@
+using IRaCIS.Core.Domain.Models;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
+{
+    public class ClinicalFromConfigration : IEntityTypeConfiguration<ClinicalForm>
+    {
+
+
+        public void Configure(EntityTypeBuilder<ClinicalForm> builder)
+        {
+           builder
+          .HasOne(s => s.ReadingClinicalData)
+          .WithMany(c => c.ClinicalFormList)
+          .HasForeignKey(s => new { s.SubjectId, s.ReadingId })
+          .HasPrincipalKey(c => new { c.Subject, c.ReadingId });
+        }
+
+
+    }
+}