XCKJ/irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改静态字符串 进行分类

Browse Source
This commit is contained in:
hang
2022-05-30 16:54:32 +08:00
parent 29f4a73168
commit 823ace7d42
22 changed files with 139 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
-1
View File
@@ -192,7 +192,6 @@ namespace IRaCIS.Core.Application.Contracts
public bool IsTrialProcessConfirmed { get; set; }
public bool IsTrialBasicLogicConfirmed { get; set; }
public bool IsTrialUrgentConfirmed { get; set; }
IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+6 -6
View File
@@ -56,7 +56,7 @@ namespace IRaCIS.Core.Application
//验证 仅仅在 Initializing/Ongoing 才可以操作
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("该项目已结束或停止，不允许修改配置。");
}
@@ -185,7 +185,7 @@ namespace IRaCIS.Core.Application
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)
{
@@ -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("项目没有进入启动状态，不能设置为停止或完成状态");
}
if (trialStatusStr != StaticData.TrialOngoing)
if (trialStatusStr != StaticData.TrialState.TrialOngoing)
{
trial.TrialFinishTime = DateTime.Now;
}
@@ -213,7 +213,7 @@ namespace IRaCIS.Core.Application
//Paused、 添加工总量 算医生读片中
if (trialStatusStr.Contains(StaticData.TrialCompleted))
if (trialStatusStr.Contains(StaticData.TrialState.TrialCompleted))
{
await _repository.BatchUpdateAsync<Enroll>(u => u.TrialId == trialId, e => new Enroll
{
@@ -296,7 +296,7 @@ namespace IRaCIS.Core.Application
[Authorize(Policy = IRaCISPolicy.PM_APM)]
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("该项目当前状态不是初始化，不允许进行该操作。");
}
IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
+1 -1
View File
@@ -51,7 +51,7 @@ namespace IRaCIS.Application.Services
var no = 1;
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);
}
IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
+2 -2
View File
@@ -187,7 +187,7 @@ namespace IRaCIS.Application.Services
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);
}
@@ -195,7 +195,7 @@ namespace IRaCIS.Application.Services
{
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("项目状态只有处于：初始化或者进行中时，才允许操作。");
IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
+2 -2
View File
@@ -62,7 +62,7 @@ namespace IRaCIS.Core.Application.Services
var no = 1;
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;
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);
}