From 307d982fcb9463d1cd945cdac4d4937652f017b4 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Tue, 14 Jan 2025 13:20:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs | 4 ++++
 1 file changed, 4 insertions(+)

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
 
 

From b86361bf0e9fe2fd19c5055558e0a8dce6f19c9e Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Tue, 14 Jan 2025 14:55:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/ReadingCriterion/ReadingQuestionService.cs     | 7 +++++++
 1 file changed, 7 insertions(+)

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,