From 768c7432aeab2ea88152c83ed697d5ad55181936 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 13 Jul 2022 11:50:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/Dto/ReadingQuestionViewModel.cs | 2 ++ .../Service/Reading/ReadingQuestionService.cs | 2 ++ .../Service/TrialSiteUser/DTO/TrialConfigDTO.cs | 4 ++-- .../Service/TrialSiteUser/TrialConfigService.cs | 2 +- IRaCIS.Core.Domain/Trial/Trial.cs | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index 5ba7c7e46..d09aa50d8 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -432,6 +432,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public Guid? ReadingQuestionSystemId { get; set; } + public Guid? ReadingCriterionPageId { get; set; } + /// /// 系统标准的ParentId /// diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs index 562678d81..a8134af10 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs @@ -237,6 +237,7 @@ namespace IRaCIS.Application.Services AnswerGroup = x.AnswerGroup, Id = x.Id, JudgeType = x.JudgeType, + ReadingCriterionPageId = x.ReadingCriterionPageId, ParentId = x.ParentId, ReadingQuestionCriterionTrialId = x.ReadingQuestionCriterionTrialId, ReadingQuestionSystemId = x.ReadingQuestionSystemId, @@ -277,6 +278,7 @@ namespace IRaCIS.Application.Services ParentId = c.trial.FirstOrDefault()?.ParentId, ParentTriggerValue=c.system.ParentTriggerValue, QuestionName=c.system.QuestionName, + ReadingCriterionPageId=c.trial.FirstOrDefault()?.ReadingCriterionPageId, ReadingQuestionCriterionTrialId = item.Id, Remark=c.system.Remark, TrialId=item.TrialId, diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs index 1426fdbaa..ad80c2943 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs @@ -305,7 +305,7 @@ namespace IRaCIS.Core.Application.Contracts /// /// 影像是否有标注 /// - public bool IsImageStandard { get; set; } + public bool IsImageLabled { get; set; } /// /// IR阅片是否显示受试者信息 @@ -563,7 +563,7 @@ namespace IRaCIS.Core.Application.Contracts /// /// 影像是否有标注 /// - public bool IsImageStandard { get; set; } + public bool IsImageLabled { get; set; } //读片任务显示是否顺序 public bool IsReadingTaskViewInOrder { get; set; } = true; diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index c670f692f..5ddc58eb4 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -88,7 +88,7 @@ namespace IRaCIS.Core.Application //DigitPlaces=inDto.DigitPlaces, IsReadingTaskViewInOrder=inDto.IsReadingTaskViewInOrder, ReadingTaskViewEnum = inDto.ReadingTaskViewEnum, - IsImageStandard = inDto.IsImageStandard, + IsImageLabled = inDto.IsImageLabled, IsReadingShowSubjectInfo = inDto.IsReadingShowSubjectInfo, IsReadingShowPreviousResults = inDto.IsReadingShowPreviousResults, ImagePlatform=inDto.ImagePlatform, diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index 5d84e0792..ddeea8398 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/IRaCIS.Core.Domain/Trial/Trial.cs @@ -372,7 +372,7 @@ namespace IRaCIS.Core.Domain.Models /// /// ͼǷбע /// - public bool IsImageStandard { get; set; } + public bool IsImageLabled { get; set; }