From 928c3ea3c21d2e8449a7fcc791d59a0390b3cb77 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 14 Jun 2023 09:45:20 +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 --- .../Dto/ReadingMedicineQuestionViewModel.cs | 8 ++++++ .../ReadingMedicineQuestionService.cs | 25 ++++++++++++++----- .../TrialSiteUser/DTO/TrialConfigDTO.cs | 13 +++++++++- .../TrialSiteUser/TrialConfigService.cs | 1 + .../ReadingQuestionCriterionTrial.cs | 9 +++++-- 5 files changed, 47 insertions(+), 9 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs index 5863a4d40..6c8326c6a 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs @@ -79,6 +79,14 @@ namespace IRaCIS.Core.Application.ViewModel public Guid Id { get; set; } } + public class BatchDeteteCriterionMedicineQuestionInDto + { + public Guid TrialReadingCriterionId { get; set; } + + public List Ids { get; set; } + } + + public class TrialDataFromSystem : ReadingMedicineTrialQuestion { public Guid SystemQuestionId { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs index f3384a70f..430c41ef7 100644 --- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs @@ -452,13 +452,26 @@ namespace IRaCIS.Core.Application.Service } } + /// + /// 批量删除医学审核问题 + /// + /// + /// + [HttpPost] + public async Task BatchDeteteCriterionMedicineQuestion(BatchDeteteCriterionMedicineQuestionInDto inDto) + { + await _readingMedicineTrialQuestionRepository.BatchDeleteNoTrackingAsync(x => inDto.Ids.Contains(x.Id)); + var result= await _readingMedicineTrialQuestionRepository.SaveChangesAsync(); + return ResponseOutput.Result(result); + } - /// - /// 从系统里面选择问题添加到项目里面 - /// - /// - /// - [HttpPost] + + /// + /// 从系统里面选择问题添加到项目里面 + /// + /// + /// + [HttpPost] public async Task AddTrialDataFromSystem(AddTrialDataFromSystemInDto inDto) { // 直接写?? diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs index 0de3a7ab2..4a19798f6 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs @@ -355,6 +355,11 @@ namespace IRaCIS.Core.Application.Contracts } } + /// + /// 是否加急 + /// + public bool IsUrgent { get; set; } = false; + /// /// 阅片平台 /// @@ -940,7 +945,13 @@ namespace IRaCIS.Core.Application.Contracts /// public bool IsOncologyReading { get; set; } - public List TrialCriterionAdditionalAssessmentTypeList { get; set; }=new List(); + + /// + /// 是否加急 + /// + public bool IsUrgent { get; set; } = false; + + public List TrialCriterionAdditionalAssessmentTypeList { get; set; }=new List(); } diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index 64e0c7b64..1ca1349a8 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -596,6 +596,7 @@ namespace IRaCIS.Core.Application IsGlobalReading = inDto.IsGlobalReading, IsArbitrationReading = inDto.IsArbitrationReading, IsOncologyReading = inDto.IsOncologyReading, + IsUrgent= inDto.IsUrgent, IsAdditionalAssessment = inDto.IsAdditionalAssessment, IsAutoCreate = inDto.IsAutoCreate diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs index a91ec42f9..3a80b6293 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs @@ -116,9 +116,14 @@ namespace IRaCIS.Core.Domain.Models public CriterionType CriterionType { get; set; } /// - /// eCRF报告是否显示在图像页面 + /// 是否加急 /// - public bool IseCRFShowInDicomReading { get; set; } = false; + public bool IsUrgent { get; set; } = false; + + /// + /// eCRF报告是否显示在图像页面 + /// + public bool IseCRFShowInDicomReading { get; set; } = false; #region 阅片单元配置 新加