From a6ccd959fc9e58ea7840ff87236a7ed5d7c71383 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 28 Aug 2024 14:40:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0oss=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/Helper/OSSService.cs  |  96 +++++++++-
 .../TrialSiteUser/Interface/ITrialService.cs  |   1 -
 .../Service/TrialSiteUser/TrialService.cs     | 173 +++++++++---------
 IRaCIS.Core.Application/TestService.cs        |  21 ++-
 4 files changed, 200 insertions(+), 91 deletions(-)

diff --git a/IRaCIS.Core.Application/Helper/OSSService.cs b/IRaCIS.Core.Application/Helper/OSSService.cs
index a9c96d1f3..5ed2eb864 100644
--- a/IRaCIS.Core.Application/Helper/OSSService.cs
+++ b/IRaCIS.Core.Application/Helper/OSSService.cs
@@ -15,6 +15,10 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Runtime.InteropServices;
 using System.Text.Json.Serialization;
+using Minio.ApiEndpoints;
+using System.Reactive.Linq;
+using IRaCIS.Core.Domain.Share;
+using static MassTransit.ValidationResultExtensions;
 
 namespace IRaCIS.Core.Application.Helper
 {
@@ -113,6 +117,7 @@ namespace IRaCIS.Core.Application.Helper
 
         public Task<string> GetSignedUrl(string ossRelativePath);
 
+        public Task DeleteFromPrefix(string prefix);
     }
 
 
@@ -239,7 +244,7 @@ namespace IRaCIS.Core.Application.Helper
             {
                 var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
 
-                var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows)? aliConfig.endPoint: aliConfig.internalEndpoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+                var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.endPoint : aliConfig.internalEndpoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
 
                 // 上传文件
                 var result = _ossClient.PutObject(aliConfig.bucketName, ossRelativePath, localFilePath);
@@ -359,7 +364,7 @@ namespace IRaCIS.Core.Application.Helper
 
         }
 
-        public async Task<string>  GetSignedUrl(string ossRelativePath)
+        public async Task<string> GetSignedUrl(string ossRelativePath)
         {
             ossRelativePath = ossRelativePath.TrimStart('/');
             try
@@ -442,6 +447,93 @@ namespace IRaCIS.Core.Application.Helper
             }
 
         }
+
+        /// <summary>
+        /// 删除某个目录的文件
+        /// </summary>
+        /// <param name="prefix"></param>
+        /// <returns></returns>
+        public async Task DeleteFromPrefix(string prefix)
+        {
+            if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS")
+            {
+                var aliConfig = ObjectStoreServiceOptions.AliyunOSS;
+
+                var _ossClient = new OssClient(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? aliConfig.endPoint : aliConfig.internalEndpoint, aliConfig.accessKeyId, aliConfig.accessKeySecret);
+
+
+                try
+                {
+                    ObjectListing objectListing = null;
+                    string nextMarker = null;
+                    do
+                    {
+                        // 使用 prefix 模拟目录结构，设置 MaxKeys 和 NextMarker
+                        objectListing = _ossClient.ListObjects(new ListObjectsRequest(aliConfig.bucketName)
+                        {
+                            Prefix = prefix,
+                            MaxKeys = 1000,
+                            Marker = nextMarker
+                        });
+
+                        List<string> keys = objectListing.ObjectSummaries.Select(t => t.Key).ToList();
+
+                        // 删除获取到的文件
+                        if (keys.Count > 0)
+                        {
+                            _ossClient.DeleteObjects(new DeleteObjectsRequest(aliConfig.bucketName, keys, false));
+                        }
+
+                        // 设置 NextMarker 以获取下一页的数据
+                        nextMarker = objectListing.NextMarker;
+
+                    } while (objectListing.IsTruncated);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"Error: {ex.Message}");
+                }
+
+
+            }
+            else if (ObjectStoreServiceOptions.ObjectStoreUse == "MinIO")
+            {
+                var minIOConfig = ObjectStoreServiceOptions.MinIO;
+
+
+                var minioClient = new MinioClient().WithEndpoint($"{minIOConfig.endPoint}:{minIOConfig.port}")
+                    .WithCredentials(minIOConfig.accessKey, minIOConfig.secretKey).WithSSL(minIOConfig.useSSL)
+                    .Build();
+
+
+                var listArgs = new ListObjectsArgs().WithBucket(minIOConfig.bucketName).WithPrefix(prefix).WithRecursive(true);
+
+
+
+                var objects = minioClient.ListObjectsAsync(listArgs).ToListObservable().Select(t => t.Key).ToList();
+
+                if (objects.Count > 0)
+                {
+                    var objArgs = new RemoveObjectsArgs()
+                  .WithBucket(minIOConfig.bucketName)
+                  .WithObjects(objects);
+
+                    // 删除对象
+                    await minioClient.RemoveObjectsAsync(objArgs);
+                }
+
+
+
+            }
+            else if (ObjectStoreServiceOptions.ObjectStoreUse == "AWS")
+            {
+                throw new BusinessValidationFailedException("未定义的存储介质类型");
+            }
+            else
+            {
+                throw new BusinessValidationFailedException("未定义的存储介质类型");
+            }
+        }
     }
 
 
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialService.cs
index ff2193eb0..e572c9eae 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialService.cs
@@ -9,7 +9,6 @@ namespace IRaCIS.Application.Interfaces
         bool TrialExpeditedChange { get; set; }
 
         Task<IResponseOutput<Trial>> AddOrUpdateTrial(TrialCommand trialAddModel);
-        Task<IResponseOutput> DeleteTrial(Guid trialId);
         Task<PageOutput<TrialDetailDTO>> GetReviewerTrialListByEnrollmentStatus(TrialByStatusQueryDTO param);
         Task<List<Guid>> GetTrialEnrollmentReviewerIds(Guid trialId);
         Task<int> GetTrialExpeditedState(Guid trialId);
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
index 761cb5462..e5aa5e4b6 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
@@ -422,7 +422,7 @@ namespace IRaCIS.Application.Services
         /// <param name="trialId">临床试验项目Id</param>
         [AllowAnonymous]
         [HttpDelete, Route("{trialId:guid}")]
-        public async Task<IResponseOutput> DeleteTrial(Guid trialId)
+        public async Task<IResponseOutput> DeleteTrial(Guid trialId, [FromServices]IRepository _repository)
         {
 
 
@@ -434,126 +434,125 @@ namespace IRaCIS.Application.Services
 
 
                 #region 真项目删除
-                //await _repository.BatchDeleteNoTrackingAsync<CheckChallengeDialog>(o => o.SubjectVisit.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<ClinicalDataTrialSet>(o => o.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<InspectionFile>(o => o.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<CriterionNidusSystem>(o => o.TrialReadingCriterion.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<DataInspection>(o => o.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<DicomStudy>(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<StudyMonitor>(t => t.TrialId == trialId);
-                //await _dicomSeriesRepository.BatchDeleteNoTrackingAsync(t => t.TrialId == trialId);
-                //await _dicomInstanceRepository.BatchDeleteNoTrackingAsync(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<EnrollReadingCategory>(t => t.Enroll.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<Enroll>(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<EnrollDetail>(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<NoneDicomStudyFile>(t => t.NoneDicomStudy.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<NoneDicomStudy>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<CheckChallengeDialog>(o => o.SubjectVisit.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<ClinicalDataTrialSet>(o => o.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<InspectionFile>(o => o.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<CriterionNidusSystem>(o => o.TrialReadingCriterion.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<DataInspection>(o => o.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<DicomStudy>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<StudyMonitor>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<DicomSeries>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<DicomInstance>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<EnrollReadingCategory>(t => t.Enroll.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<Enroll>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<EnrollDetail>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<NoneDicomStudyFile>(t => t.NoneDicomStudy.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<NoneDicomStudy>(t => t.TrialId == trialId);
 
-                //await _repository.BatchDeleteNoTrackingAsync<OrganTrialInfo>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<OrganTrialInfo>(t => t.TrialId == trialId);
 
-                //await _repository.BatchDeleteNoTrackingAsync<PaymentAdjustment>(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<PaymentDetail>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<PaymentAdjustment>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<PaymentDetail>(t => t.TrialId == trialId);
 
 
 
 
-                //await _repository.BatchDeleteNoTrackingAsync<PreviousHistory>(t => t.SubjectVisit.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<PreviousOther>(t => t.SubjectVisit.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<PreviousPDF>(t => t.SubjectVisit.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<PreviousHistory>(t => t.SubjectVisit.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<PreviousOther>(t => t.SubjectVisit.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<PreviousPDF>(t => t.SubjectVisit.TrialId == trialId);
 
 
-                //await _repository.BatchDeleteNoTrackingAsync<QCChallengeDialog>(t => t.QCChallenge.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<QCChallenge>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<QCChallengeDialog>(t => t.QCChallenge.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<QCChallenge>(t => t.TrialId == trialId);
 
 
 
-                //await _repository.BatchDeleteNoTrackingAsync<ReadingClinicalDataPDF>(t => t.ReadingClinicalData.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<ReadingClinicalData>(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<ReadingGlobalTaskInfo>(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<ReadingJudgeInfo>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<ReadingClinicalDataPDF>(t => t.ReadingClinicalData.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<ReadingClinicalData>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<ReadingGlobalTaskInfo>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<ReadingJudgeInfo>(t => t.TrialId == trialId);
 
 
-                //await _repository.BatchDeleteNoTrackingAsync<ReadingMedicalReviewDialog>(t => t.TaskMedicalReview.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<ReadingMedicineQuestionAnswer>(t => t.TaskMedicalReview.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<ReadingMedicineTrialQuestion>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<ReadingMedicalReviewDialog>(t => t.TaskMedicalReview.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<ReadingMedicineQuestionAnswer>(t => t.TaskMedicalReview.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<ReadingMedicineTrialQuestion>(t => t.TrialId == trialId);
 
 
-                //await _repository.BatchDeleteNoTrackingAsync<ReadingOncologyTaskInfo>(t => t.VisitTask.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<ReadingPeriodPlan>(t => t.ReadingPeriodSet.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<ReadingPeriodSet>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<ReadingOncologyTaskInfo>(t => t.VisitTask.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<ReadingPeriodPlan>(t => t.ReadingPeriodSet.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<ReadingPeriodSet>(t => t.TrialId == trialId);
 
 
-                //await _repository.BatchDeleteNoTrackingAsync<ReadingQuestionTrial>(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<ReadingTableAnswerRowInfo>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<ReadingQuestionTrial>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<ReadingTableAnswerRowInfo>(t => t.TrialId == trialId);
 
-                //await _repository.BatchDeleteNoTrackingAsync<ReadingTableQuestionAnswer>(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<ReadingTableQuestionTrial>(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<ReadingTaskQuestionAnswer>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<ReadingTableQuestionAnswer>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<ReadingTableQuestionTrial>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<ReadingTaskQuestionAnswer>(t => t.TrialId == trialId);
 
-                //await _repository.BatchDeleteNoTrackingAsync<ReadingTaskRelation>(t => t.VisitTask.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<ReadModule>(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<ReadingTaskQuestionAnswer>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<ReadingTaskRelation>(t => t.VisitTask.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<ReadModule>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<ReadingTaskQuestionAnswer>(t => t.TrialId == trialId);
 
-                //await _repository.BatchDeleteNoTrackingAsync<SubjectCanceDoctor>(t => t.Subject.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<SubjectUser>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<SubjectCanceDoctor>(t => t.Subject.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<SubjectUser>(t => t.TrialId == trialId);
 
-                //await _repository.BatchDeleteNoTrackingAsync<Subject>(t => t.TrialId == trialId);
-                //await _subjectVisitRepository.BatchDeleteNoTrackingAsync(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<Subject>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<SubjectVisit>(t => t.TrialId == trialId);
 
-                //await _repository.BatchDeleteNoTrackingAsync<TaskAllocationRule>(t => t.TrialId == trialId);
-                //await _taskConsistentRuleRepository.BatchDeleteNoTrackingAsync(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<TaskInfluence>(t => t.InfluenceTask.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<TaskMedicalReview>(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<TaskMedicalReviewRule>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TaskAllocationRule>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TaskConsistentRule>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TaskInfluence>(t => t.InfluenceTask.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TaskMedicalReview>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TaskMedicalReviewRule>(t => t.TrialId == trialId);
 
-                //await _repository.BatchDeleteNoTrackingAsync<TrialStateChange>(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<TrialPaymentPrice>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TrialStateChange>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TrialPaymentPrice>(t => t.TrialId == trialId);
 
 
-                //await _repository.BatchDeleteNoTrackingAsync<Trial>(o => o.Id == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<TrialClinicalDataSetCriterion>(t => t.TrialReadingCriterion.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<TrialCriterionDictionaryCode>(t => t.TrialReadingCriterion.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<ReadingQuestionCriterionTrial>(t => t.TrialId == trialId);
-                //await _trialDictionaryRepository.BatchDeleteNoTrackingAsync(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<TrialDocConfirmedUser>(t => t.TrialDocument.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<Trial>(o => o.Id == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TrialClinicalDataSetCriterion>(t => t.TrialReadingCriterion.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TrialCriterionDictionaryCode>(t => t.TrialReadingCriterion.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<ReadingQuestionCriterionTrial>(t => t.TrialId == trialId);
+                await _trialDictionaryRepository.BatchDeleteNoTrackingAsync(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TrialDocConfirmedUser>(t => t.TrialDocument.TrialId == trialId);
 
-                //await _repository.BatchDeleteNoTrackingAsync<TrialDocument>(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<TrialDocNeedConfirmedUserType>(t => t.TrialDocument.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TrialDocument>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TrialDocNeedConfirmedUserType>(t => t.TrialDocument.TrialId == trialId);
 
-                //await _trialEmailNoticeUserRepository.BatchDeleteNoTrackingAsync(t => t.TrialEmailNoticeConfig.TrialId == trialId);
-
-                ////await _repository.BatchDeleteAsync<TrialExperience>(t => t.TrialId == trialId) ;
-                //await _trialEmailNoticeUserRepository.BatchDeleteNoTrackingAsync(t => t.TrialEmailNoticeConfig.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<TrialEmailNoticeConfig>(t => t.TrialId == trialId);
-
-                //await _repository.BatchDeleteNoTrackingAsync<TrialExternalUser>(t => t.TrialId == trialId);
-
-                //await _repository.BatchDeleteNoTrackingAsync<TrialPaymentPrice>(t => t.TrialId == trialId);
-
-                //await _repository.BatchDeleteNoTrackingAsync<TrialQCQuestion>(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<TrialQCQuestionAnswer>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TrialEmailNoticeUser>(t => t.TrialEmailNoticeConfig.TrialId == trialId);
 
 
-                //await _repository.BatchDeleteNoTrackingAsync<TrialRevenuesPrice>(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<TrialRevenuesPriceVerification>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TrialEmailNoticeConfig>(t => t.TrialId == trialId);
+
+                await _repository.BatchDeleteNoTrackingAsync<TrialExternalUser>(t => t.TrialId == trialId);
+
+                await _repository.BatchDeleteNoTrackingAsync<TrialPaymentPrice>(t => t.TrialId == trialId);
+
+                await _repository.BatchDeleteNoTrackingAsync<TrialQCQuestion>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TrialQCQuestionAnswer>(t => t.TrialId == trialId);
+
+
+                await _repository.BatchDeleteNoTrackingAsync<TrialRevenuesPrice>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TrialRevenuesPriceVerification>(t => t.TrialId == trialId);
 
 
 
-                //await _repository.BatchDeleteNoTrackingAsync<TrialSign>(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<TrialSite>(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<TrialSiteSurvey>(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<TrialSiteUserSurvey>(t => t.TrialSiteSurvey.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<TrialSiteEquipmentSurvey>(t => t.TrialSiteSurvey.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TrialSign>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TrialSite>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TrialSiteSurvey>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TrialSiteUserSurvey>(t => t.TrialSiteSurvey.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TrialSiteEquipmentSurvey>(t => t.TrialSiteSurvey.TrialId == trialId);
 
-                //await _repository.BatchDeleteNoTrackingAsync<TrialUser>(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<TrialSiteUser>(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<VisitStage>(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<VisitPlanInfluenceStat>(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<VisitPlanInfluenceStudy>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TrialUser>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TrialSiteUser>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<VisitStage>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<VisitPlanInfluenceStat>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<VisitPlanInfluenceStudy>(t => t.TrialId == trialId);
 
-                //await _repository.BatchDeleteNoTrackingAsync<VisitTaskReReading>(t => t.OriginalReReadingTask.TrialId == trialId);
-                //await _visitTaskRepository.BatchDeleteNoTrackingAsync(t => t.TrialId == trialId);
-                //await _repository.BatchDeleteNoTrackingAsync<TrialStateChange>(t => t.TrialId == trialId);
+                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);
                 #endregion
 
 
diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs
index 56983e702..c5704afdc 100644
--- a/IRaCIS.Core.Application/TestService.cs
+++ b/IRaCIS.Core.Application/TestService.cs
@@ -1,4 +1,5 @@
 using Aliyun.OSS;
+using DocumentFormat.OpenXml.Drawing.Charts;
 using DocumentFormat.OpenXml.Wordprocessing;
 using IP2Region.Net.XDB;
 using IRaCIS.Application.Contracts;
@@ -85,6 +86,24 @@ namespace IRaCIS.Application.Services
             await _readingConsistentClinicalDataRepository.SaveChangesAsync();
             return ResponseOutput.Ok();
         }
+        public async Task<IResponseOutput> DeleteOSSDate([FromServices] IOSSService _oSSService, [FromServices] IWebHostEnvironment _hostEnvironment)
+        {
+
+            var deleteIdList = _trialRepository.Where(t => t.IsDeleted == true, false, true).Select(t => t.Id).ToList();
+
+            //foreach (var deleteId in deleteIdList)
+            //{
+            //    await _oSSService.DeleteFromPrefix($"{deleteId}");
+
+            //}
+
+            await _oSSService.DeleteFromPrefix($"01000000-0a00-0242-0d73-08dcac46a4bf");
+
+
+
+            return ResponseOutput.Ok();
+        }
+
 
 
         public async Task<IResponseOutput> TestEFcore8()
@@ -491,7 +510,7 @@ namespace IRaCIS.Application.Services
         /// <returns></returns>
         [AllowAnonymous]
         [UnitOfWork]
-        public async Task<IResponseOutput> OldLocalImageResizeJpg([FromServices] IOSSService oSSService,  [FromServices] IWebHostEnvironment _hostEnvironment)
+        public async Task<IResponseOutput> OldLocalImageResizeJpg([FromServices] IOSSService oSSService, [FromServices] IWebHostEnvironment _hostEnvironment)
         {
 
             var aliConfig = oSSService.ObjectStoreServiceOptions.AliyunOSS;