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

修改

Uat_Study
he 2022-07-20 17:48:49 +08:00
parent 1214a0da5a
commit a9936c2da1
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
View File

@ -746,12 +746,7 @@ namespace IRaCIS.Application.Services
});
var result = await _visitTaskRepository.SaveChangesAsync();
// 触裁判任务
await this.TriggerJudgeQuestion(inDto.VisitTaskId);
// 添加阅片期任务
await this.AddReadingTask(inDto.VisitTaskId);
// 完成阅片修改状态
await this.FinishReadUpdateState(inDto.VisitTaskId);
await this.SubmitTaskChangeState(inDto.VisitTaskId);
return ResponseOutput.Ok(result);
}
@ -789,14 +784,21 @@ namespace IRaCIS.Application.Services
{
var result = await this.SaveGlobalReadingInfo(inDto);
await this.SubmitTaskChangeState(inDto.GlobalTaskId);
return result;
}
//public async Task<IResponseOutput> SubmitTaskChangeState()
//{
//}
private async Task SubmitTaskChangeState(Guid visitTaskId)
{
// 触裁判任务
await this.TriggerJudgeQuestion(visitTaskId);
// 添加阅片期任务
await this.AddReadingTask(visitTaskId);
// 完成阅片修改状态
await this.FinishReadUpdateState(visitTaskId);
}
#endregion
@ -931,7 +933,7 @@ namespace IRaCIS.Application.Services
if (visitTask.SouceReadModuleId != null)
{
var visitNum = await _readModuleRepository.Where(x => x.Id == visitTask.SouceReadModuleId).Select(x => x.VisitNum).FirstOrDefaultAsync();
var lastVisitId = await _visitTaskRepository.Where(x => !x.IsAnalysisCreate && x.SouceReadModuleId == visitTask.SouceReadModuleId && x.ReadModule.VisitNum <= visitNum).OrderByDescending(x => x.ReadModule.VisitNum).Select(x => x.Id).FirstOrDefaultAsync();
var lastVisitId = await _visitTaskRepository.Where(x => !x.IsAnalysisCreate&&x.ArmEnum== visitTask.ArmEnum && x.SouceReadModuleId == visitTask.SouceReadModuleId && x.ReadModule.VisitNum <= visitNum).OrderByDescending(x => x.ReadModule.VisitNum).Select(x => x.Id).FirstOrDefaultAsync();
visitTaskids.Add(lastVisitId);
}
}

2
IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs
View File

@ -298,8 +298,6 @@ namespace IRaCIS.Application.Services
{
if (indto.IsTakeEffect == ReadingPeriodStatus.TakeEffect)
{
var readingPeriodSet = await _readingPeriodSetRepository.Where(x => x.Id == indto.Id).FirstNotNullAsync();
var plans = _readingPeriodPlanRepository.Where(x => x.ReadingPeriodSetId == indto.Id).Include(x => x.SubjectVisit)
.Include(x => x.ReadingPeriodSet).Include(x => x.SubjectVisit).ToList();

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

@ -63,7 +63,7 @@ namespace IRaCIS.Core.Application
if (existsJudge)
{
throw new BusinessValidationFailedException("配置了裁判问题但未配置裁判规则,操作失败");
throw new BusinessValidationFailedException("有裁判问题未配置产生裁判阅片任务的条件,操作失败！");
}
await _trialRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.TrialId, x => new Trial()

2
IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs
View File

@ -63,7 +63,7 @@ namespace IRaCIS.Core.Domain.Models
/// 表单类型
/// </summary>
public FormType FormType { get; set; }
public FormType FormType { get; set; } = FormType.SinglePage;
/// <summary>