diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 81d2f3ea4..21197f7a8 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -5822,16 +5822,6 @@ 仲裁阅片 - - - 阅片模式 - - - - - 全局阅片 - - 肿瘤学阅片 原字段 IsClinicalReading diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 78b3bb6f0..b5c93edf3 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -834,8 +834,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto [NotDefault] public Guid TrialId { get; set; } - [NotDefault] - public Guid VisitTaskId { get; set; } + + public Guid? VisitTaskId { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index 7c22c0c71..1865046f4 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -1466,12 +1466,13 @@ namespace IRaCIS.Application.Services [HttpPost] public async Task> GetTrialConfirmCriterionList(GetConfirmCriterionInDto inDto) { - var result = await _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId && x.TrialReadingCriterion.IsConfirm && x.Id==inDto.VisitTaskId) + var result = await _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId && x.TrialReadingCriterion.IsConfirm ) + .WhereIf(inDto.VisitTaskId !=null ,t=>t.Id==inDto.VisitTaskId) .Select(x => new GetTrialConfirmCriterionListOutDto() { ReadingQuestionCriterionTrialId = x.TrialReadingCriterion.Id, ReadingQuestionCriterionTrialName = x.TrialReadingCriterion.CriterionName - }).ToListAsync(); + }).Distinct().ToListAsync(); return result; } #endregion diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index b791b4041..5b06852d5 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/IRaCIS.Core.Domain/Trial/Trial.cs @@ -216,46 +216,20 @@ namespace IRaCIS.Core.Domain.Models public bool IsSubjectSecondCodeView { get; set; } - ///// - ///// 1 Mint2 PACS - ///// - - //public int ImagePlatform { get; set; } = 1; //Ƭʽ public int ReadingMode { get; set; } = 1; - ////Ƭ - //public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double; - - - //public bool IsGlobalReading { get; set; } = true; - - ///// - ///// ٲƬ - ///// - //public bool? IsArbitrationReading { get; set; } = true; - - //public bool IsClinicalReading { get; set; } - - - ///// - ///// ٲù - ///// - //public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.None; public int ChangeDefalutDays { get; set; } = 5; - /// /// Ŀ /// public bool IsImageReplicationAcrossTrial { get; set; } = false; - - public string BodyPartTypes { get; set; } = "ʲ|Բ||ز|/¸|ǻ|ȫ|"; @@ -337,6 +311,44 @@ namespace IRaCIS.Core.Domain.Models public DateTime? DeletedTime { get; set; } public Guid? DeleteUserId { get; set; } + /// + /// ͬٴʱ + /// + public DateTime? SyncClinicalDataTime { get; set; } + + ///// + ///// ͼǷбע + ///// + //public bool IsImageIabeled { get; set; } + + + + ////Ƭ + //public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double; + + + //public bool IsGlobalReading { get; set; } = true; + + ///// + ///// ٲƬ + ///// + //public bool? IsArbitrationReading { get; set; } = true; + + //public bool IsClinicalReading { get; set; } + + + ///// + ///// 1 Mint2 PACS + ///// + + //public int ImagePlatform { get; set; } = 1; + + + ///// + ///// ٲù + ///// + //public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.None; + //// //public TaskAllocateObj TaskAllocateObjEnum { get; set; } @@ -374,10 +386,7 @@ namespace IRaCIS.Core.Domain.Models //public bool IsReadingShowPreviousResults { get; set; } = false; - /// - /// ͬٴʱ - /// - public DateTime? SyncClinicalDataTime { get; set; } + ///// ///// ȷҽѧ @@ -385,10 +394,7 @@ namespace IRaCIS.Core.Domain.Models //public bool IsConfirmMedicineQuestion { get; set; } = false; - /// - /// ͼǷбע - /// - public bool IsImageIabeled { get; set; } + /////