Merge branch 'Test_IRC_Net10' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net10

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -95,6 +95,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             {
                 TrialReadingCriterionId = t.Id,
                 IsAutoCreate = t.IsAutoCreate,
+                ReadingTool = t.ReadingTool,
                 IsAdditionalAssessment = t.IsAdditionalAssessment,
                 TrialReadingCriterionName = t.CriterionName,
                 CriterionType = t.CriterionType,

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

@@ -599,6 +599,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public string DictionaryCode { get; set; }
 
         public bool IsHighlight { get; set; } = false;
+
+        public Guid? VisitTaskId { get; set; }
     }
 
     public class ChartItem

IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs

@@ -590,6 +590,26 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 }
 
 
+                void SetVisitTaskId(List<EvaluationValue> data, List<VisitTaskInfo> VisitTaskList)
+                {
+                    for (var index = 0; index < data.Count; index++)
+                    {
+                        try
+                        {
+                            data[index].VisitTaskId = VisitTaskList[index].VisitTaskId;
+                        }
+                        catch (Exception)
+                        {
+
+                           
+                        }
+                   
+                    }
+                }
+
+
+
+
                 result.Evaluation.Add(visitTaskName.Select(x => new EvaluationValue()
                 {
                     Value = x
@@ -622,6 +642,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                           .Take(length)
                           .ToList();
                 SetHighlight(r1data, Arm.DoubleReadingArm1);
+                SetVisitTaskId(r1data, r1.VisitTaskList);
                 result.Evaluation.Add(r1data);
 
 
@@ -654,6 +675,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                               .Take(length)
                               .ToList();
                     SetHighlight(r2data, Arm.DoubleReadingArm2);
+                    SetVisitTaskId(r2data, r2.VisitTaskList);
                     result.Evaluation.Add(r2data);
                 }
 

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs

@@ -766,6 +766,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string LinkVerificationCode { get; set; }
 
+        public string ResearchProgramNo { get; set; } = string.Empty;
+
     }
 
     public class VerifyLinkExpirationTimeDto

IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs

@@ -143,6 +143,7 @@ namespace IRaCIS.Core.Application
                  TrialId = x.Id,
                  LinkExpirationTime = x.LinkExpirationTime,
                  LinkVerificationCode=x.LinkVerificationCode,
+                 ResearchProgramNo = x.ResearchProgramNo,
              }).FirstOrDefaultAsync();
 
             return result;

IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs

@@ -396,6 +396,7 @@ namespace IRaCIS.Application.Contracts
         //是否附加评估
         public bool IsAdditionalAssessment { get; set; }
 
+        public ReadingTool? ReadingTool { get; set; }
 
         //自动  手动生成任务
         public bool IsAutoCreate { get; set; }