From 5c4485a3f0853b881de42bee00ea30aa7606f7b3 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 8 Jun 2022 16:16:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRaCIS.Core.Application.xml | 21 +++++++++++++++ .../Service/Reading/ClinicalDataSetService.cs | 26 +++++++++++++++---- .../Dto/ClinicalDataServiceViewModel.cs | 19 ++++++++++++++ .../Reading/ReadingPeriodSetService.cs | 2 +- 4 files changed, 62 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 94b1878ba..49115bdc5 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -500,6 +500,21 @@ 创建人 + + + 是否启用 + + + + + 是否勾选 + + + + + 是否来自于系统数据 + + 项目Id @@ -3223,6 +3238,12 @@ + + + 获取系统临床数据 + + + 将系统配置添加到项目配置 diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs index c918ae5e8..0fb644ccb 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs @@ -67,11 +67,27 @@ namespace IRaCIS.Application.Services return pageList; } + /// + /// 获取系统临床数据 + /// + /// + [HttpGet] + public async Task> GetSystemClinicalDataSetList() + { + return await _clinicalDataSetRepository.AsQueryable() + .Where(x => x.TrialId == null) + .ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); + } - //public List GetClinicalDataSetList() - //{ - - //} + public async Task> GetTrialClinicalDataSetList(AddTrialClinicalDataSetInDto inDto) + { + await this.AddTrialClinicalDataSet(inDto); + + return await _clinicalDataSetRepository.AsQueryable() + .Where(x => x.TrialId == inDto.TrialId) + .ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); + + } /// @@ -79,7 +95,7 @@ namespace IRaCIS.Application.Services /// /// /// - + private async Task AddTrialClinicalDataSet(AddTrialClinicalDataSetInDto inDto) { var systemIds = await _clinicalDataSetRepository.Where(x => x.TrialId == null).Select(x => x.Id).ToListAsync(); diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs index f3e4367d0..4d43661d2 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs @@ -87,6 +87,25 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 创建人 /// public Guid CreateUserId { get; set; } + + /// + /// 是否启用 + /// + public bool IsEnable { get; set; } + + /// + /// 是否勾选 + /// + public bool IsCheck { get; set; } + + /// + /// 是否来自于系统数据 + /// + public bool IsFromSystemData { + get { + return this.SystemClinicalDataSetId == null ? false : true; + } + } } public class ClinicalDataInDto diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs index d46269905..17f985ede 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs @@ -52,7 +52,7 @@ namespace IRaCIS.Application.Services [HttpPost] public async Task AddOrUpdateReadingPeriodSet(ReadingPeriodSetAddOrEdit addOrEditReadingPeriodSet) { - if (await _readingPeriodSetRepository.AnyAsync(x => x.Id != addOrEditReadingPeriodSet.Id && x.ReadingPeriodName == addOrEditReadingPeriodSet.ReadingPeriodName)) + if (await _readingPeriodSetRepository.AnyAsync(x => x.Id != addOrEditReadingPeriodSet.Id &&x.TrialId==addOrEditReadingPeriodSet.TrialId && x.ReadingPeriodName == addOrEditReadingPeriodSet.ReadingPeriodName)) { return ResponseOutput.NotOk("阅片期名称重复,操作失败"); }