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 /// 批量验证 检查是否可以上传 并告知原因 /// [HttpPost] - public (List, object?) VerifyStudyAllowUpload(VerifyUploadOrReupload verifyInfo) + public IResponseOutput> VerifyStudyAllowUpload(VerifyUploadOrReupload verifyInfo) { var trialInfo = _repository.Where().FirstOrDefault(t => t.Id == verifyInfo.TrialId).IfNullThrowException(); @@ -703,13 +703,12 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc var systemAnonymizationList = _repository.Where(t => t.IsEnable).ToList(); - return (result, new + return ResponseOutput.Ok>(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(); - CreateMap().ForMember(t => t.TrialId, u => u.MapFrom(c => c.Id)) + var isEn_Us = false; + + CreateMap().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)))