diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index 2a56a8f21..b7228f2f9 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -95,6 +95,7 @@ public class VisitTaskService(IRepository _visitTaskRepository, { TrialReadingCriterionId = t.Id, IsAutoCreate = t.IsAutoCreate, + ReadingTool = t.ReadingTool, IsAdditionalAssessment = t.IsAdditionalAssessment, TrialReadingCriterionName = t.CriterionName, CriterionType = t.CriterionType, diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 5d724ee0d..9dfacdcfe 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/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 diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs index cc20f70a7..bf829f71d 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs @@ -590,6 +590,26 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate } + void SetVisitTaskId(List data, List 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); } diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs index fc0fc5df4..49e523718 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs +++ b/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 diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index 376b715a3..a3482c54c 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/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; diff --git a/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs b/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs index 710cd6362..605419ac0 100644 --- a/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs +++ b/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; }