IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs

@@ -365,8 +365,6 @@ namespace IRaCIS.Core.Application.Contracts.DTO
 
         public Guid StudyId { get; set; }
 
-        public Guid SubjectVisitId { get; set; }
-
         public int StudyStatus { get; set; }
 
         public string StudyCode { get; set; } = string.Empty;

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

@@ -216,7 +216,7 @@ namespace IRaCIS.Application.Services
             var query = _readingClinicalDataRepository.AsQueryable();
             if (inDto.StudyId != null)
             {
-                query = query.Where(x => x.StudyId == inDto.StudyId.Value && x.ReadingId == inDto.SubjectVisitId);
+                query = query.Where(x => x.StudyId == inDto.StudyId.Value && x.TrialId == inDto.TrialId && x.SubjectId == inDto.SubjectId);
             }
             else
             {

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

@@ -172,14 +172,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 	{
 		public Guid SubjectVisitId { get; set; }
 
-        public Guid TrialId { get; set; }
+		public Guid TrialId { get; set; }
 
-        //public Guid TrialId { get; set; }
+		public Guid SubjectId { get; set; }
 
-        public Guid SubjectId { get; set; }
+		public bool IsBaseline { get; set; }
-
-
-        public bool IsBaseline { get; set; }
 
 		public Guid? StudyId { get; set; }