From 4f3b19953b11a0a7018f067c2c20165bab0b464d Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 24 Mar 2023 13:31:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Allocation/DTO/VisitTaskViewModel.cs | 2 ++ .../Service/Allocation/_MapConfig.cs | 2 ++ .../DTO/SubjectCriteriaEvaluationViewModel.cs | 10 ++++++---- .../SubjectCriteriaEvaluationService.cs | 2 +- .../Service/TrialSiteUser/DTO/TrialConfigDTO.cs | 2 ++ 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs index 315580a1a..87d4a0637 100644 --- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs @@ -65,6 +65,8 @@ namespace IRaCIS.Core.Application.ViewModel public string TrialReadingCriterionName { get; set; } + public bool IsAutoCreate { get; set; } + public bool IsNeedClinicalDataSign { get; set; } diff --git a/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs b/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs index a6c24cc96..e5c0a0f2a 100644 --- a/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs @@ -111,6 +111,7 @@ namespace IRaCIS.Core.Application.Service CreateMap() + .ForMember(o => o.IsAutoCreate, t => t.MapFrom(u => u.TrialReadingCriterion.IsAutoCreate)) .ForMember(o => o.TrialReadingCriterionName, t => t.MapFrom(u => u.TrialReadingCriterion.CriterionName)) .ForMember(o => o.ReadingTool, t => t.MapFrom(u => u.TrialReadingCriterion.ReadingTool)) .ForMember(o => o.IsReadingTaskViewInOrder, t => t.MapFrom(u => u.TrialReadingCriterion.IsReadingTaskViewInOrder)) @@ -208,6 +209,7 @@ namespace IRaCIS.Core.Application.Service .ForMember(o => o.FullName, t => t.MapFrom(u => u.FullName)); CreateMap().IncludeMembers(t => t.VisitTask) + .ForMember(o => o.IsAutoCreate, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.IsAutoCreate)) .ForMember(o => o.TrialReadingCriterionId, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.Id)) .ForMember(o => o.TrialReadingCriterionName, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.CriterionName)) .ForMember(o => o.ReadingTool, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.ReadingTool)) diff --git a/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationViewModel.cs b/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationViewModel.cs index 4b4a6845e..eeb2aaff7 100644 --- a/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationViewModel.cs @@ -11,7 +11,7 @@ using System.ComponentModel.DataAnnotations; namespace IRaCIS.Core.Application.ViewModel { /// SubjectCriteriaEvaluationView 列表视图模型 - public class SubjectCriteriaEvaluationView + public class SubjectCriteriaEvaluationView { public Guid? Id { get; set; } public Guid SubjectId { get; set; } @@ -25,17 +25,17 @@ namespace IRaCIS.Core.Application.ViewModel public bool? IsImageFiltering { get; set; } - public bool? IsJoinEvaluation { get; set; } + public bool? IsJoinEvaluation { get; set; } public string SubjectCode { get; set; } public string TrialSiteCode { get; set; } public SubjectStatus SubjectStatus { get; set; } - public List FinalEvaluationList { get; set; }=new List(); + public List FinalEvaluationList { get; set; } = new List(); - public List ReadingEvaluationList { get; set; }=new List(); + public List ReadingEvaluationList { get; set; } = new List(); } @@ -43,6 +43,8 @@ namespace IRaCIS.Core.Application.ViewModel { public Guid? QuestionId { get; set; } + + public Arm? ArmEnum { get; set; } public string Answer { get; set; } public string FinalTranslateDictionaryCode { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs b/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs index 242829daf..575c04d2c 100644 --- a/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs +++ b/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs @@ -135,7 +135,7 @@ namespace IRaCIS.Core.Application.Service { QuestionId = u.ReadingQuestionTrialId, Answer = u.Answer, - + ArmEnum=u.VisitTask.ArmEnum, FinalTranslateDictionaryCode = u.ReadingQuestionTrial.DictionaryCode }).ToList() diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs index 17eaad0cd..57c1f8329 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs @@ -302,6 +302,8 @@ namespace IRaCIS.Core.Application.Contracts public bool IsPDProgressView { get; set; } + + } public class TrialStateChangeDTO