diff --git a/IRaCIS.Core.Application/Helper/FileStoreHelper.cs b/IRaCIS.Core.Application/Helper/FileStoreHelper.cs index e7b750bae..c1d336fd3 100644 --- a/IRaCIS.Core.Application/Helper/FileStoreHelper.cs +++ b/IRaCIS.Core.Application/Helper/FileStoreHelper.cs @@ -194,7 +194,7 @@ public static class FileStoreHelper var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment); //上传根路径 - string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), "CheckExcel"); + string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), StaticData.Folder.UploadEDCData); if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath); @@ -203,7 +203,7 @@ public static class FileStoreHelper var (trustedFileNameForFileStorage, realFileName) = FileStoreHelper.GetStoreFileName(fileName); - var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/CheckExcel/{trustedFileNameForFileStorage}"; + var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{StaticData.Folder.UploadEDCData}/{trustedFileNameForFileStorage}"; var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage); @@ -268,7 +268,7 @@ public static class FileStoreHelper - var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/UploadFile/{doctorId}/{attachmentType}/{trustedFileNameForFileStorage}"; + var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.UploadFile}/{doctorId}/{attachmentType}/{trustedFileNameForFileStorage}"; var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage); @@ -281,7 +281,7 @@ public static class FileStoreHelper var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment); //文件类型路径处理 - var uploadFolderPath = Path.Combine(rootPath, "UploadFile", attachmentType); + var uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.UploadFile , attachmentType); if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath); @@ -289,7 +289,7 @@ public static class FileStoreHelper - var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/UploadFile/{attachmentType}/{trustedFileNameForFileStorage}"; + var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.UploadFile}/{attachmentType}/{trustedFileNameForFileStorage}"; var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage); diff --git a/IRaCIS.Core.Domain/_Config/_StaticData.cs b/IRaCIS.Core.Domain/_Config/_StaticData.cs index bb8b43ecd..06b193b64 100644 --- a/IRaCIS.Core.Domain/_Config/_StaticData.cs +++ b/IRaCIS.Core.Domain/_Config/_StaticData.cs @@ -6,8 +6,6 @@ public static class StaticData #region 字典表项固定值 - - public static readonly string Title = "Title"; public static readonly string ReadingType = "ReadingType"; public static readonly string Subspeciality = "Subspeciality"; @@ -16,18 +14,13 @@ public static class StaticData public static readonly string Criterion = "Criterion"; public static readonly string ReviewType = "ReviewType"; public static readonly string ReadingStandard = "ReadingStandard"; - - - - - - - #endregion public static class Folder { + public static readonly string IRaCISDataFolder = "IRaCISData"; + public static readonly string TrialDataFolder = "TrialData"; public static readonly string SystemDataFolder = "SystemData"; @@ -39,22 +32,15 @@ public static class StaticData public static readonly string NoticeAttachment = "NoticeAttachment"; - public static readonly string UploadEDCData = "UploadEDCData"; - - - - public static readonly string IRaCISDataFolder = "IRaCISData"; - - - public static readonly string DicomFolder = "Dicom"; public static readonly string NoneDicomFolder = "NoneDicom"; - public static readonly string UploadFileFolder = "UploadFile"; public static readonly string TreatmenthistoryFolder = "Treatmenthistory"; - public static readonly string CommonFileFolder = "CommonFileFolder"; - public static readonly string SystemNoticeFolder = "SystemNoticeFolder"; + + + public static readonly string UploadEDCData = "UploadEDCData"; + public static readonly string UploadFileFolder = "UploadFile"; }