diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs index aa961eee5..5ad7fd71b 100644 --- a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs +++ b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs @@ -106,6 +106,7 @@ namespace IRaCIS.Core.Application.ViewModel public Guid? DoctorUserId { get; set; } [JsonIgnore] public Guid? TaskConsistentRuleId { get; set; } + public bool IsHaveGeneratedTask { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs index 715f990fb..9e74b6255 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs @@ -380,6 +380,7 @@ namespace IRaCIS.Core.Application.Service TaskAllocationState = TaskAllocationState.Allocated, AllocateTime = DateTime.Now, + ConsistentAnalysisTaskId=task.Id }; diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs index 7cec11e20..246185e07 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs @@ -122,24 +122,9 @@ namespace IRaCIS.Core.Domain.Models public bool IsReReadingCreate { get; set; } - /// - /// 是否是一致性分析产生 - /// - public bool IsAnalysisCreate { get; set; } - - - - public string BlindSubjectCode { get; set; } = string.Empty; - public string BlindTrialSiteCode { get; set; } = string.Empty; - - //一致性分析规则Id 用于最后统计 - public Guid? TaskConsistentRuleId { get; set; } - - /// - /// 裁判结果的任务ID - /// + /// 裁判结果的任务ID public Guid? JudgeResultTaskId { get; set; } [ForeignKey("JudgeResultTaskId")] @@ -153,10 +138,34 @@ namespace IRaCIS.Core.Domain.Models //随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.002 全局任务在截止访视号上+0.03 肿瘤待定 public decimal VisitTaskNum { get; set; } + + #region 一致性分析的任务特有数据 + /// /// 是否和原数据有差异 /// - public bool? IsDifferenceToOriginalData { get; set; } + public bool? IsAnalysisDiffToOriginalData { get; set; } + + /// + /// 是否是一致性分析产生 + /// + public bool IsAnalysisCreate { get; set; } + + public string BlindSubjectCode { get; set; } = string.Empty; + public string BlindTrialSiteCode { get; set; } = string.Empty; + + //一致性分析规则Id 用于最后统计 + public Guid? TaskConsistentRuleId { get; set; } + + /// + /// 针对产生的一致性任务而言,这个字段存储的是原始任务 + /// + public Guid? ConsistentAnalysisTaskId { get; set; } + + #endregion + + + } }