Uat_Study
parent
424174636e
commit
b0f189c338
|
@ -10482,7 +10482,7 @@
|
||||||
<param name="inDto"></param>
|
<param name="inDto"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.FindChildQuestion(IRaCIS.Core.Application.Service.Reading.Dto.TrialReadQuestionData,System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TrialReadQuestionData},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TableQuestionTrial},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionAnswerInfo},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TableAnsweRowInfo},System.Collections.Generic.List{IRaCIS.Core.Domain.Models.OrganInfo},System.Collections.Generic.List{IRaCIS.Core.Domain.Models.ReadingTableQuestionAnswer})">
|
<member name="M:IRaCIS.Application.Services.ReadingImageTaskService.FindChildQuestion(IRaCIS.Core.Application.Service.Reading.Dto.TrialReadQuestionData,System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TrialReadQuestionData},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TableQuestionTrial},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionAnswerInfo},System.Collections.Generic.List{IRaCIS.Core.Application.Service.Reading.Dto.TableAnsweRowInfo},System.Collections.Generic.List{IRaCIS.Core.Domain.Models.OrganInfo},System.Collections.Generic.List{IRaCIS.Core.Domain.Models.ReadingTableQuestionAnswer},System.Boolean)">
|
||||||
<summary>
|
<summary>
|
||||||
获取子元素
|
获取子元素
|
||||||
</summary>
|
</summary>
|
||||||
|
|
|
@ -15,6 +15,9 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
Task AddTaskAsync(GenerateTaskCommand generateTaskCommand);
|
Task AddTaskAsync(GenerateTaskCommand generateTaskCommand);
|
||||||
|
|
||||||
|
|
||||||
|
Task AddConvertedTask(Guid taskId);
|
||||||
|
|
||||||
Task BaseCritrionGenerateVisitTask(Guid trialId, Guid confirmedTrialReadingCriterionId,bool? isManualSelectVisit=null,List<Guid>? subjectVisitIdList=null);
|
Task BaseCritrionGenerateVisitTask(Guid trialId, Guid confirmedTrialReadingCriterionId,bool? isManualSelectVisit=null,List<Guid>? subjectVisitIdList=null);
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -2347,9 +2347,34 @@ namespace IRaCIS.Application.Services
|
||||||
|
|
||||||
await _visitTaskRepository.SaveChangesAsync();
|
await _visitTaskRepository.SaveChangesAsync();
|
||||||
|
|
||||||
|
bool isConverted = false;
|
||||||
|
|
||||||
|
var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).Include(x=>x.TrialReadingCriterion).FirstNotNullAsync();
|
||||||
|
|
||||||
|
switch (taskinfo.TrialReadingCriterion.CriterionType)
|
||||||
|
{
|
||||||
|
case CriterionType.IRECIST1Point1:
|
||||||
|
if (!taskinfo.IsConvertedTask &&
|
||||||
|
(await _readingTaskQuestionAnswerRepository.AnyAsync(x => x.VisitTaskId == visitTaskId
|
||||||
|
&& x.ReadingQuestionTrial.QuestionType == QuestionType.Tumor && x.Answer.EqEnum(OverallAssessment.PD)))
|
||||||
|
)
|
||||||
|
{
|
||||||
|
|
||||||
|
isConverted = true;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
// 创建任务关联关系
|
// 创建任务关联关系
|
||||||
await this.CreateTaskRelated(visitTaskId);
|
await this.CreateTaskRelated(visitTaskId);
|
||||||
|
|
||||||
|
// 是否触发转变任务
|
||||||
|
if (isConverted)
|
||||||
|
{
|
||||||
|
await _visitTaskHelpeService.AddConvertedTask(visitTaskId);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
// 触裁判任务
|
// 触裁判任务
|
||||||
await this.TriggerJudgeQuestion(visitTaskId);
|
await this.TriggerJudgeQuestion(visitTaskId);
|
||||||
// 添加阅片期任务
|
// 添加阅片期任务
|
||||||
|
@ -2366,6 +2391,9 @@ namespace IRaCIS.Application.Services
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 签名时创建任务关联
|
/// 签名时创建任务关联
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
Loading…
Reference in New Issue