diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
index 7371c790a..a61aa183f 100644
--- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
+++ b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
@@ -945,72 +945,6 @@ namespace IRaCIS.Core.API.Controllers
#endregion
- #region 医生文件上传下载
-
- /// 医生文件上传下载
- [ApiExplorerSettings(GroupName = "Common")]
- [ApiController]
- public class FileController : UploadBaseController
- {
- public IMapper _mapper { get; set; }
- public IUserInfo _userInfo { get; set; }
-
-
- private readonly IWebHostEnvironment _hostEnvironment;
-
- private readonly IFileService _fileService;
-
-
-
- public FileController(IMapper mapper, IUserInfo userInfo, IWebHostEnvironment hostEnvironment, IFileService fileService)
- {
- _fileService = fileService;
- _hostEnvironment = hostEnvironment;
-
- _mapper = mapper;
- _userInfo = userInfo;
- }
-
- ///
- /// 上传文件[FileUpload]
- ///
- /// 附件类型
- /// 医生Id
- /// 返回文件信息
- [HttpPost, Route("file/UploadFile/{attachmentType}/{doctorId}")]
- [DisableFormValueModelBinding]
- [DisableRequestSizeLimit]
- public async Task UploadOrdinaryFile(string attachmentType, Guid doctorId)
- {
-
- return await SingleFileUploadAsync((fileName) => FileStoreHelper.GetDoctorOrdinaryFilePath(_hostEnvironment, fileName, doctorId, attachmentType));
-
- }
-
-
-
-
-
- ///
- /// 上传文件（ 不是医生个人的文件）[FileUpload]
- /// 例如：阅片章程等
- ///
- /// 文件类型
- ///
-
- [HttpPost, Route("file/UploadNonDoctorFile/{type}")]
- [DisableFormValueModelBinding]
- [DisableRequestSizeLimit]
- public async Task UploadNonDoctorFile(string type)
- {
- return await SingleFileUploadAsync((fileName) => FileStoreHelper.GetNonDoctorFilePath(_hostEnvironment, fileName, type));
- }
-
-
-
-
- }
- #endregion
#region 项目 系统 基本文件 上传 下载 预览
@@ -1269,10 +1203,12 @@ namespace IRaCIS.Core.API.Controllers
EmailAttachment=3,
EmailBodyHtml=4,
+
+ Other=5
}
///
- /// 数据上传、导出、 邮件附件 、邮件Html 通过 ----new
+ /// 1：数据上传 2：导出、 3：邮件附件 4：邮件Html 通过 ----new
///
///
[HttpPost("SystemFile/Upload")]
@@ -1302,6 +1238,8 @@ namespace IRaCIS.Core.API.Controllers
break;
default:
+ result = await SingleFileUploadAsync((fileName) => FileStoreHelper.GetOtherFileUploadPath(_hostEnvironment, StaticData.Folder.CommonFile, fileName));
+
break;
}
diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml
index e5067df29..1324dfafd 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.xml
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml
@@ -219,25 +219,6 @@
-
- 医生文件上传下载
-
-
-
- 上传文件[FileUpload]
-
- 附件类型
- 医生Id
- 返回文件信息
-
-
-
- 上传文件（ 不是医生个人的文件）[FileUpload]
- 例如：阅片章程等
-
- 文件类型
-
-
上传通用文档 比如一致性核查的 比如导出的excel 模板
diff --git a/IRaCIS.Core.API/Properties/launchSettings.json b/IRaCIS.Core.API/Properties/launchSettings.json
index a8d648f0a..6736bd9b9 100644
--- a/IRaCIS.Core.API/Properties/launchSettings.json
+++ b/IRaCIS.Core.API/Properties/launchSettings.json
@@ -1,29 +1,6 @@
{
"$schema": "http://json.schemastore.org/launchsettings.json",
- "iisSettings": {
- "windowsAuthentication": false,
- "anonymousAuthentication": true,
- "iisExpress": {
- "applicationUrl": "http://localhost:3305",
- "sslPort": 0
- }
- },
- "profiles": {
- "IIS Express": {
- "commandName": "IISExpress",
- "launchBrowser": true,
- "environmentVariables": {
- "ASPNETCORE_ENVIRONMENT": "Development"
- }
- },
- //"IRaCIS.Development": {
- // "commandName": "Project",
- // "launchBrowser": true,
- // "environmentVariables": {
- // "ASPNETCORE_ENVIRONMENT": "Development"
- // },
- // "applicationUrl": "http://localhost:6100"
- //},
+ "profiles": {
"Docker": {
"commandName": "Docker",
"launchBrowser": true,
diff --git a/IRaCIS.Core.Application/Helper/FileStoreHelper.cs b/IRaCIS.Core.Application/Helper/FileStoreHelper.cs
index 68bb2b970..e9a3b1e9c 100644
--- a/IRaCIS.Core.Application/Helper/FileStoreHelper.cs
+++ b/IRaCIS.Core.Application/Helper/FileStoreHelper.cs
@@ -41,12 +41,12 @@ public static class FileStoreHelper
if (isChangeToPdfFormat==false)
{
- trustedFileNameForFileStorage= Guid.NewGuid().ToString() + fileName;
+ trustedFileNameForFileStorage= fileName+ Guid.NewGuid().ToString() ;
}
else
{
- trustedFileNameForFileStorage=Guid.NewGuid().ToString() + Path.GetFileNameWithoutExtension(fileName) + ".pdf";
+ trustedFileNameForFileStorage= Path.GetFileNameWithoutExtension(fileName) + Guid.NewGuid().ToString() + ".pdf";
}
return (trustedFileNameForFileStorage, fileName);
@@ -227,6 +227,8 @@ public static class FileStoreHelper
return (serverFilePath, relativePath);
}
+ #region 修改后留存
+
public static (string PhysicalPath, string RelativePath) GetSystemFileUploadPath(IWebHostEnvironment _hostEnvironment, string templateFolderName, string fileName)
{
@@ -247,6 +249,30 @@ public static class FileStoreHelper
return (serverFilePath, relativePath);
}
+ public static (string PhysicalPath, string RelativePath) GetOtherFileUploadPath(IWebHostEnvironment _hostEnvironment, string templateFolderName, string fileName)
+ {
+ var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
+
+ //文件类型路径处理
+ var uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.OtherDataFolder, templateFolderName);
+ if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
+
+
+ var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
+
+
+ var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.OtherDataFolder}/{templateFolderName}/{trustedFileNameForFileStorage}";
+
+ var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
+
+ return (serverFilePath, relativePath);
+ }
+
+
+ #endregion
+
+
+
// 获取通用文档存放路径（excel模板 ）
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 3ec98cf7f..3fb61831b 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -8950,6 +8950,24 @@
是否区分标准
+
+ 业务模块 ///
+
+
+ 业务层级 ///
+
+
+ 邮件类型 ///
+
+
+ 邮件加急类型 ///
+
+
+ 定时周期 ///
+
+
+ 邮件主题 ///
+
SystemBasicDataView 列表视图模型