diff --git a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs
index 8f6fbdaaf..50dcf99ee 100644
--- a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs
@@ -33,9 +33,11 @@ namespace IRaCIS.Core.Application.Service
           .ForMember(d => d.SubmitUserName, u => u.MapFrom(s => s.SubmitUser.FullName))
           .ForMember(d => d.ClinicalInformationTransmissionEnum, u => u.MapFrom(s => s.Trial.ClinicalInformationTransmissionEnum))
 
-           .ForMember(d => d.IsHaveClinicalData, u => u.MapFrom(t => t.IsBaseLine ? t.PreviousHistoryList.Any() || t.PreviousOtherList.Any() || t.PreviousSurgeryList.Any()
-           || t.ReadingClinicalDataList.Any(x => x.ClinicalDataTrialSet.UploadRole == Domain.Share.UploadRole.CRC && x.ReadingClinicalDataPDFList.Count > 0)
-            : false))
+           .ForMember(d => d.IsHaveClinicalData,
+                 u => u.MapFrom(t => t.PreviousHistoryList.Any() ||
+                 t.PreviousOtherList.Any() || t.PreviousSurgeryList.Any() ||
+                 t.Subject.ClinicalFormList.Any(x => x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && x.ReadingId == t.Id) ||
+                 t.ReadingClinicalDataList.Any(x => x.ClinicalDataTrialSet.UploadRole == Domain.Share.UploadRole.CRC && x.ReadingClinicalDataPDFList.Count > 0)))
 
            .ForMember(d => d.DicomStudyCount, u => u.MapFrom(t => t.StudyList.Count()))
            .ForMember(d => d.NoneDicomStudyCount, u => u.MapFrom(t => t.NoneDicomStudyList.Count(t => t.NoneDicomFileList.Any())));
@@ -549,10 +551,10 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(d => d.Age, u => u.MapFrom(t => t.Subject.Age))
                  .ForMember(d => d.IsHaveClinicalData,
                  u => u.MapFrom(t => t.PreviousHistoryList.Any() ||
-                 t.PreviousOtherList.Any() ||
+                 t.PreviousOtherList.Any() || t.PreviousSurgeryList.Any() ||
                  t.Subject.ClinicalFormList.Any(x => x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && x.ReadingId == t.Id) ||
-                 t.ReadingClinicalDataList.Any(x => x.ClinicalDataTrialSet.UploadRole == Domain.Share.UploadRole.CRC && x.ReadingClinicalDataPDFList.Count > 0) ||
-                 t.PreviousSurgeryList.Any()))
+                 t.ReadingClinicalDataList.Any(x => x.ClinicalDataTrialSet.UploadRole == Domain.Share.UploadRole.CRC && x.ReadingClinicalDataPDFList.Count > 0) 
+                ))
 
                    .ForMember(d => d.IsHaveUploadFailed, u => u.MapFrom(t => t.StudyList.SelectMany(c => c.DicomStudyMonitorList).Any(h => h.FailedFileCount > 0)))
 
diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs
index 225dd172b..710513b05 100644
--- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs
+++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs
@@ -9,6 +9,11 @@ public class ClinicalForm : BaseAddAuditEntity
     [ForeignKey("ClinicalDataTrialSetId")]
     public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; }
 
+    [JsonIgnore]
+    [ForeignKey("ReadingId")]
+    public SubjectVisit SubjectVisit { get; set; }
+
+
     [JsonIgnore]
     [ForeignKey("SubjectId")]
     public Subject Subject { get; set; }
diff --git a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs
index 435f8e49f..f95d5c47a 100644
--- a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs
+++ b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs
@@ -10,6 +10,9 @@ public class SubjectVisit : BaseFullDeleteAuditEntity
     [JsonIgnore]
     public TrialSite TrialSite { get; set; }
 
+    [JsonIgnore]
+    public List<ClinicalForm> ClinicalFormList { get; set; }
+
     [JsonIgnore]
     [ForeignKey("OutPlanPreviousVisitId")]
     public SubjectVisit OutPlanPreviousVisit { get; set; }