From 74dcd1228561bfd9c34d0ae4f1402d6da6aa75dd Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 11 Apr 2022 11:21:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B=E5=A4=87?= =?UTF-8?q?=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../Service/Common/CommonDocumentService.cs | 7 +------ .../Service/Common/DictionaryService.cs | 9 +++++++++ .../Service/Common/EmailNoticeConfigService.cs | 8 ++++---- IRaCIS.Core.Application/Service/QC/QCOperationService.cs | 2 +- .../Service/TrialSiteUser/TrialMaintenanceService.cs | 2 +- .../Service/Visit/SubjectVisitService.cs | 2 ++ 7 files changed, 19 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 2ea13e829..127e944b3 100644 --- a/.gitignore +++ b/.gitignore @@ -363,3 +363,4 @@ MigrationBackup/ FodyWeavers.xsd /UploadFile/Check /TrialData/281bdb09-f792-4faa-de18-08da0e042672/50d0cf71-ee4d-4e54-af06-490f8be1bff1/72b8ef0b-4adc-465e-fa25-08da122bbd9c/eb53c5e2-6307-42f3-d710-08da122bbde1/Dicom +/TrialData/4067198c-f9c4-47de-705a-08da12df3a17/6dedb49c-874c-4f7c-5c0d-08d947774c19 diff --git a/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs b/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs index 65d1fc3fb..a0bb8e1c9 100644 --- a/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs @@ -11,7 +11,7 @@ using IRaCIS.Core.Application.ViewModel; namespace IRaCIS.Core.Application.Service { /// - /// CommonDocumentService + /// 系统模板文档配置表 /// [ApiExplorerSettings(GroupName = "Common")] public class CommonDocumentService : BaseService, ICommonDocumentService @@ -53,10 +53,5 @@ namespace IRaCIS.Core.Application.Service } - - - - - } } diff --git a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs index 164d57a05..4a7a8be9c 100644 --- a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs +++ b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs @@ -117,6 +117,11 @@ namespace IRaCIS.Application.Services } + /// + /// 根据父亲Code 获取单个下拉框数据 + /// + /// + /// public async Task> GetBasicDataSelect(string searchKey) { var searchList = await _dicRepository.Where(t => t.Parent.Code== searchKey && t.ParentId != null && t.IsEnable).ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); @@ -125,6 +130,10 @@ namespace IRaCIS.Application.Services } + /// + /// 获取所有下拉框 枚举 bool 数据 + /// + /// [AllowAnonymous] public async Task>> GetBasicDataAllSelect() { diff --git a/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs index a1f40598a..2af2b1586 100644 --- a/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs +++ b/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Mvc; namespace IRaCIS.Core.Application.Contracts { /// - /// EmailNoticeConfigService + /// 系统邮件配置表 /// [ApiExplorerSettings(GroupName = "Common")] public class EmailNoticeConfigService : BaseService, IEmailNoticeConfigService @@ -28,9 +28,9 @@ namespace IRaCIS.Core.Application.Contracts { var emailNoticeConfigQueryable = _repository .WhereIf(queryEmailNoticeConfig.ScenarioId != null, t => t.ScenarioId == queryEmailNoticeConfig.ScenarioId) - .WhereIf(queryEmailNoticeConfig.IsReturnRequired != null, t => t.IsReturnRequired == queryEmailNoticeConfig.IsReturnRequired) - .WhereIf(queryEmailNoticeConfig.IsUrgent != null, t => t.IsUrgent == queryEmailNoticeConfig.IsUrgent) - .WhereIf(queryEmailNoticeConfig.IsEnable != null, t => t.IsEnable == queryEmailNoticeConfig.IsEnable) + .WhereIf(queryEmailNoticeConfig.IsReturnRequired != null, t => t.IsReturnRequired == queryEmailNoticeConfig.IsReturnRequired) + .WhereIf(queryEmailNoticeConfig.IsUrgent != null, t => t.IsUrgent == queryEmailNoticeConfig.IsUrgent) + .WhereIf(queryEmailNoticeConfig.IsEnable != null, t => t.IsEnable == queryEmailNoticeConfig.IsEnable) .ProjectTo(_mapper.ConfigurationProvider); return await emailNoticeConfigQueryable.ToPagedListAsync(queryEmailNoticeConfig.PageIndex, queryEmailNoticeConfig.PageSize, queryEmailNoticeConfig.SortField, queryEmailNoticeConfig.Asc); diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index 20b45d2c9..831e1f311 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -633,7 +633,7 @@ namespace IRaCIS.Core.Application.Image.QA #endregion - #region 导入组件有问题 + #region 导入组件有问题 excel编码格式 //var Importer = new CsvImporter(); //var import = await Importer.Import(File.OpenRead(filePath)); diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs index ae8c704dc..6d2ae915d 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs @@ -45,7 +45,7 @@ namespace IRaCIS.Application.Services throw new Exception("当前code 没要找到对应的导出模板文件"); } - var rootPath = Directory.GetParent(_hostEnvironment.ContentRootPath.TrimEnd('\\')).FullName; + var rootPath = Directory.GetParent(_hostEnvironment.ContentRootPath.TrimEnd('\\'))?.FullName; var filePath = Path.Combine(rootPath, doc.Path.Trim('/')); diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs index 368d5f8ac..a887efdd3 100644 --- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs +++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs @@ -186,6 +186,8 @@ namespace IRaCIS.Core.Application.Services } + + [HttpPut("{trialId:guid}/{subjectVisitId:guid}/{isUrgent:bool}")] public async Task SetSubjectVisitUrgent(Guid subjectVisitId, bool isUrgent) {