修改一版

2022-06-27 16:33:48 +08:00
parent 0ca3447cf6
commit 31158df4a0
3 changed files with 45 additions and 1 deletions
@@ -329,6 +329,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		} 

 		public List<GetFileDto> FileList { get; set; } = new List<GetFileDto>();
+
+
+		public ClinicalDataTable ClinicalTableData { get; set; }
 	}


@@ -328,7 +328,26 @@ namespace IRaCIS.Application.Services

                var result=await resultQuery.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField == null ? nameof(GetReadingClinicalDataListOutDto.ClinicalDataSetName) : inDto.SortField,
                   inDto.Asc);
-               return result;
+
+
+            var previousHistoryList = await _previousHistoryRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).ProjectTo<PreviousHistoryView>(_mapper.ConfigurationProvider).ToListAsync();
+            var previousOtherList = await _previousOtherRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).ProjectTo<PreviousOtherView>(_mapper.ConfigurationProvider).ToListAsync();
+            var previousSurgeryList = await _previousSurgeryRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).ProjectTo<PreviousSurgeryView>(_mapper.ConfigurationProvider).ToListAsync();
+
+
+
+            foreach (var item in result.CurrentPageData)
+            {
+                item.ClinicalTableData = new ClinicalDataTable()
+                {
+                    PreviousHistoryList = previousHistoryList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
+                    PreviousOtherList = previousOtherList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
+                    PreviousSurgeryList = previousSurgeryList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
+                };
+
+            }
+
+            return result;
        }