From b0f092537721503c469f3ff3b2761a0146f7e548 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 24 Jun 2022 17:44:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Service/Allocation/DTO/VisitTaskViewModel.cs | 4 ++--
.../Service/Allocation/VisitTaskHelpeService.cs | 6 +++---
IRaCIS.Core.Domain/Allocation/VisitTask.cs | 10 ++++++----
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
index 43f394159..512209c1e 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
@@ -27,7 +27,7 @@ namespace IRaCIS.Core.Application.ViewModel
public bool IsJudgeTaskReturn { get; set; }
- public DateTime? CheckPassedTime { get; set; }
+ //public DateTime? CheckPassedTime { get; set; }
public DateTime? AllocateTime { get; set; }
public Guid SubjectId { get; set; }
@@ -36,7 +36,7 @@ namespace IRaCIS.Core.Application.ViewModel
public Arm ArmEnum { get; set; }
public Guid? DoctorUserId { get; set; }
-
+ public TaskState TaskState { get; set; }
public Guid CreateUserId { get; set; }
public DateTime CreateTime { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
index 3cf7afd0a..709c5cbef 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
@@ -100,7 +100,7 @@ namespace IRaCIS.Core.Application.Service
IsUrgent = subjectVisit.IsUrgent,
TaskBlindName = subjectVisit.BlindName,
TaskName = subjectVisit.VisitName,
- CheckPassedTime = subjectVisit.CheckPassedTime,
+ //CheckPassedTime = subjectVisit.CheckPassedTime,
ArmEnum = Arm.DoubleReadingArm1,//特殊
Code = currentMaxCodeInt + 1,
SourceSubjectVisitId = subjectVisit.Id,
@@ -115,7 +115,7 @@ namespace IRaCIS.Core.Application.Service
IsUrgent = subjectVisit.IsUrgent,
TaskBlindName = subjectVisit.BlindName,
TaskName = subjectVisit.VisitName,
- CheckPassedTime = subjectVisit.CheckPassedTime,
+ //CheckPassedTime = subjectVisit.CheckPassedTime,
ArmEnum = Arm.DoubleReadingArm2,//特殊
Code = currentMaxCodeInt + 2,
SourceSubjectVisitId = subjectVisit.Id,
@@ -215,7 +215,7 @@ namespace IRaCIS.Core.Application.Service
IsUrgent = subjectVisit.IsUrgent,
TaskBlindName = subjectVisit.BlindName,
TaskName = subjectVisit.VisitName,
- CheckPassedTime = subjectVisit.CheckPassedTime,
+ //CheckPassedTime = subjectVisit.CheckPassedTime,
ArmEnum = Arm.SingleReadingArm, //特殊
Code = currentMaxCodeInt + 1,
SourceSubjectVisitId = subjectVisit.Id,
diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
index 5b60ff5d4..08375953c 100644
--- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs
+++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
@@ -77,10 +77,10 @@ namespace IRaCIS.Core.Domain.Models
[Required]
public ReadingCategory ReadingCategory { get; set; }
- ///
- /// 一致性核查通过时间
- ///
- public DateTime? CheckPassedTime { get; set; }
+ /////
+ ///// 一致性核查通过时间
+ /////
+ //public DateTime? CheckPassedTime { get; set; }
///
/// 分配时间
@@ -172,6 +172,8 @@ namespace IRaCIS.Core.Domain.Models
public SubjectUser SujectArm { get; set; }
+ //是否是重阅产生的,方便过滤数据
+
public bool IsReReadingCreate { get; set; }