修改逻辑
parent
6d87f7f1e3
commit
c7869abfaa
|
@ -1626,6 +1626,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
var task1 = await _visitTaskRepository.AddAsync(new VisitTask()
|
var task1 = await _visitTaskRepository.AddAsync(new VisitTask()
|
||||||
{
|
{
|
||||||
TrialId = trialId,
|
TrialId = trialId,
|
||||||
|
IsConvertedTask= originalTaskInfo.IsConvertedTask,
|
||||||
SubjectId = item.SubjectId,
|
SubjectId = item.SubjectId,
|
||||||
IsUrgent = originalTaskInfo.IsUrgent,
|
IsUrgent = originalTaskInfo.IsUrgent,
|
||||||
VisitTaskNum = item.VisitNum + ReadingCommon.TaskNumDic[ReadingCategory.Global],
|
VisitTaskNum = item.VisitNum + ReadingCommon.TaskNumDic[ReadingCategory.Global],
|
||||||
|
@ -1677,6 +1678,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
SubjectId = item.SubjectId,
|
SubjectId = item.SubjectId,
|
||||||
IsUrgent = originalTaskInfo.IsUrgent,
|
IsUrgent = originalTaskInfo.IsUrgent,
|
||||||
TaskName = item.ReadingName,
|
TaskName = item.ReadingName,
|
||||||
|
IsConvertedTask= originalTaskInfo.IsConvertedTask,
|
||||||
// 原任务是全局任务 加0.03 就好
|
// 原任务是全局任务 加0.03 就好
|
||||||
VisitTaskNum = originalTaskInfo.VisitTaskNum + 0.03m,
|
VisitTaskNum = originalTaskInfo.VisitTaskNum + 0.03m,
|
||||||
ArmEnum = Arm.TumorArm, //特殊
|
ArmEnum = Arm.TumorArm, //特殊
|
||||||
|
|
|
@ -1141,6 +1141,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
|
|
||||||
public Arm ArmEnum { get; set; }
|
public Arm ArmEnum { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 是否是转变的任务(转为IRECIST)
|
||||||
|
/// </summary>
|
||||||
|
public bool IsConvertedTask { get; set; } = false;
|
||||||
|
|
||||||
|
public bool IsFirstChangeTask { get; set; } = false;
|
||||||
|
|
||||||
public string AgreeOrNotAnswer
|
public string AgreeOrNotAnswer
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
|
|
|
@ -224,6 +224,8 @@ namespace IRaCIS.Application.Services
|
||||||
VisitName = x.TaskName,
|
VisitName = x.TaskName,
|
||||||
BlindName = x.TaskBlindName,
|
BlindName = x.TaskBlindName,
|
||||||
VisitTaskId = x.Id,
|
VisitTaskId = x.Id,
|
||||||
|
IsConvertedTask = x.IsConvertedTask,
|
||||||
|
IsFirstChangeTask = x.IsConvertedTask && x.BeforeConvertedTaskId != null,
|
||||||
ArmEnum = taskInfo.ArmEnum,
|
ArmEnum = taskInfo.ArmEnum,
|
||||||
VisitNum = x.SourceSubjectVisit.VisitNum,
|
VisitNum = x.SourceSubjectVisit.VisitNum,
|
||||||
IsBaseLine = x.SourceSubjectVisit.IsBaseLine,
|
IsBaseLine = x.SourceSubjectVisit.IsBaseLine,
|
||||||
|
|
Loading…
Reference in New Issue