diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index b6e0cf8d1..d48f80e33 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -398,6 +398,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public int ShowOrder { get; set; } + /// + /// 标准类型 + /// + public CriterionType CriterionType { get; set; } + /// /// 是否完成配置 /// @@ -1217,6 +1222,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public bool IsEnable { get; set; } + + /// + /// 标准类型 + /// + public CriterionType CriterionType { get; set; } + /// /// 是否完成配置 /// diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs index 9698ec640..6f5b7d4e4 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs @@ -951,7 +951,8 @@ namespace IRaCIS.Application.Services { await _readingQuestionCriterionTrialRepository.BatchUpdateNoTrackingAsync(x => x.ReadingQuestionCriterionSystemId == indto.Id, x => new ReadingQuestionCriterionTrial() { - CriterionName = indto.CriterionName + CriterionName = indto.CriterionName, + CriterionType=indto.CriterionType, }); } diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index 6a1903b79..d6304496e 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -17,6 +17,94 @@ namespace IRaCIS.Core.Domain.Share } + /// + /// 标准类型 + /// + public enum CriterionType + { + None=0, + + /// + /// RECIST 1.1 + /// + RECIST1Pointt1 = 1, + + /// + /// PCWG3 + /// + PCWG3 = 10, + + /// + /// mRECIST Mesothelioma + /// + mRECISTMesothelioma = 11, + + /// + /// RECIL + /// + RECIL = 12, + + /// + /// RECIST 1.0 + /// + RECIST1Point0 = 13, + + /// + /// WHO + /// + WHO = 14, + + /// + /// PERCIST + /// + PERCIST = 15, + + /// + /// Forrest + /// + Forrest = 16, + + /// + /// Lugano 2014 + /// + Lugano2014 = 2, + + /// + /// iRECIST + /// + iRECIST = 3, + + /// + /// RANO-BM + /// + RANO_BM = 4, + + /// + /// RANO + /// + RANO = 5, + + /// + /// IWCLL 2018 + /// + IWCLL2018 = 6, + + /// + /// mRECIST HCC + /// + mRECISTHCC = 7, + + /// + /// Cheson 2007 + /// + Cheson2007 = 8, + + /// + /// IMWG 2016 + /// + IMWG2016 = 9 + } + /// /// 是否存在疾病 diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionSystem.cs index 1882e622e..111a7a953 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionSystem.cs @@ -54,13 +54,20 @@ namespace IRaCIS.Core.Domain.Models /// public Guid CreateUserId { get; set; } - [JsonIgnore] + /// + /// 标准类型 + /// + public CriterionType CriterionType { get; set; } + + [JsonIgnore] public List ReadingQuestionSystemList { get; set; } = new List(); //[JsonIgnore] //[ForeignKey("CriterionId")] //public Dictionary Dictionary { get; set; } + + } diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs index 97bfa3c90..45718d768 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs @@ -109,7 +109,10 @@ namespace IRaCIS.Core.Domain.Models /// public DateTime? SynchronizeOriginalTime { get; set; } - + /// + /// 标准类型 + /// + public CriterionType? CriterionType { get; set; } /// /// 项目