修改一版

IRaCIS.Core.Application/Helper/FileStoreHelper.cs

@@ -211,6 +211,27 @@ public static class FileStoreHelper
     }
 
 
+    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);

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -600,6 +600,16 @@
             是否勾选
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.FileName">
+            <summary>
+            模板文件名称
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetAddOrEdit.Path">
+            <summary>
+            文件路径
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit.ClinicalDataSetEnum">
             <summary>
             枚举
@@ -630,6 +640,16 @@
             是否启用
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit.FileName">
+            <summary>
+            模板文件名称
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetAddOrEdit.Path">
+            <summary>
+            文件路径
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetView.ClinicalDataSetName">
             <summary>
             名称
@@ -685,6 +705,16 @@
             是否使用
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetView.FileName">
+            <summary>
+            模板文件名称
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataTrialSetView.Path">
+            <summary>
+            文件路径
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetView.ClinicalDataSetEnum">
             <summary>
             枚举
@@ -725,6 +755,16 @@
             是否启用
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetView.FileName">
+            <summary>
+            模板文件名称
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataSystemSetView.Path">
+            <summary>
+            文件路径
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ClinicalDataInDto.TrialId">
             <summary>
             项目Id

IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs

@@ -122,6 +122,8 @@ namespace IRaCIS.Application.Services
                 ClinicalDataLevel=x.ClinicalDataLevel,
                 ClinicalUploadType=x.ClinicalUploadType,
                 UploadRole=x.UploadRole,
+                FileName=x.FileName,
+                Path=x.Path,
                 TrialId= trialId,
                
             }).ToList();

IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs

@@ -51,6 +51,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// 是否勾选
         /// </summary>
         public bool IsConfirm { get; set; }
+
+        /// <summary>
+		/// 模板文件名称
+		/// </summary>
+		public string FileName { get; set; }
+
+        /// <summary>
+        /// 文件路径
+        /// </summary>
+        public string Path { get; set; }
     }
 
     public class ClinicalDataSystemSetAddOrEdit
@@ -89,7 +99,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public bool IsEnable { get; set; }
 
-       
+        /// <summary>
+		/// 模板文件名称
+		/// </summary>
+		public string FileName { get; set; }
+
+        /// <summary>
+        /// 文件路径
+        /// </summary>
+        public string Path { get; set; }
+
+
     }
 
    
@@ -161,6 +181,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// 是否使用
         /// </summary>
         public bool IsUsed { get; set; } = false;
+
+        /// <summary>
+		/// 模板文件名称
+		/// </summary>
+		public string FileName { get; set; }
+
+        /// <summary>
+        /// 文件路径
+        /// </summary>
+        public string Path { get; set; }
     }
 
 
@@ -210,6 +240,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public bool IsEnable { get; set; }
 
+        /// <summary>
+		/// 模板文件名称
+		/// </summary>
+		public string FileName { get; set; }
+
+        /// <summary>
+        /// 文件路径
+        /// </summary>
+        public string Path { get; set; }
+
 
 
 

IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs

@@ -146,6 +146,7 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<List<GetTrialClinicalDataSelectOutDto>> GetTrialClinicalDataSelect(GetTrialClinicalDataSelectIndto inDto)
         {
+           
             var usedIdsQuery = _readingClinicalDataRepository.Where(x => x.ReadingId == inDto.ReadingId && x.Id != inDto.ReadingClinicalDataId).Select(x => x.ClinicalDataTrialSetId);
             List<GetTrialClinicalDataSelectOutDto> clinicalList = await _clinicalDataTrialSetRepository.Where(x=>x.TrialId==inDto.TrialId&&x.IsConfirm)
                 .WhereIf(inDto.UploadRole!=null,x=>x.UploadRole==inDto.UploadRole)