修改一版

2022-06-14 15:20:49 +08:00
parent 6070dbca25
commit e50db3f317
8 changed files with 38 additions and 8 deletions
@@ -16,7 +16,9 @@ namespace IRaCIS.Core.Application.Contracts
        /// </summary>
        public string SubjectCodeRule { get; set; } = string.Empty;

+        public List<Guid> TrialCriterionIds { get; set; } = new List<Guid>();

+        public List<string> TrialCriterionNames { get; set; } = new List<string>();

        public List<Guid> ClinicalDataTrialSetIds { get; set; } = new List<Guid>();

@@ -80,6 +82,8 @@ namespace IRaCIS.Core.Application.Contracts

        public List<Guid> CriterionIds { get; set; } = new List<Guid>();

+        public List<Guid> TrialCriterionIds { get; set; } = new List<Guid>();
+

        public Guid TrialId { get; set; }

@@ -218,6 +222,7 @@ namespace IRaCIS.Core.Application.Contracts
    public class TrialConfigDTO: BasicTrialConfig
    {

+
        public List<Guid> CriterionIds { get; set; } = new List<Guid>();

        public List<string> ClinicalDataSetNames { get; set; } = new List<string>();
@@ -325,10 +325,10 @@ namespace IRaCIS.Core.Application
            }

            var trialInfo = await _trialRepository.Where(t => t.Id == trialConfig.TrialId, true).Include(t => t.TrialDicList.Where(u => u.KeyName == StaticData.Criterion)).FirstOrDefaultAsync();
-
            if (trialInfo == null) return Null404NotFound(trialInfo);

            _mapper.Map(trialConfig, trialInfo);
+
            trialInfo.UpdateTime = DateTime.Now;


@@ -146,6 +146,8 @@ namespace IRaCIS.Core.Application.Service

            CreateMap<AssginSiteCRCCommand, TrialSiteUser>();
            CreateMap<Domain.Models.Trial, TrialConfigDTO>().ForMember(t => t.TrialId, u => u.MapFrom(c => c.Id))
+                    .ForMember(t => t.TrialCriterionIds, u => u.MapFrom(c => c.ReadingQuestionCriterionTrialList.Where(v =>v.IsConfirm).Select(r => r.Id)))
+                    .ForMember(t => t.ClinicalDataSetNames, u => u.MapFrom(c => c.ReadingQuestionCriterionTrialList.Where(v => v.IsConfirm).Select(r => r.CriterionName)))
                 .ForMember(t => t.ClinicalDataTrialSetIds, u => u.MapFrom(c => c.clinicalDataTrialSets.Where(v => v.IsConfirm).Select(r => r.Id)))
                   .ForMember(t => t.ClinicalDataSetNames, u => u.MapFrom(c => c.clinicalDataTrialSets.Where(v => v.IsConfirm).Select(r => r.ClinicalDataSetName)))
                .ForMember(t => t.CriterionIds, u => u.MapFrom(c => c.TrialDicList.Where(v => v.KeyName == StaticData.Criterion).Select(r => r.DictionaryId)));