From 95ebcf25499e17e1531507d15a7b0777ac3a49cc Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 5 Jul 2022 10:27:55 +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

---
 IRaCIS.Core.Application/Helper/FileStoreHelper.cs | 4 ++--
 IRaCIS.Core.Domain/_Config/_StaticData.cs         | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Helper/FileStoreHelper.cs b/IRaCIS.Core.Application/Helper/FileStoreHelper.cs
index d11ccad0f..51cf3cefd 100644
--- a/IRaCIS.Core.Application/Helper/FileStoreHelper.cs
+++ b/IRaCIS.Core.Application/Helper/FileStoreHelper.cs
@@ -290,14 +290,14 @@ public static class FileStoreHelper
     {
         var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
 
-        string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), siteId.ToString(), subjectId.ToString(), "Reading", readingId.ToString(), StaticData.Folder.TreatmenthistoryFolder);
+        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}/Reading/{readingId}/{StaticData.Folder.TreatmenthistoryFolder}/{trustedFileNameForFileStorage}";
+        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{siteId}/{subjectId}{StaticData.Folder.Reading}/{readingId}/{trustedFileNameForFileStorage}";
 
         var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
 
diff --git a/IRaCIS.Core.Domain/_Config/_StaticData.cs b/IRaCIS.Core.Domain/_Config/_StaticData.cs
index 05a7d8f58..971f32327 100644
--- a/IRaCIS.Core.Domain/_Config/_StaticData.cs
+++ b/IRaCIS.Core.Domain/_Config/_StaticData.cs
@@ -36,6 +36,8 @@ public static class StaticData
         public static readonly string NoneDicomFolder = "NoneDicom";
         public static readonly string TreatmenthistoryFolder = "Treatmenthistory";
 
+        public static readonly string Reading = "Reading";
+
         public static readonly string MedicalReview = "MedicalReview";