diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
index 6488825d2..511211d15 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
@@ -130,7 +130,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid OriginalReReadingTaskId { get; set; }
 
         //重阅申请 产生的新任务Id
-        public Guid NewReReadingTaskId { get; set; }
+        public Guid? NewReReadingTaskId { get; set; }
 
 
         //产生重阅的根任务Id
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index ea4a29050..1aa553fc9 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -360,6 +360,8 @@ namespace IRaCIS.Core.Application.Service
         }
 
 
+
+
         /// <summary>
         /// IR  已阅片任务
         /// </summary>
diff --git a/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs b/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
index bf4baabf2..0d9931d0d 100644
--- a/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
@@ -73,8 +73,8 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<VisitTask, VisitTaskView>()
                  .ForMember(o => o.SiteId, t => t.MapFrom(u => u.Subject.SiteId))
-                 .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode))
-                 .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code))
+                 .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.IsAnalysisCreate ? u.BlindTrialSiteCode : u.Subject.TrialSite.TrialSiteCode))
+                 .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.IsAnalysisCreate ? u.BlindSubjectCode : u.Subject.Code))
                  .ForMember(o => o.UserCode, t => t.MapFrom(u => u.DoctorUser.UserCode))
                  .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
                  .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName))
@@ -83,42 +83,16 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-            CreateMap<VisitTask, JudgeVisitTaskView>()
-                 .ForMember(o => o.SiteId, t => t.MapFrom(u => u.Subject.SiteId))
-                 .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode))
-                 .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code))
-                 .ForMember(o => o.UserCode, t => t.MapFrom(u => u.DoctorUser.UserCode))
-                 .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
-                 .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName))
-                 .ForMember(o => o.UserTypeShortName, t => t.MapFrom(u => u.DoctorUser.UserTypeRole.UserTypeShortName))
+            CreateMap<VisitTask, JudgeVisitTaskView>().IncludeBase<VisitTask,VisitTaskView>()
+
 
                  .ForMember(o => o.HistoryReadingDoctorUserList, t => t.MapFrom(u => u.JudgeVisitList));
 
-            CreateMap<VisitTask, ReadingTaskView>()
-                  .ForMember(o => o.SiteId, t => t.MapFrom(u => u.Subject.SiteId))
-                 .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode))
-                 .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code))
-                 .ForMember(o => o.UserCode, t => t.MapFrom(u => u.DoctorUser.UserCode))
-                 .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
-                 .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName))
-                 .ForMember(o => o.UserTypeShortName, t => t.MapFrom(u => u.DoctorUser.UserTypeRole.UserTypeShortName));
+            CreateMap<VisitTask, ReadingTaskView>().IncludeBase<VisitTask, VisitTaskView>();
 
 
 
-            //CreateMap<VisitTaskReReading, IRReReadingTaskView>().IncludeMembers(t => t.OriginalReReadingTask)
-            //     .ForMember(o => o.ReReadingOriginalTaskCode, t => t.MapFrom(u => u.OriginalReReadingTask.TaskCode))
-            //     .ForMember(o => o.Id, t => t.MapFrom(u => u.Id))
 
-            //     .ForMember(o => o.SiteId, t => t.MapFrom(u => u.OriginalReReadingTask.Subject.SiteId))
-            //     .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.OriginalReReadingTask.Subject.TrialSite.TrialSiteCode))
-            //     .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.OriginalReReadingTask.Subject.Code))
-            //     .ForMember(o => o.UserCode, t => t.MapFrom(u => u.OriginalReReadingTask.DoctorUser.UserCode))
-            //     .ForMember(o => o.UserName, t => t.MapFrom(u => u.OriginalReReadingTask.DoctorUser.UserName))
-            //     .ForMember(o => o.FullName, t => t.MapFrom(u => u.OriginalReReadingTask.DoctorUser.FullName))
-            //     .ForMember(o => o.UserTypeShortName, t => t.MapFrom(u => u.OriginalReReadingTask.DoctorUser.UserTypeRole.UserTypeShortName)); 
-
-            //CreateMap<VisitTask, IRReReadingTaskView>()
-            //   .ForMember(o => o.Id, t => t.Ignore());
 
 
 
@@ -126,21 +100,13 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(o => o.ReReadingNewTaskCode, t => t.MapFrom(u => u.NewReReadingTask.TaskCode))
                  .ForMember(o => o.OriginalReReadingTask, t => t.MapFrom(u => u.OriginalReReadingTask));
 
-            //CreateMap<VisitTask, ReReadingTaskView>()
-            //     .ForMember(o => o.Id, t => t.Ignore())
-            //     .ForMember(o => o.SiteId, t => t.MapFrom(u => u.Subject.SiteId))
-            //     .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode))
-            //     .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code))
-            //     .ForMember(o => o.UserCode, t => t.MapFrom(u => u.DoctorUser.UserCode))
-            //     .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
-            //     .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName))
-            //     .ForMember(o => o.UserTypeShortName, t => t.MapFrom(u => u.DoctorUser.UserTypeRole.UserTypeShortName));
+
 
 
             CreateMap<VisitTask, IRHaveReadView>()
                  .ForMember(o => o.SiteId, t => t.MapFrom(u => u.Subject.SiteId))
-                 .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode))
-                 .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code));
+                 .ForMember(o => o.TrialSiteCode, t =>   t.MapFrom(u =>  u.IsAnalysisCreate? u.BlindTrialSiteCode: u.Subject.TrialSite.TrialSiteCode))
+                 .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.IsAnalysisCreate ? u.BlindSubjectCode: u.Subject.Code));
 
 
 
@@ -183,7 +149,8 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(o => o.DoctorUser, t => t.MapFrom(u => u.VisitTask.DoctorUser))
                  .ForMember(o => o.MedicalManagerUser, t => t.MapFrom(u => u.MedicalManagerUser));
             CreateMap<VisitTask, TaskMedicalReviewView>()
-                .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode));
+                .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.IsAnalysisCreate ? u.BlindTrialSiteCode : u.Subject.TrialSite.TrialSiteCode))
+                .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.IsAnalysisCreate ? u.BlindSubjectCode : u.Subject.Code));
 
             CreateMap<User, UserSimpleInfo>()