From 7ce98a8c81f67095a0f1b281888a7dbda3b63afc Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 4 May 2023 13:50:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/ImageAndDoc/StudyService.cs                    | 7 +++----
 .../Service/TrialSiteUser/_MapConfig.cs                    | 4 +++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
index 24d8ccd74..ac3691d2e 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
@@ -655,7 +655,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         /// 批量验证 检查是否可以上传 并告知原因
         /// </summary>
         [HttpPost]
-        public (List<VerifyStudyUploadResult>, object?) VerifyStudyAllowUpload(VerifyUploadOrReupload verifyInfo)
+        public IResponseOutput<List<VerifyStudyUploadResult>> VerifyStudyAllowUpload(VerifyUploadOrReupload verifyInfo)
         {
             var trialInfo = _repository.Where<Trial>().FirstOrDefault(t => t.Id == verifyInfo.TrialId).IfNullThrowException();
 
@@ -703,13 +703,12 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             var systemAnonymizationList = _repository.Where<SystemAnonymization>(t => t.IsEnable).ToList();
 
-            return (result, new
+            return  ResponseOutput.Ok<List<VerifyStudyUploadResult>>(result, new
             {
                 DicomStoreInfo = otherData,
                 AnonymizeFixedList = systemAnonymizationList.Where(t => t.IsFixed).ToList(),
                 AnonymizeNotFixedList = systemAnonymizationList.Where(t => t.IsFixed == false).ToList()
-            }
-            );
+            });
         }
 
 
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
index 6dab84b71..4ec110bde 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
@@ -162,7 +162,9 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<AssginSiteCRCCommand, TrialSiteUser>();
 
-			CreateMap<Domain.Models.Trial, TrialConfigDTO>().ForMember(t => t.TrialId, u => u.MapFrom(c => c.Id))
+            var isEn_Us = false;
+
+            CreateMap<Domain.Models.Trial, TrialConfigDTO>().ForMember(t => t.TrialId, u => u.MapFrom(c => c.Id))
                     .ForMember(t => t.TrialCriterionIds, u => u.MapFrom(c => c.ReadingQuestionCriterionTrialList.Where(v =>v.IsConfirm).OrderBy(x=>x.ShowOrder).Select(r => r.Id)))
                     .ForMember(t => t.TrialCriterionNames, u => u.MapFrom(c => c.ReadingQuestionCriterionTrialList.Where(v => v.IsConfirm).OrderBy(x => x.ShowOrder).Select(r => r.CriterionName)))
                     .ForMember(t => t.ClinicalDataTrialSetIds, u => u.MapFrom(c => c.clinicalDataTrialSets.Where(v => v.IsConfirm).Select(r => r.Id)))