XCKJ
/
EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改静态字符串 进行分类

Test.EIImageViewer
hang 2022-05-30 16:54:32 +08:00
parent 29f4a73168
commit 823ace7d42
22 changed files with 139 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
IRaCIS.Core.API/_PipelineExtensions/IRacisHostFileStoreConfig.cs
View File

@ -23,38 +23,8 @@ namespace IRaCIS.Core.API
app.UseStaticFiles(new StaticFileOptions app.UseStaticFiles(new StaticFileOptions
{ {
FileProvider = new PhysicalFileProvider(iRaCISDataFolder), FileProvider = new PhysicalFileProvider(iRaCISDataFolder),
RequestPath = $"/{StaticData.IRaCISDataFolder}" RequestPath = $"/{StaticData.Folder.IRaCISDataFolder}"
}); });
#region 后期废弃
var uploadPath = Path.Combine(Directory.GetParent(_hostEnvironment.ContentRootPath.TrimEnd('\\')).FullName, StaticData.UploadFileFolder);
if (!Directory.Exists(uploadPath))
{
Directory.CreateDirectory(uploadPath);
}
app.UseStaticFiles(new StaticFileOptions
{
FileProvider = new PhysicalFileProvider(uploadPath),
RequestPath = $"/{StaticData.UploadFileFolder}"
});
#endregion
} }
} }
} }

6
IRaCIS.Core.API/appsettings.json
View File

@ -75,8 +75,10 @@
"NoneDicomStudyCodePrefix": "ST", "NoneDicomStudyCodePrefix": "ST",
"DicomStudyCodePrefix": "NST" "DicomStudyCodePrefix": "NST",
},
"DefaultPassword": "123456"
}
//网站根地址，为了访问文件 dicom 和上传的文档... 实测发现不用将域名拼接返回，浏览器会自动加上当前ip，避免了多环境读取环境配置文件 //网站根地址，为了访问文件 dicom 和上传的文档... 实测发现不用将域名拼接返回，浏览器会自动加上当前ip，避免了多环境读取环境配置文件

2
IRaCIS.Core.Application/AOP/TrialStatusAutofacAOP.cs
View File

@ -62,7 +62,7 @@ namespace IRaCIS.Core.Application.AOP
var trialModel = (invocation.Arguments[0] as TrialCommand).IfNullThrowConvertException(); var trialModel = (invocation.Arguments[0] as TrialCommand).IfNullThrowConvertException();
if (trialModel.Id == null || trialModel.Id == Guid.Empty) if (trialModel.Id == null || trialModel.Id == Guid.Empty)
{ {
_provider.Set(result.Data.Id.ToString(), StaticData.TrialOngoing, TimeSpan.FromDays(1)); _provider.Set(result.Data.Id.ToString(), StaticData.TrialState.TrialOngoing, TimeSpan.FromDays(1));
} }

2
IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs
View File

@ -94,7 +94,7 @@ namespace IRaCIS.Core.Application.Filter
// 这里是统一拦截 项目有关的操作允许情况(特殊的地方，比如项目配置（有的在多种状态（初始化，ongoing）都可以操作，有的仅仅在Initializing）还有 项目添加和更新，不走这里，特殊处理,不然在这里显得很乱，判断是哪个接口) // 这里是统一拦截 项目有关的操作允许情况(特殊的地方，比如项目配置（有的在多种状态（初始化，ongoing）都可以操作，有的仅仅在Initializing）还有 项目添加和更新，不走这里，特殊处理,不然在这里显得很乱，判断是哪个接口)
if (trialStatusStr.Value == StaticData.TrialOngoing) if (trialStatusStr.Value == StaticData.TrialState.TrialOngoing)
{ {
await next.Invoke(); await next.Invoke();

34
IRaCIS.Core.Application/Helper/FileStoreHelper.cs
View File

@ -44,7 +44,7 @@ public static class FileStoreHelper
{ {
var rootPath = GetIRaCISRootPath(_hostEnvironment); var rootPath = GetIRaCISRootPath(_hostEnvironment);
var rootFolder = Path.Combine(rootPath, StaticData.IRaCISDataFolder); var rootFolder = Path.Combine(rootPath, StaticData.Folder.IRaCISDataFolder);
return rootFolder; return rootFolder;
} }
@ -113,12 +113,12 @@ public static class FileStoreHelper
var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment); var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
//文件类型路径处理 //文件类型路径处理
var uploadFolderPath = Path.Combine(rootPath, StaticData.TrialDataFolder, trialId.ToString(), StaticData.SignDocumentFolder); var uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), StaticData.Folder.SignDocumentFolder);
if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath); if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName); var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
var relativePath = $"/{StaticData.IRaCISDataFolder}/{StaticData.TrialDataFolder}/{trialId}/{StaticData.SignDocumentFolder}/{trustedFileNameForFileStorage}"; var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{StaticData.Folder.SignDocumentFolder}/{trustedFileNameForFileStorage}";
var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage); var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
@ -132,13 +132,13 @@ public static class FileStoreHelper
//文件类型路径处理 //文件类型路径处理
var uploadFolderPath = Path.Combine(rootPath, StaticData.SystemDataFolder, StaticData.SignDocumentFolder); var uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.SystemDataFolder, StaticData.Folder.SignDocumentFolder);
if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath); if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName); var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
var relativePath = $"/{StaticData.IRaCISDataFolder}/{StaticData.SystemDataFolder}/{ StaticData.SignDocumentFolder}/{trustedFileNameForFileStorage}"; var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.SystemDataFolder}/{ StaticData.Folder.SignDocumentFolder}/{trustedFileNameForFileStorage}";
var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage); var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
@ -152,14 +152,14 @@ public static class FileStoreHelper
var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment); var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
//文件类型路径处理 //文件类型路径处理
var uploadFolderPath = Path.Combine(rootPath, StaticData.SystemDataFolder, StaticData.DataTemplate); var uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.SystemDataFolder, StaticData.Folder.DataTemplate);
if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath); if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName); var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
var relativePath = $"/{StaticData.IRaCISDataFolder}/{StaticData.SystemDataFolder}/{StaticData.DataTemplate}/{trustedFileNameForFileStorage}"; var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.SystemDataFolder}/{StaticData.Folder.DataTemplate}/{trustedFileNameForFileStorage}";
var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage); var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
@ -173,7 +173,7 @@ public static class FileStoreHelper
var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment); var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
//文件类型路径处理 //文件类型路径处理
var uploadFolderPath = Path.Combine(rootPath, StaticData.SystemDataFolder, StaticData.NoticeAttachment); var uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.SystemDataFolder, StaticData.Folder.NoticeAttachment);
if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath); if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
@ -181,7 +181,7 @@ public static class FileStoreHelper
var relativePath = $"/{StaticData.IRaCISDataFolder}/{StaticData.SystemDataFolder}/{StaticData.NoticeAttachment}/{trustedFileNameForFileStorage}"; var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.SystemDataFolder}/{StaticData.Folder.NoticeAttachment}/{trustedFileNameForFileStorage}";
var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage); var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
@ -194,7 +194,7 @@ public static class FileStoreHelper
var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment); var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
//上传根路径 //上传根路径
string uploadFolderPath = Path.Combine(rootPath, StaticData.TrialDataFolder, trialId.ToString(), "CheckExcel"); string uploadFolderPath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), "CheckExcel");
if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath); if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
@ -203,7 +203,7 @@ public static class FileStoreHelper
var (trustedFileNameForFileStorage, realFileName) = FileStoreHelper.GetStoreFileName(fileName); var (trustedFileNameForFileStorage, realFileName) = FileStoreHelper.GetStoreFileName(fileName);
var relativePath = $"/{StaticData.IRaCISDataFolder}/{StaticData.TrialDataFolder}/{trialId}/CheckExcel/{trustedFileNameForFileStorage}"; var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/CheckExcel/{trustedFileNameForFileStorage}";
var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage); var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
@ -215,14 +215,14 @@ public static class FileStoreHelper
{ {
var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment); var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
string uploadFolderPath = Path.Combine(rootPath, StaticData.TrialDataFolder, trialId.ToString(),siteId.ToString(), subjectId.ToString(), subjectVisitId.ToString(), StaticData.TreatmenthistoryFolder); 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); if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName); var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
var relativePath = $"/{StaticData.IRaCISDataFolder}/{StaticData.TrialDataFolder}/{trialId}/{siteId}/{subjectId}/{subjectVisitId}/{StaticData.TreatmenthistoryFolder}/{trustedFileNameForFileStorage}"; var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{siteId}/{subjectId}/{subjectVisitId}/{StaticData.Folder.TreatmenthistoryFolder}/{trustedFileNameForFileStorage}";
var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage); var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
@ -235,14 +235,14 @@ public static class FileStoreHelper
{ {
var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment); var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
string uploadFolderPath = Path.Combine(rootPath, StaticData.TrialDataFolder, trialId.ToString(), siteId.ToString(), subjectId.ToString(), subjectVisitId.ToString(), StaticData.NoneDicomFolder); 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); if (!Directory.Exists(uploadFolderPath)) Directory.CreateDirectory(uploadFolderPath);
var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName); var (trustedFileNameForFileStorage, fileRealName) = FileStoreHelper.GetStoreFileName(fileName);
var relativePath = $"/{StaticData.IRaCISDataFolder}/{StaticData.TrialDataFolder}/{trialId}/{siteId}/{subjectId}/{subjectVisitId}/{StaticData.NoneDicomFolder}/{trustedFileNameForFileStorage}"; var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{siteId}/{subjectId}/{subjectVisitId}/{StaticData.Folder.NoneDicomFolder}/{trustedFileNameForFileStorage}";
var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage); var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
@ -268,7 +268,7 @@ public static class FileStoreHelper
var relativePath = $"/{StaticData.IRaCISDataFolder}/UploadFile/{doctorId}/{attachmentType}/{trustedFileNameForFileStorage}"; var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/UploadFile/{doctorId}/{attachmentType}/{trustedFileNameForFileStorage}";
var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage); var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);
@ -289,7 +289,7 @@ public static class FileStoreHelper
var relativePath = $"/{StaticData.IRaCISDataFolder}/UploadFile/{attachmentType}/{trustedFileNameForFileStorage}"; var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/UploadFile/{attachmentType}/{trustedFileNameForFileStorage}";
var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage); var serverFilePath = Path.Combine(uploadFolderPath, trustedFileNameForFileStorage);

22
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -1911,21 +1911,6 @@
构造函数注入 构造函数注入
</summary> </summary>
</member> </member>
<member name="T:IRaCIS.Core.Domain.Share.ServiceVerifyConfigOption">
<summary>
多环境 配置环境实体
</summary>
</member>
<member name="T:IRaCIS.Core.Domain.Share.AppSettings">
<summary>
项目基础配置规则
</summary>
</member>
<member name="F:IRaCIS.Core.Domain.Share.StaticData.DefaultPassword">
<summary>
用户默认密码
</summary>
</member>
<member name="T:IRaCIS.Application.Services.BusinessFilter.UnifiedApiResultFilter"> <member name="T:IRaCIS.Application.Services.BusinessFilter.UnifiedApiResultFilter">
<summary> <summary>
统一返回前端数据包装，之前在控制器包装，现在修改为动态Api 在ResultFilter这里包装，减少重复冗余代码 统一返回前端数据包装，之前在控制器包装，现在修改为动态Api 在ResultFilter这里包装，减少重复冗余代码
@ -2447,13 +2432,6 @@
<member name="M:IRaCIS.Application.Services.UserService.SendVerificationCode(System.String)"> <member name="M:IRaCIS.Application.Services.UserService.SendVerificationCode(System.String)">
<summary>发送验证码 修改邮箱（已经登陆修改） New </summary> <summary>发送验证码 修改邮箱（已经登陆修改） New </summary>
</member> </member>
<member name="M:IRaCIS.Application.Services.UserService.VerifyCanInitSetUserNameAndPwd(System.Guid)">
<summary>
Result 为true 的时候 认为链接没有失效
</summary>
<param name="userId"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.UserService.ResetPassword(System.Guid)"> <member name="M:IRaCIS.Application.Services.UserService.ResetPassword(System.Guid)">
<summary> <summary>
重置密码为 默认密码 重置密码为 默认密码

2
IRaCIS.Core.Application/Service/Common/MailService.cs
View File

@ -341,7 +341,7 @@ namespace IRaCIS.Application.Services
sysUserInfo.FullName, sysUserInfo.FullName,
sysUserInfo.UserName, sysUserInfo.UserName,
sysUserInfo.UserTypeRole.UserTypeShortName, sysUserInfo.UserTypeRole.UserTypeShortName,
StaticData.DefaultPassword AppSettings.DefaultPassword
); );
} }

6
IRaCIS.Core.Application/Service/Doctor/EducationService.cs
View File

@ -55,13 +55,13 @@ namespace IRaCIS.Application.Services
var doctorEducationInfo = _mapper.Map<Education>(educationInfoViewModel); var doctorEducationInfo = _mapper.Map<Education>(educationInfoViewModel);
switch (educationInfoViewModel.Degree) switch (educationInfoViewModel.Degree)
{ {
case StaticData.Bachelor: case StaticData.ReviewerDegree.Bachelor:
doctorEducationInfo.ShowOrder = 1; doctorEducationInfo.ShowOrder = 1;
break; break;
case StaticData.Master: case StaticData.ReviewerDegree.Master:
doctorEducationInfo.ShowOrder = 2; doctorEducationInfo.ShowOrder = 2;
break; break;
case StaticData.Doctorate: case StaticData.ReviewerDegree.Doctorate:
doctorEducationInfo.ShowOrder = 3; doctorEducationInfo.ShowOrder = 3;
break; break;
} }

12
IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs
View File

@ -67,10 +67,10 @@ namespace IRaCIS.Core.Application.Services
} }
var anonymize_AddFixedFiledList = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize_AddFixedFiled).Value; var anonymize_AddFixedFiledList = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize.Anonymize_AddFixedFiled).Value;
var anonymize_AddIRCInfoFiled = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize_AddIRCInfoFiled).Value; var anonymize_AddIRCInfoFiled = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize.Anonymize_AddIRCInfoFiled).Value;
var anonymize_FixedField = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize_FixedField).Value; var anonymize_FixedField = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize.Anonymize_FixedField).Value;
var anonymize_IRCInfoField = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize_IRCInfoField).Value; var anonymize_IRCInfoField = _provider.Get<List<SystemAnonymization>>(StaticData.Anonymize.Anonymize_IRCInfoField).Value;
@ -242,7 +242,7 @@ namespace IRaCIS.Core.Application.Services
var dbStudyCodeIntMax = _studyRepository.Where(s => s.TrialId == addtionalInfo.TrialId).Select(t => t.Code).DefaultIfEmpty().Max(); var dbStudyCodeIntMax = _studyRepository.Where(s => s.TrialId == addtionalInfo.TrialId).Select(t => t.Code).DefaultIfEmpty().Max();
//获取缓存中的值 并发的时候，需要记录，已被占用的值 这样其他线程在此占用的最大的值上递增 //获取缓存中的值 并发的时候，需要记录，已被占用的值 这样其他线程在此占用的最大的值上递增
var cacheMaxCodeInt = _provider.Get<int>($"{addtionalInfo.TrialId }_{ StaticData.StudyMaxCode}").Value; var cacheMaxCodeInt = _provider.Get<int>($"{addtionalInfo.TrialId }_{ StaticData.CacheKey.StudyMaxCode}").Value;
int currentNextCodeInt = cacheMaxCodeInt > dbStudyCodeIntMax ? cacheMaxCodeInt + 1 : dbStudyCodeIntMax + 1; int currentNextCodeInt = cacheMaxCodeInt > dbStudyCodeIntMax ? cacheMaxCodeInt + 1 : dbStudyCodeIntMax + 1;
@ -250,7 +250,7 @@ namespace IRaCIS.Core.Application.Services
dicomStudy.StudyCode = AppSettings.GetCodeStr(currentNextCodeInt, nameof(DicomStudy)); dicomStudy.StudyCode = AppSettings.GetCodeStr(currentNextCodeInt, nameof(DicomStudy));
_provider.Set<int>($"{addtionalInfo.TrialId }_{ StaticData.StudyMaxCode}", dicomStudy.Code, TimeSpan.FromMinutes(30)); _provider.Set<int>($"{addtionalInfo.TrialId }_{ StaticData.CacheKey.StudyMaxCode}", dicomStudy.Code, TimeSpan.FromMinutes(30));
} }

8
IRaCIS.Core.Application/Service/ImageAndDoc/Helper/DicomFileStoreHelper.cs
View File

@ -24,14 +24,14 @@ namespace IRaCIS.Core.Application
var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment); var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
//上传根路径 //上传根路径
_fileStorePath = Path.Combine(rootPath, StaticData.TrialDataFolder); _fileStorePath = Path.Combine(rootPath, StaticData.Folder.TrialDataFolder);
} }
public string GetInstanceFilePath(DicomStudy dicomStudy, Guid seriesId, string instanceId) public string GetInstanceFilePath(DicomStudy dicomStudy, Guid seriesId, string instanceId)
{ {
return Path.Combine(_fileStorePath, dicomStudy.TrialId.ToString(), return Path.Combine(_fileStorePath, dicomStudy.TrialId.ToString(),
dicomStudy.SiteId.ToString(), dicomStudy.SubjectId.ToString(), dicomStudy.SubjectVisitId.ToString(), StaticData.DicomFolder, dicomStudy.Id.ToString(), instanceId.ToString() + ".dcm"); dicomStudy.SiteId.ToString(), dicomStudy.SubjectId.ToString(), dicomStudy.SubjectVisitId.ToString(), StaticData.Folder.DicomFolder, dicomStudy.Id.ToString(), instanceId.ToString() + ".dcm");
} }
@ -40,7 +40,7 @@ namespace IRaCIS.Core.Application
//加入访视层级 和Data //加入访视层级 和Data
var path = Path.Combine(_fileStorePath, dicomStudy.TrialId.ToString(), var path = Path.Combine(_fileStorePath, dicomStudy.TrialId.ToString(),
dicomStudy.SiteId.ToString(), dicomStudy.SubjectId.ToString(), dicomStudy.SubjectVisitId.ToString(), StaticData.DicomFolder, dicomStudy.Id.ToString()); dicomStudy.SiteId.ToString(), dicomStudy.SubjectId.ToString(), dicomStudy.SubjectVisitId.ToString(), StaticData.Folder.DicomFolder, dicomStudy.Id.ToString());
if (!Directory.Exists(path)) if (!Directory.Exists(path))
{ {
@ -53,7 +53,7 @@ namespace IRaCIS.Core.Application
public string GetSubjectVisitPath(Guid trialId,Guid siteId,Guid subjectId, Guid subjectVisitId) public string GetSubjectVisitPath(Guid trialId,Guid siteId,Guid subjectId, Guid subjectVisitId)
{ {
return Path.Combine(_fileStorePath, trialId.ToString(), return Path.Combine(_fileStorePath, trialId.ToString(),
siteId.ToString(), subjectId.ToString(), subjectVisitId.ToString(), StaticData.DicomFolder); siteId.ToString(), subjectId.ToString(), subjectVisitId.ToString(), StaticData.Folder.DicomFolder);
} }
//public static string CreateInstanceFilePath(DicomStudy dicomStudy, Guid seriesId, Guid instanceId) //public static string CreateInstanceFilePath(DicomStudy dicomStudy, Guid seriesId, Guid instanceId)

2
IRaCIS.Core.Application/Service/Management/UserService.cs
View File

@ -252,7 +252,7 @@ namespace IRaCIS.Application.Services
await _userRepository.UpdatePartialNowNoQueryAsync(userId, u => new User() await _userRepository.UpdatePartialNowNoQueryAsync(userId, u => new User()
{ {
Password = MD5Helper.Md5(StaticData.DefaultPassword), Password = MD5Helper.Md5(AppSettings.DefaultPassword),
IsFirstAdd = true IsFirstAdd = true
}); });

1
IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs
View File

@ -11,7 +11,6 @@ namespace IRaCIS.Core.Application.Contracts
public class NoneDicomStudyView:NoneDicomStudyAddOrEdit public class NoneDicomStudyView:NoneDicomStudyAddOrEdit
{ {
public string CodeView { get; set; } public string CodeView { get; set; }
public int Code {get;set;}
public int FileCount { get; set; } public int FileCount { get; set; }

1
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
View File

@ -192,7 +192,6 @@ namespace IRaCIS.Core.Application.Contracts
public bool IsTrialProcessConfirmed { get; set; } public bool IsTrialProcessConfirmed { get; set; }
public bool IsTrialBasicLogicConfirmed { get; set; }
public bool IsTrialUrgentConfirmed { get; set; } public bool IsTrialUrgentConfirmed { get; set; }

12
IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
View File

@ -56,7 +56,7 @@ namespace IRaCIS.Core.Application
//验证 仅仅在 Initializing/Ongoing 才可以操作 //验证 仅仅在 Initializing/Ongoing 才可以操作
private async Task VerifyOnlyInOngoingOrInitialIzingOptAsync(Guid trialId) private async Task VerifyOnlyInOngoingOrInitialIzingOptAsync(Guid trialId)
{ {
if (!await _trialRepository.AnyAsync(t => t.Id == trialId && (t.TrialStatusStr == StaticData.TrialInitializing || t.TrialStatusStr == StaticData.TrialOngoing))) if (!await _trialRepository.AnyAsync(t => t.Id == trialId && (t.TrialStatusStr == StaticData.TrialState.TrialInitializing || t.TrialStatusStr == StaticData.TrialState.TrialOngoing)))
{ {
throw new BusinessValidationFailedException("该项目已结束或停止，不允许修改配置。"); throw new BusinessValidationFailedException("该项目已结束或停止，不允许修改配置。");
} }
@ -185,7 +185,7 @@ namespace IRaCIS.Core.Application
var trial = (await _trialRepository.Where(t => t.Id == trialId, true).IgnoreQueryFilters().FirstOrDefaultAsync()).IfNullThrowException(); var trial = (await _trialRepository.Where(t => t.Id == trialId, true).IgnoreQueryFilters().FirstOrDefaultAsync()).IfNullThrowException();
if (trialStatusStr == StaticData.TrialOngoing) if (trialStatusStr == StaticData.TrialState.TrialOngoing)
{ {
if (trial.IsTrialBasicLogicConfirmed && trial.IsTrialProcessConfirmed && trial.IsTrialUrgentConfirmed && trial.VisitPlanConfirmed) if (trial.IsTrialBasicLogicConfirmed && trial.IsTrialProcessConfirmed && trial.IsTrialUrgentConfirmed && trial.VisitPlanConfirmed)
{ {
@ -197,12 +197,12 @@ namespace IRaCIS.Core.Application
} }
} }
if((trialStatusStr == StaticData.TrialStopped|| trialStatusStr == StaticData.TrialCompleted)&& trial.TrialStatusStr!= StaticData.TrialOngoing) if((trialStatusStr == StaticData.TrialState.TrialStopped|| trialStatusStr == StaticData.TrialState.TrialCompleted)&& trial.TrialStatusStr!= StaticData.TrialState.TrialOngoing)
{ {
return ResponseOutput.NotOk("项目没有进入启动状态，不能设置为停止或完成状态"); return ResponseOutput.NotOk("项目没有进入启动状态，不能设置为停止或完成状态");
} }
if (trialStatusStr != StaticData.TrialOngoing) if (trialStatusStr != StaticData.TrialState.TrialOngoing)
{ {
trial.TrialFinishTime = DateTime.Now; trial.TrialFinishTime = DateTime.Now;
} }
@ -213,7 +213,7 @@ namespace IRaCIS.Core.Application
//Paused、 添加工总量 算医生读片中 //Paused、 添加工总量 算医生读片中
if (trialStatusStr.Contains(StaticData.TrialCompleted)) if (trialStatusStr.Contains(StaticData.TrialState.TrialCompleted))
{ {
await _repository.BatchUpdateAsync<Enroll>(u => u.TrialId == trialId, e => new Enroll await _repository.BatchUpdateAsync<Enroll>(u => u.TrialId == trialId, e => new Enroll
{ {
@ -296,7 +296,7 @@ namespace IRaCIS.Core.Application
[Authorize(Policy = IRaCISPolicy.PM_APM)] [Authorize(Policy = IRaCISPolicy.PM_APM)]
public async Task<IResponseOutput> ConfigTrialProcessInfo(TrialProcessConfig trialConfig) public async Task<IResponseOutput> ConfigTrialProcessInfo(TrialProcessConfig trialConfig)
{ {
if (!await _trialRepository.Where(t => t.Id == trialConfig.TrialId).IgnoreQueryFilters().AnyAsync(t => t.TrialStatusStr == StaticData.TrialInitializing)) if (!await _trialRepository.Where(t => t.Id == trialConfig.TrialId).IgnoreQueryFilters().AnyAsync(t => t.TrialStatusStr == StaticData.TrialState.TrialInitializing))
{ {
return ResponseOutput.NotOk("该项目当前状态不是初始化，不允许进行该操作。"); return ResponseOutput.NotOk("该项目当前状态不是初始化，不允许进行该操作。");
} }

2
IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
View File

@ -51,7 +51,7 @@ namespace IRaCIS.Application.Services
var no = 1; var no = 1;
exportInfo.TrialUserList.ForEach(t => t.No = no++); exportInfo.TrialUserList.ForEach(t => t.No = no++);
return await ExcelExportHelper.DataExportAsync(StaticData.TrialUserList_Export, exportInfo, exportInfo.TrialCode, _commonDocumentRepository, _hostEnvironment); return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialUserList_Export, exportInfo, exportInfo.TrialCode, _commonDocumentRepository, _hostEnvironment);
} }

4
IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
View File

@ -187,7 +187,7 @@ namespace IRaCIS.Application.Services
var success = await _repository.SaveChangesAsync(); var success = await _repository.SaveChangesAsync();
_provider.Set(trial.Id.ToString(), StaticData.TrialInitializing, TimeSpan.FromDays(7)); _provider.Set(trial.Id.ToString(), StaticData.TrialState.TrialInitializing, TimeSpan.FromDays(7));
return ResponseOutput.Ok(trial); return ResponseOutput.Ok(trial);
} }
@ -195,7 +195,7 @@ namespace IRaCIS.Application.Services
{ {
var updateModel = trialAddModel; var updateModel = trialAddModel;
if (!await _repository.AnyAsync<Trial>(u => u.Id == trialAddModel.Id && (u.TrialStatusStr == StaticData.TrialInitializing || u.TrialStatusStr == StaticData.TrialOngoing))) if (!await _repository.AnyAsync<Trial>(u => u.Id == trialAddModel.Id && (u.TrialStatusStr == StaticData.TrialState.TrialInitializing || u.TrialStatusStr == StaticData.TrialState.TrialOngoing)))
{ {
throw new BusinessValidationFailedException("项目状态只有处于：初始化或者进行中时，才允许操作。"); throw new BusinessValidationFailedException("项目状态只有处于：初始化或者进行中时，才允许操作。");

4
IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
View File

@ -62,7 +62,7 @@ namespace IRaCIS.Core.Application.Services
var no = 1; var no = 1;
exportInfo.TrialSiteUserList.ForEach(t => t.No = no++); exportInfo.TrialSiteUserList.ForEach(t => t.No = no++);
return await ExcelExportHelper.DataExportAsync(StaticData.TrialSiteUserList_Export, exportInfo, exportInfo.TrialCode, _commonDocumentRepository, _hostEnvironment); return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSiteUserList_Export, exportInfo, exportInfo.TrialCode, _commonDocumentRepository, _hostEnvironment);
} }
@ -115,7 +115,7 @@ namespace IRaCIS.Core.Application.Services
var no = 1; var no = 1;
exportInfo.TrialSiteUserList.ForEach(t => t.No = no++); exportInfo.TrialSiteUserList.ForEach(t => t.No = no++);
return await ExcelExportHelper.DataExportAsync(StaticData.TrialSiteUserSummary_Export, exportInfo, exportInfo.TrialCode, _commonDocumentRepository, _hostEnvironment); return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSiteUserSummary_Export, exportInfo, exportInfo.TrialCode, _commonDocumentRepository, _hostEnvironment);
} }

4
IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs
View File

@ -87,7 +87,7 @@ namespace IRaCIS.Application.Services
public async Task<IResponseOutput> AddOrUpdateVisitStage(VisitPlanCommand visitPlan) public async Task<IResponseOutput> AddOrUpdateVisitStage(VisitPlanCommand visitPlan)
{ {
if (!await _trialRepository.Where(t => t.Id == visitPlan.TrialId).IgnoreQueryFilters().AnyAsync(t => t.TrialStatusStr == StaticData.TrialOngoing || t.TrialStatusStr == StaticData.TrialInitializing)) if (!await _trialRepository.Where(t => t.Id == visitPlan.TrialId).IgnoreQueryFilters().AnyAsync(t => t.TrialStatusStr == StaticData.TrialState.TrialOngoing || t.TrialStatusStr == StaticData.TrialState.TrialInitializing))
{ {
throw new BusinessValidationFailedException("只有当项目状态为：初始化或进行中时，可以操作。 "); throw new BusinessValidationFailedException("只有当项目状态为：初始化或进行中时，可以操作。 ");
} }
@ -217,7 +217,7 @@ namespace IRaCIS.Application.Services
[Authorize(Policy = IRaCISPolicy.PM_APM)] [Authorize(Policy = IRaCISPolicy.PM_APM)]
public async Task<IResponseOutput> ConfirmTrialVisitPlan(Guid trialId) public async Task<IResponseOutput> ConfirmTrialVisitPlan(Guid trialId)
{ {
if (!await _trialRepository.AnyAsync(t => t.Id == trialId && (t.TrialStatusStr == StaticData.TrialInitializing || t.TrialStatusStr == StaticData.TrialOngoing))) if (!await _trialRepository.AnyAsync(t => t.Id == trialId && (t.TrialStatusStr == StaticData.TrialState.TrialInitializing || t.TrialStatusStr == StaticData.TrialState.TrialOngoing)))
{ {
return ResponseOutput.NotOk("仅仅在项目初始化或者进行中时，才允许修改确认"); return ResponseOutput.NotOk("仅仅在项目初始化或者进行中时，才允许修改确认");
} }

8
IRaCIS.Core.Application/_MediatR/Handlers/AnonymizeCacheHandler.cs
View File

@ -31,10 +31,10 @@ namespace IRaCIS.Core.Application.MediatR.Handlers
{ {
var systemAnonymizationList = _repository.Where<SystemAnonymization>(t => t.IsEnable).ToList(); var systemAnonymizationList = _repository.Where<SystemAnonymization>(t => t.IsEnable).ToList();
_provider.Set(StaticData.Anonymize_AddFixedFiled, systemAnonymizationList.Where(t => t.IsAdd && t.IsFixed).ToList(), TimeSpan.FromDays(7)); _provider.Set(StaticData.Anonymize.Anonymize_AddFixedFiled, systemAnonymizationList.Where(t => t.IsAdd && t.IsFixed).ToList(), TimeSpan.FromDays(7));
_provider.Set(StaticData.Anonymize_AddIRCInfoFiled, systemAnonymizationList.Where(t => t.IsAdd && t.IsFixed == false).ToList(), TimeSpan.FromDays(7)); _provider.Set(StaticData.Anonymize.Anonymize_AddIRCInfoFiled, systemAnonymizationList.Where(t => t.IsAdd && t.IsFixed == false).ToList(), TimeSpan.FromDays(7));
_provider.Set(StaticData.Anonymize_FixedField, systemAnonymizationList.Where(t => t.IsAdd == false && t.IsFixed).ToList(), TimeSpan.FromDays(7)); _provider.Set(StaticData.Anonymize.Anonymize_FixedField, systemAnonymizationList.Where(t => t.IsAdd == false && t.IsFixed).ToList(), TimeSpan.FromDays(7));
_provider.Set(StaticData.Anonymize_IRCInfoField, systemAnonymizationList.Where(t => t.IsAdd == false && t.IsFixed == false).ToList(), TimeSpan.FromDays(7)); _provider.Set(StaticData.Anonymize.Anonymize_IRCInfoField, systemAnonymizationList.Where(t => t.IsAdd == false && t.IsFixed == false).ToList(), TimeSpan.FromDays(7));
return Task.FromResult(true); return Task.FromResult(true);
} }

2
IRaCIS.Core.Domain/Trial/Trial.cs
View File

@ -77,7 +77,7 @@ namespace IRaCIS.Core.Domain.Models
//启动状态 //启动状态
[StringLength(500)] [StringLength(500)]
public string TrialStatusStr { get; set; } = StaticData.TrialInitializing; public string TrialStatusStr { get; set; } = StaticData.TrialState.TrialInitializing;
public List<TrialStateChange> TrialStateChangeList { get; set; } = new List<TrialStateChange>(); public List<TrialStateChange> TrialStateChangeList { get; set; } = new List<TrialStateChange>();

11
IRaCIS.Core.Application/Config/_AppSettings.cs → IRaCIS.Core.Domain/_Config/_AppSettings.cs
View File

@ -1,4 +1,5 @@
using Microsoft.Extensions.Configuration; using IRaCIS.Core.Domain.Models;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Configuration.Json; using Microsoft.Extensions.Configuration.Json;
namespace IRaCIS.Core.Domain.Share namespace IRaCIS.Core.Domain.Share
@ -34,6 +35,12 @@ namespace IRaCIS.Core.Domain.Share
public static string NoneDicomStudyCodePrefix { get; set; } public static string NoneDicomStudyCodePrefix { get; set; }
/// <summary>
/// 用户默认密码
/// </summary>
public static readonly string DefaultPassword = "123456";
static AppSettings() static AppSettings()
{ {
var configuration = new ConfigurationBuilder() var configuration = new ConfigurationBuilder()
@ -49,7 +56,7 @@ namespace IRaCIS.Core.Domain.Share
QCChallengeCodePrefix = configuration.GetSection("IRaCISBasicConfig").GetValue<string>("QCChallengeCodePrefix"); QCChallengeCodePrefix = configuration.GetSection("IRaCISBasicConfig").GetValue<string>("QCChallengeCodePrefix");
NoneDicomStudyCodePrefix = configuration.GetSection("IRaCISBasicConfig").GetValue<string>("NoneDicomStudyCodePrefix"); NoneDicomStudyCodePrefix = configuration.GetSection("IRaCISBasicConfig").GetValue<string>("NoneDicomStudyCodePrefix");
DicomStudyCodePrefix = configuration.GetSection("IRaCISBasicConfig").GetValue<string>("DicomStudyCodePrefix"); DicomStudyCodePrefix = configuration.GetSection("IRaCISBasicConfig").GetValue<string>("DicomStudyCodePrefix");
DefaultPassword= configuration.GetSection("IRaCISBasicConfig").GetValue<string>("DefaultPassword");
} }

114
IRaCIS.Core.Application/Config/_StaticData.cs → IRaCIS.Core.Domain/_Config/_StaticData.cs
View File

@ -1,28 +1,35 @@
namespace IRaCIS.Core.Domain.Share namespace IRaCIS.Core.Domain.Share;
public static class StaticData
{ {
public static class StaticData
#region 字典表项固定值
public static readonly string Title = "Title";
public static readonly string ReadingType = "ReadingType";
public static readonly string Subspeciality = "Subspeciality";
public static readonly string Modality = "Modality";
public static readonly string Criterion = "Criterion";
public static readonly string ReviewType = "ReviewType";
public static readonly string ReadingStandard = "ReadingStandard";
#endregion
public static class Folder
{ {
/// <summary>
/// 用户默认密码
/// </summary>
public static readonly string DefaultPassword = "123456";
public static string StudyMaxCode = "StudyMaxCode";
public static string Question = "Question";
#region 字典表项固定值
public static readonly string Title = "Title";
public static readonly string ReadingType = "ReadingType";
public static readonly string Subspeciality = "Subspeciality";
public static readonly string Modality = "Modality";
public static readonly string Criterion = "Criterion";
public static readonly string ReviewType = "ReviewType";
public static readonly string ReadingStandard = "ReadingStandard";
public static readonly string TrialDataFolder = "TrialData"; public static readonly string TrialDataFolder = "TrialData";
public static readonly string SystemDataFolder = "SystemData"; public static readonly string SystemDataFolder = "SystemData";
@ -42,28 +49,42 @@
public static readonly string DicomFolder = "Dicom"; public static readonly string DicomFolder = "Dicom";
public static readonly string NoneDicomFolder = "NoneDicom"; public static readonly string NoneDicomFolder = "NoneDicom";
public static readonly string UploadFileFolder = "UploadFile"; public static readonly string UploadFileFolder = "UploadFile";
public static readonly string TreatmenthistoryFolder = "Treatmenthistory"; public static readonly string TreatmenthistoryFolder = "Treatmenthistory";
public static readonly string CommonFileFolder = "CommonFileFolder"; public static readonly string CommonFileFolder = "CommonFileFolder";
public static readonly string SystemNoticeFolder = "SystemNoticeFolder"; public static readonly string SystemNoticeFolder = "SystemNoticeFolder";
}
public static class CacheKey
{
public static string StudyMaxCode = "StudyMaxCode";
}
/// <summary>
#endregion /// 医生学位等级
/// </summary>
#region Reviewer Degree public static class ReviewerDegree
{
public const string Bachelor = "Bachelor"; public const string Bachelor = "Bachelor";
public const string Master = "Master"; public const string Master = "Master";
public const string Doctorate = "Doctorate"; public const string Doctorate = "Doctorate";
#endregion }
#region TrialStatusStr /// <summary>
/// 项目状态
/// </summary>
public static class TrialState
{
public const string TrialInitializing = "Initializing"; public const string TrialInitializing = "Initializing";
public const string TrialOngoing = "Ongoing"; public const string TrialOngoing = "Ongoing";
@ -71,13 +92,18 @@
public const string TrialCompleted = "Completed"; public const string TrialCompleted = "Completed";
public const string TrialStopped = "Stopped"; public const string TrialStopped = "Stopped";
}
#endregion
#region 匿名化
/// <summary>
/// 匿名化配置 key
/// </summary>
public static class Anonymize
{
public const string Anonymize_FixedField = "Anonymize_FixedField"; public const string Anonymize_FixedField = "Anonymize_FixedField";
public const string Anonymize_IRCInfoField = "Anonymize_IRCInfoField"; public const string Anonymize_IRCInfoField = "Anonymize_IRCInfoField";
@ -85,23 +111,29 @@
public const string Anonymize_AddFixedFiled = "Anonymize_AddFixedFiled"; public const string Anonymize_AddFixedFiled = "Anonymize_AddFixedFiled";
public const string Anonymize_AddIRCInfoFiled = "Anonymize_AddIRCInfoFiled"; public const string Anonymize_AddIRCInfoFiled = "Anonymize_AddIRCInfoFiled";
}
#endregion
#region 项目人员导出
/// <summary>
/// 导出模板code
/// </summary>
public static class Export
{
public const string TrialSiteUserList_Export = "TrialSiteUserList_Export"; public const string TrialSiteUserList_Export = "TrialSiteUserList_Export";
public const string TrialSiteUserSummary_Export = "TrialSiteUserSummary_Export"; public const string TrialSiteUserSummary_Export = "TrialSiteUserSummary_Export";
public const string TrialUserList_Export = "TrialUserList_Export"; public const string TrialUserList_Export = "TrialUserList_Export";
#endregion
} }
}
}