From e902f29458a5ffcf3dac4c3d366eb8445a17c7be Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 6 Jul 2022 14:52:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DTO/TaskConsistentRuleViewModel.cs        |  1 +
 .../Allocation/VisitTaskHelpeService.cs       |  1 +
 IRaCIS.Core.Domain/Allocation/VisitTask.cs    | 43 +++++++++++--------
 3 files changed, 28 insertions(+), 17 deletions(-)

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; }
 
 
-        /// <summary>
-        /// 是否是一致性分析产生
-        /// </summary>
-        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; }
-
-        /// <summary>
-        /// 裁判结果的任务ID
-        /// </summary>
+        /// <summary> 裁判结果的任务ID </summary>
         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  一致性分析的任务特有数据
+
         /// <summary>
         /// 是否和原数据有差异
         /// </summary>
-        public bool? IsDifferenceToOriginalData { get; set; }
+        public bool? IsAnalysisDiffToOriginalData { get; set; }
+
+        /// <summary>
+        /// 是否是一致性分析产生
+        /// </summary>
+        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; }
+
+        /// <summary>
+        /// 针对产生的一致性任务而言，这个字段存储的是原始任务
+        /// </summary>
+        public Guid? ConsistentAnalysisTaskId { get; set; }
+
+        #endregion
+
+
+
     }
 
 }