S-29

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

@@ -529,6 +529,7 @@ namespace IRaCIS.Core.Application.Service
 				.Include(x=>x.ClinicalDataTrialSet)
                 .Select(x => new CRCClinicalForm
 				{
+					SubjectId=x.SubjectId,
 					CheckDate = x.CheckDate,
 					ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel,
 					ClinicalFormId = x.Id,
@@ -569,7 +570,8 @@ namespace IRaCIS.Core.Application.Service
                 {
                     if (x.ReadingSetType == ReadingSetType.ImageReading)
                     {
-                        x.ClinicalFormList = formList.Where(y => y.ClinicalDataLevel == ClinicalLevel.ImageRead&&y.CheckDate <= x.LatestScanDate)
+                        x.ClinicalFormList = formList.Where(y => y.ClinicalDataLevel == ClinicalLevel.ImageRead&&y.CheckDate <= x.LatestScanDate&&y.SubjectId==x.SubjectId)
+                     
 					   .Select(y => new GetCRCBeConfirmListOutDto()
 					   {
 						   CheckDate = y.CheckDate ?? default(DateTime),
@@ -582,7 +584,7 @@ namespace IRaCIS.Core.Application.Service
                     }
                     else
                     {
-						x.ClinicalFormList = formList.Where(y => y.ClinicalDataLevel == ClinicalLevel.OncologyRead&&y.CheckDate <= x.LatestScanDate)
+						x.ClinicalFormList = formList.Where(y => y.ClinicalDataLevel == ClinicalLevel.OncologyRead&&y.CheckDate <= x.LatestScanDate && y.SubjectId == x.SubjectId)
                         .Select(y => new GetCRCBeConfirmListOutDto()
 						{
 							CheckDate = y.CheckDate ?? default(DateTime),

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

@@ -226,6 +226,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
 	public class CRCClinicalForm
     {
+		/// <summary>
+		/// 受试者Id
+		/// </summary>
+		public Guid SubjectId { get; set; }
 		public DateTime? CheckDate { get; set; }
 
         public Guid ClinicalFormId { get; set; }