From 890d349ee9cb3bc04da2a1158c54f38a0458cee3 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 6 Jul 2026 17:49:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4=20?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=A0=94=E7=A9=B6=E6=96=B9=E6=A1=88=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TrialSiteUser/DTO/TrialConfigDTO.cs | 2 ++ .../Service/TrialSiteUser/TrialConfigService.cs | 1 + 2 files changed, 3 insertions(+) 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; From 7cd476028a7b716ff2f0b7f2b1e21a371a64b169 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Tue, 7 Jul 2026 09:24:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=97=E8=AF=95=E8=80=85=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Allocation/VisitTaskService.cs | 1 + .../Reading/Dto/ReadingImageTaskViewModel.cs | 2 ++ .../General/ReadingCalculateService.cs | 22 +++++++++++++++++++ .../WorkLoad/DTO/DoctorWorkLoadViewModel.cs | 1 + 4 files changed, 26 insertions(+) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index ca5e3c1e1..4c235030e 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -91,6 +91,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..0fd9ed8b9 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/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; } From a8a31040195a99833a20991091208c691db1f4ab Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Tue, 7 Jul 2026 09:32:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=BB=E5=8A=A1Id=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/Dto/ReadingImageTaskViewModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 0fd9ed8b9..9dfacdcfe 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -600,7 +600,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public bool IsHighlight { get; set; } = false; - public Guid VisitTaskId { get; set; } + public Guid? VisitTaskId { get; set; } } public class ChartItem