From 35d7202fc3868c1cd8832dd2f321804364e879ed Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Wed, 4 Sep 2024 09:50:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/QC/DTO/QARecordViewModel.cs                  | 2 ++
 .../Reading/ClinicalData/ReadingClinicalDataService.cs   | 2 +-
 .../Service/Reading/Dto/ReadingClinicalDataDto.cs        | 9 ++++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs
index d7e41ff55..d97d57b1d 100644
--- a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs
+++ b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs
@@ -365,6 +365,8 @@ 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;
diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index 945c150ba..7d2d5a84e 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/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.TrialId == inDto.TrialId && x.SubjectId == inDto.SubjectId);
+                query = query.Where(x => x.StudyId == inDto.StudyId.Value && x.ReadingId == inDto.SubjectVisitId);
             }
             else
             {
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
index edf51866c..d9e1ae23e 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
@@ -172,11 +172,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 	{
 		public Guid SubjectVisitId { get; set; }
 
-		public Guid TrialId { get; set; }
+        public Guid TrialId { get; set; }
 
-		public Guid SubjectId { get; set; }
+        //public Guid TrialId { get; set; }
 
-		public bool IsBaseline { get; set; }
+        public Guid SubjectId { get; set; }
+
+
+        public bool IsBaseline { get; set; }
 
 		public Guid? StudyId { get; set; }