diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
index 0947548a3..18989d205 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
@@ -66,6 +66,13 @@ namespace IRaCIS.Core.Application.Service
                 throw new BusinessValidationFailedException(_localizer["ReadingQuestion_CDISCCodeRepeat"]);
             }
 
+            if(inDto.QuestionList.Any(x=>x.ExportResult.Contains(ExportResult.CDISC)&&x.CDISCCode.IsNullOrEmpty())
+                || inDto.TableQuestionList.Any(x => x.ExportResult.Contains(ExportResult.CDISC) && x.CDISCCode.IsNullOrEmpty())
+                )
+            {
+                throw new BusinessValidationFailedException(_localizer["ReadingQuestion_CDISCCodeCannotEmpty"]);
+            }
+
             List<ExportResult> needAdd = new List<ExportResult>()
             {
                 ExportResult.DetailedTableOfAdjudicationResults,
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
index 35a02e814..3c1357226 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
@@ -21,6 +21,7 @@ namespace IRaCIS.Core.Application.Service
         IRepository<EnrollDetail> _enrollDetailRepository,
         IRepository<Dictionary> _dictionaryRepository,
         IRepository<Enroll> _enrollRepository,
+        IOSSService _oSSService,
         IRepository<Workload> _workloadRepository,
         IRepository<Sponsor> _sponsorRepository,
         IRepository<VisitStage> _visitStageRepository,
@@ -568,6 +569,9 @@ namespace IRaCIS.Core.Application.Service
                 await _repository.BatchDeleteNoTrackingAsync<VisitTaskReReading>(t => t.OriginalReReadingTask.TrialId == trialId);
                 await _repository.BatchDeleteNoTrackingAsync<VisitTask>(t => t.TrialId == trialId);
                 await _repository.BatchDeleteNoTrackingAsync<TrialStateChange>(t => t.TrialId == trialId);
+
+
+                await _oSSService.DeleteFromPrefix(trialId.ToString());
                 #endregion