修改

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -9522,7 +9522,7 @@
             <param name="visitTaskId"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.AddReadingTask(System.Guid)">
+        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.AddReadingTask(System.Guid,System.Nullable{System.Guid})">
             <summary>
             阅片期 -全局和肿瘤学任务的生成
             </summary>

IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs

@@ -996,6 +996,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Guid? OtherGlobalTaskId { get; set; }
 
+        public string SubjectCode { get; set; } = string.Empty;
+
+        public string TaskBlindName { get; set; } = string.Empty;
+
         public Guid? JudgeTaskId { get; set; }
 
         public string? JudgeTaskName { get; set; }

IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs

@@ -105,7 +105,7 @@ namespace IRaCIS.Core.Application.Service
 
             medicalReviewInfo.VisitTaskId = taskInfo.Id;
             medicalReviewInfo.ArmEnum = taskInfo.ArmEnum;
-            medicalReviewInfo.SubjectCode = taskInfo.Subject.Code;
+            medicalReviewInfo.SubjectCode = taskInfo.IsAnalysisCreate?taskInfo.BlindSubjectCode: taskInfo.Subject.Code;
             medicalReviewInfo.TaskBlindName = taskInfo.TaskBlindName;
             medicalReviewInfo.ReadingUser = taskInfo.DoctorUser.FirstName + taskInfo.DoctorUser.LastName;
 

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs

@@ -126,7 +126,7 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<GetGlobalReadingInfoOutDto> GetGlobalReadingInfo(GetGlobalReadingInfoInDto inDto)
         {
-            var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
+            var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Include(x=>x.Subject).FirstNotNullAsync();
             if (taskInfo.ReadingCategory != ReadingCategory.Global)
             {
                 throw new BusinessValidationFailedException(_localizer["ReadingGlobal_NotGlobal"]);
@@ -141,6 +141,17 @@ namespace IRaCIS.Application.Services
               && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis && x.TaskState == TaskState.Effect && x.DoctorUserId != taskInfo.DoctorUserId
             ).Select(x => x.Id).FirstOrDefaultAsync();
 
+            result.TaskBlandName = taskInfo.TaskBlindName;
+            if (taskInfo.IsAnalysisCreate)
+            {
+                result.SubjectCode = taskInfo.BlindSubjectCode;
+
+            }
+            else
+            {
+                result.SubjectCode = taskInfo.Subject.Code;
+            }
+
           var judgeInfo  = await _visitTaskRepository.Where(x =>
                            x.SubjectId == taskInfo.SubjectId
                          && x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -1941,7 +1941,7 @@ namespace IRaCIS.Application.Services
         /// <returns></returns>
         [HttpPost]
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
-        public async Task AddReadingTask(Guid visitTaskId)
+        public async Task AddReadingTask(Guid visitTaskId,Guid? trialId=null)
         {
             // ****** 先生成阅片期  阅片期任务阅片完成之后生成肿瘤学的  如果没有阅片期 直接生成肿瘤学 *********////
             #region 建立关系