1 changed files with 4 additions and 6 deletions
--- a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs
@ -537,12 +537,10 @@ namespace IRaCIS.Core.Application.Service
                 .ForMember(d => d.MedicalNo, u => u.MapFrom(s => s.Subject.MedicalNo))
                 .ForMember(d => d.Sex, u => u.MapFrom(s => s.Subject.Sex))
                 .ForMember(d => d.Age, u => u.MapFrom(t => t.Subject.Age))
-                 .ForMember(d => d.IsHaveClinicalData, 
+                 .ForMember(d => d.IsHaveClinicalData, u => u.MapFrom(t => t.PreviousHistoryList.Any() || t.PreviousOtherList.Any()
-                 u => u.MapFrom(t => t.PreviousHistoryList.Any() || 
+                 || t.Subject.ClinicalFormList.Any(x => x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && x.ReadingId == t.Id)
-                 t.PreviousOtherList.Any() || 
+                 || t.ReadingClinicalDataList.Any(x => x.ClinicalDataTrialSet.UploadRole == Domain.Share.UploadRole.CRC && x.ReadingClinicalDataPDFList.Count > 0)
-                 t.Subject.ClinicalFormList.Any(x => x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && x.ReadingId == t.Id) || 
+                 || t.PreviousSurgeryList.Any()))
                 t.ReadingClinicalDataList.Any(x => x.ClinicalDataTrialSet.UploadRole == Domain.Share.UploadRole.CRC && x.ReadingClinicalDataPDFList.Count > 0) || 
                 t.PreviousSurgeryList.Any()))
                   .ForMember(d => d.IsHaveUploadFailed, u => u.MapFrom(t => t.StudyList.SelectMany(c => c.DicomStudyMonitorList).Any(h => h.FailedFileCount > 0)))