S-45

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

@@ -128,7 +128,14 @@ namespace IRaCIS.Core.Application.Service
 
 			var clinicalDataList =await _readingClinicalDataRepository
 				   .WhereIf(inDto.SubjectId != null, x => x.SubjectId == inDto.SubjectId)
-				.Where(x =>x.TrialId==inDto.TrialId&&x.ClinicalDataTrialSet.UploadRole== UploadRole.CRC).IgnoreAutoIncludes().ToListAsync();
+				.Where(x =>x.TrialId==inDto.TrialId&&x.ClinicalDataTrialSet.UploadRole== UploadRole.CRC)
+                .Select(x=>new 
+                {
+                    ClinicalDataTrialSetId=x.ClinicalDataTrialSetId,
+                    SubjectId=x.SubjectId,
+                    x.ReadingId,
+
+                }).ToListAsync();
 
             List<ReadingClinicalData> readingClinicalDatas = new List<ReadingClinicalData>();
 
@@ -184,12 +191,12 @@ namespace IRaCIS.Core.Application.Service
 				   }).ToList());
 			});
 
-			await _readingClinicalDataRepository.AddRangeAsync(readingClinicalDatas);
-
-			await _readingClinicalDataRepository.SaveChangesAsync();
+          
+            await _readingClinicalDataRepository.AddRangeAsync(readingClinicalDatas);
+            await _readingClinicalDataRepository.SaveChangesAsync();
 
 
-		}
+        }
 
 		/// <summary>
 		/// 获取CRC受试者临床数据

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

@@ -197,7 +197,7 @@ namespace IRaCIS.Application.Services
                     Path = x.ClinicalDataTrialSet.Path,
                     IsBlind = x.IsBlind,
                     IsComplete = x.IsComplete,
-                    ClinicalFromList=x.ClinicalFormList.Select(y=> new ClinicalFromData() { 
+                    ClinicalFromList=x.Subject.ClinicalFormList.Where(y=>y.ReadingId==x.ReadingId).Select(y=> new ClinicalFromData() { 
                     CheckDate=y.CheckDate,
                     ClinicalFormId=y.Id
                     }).ToList(),