diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
index 70692f8d6..e7f09042e 100644
--- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
@@ -1989,7 +1989,7 @@ namespace IRaCIS.Core.Application.Service.Common
             {
                 list.Add(new ExportDocumentDes() { Code = StaticData.Export.OCT_ReadingLession_Export, ExportCatogory = ExportResult.OCT_ReadingLession_Export });
             }
-            else if (criterion.CriterionType == CriterionType.SelfDefine)
+            //else if (criterion.CriterionType == CriterionType.SelfDefine)
             {
                 list.Add(new ExportDocumentDes() { Code = StaticData.Export.CDISC_Reading_Export, ExportCatogory = ExportResult.CDISC });
             }
diff --git a/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs b/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs
index bcb634798..c7f0d3f2b 100644
--- a/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs
+++ b/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs
@@ -176,9 +176,9 @@ namespace IRaCIS.Core.Application.Service
             var trial = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId);
 
             var hasSPMOrCPM = await _trialRepository.Where(t => t.Id == trialId).AnyAsync(t => t.TrialIdentityUserList.SelectMany(t => t.TrialUserRoleList).Any(t =>
-            t.UserRole.IdentityUser.Status==UserStateEnum.Enable 
-            && t.UserRole.IsUserRoleDisabled==false 
-            && (t.UserRole.UserTypeEnum == UserTypeEnum.SPM || t.UserRole.UserTypeEnum == UserTypeEnum.CPM) )
+            t.UserRole.IdentityUser.Status == UserStateEnum.Enable
+            && t.UserRole.IsUserRoleDisabled == false
+            && (t.UserRole.UserTypeEnum == UserTypeEnum.SPM || t.UserRole.UserTypeEnum == UserTypeEnum.CPM || t.UserRole.UserTypeEnum == UserTypeEnum.SMM || t.UserRole.UserTypeEnum == UserTypeEnum.CMM))
             );
 
             var isSPMjoin = trial.IsSPMJoinReviewerSelect && hasSPMOrCPM;