From dec123f710c7b9128faa252b08bb72d6ea818d48 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 29 Jun 2022 17:35:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BB=E5=AD=A6=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/DTO/TaskMedicalReviewViewModel.cs | 2 ++
 .../Service/Allocation/DTO/VisitTaskViewModel.cs         | 9 +--------
 IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs | 3 ++-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs
index d99418bd..7f2d205d 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs
@@ -25,6 +25,8 @@ namespace IRaCIS.Core.Application.ViewModel
         public string AuditSuggestion { get; set; }
 
 
+    
+
         public UserSimpleInfo DoctorUser { get; set; }
 
         public UserSimpleInfo MedicalManagerUser { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
index c1383104..b7935d31 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
@@ -27,11 +27,8 @@ namespace IRaCIS.Core.Application.ViewModel
         public TaskAllocationState TaskAllocationState { get; set; }
         public TaskState TaskState { get; set; }
 
+        public DateTime? SignTime { get; set; }
 
-        //public bool IsJudgeTaskReturn { get; set; }
-
-
-        //public DateTime? CheckPassedTime { get; set; }
         public DateTime? AllocateTime { get; set; }
         public Guid SubjectId { get; set; }
 
@@ -90,7 +87,6 @@ namespace IRaCIS.Core.Application.ViewModel
         public ReadingTaskState ReadingTaskState { get; set; }
 
 
-        public DateTime? SignTime { get; set; }
 
         public ReReadingApplyState ReReadingApplyState { get; set; }
         public DateTime? SuggesteFinishedTime { get; set; }
@@ -109,7 +105,6 @@ namespace IRaCIS.Core.Application.ViewModel
         public ReadingTaskState ReadingTaskState { get; set; }
 
 
-        public DateTime? SignTime { get; set; }
 
         public RequestReReadingType RequestReReadingType { get; set; }
 
@@ -145,8 +140,6 @@ namespace IRaCIS.Core.Application.ViewModel
         public ReReadingApplyState ReReadingApplyState { get; set; }
         public DateTime? SuggesteFinishedTime { get; set; }
 
-        //签名时间
-        public DateTime? SignTime { get; set; }
     }
 
     public class IRUnReadSubjectView
diff --git a/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs b/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
index b0dcb35a..72ab01f2 100644
--- a/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
@@ -187,7 +187,8 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<TaskMedicalReview, TaskMedicalReviewView>().IncludeMembers(t => t.VisitTask)
                  .ForMember(o => o.DoctorUser, t => t.MapFrom(u => u.VisitTask.DoctorUser))
                  .ForMember(o => o.MedicalManagerUser, t => t.MapFrom(u => u.MedicalManagerUser));
-            CreateMap<VisitTask, TaskMedicalReviewView>();
+            CreateMap<VisitTask, TaskMedicalReviewView>()
+                .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode));
 
             CreateMap<User, UserSimpleInfo>()