diff --git a/IRaCIS.Core.Application/Helper/FileStoreHelper.cs b/IRaCIS.Core.Application/Helper/FileStoreHelper.cs
index 288718745..55c01d7f0 100644
--- a/IRaCIS.Core.Application/Helper/FileStoreHelper.cs
+++ b/IRaCIS.Core.Application/Helper/FileStoreHelper.cs
@@ -129,65 +129,6 @@ public static class FileStoreHelper
#endregion
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public static async Task<(string PhysicalPath, string FileName)> GetSystemClinicalPathAsync(IWebHostEnvironment _hostEnvironment, IRepository _clinicalDataTrialSetRepository, Guid id)
- {
- var systemClinicalData = await _clinicalDataTrialSetRepository.FirstOrDefaultAsync(t => t.Id == id);
-
- if (systemClinicalData == null || systemClinicalData.Path == string.Empty)
- {
- //---数据库没有找到对应的数据模板文件,请联系系统运维人员。
- throw new BusinessValidationFailedException(StaticData.International("FileStore_TemplateFileNotFound"));
- }
-
- var filePath = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, systemClinicalData.Path);
-
- if (!System.IO.File.Exists(filePath))
- {
- //---数据模板文件存储路径上未找对应文件,请联系系统运维人员。
- throw new BusinessValidationFailedException(StaticData.International("FileStore_TemplateFileStoragePathInvalid"));
- }
-
- return (filePath, systemClinicalData.FileName);
- }
-
-
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public static async Task<(string PhysicalPath, string FileName)> GetTrialClinicalPathAsync(IWebHostEnvironment _hostEnvironment, IRepository _clinicalDataTrialSetRepository, Guid id)
- {
- var trialClinicalData = await _clinicalDataTrialSetRepository.FirstOrDefaultAsync(t => t.Id == id);
-
- if (trialClinicalData == null|| trialClinicalData.Path==string.Empty)
- {
- //---数据库没有找到对应的数据模板文件,请联系系统运维人员。
- throw new BusinessValidationFailedException(StaticData.International("FileStore_TemplateFileNotFound"));
- }
-
- var filePath = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, trialClinicalData.Path);
-
- if (!System.IO.File.Exists(filePath))
- {
- //---数据模板文件存储路径上未找对应文件,请联系系统运维人员。
- throw new BusinessValidationFailedException(StaticData.International("FileStore_TemplateFileStoragePathInvalid"));
- }
-
- return (filePath, trialClinicalData.FileName);
- }
-
//通过编码获取通用文档具体物理路径
@@ -237,44 +178,6 @@ public static class FileStoreHelper
return writeCount;
}
- // 获取项目签名文档存放路径
-
- public static (string PhysicalPath, string RelativePath) GetTrialSignDocPath(IWebHostEnvironment _hostEnvironment, Guid trialId, string fileName)
- {
- var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
- //文件类型路径处理
- var uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), StaticData.Folder.SignDocumentFolder);
- if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
- var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
- var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{StaticData.Folder.SignDocumentFolder}/{trustedFileNameForFileStorage}";
-
- var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
- return (serverFilePath, relativePath);
- }
-
- // 获取系统签名文档存放路径
- public static (string PhysicalPath, string RelativePath) GetSystemSignDocPath(IWebHostEnvironment _hostEnvironment, string fileName)
- {
- var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
-
- //文件类型路径处理
- var uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.SystemDataFolder, StaticData.Folder.SignDocumentFolder);
- if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
-
- var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
- var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.SystemDataFolder}/{ StaticData.Folder.SignDocumentFolder}/{trustedFileNameForFileStorage}";
-
- var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
- return (serverFilePath, relativePath);
- }
// 获取通用文档存放路径(excel模板 )
@@ -297,224 +200,6 @@ public static class FileStoreHelper
return (serverFilePath, relativePath);
}
- //获取系统通知文档存放路径
-
- public static (string PhysicalPath, string RelativePath) GetSystemNoticePath(IWebHostEnvironment _hostEnvironment, string fileName)
- {
- var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
- //文件类型路径处理
- var uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.SystemDataFolder, StaticData.Folder.NoticeAttachment);
- if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
-
- var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
-
- var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.SystemDataFolder}/{StaticData.Folder.NoticeAttachment}/{trustedFileNameForFileStorage}";
-
- var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
- return (serverFilePath, relativePath);
- }
-
- // 获取一致性核查路径
- public static (string PhysicalPath, string RelativePath) GetTrialCheckFilePath(IWebHostEnvironment _hostEnvironment, string fileName,Guid trialId)
- {
- var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
- //上传根路径
- string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), StaticData.Folder.UploadEDCData);
-
- if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
-
- //存放核对表
- var (trustedFileNameForFileStorage, realFileName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
- var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{StaticData.Folder.UploadEDCData}/{trustedFileNameForFileStorage}";
-
- var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
- return (serverFilePath, relativePath);
- }
-
-
- public static (string PhysicalPath, string RelativePath, string FileRealName) GetClinicalTemplatePath(IWebHostEnvironment _hostEnvironment, string fileName,Guid trialId)
- {
-
- var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
- string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, "ClinicalTemplate", trialId.ToString(), StaticData.Folder.TreatmenthistoryFolder);
-
- if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
- var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
- var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/ClinicalTemplate/{trialId}/{StaticData.Folder.TreatmenthistoryFolder}/{trustedFileNameForFileStorage}";
-
- var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
- return (serverFilePath, relativePath, fileRealName);
-
- }
-
-
- public static (string PhysicalPath, string RelativePath, string FileRealName) GetReadClinicalDataPath(IWebHostEnvironment _hostEnvironment, string fileName, Guid trialId, Guid siteId, Guid subjectId, Guid readingId)
- {
- var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
- string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), siteId.ToString(), subjectId.ToString(), StaticData.Folder.Reading, readingId.ToString());
-
- if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
- var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
- var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{siteId}/{subjectId}/{StaticData.Folder.Reading}/{readingId}/{trustedFileNameForFileStorage}";
-
- var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
- return (serverFilePath, relativePath, fileRealName);
-
- }
-
- //获取临床数据存放路径
- public static (string PhysicalPath, string RelativePath,string FileRealName) GetClinicalDataPath(IWebHostEnvironment _hostEnvironment, string fileName,Guid trialId,Guid siteId,Guid subjectId,Guid subjectVisitId)
- {
- var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
- string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(),siteId.ToString(), subjectId.ToString(), subjectVisitId.ToString(), StaticData.Folder.TreatmenthistoryFolder);
-
- if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
- var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
- var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{siteId}/{subjectId}/{subjectVisitId}/{StaticData.Folder.TreatmenthistoryFolder}/{trustedFileNameForFileStorage}";
-
- var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
- return (serverFilePath, relativePath, fileRealName);
-
- }
-
-
- public static (string PhysicalPath, string RelativePath, string FileRealName) GetClinicalDataPath(IWebHostEnvironment _hostEnvironment, string fileName, Guid trialId , Guid subjectId)
- {
- var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
- string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), subjectId.ToString(), StaticData.Folder.TreatmenthistoryFolder);
-
- if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
- var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
- var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{subjectId}/{StaticData.Folder.TreatmenthistoryFolder}/{trustedFileNameForFileStorage}";
-
- var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
- return (serverFilePath, relativePath, fileRealName);
-
- }
-
-
- ///
- /// 上传截图
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public static (string PhysicalPath, string RelativePath, string FileRealName) GetUploadPrintscreenFilePath(IWebHostEnvironment _hostEnvironment, string fileName, Guid trialId, Guid siteid, Guid subjectId)
- {
- var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
- string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), siteid.ToString(), subjectId.ToString());
-
- if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
- var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
- var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{siteid}/{subjectId}/{trustedFileNameForFileStorage}";
-
- var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
- return (serverFilePath, relativePath, fileRealName);
- }
-
-
- ///
- /// 通用获取文件路径
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public static (string PhysicalPath, string RelativePath, string FileRealName) GetFilePath(IWebHostEnvironment _hostEnvironment, string fileName, Guid trialId, Guid id,string type)
- {
- var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
- string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), id.ToString(), type);
-
- if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
- var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
- var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{id}/{type}/{trustedFileNameForFileStorage}";
-
- var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
- return (serverFilePath, relativePath, fileRealName);
- }
-
- public static (string PhysicalPath, string RelativePath, string FileRealName) GetMedicalReviewImage(IWebHostEnvironment _hostEnvironment, string fileName, Guid trialId, Guid taskMedicalReviewId)
- {
- var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
- string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), taskMedicalReviewId.ToString(), StaticData.Folder.MedicalReview);
-
- if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
- var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
- var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{taskMedicalReviewId}/{StaticData.Folder.MedicalReview}/{trustedFileNameForFileStorage}";
-
- var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
- return (serverFilePath, relativePath, fileRealName);
- }
-
- //获取非dicom文件存放路径
- public static (string PhysicalPath, string RelativePath, string FileRealName) GetNoneDicomFilePath(IWebHostEnvironment _hostEnvironment, string fileName, Guid trialId, Guid siteId, Guid subjectId, Guid subjectVisitId)
- {
- var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
- string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), siteId.ToString(), subjectId.ToString(), subjectVisitId.ToString(), StaticData.Folder.NoneDicomFolder);
-
- if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
- var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
- var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{siteId}/{subjectId}/{subjectVisitId}/{StaticData.Folder.NoneDicomFolder}/{trustedFileNameForFileStorage}";
-
- var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
- return (serverFilePath, relativePath, fileRealName);
- }
-
// 获取 入组确认 PD 进展发送邮件Word|PDF 存放路径
public static (string PhysicalPath, string RelativePath, string FileRealName) GetSubjectEnrollConfirmOrPDEmailPath(IWebHostEnvironment _hostEnvironment, string fileName, Guid trialId, Guid trialSiteId, Guid subjectId,bool isChangeToPdfFormat=false)
@@ -631,49 +316,7 @@ public static class FileStoreHelper
- // 获取医生通用文件存放路径
- public static (string PhysicalPath, string RelativePath) GetDoctorOrdinaryFilePath(IWebHostEnvironment _hostEnvironment, string fileName,Guid doctorId,string attachmentType)
- {
-
- var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
- //文件类型路径处理
- var uploadFolderPath = Path.Combine(rootPath, "UploadFile", doctorId.ToString(), attachmentType);
- if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
-
- var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
-
- var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.UploadFileFolder}/{doctorId}/{attachmentType}/{trustedFileNameForFileStorage}";
-
- var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
- return (serverFilePath, relativePath);
- }
-
- public static (string PhysicalPath, string RelativePath) GetNonDoctorFilePath(IWebHostEnvironment _hostEnvironment, string fileName, string attachmentType)
- {
-
- var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
-
- //文件类型路径处理
- var uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.UploadFileFolder, attachmentType);
- if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
-
-
- var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
-
-
-
- var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.UploadFileFolder}/{attachmentType}/{trustedFileNameForFileStorage}";
-
- var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
-
- return (serverFilePath, relativePath);
- }