From e81627ed88bace461b13a0845e26bf8609ec4aae Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Tue, 12 Apr 2022 11:31:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/InspectionController.cs | 50 ++++++++++++++++++- IRaCIS.Core.API/IRaCIS.Core.API.xml | 35 +++++++++++++ .../Service/Inspection/InspectionService.cs | 4 +- .../UnitOfWork/EFUnitOfWorkFilter.cs | 1 - 4 files changed, 86 insertions(+), 4 deletions(-) diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs index ff9524601..29970c85a 100644 --- a/IRaCIS.Core.API/Controllers/InspectionController.cs +++ b/IRaCIS.Core.API/Controllers/InspectionController.cs @@ -33,11 +33,13 @@ namespace IRaCIS.Core.API.Controllers private readonly ITrialDocumentService _trialDocumentService; private readonly IQCListService _qCListService; private readonly ITrialConfigService _trialConfigService; + private readonly INoneDicomStudyService _noneDicomStudyService; private readonly ISubjectService _subjectService; private readonly ISubjectVisitService _subjectVisitService; private readonly IQCOperationService _qCOperationService; private readonly IVisitPlanService _visitPlanService; private readonly IInspectionService _inspectionService; + private readonly IRepository _dataInspectionRepository; private delegate Task executionFun(dynamic data); @@ -49,6 +51,7 @@ namespace IRaCIS.Core.API.Controllers IQCListService _qCListService, IInspectionService sinspectionService, ITrialConfigService _trialConfigService, + INoneDicomStudyService noneDicomStudyService, ISubjectService _subjectService, ISubjectVisitService subjectVisitService, IQCOperationService qCOperationService, @@ -62,6 +65,7 @@ namespace IRaCIS.Core.API.Controllers this._trialDocumentService = trialDocumentService; this._qCListService = _qCListService; this._trialConfigService = _trialConfigService; + this._noneDicomStudyService = noneDicomStudyService; this._subjectService = _subjectService; this._subjectVisitService = subjectVisitService; this._qCOperationService = qCOperationService; @@ -86,7 +90,7 @@ namespace IRaCIS.Core.API.Controllers /// - /// 调整影像状态 + /// 疾病进展确认评估 /// /// /// @@ -117,6 +121,50 @@ namespace IRaCIS.Core.API.Controllers } + /// + /// CRC RequestToQC 批量提交 + /// + /// + /// + [HttpPost, Route("Inspection/QCOperation/CRCRequestToQC")] + [UnitOfWork] + public async Task CRCRequestToQC(DataInspectionDto opt) + { + var fun = _qCOperationService.CRCRequestToQC; + return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun); + } + + + /// + /// 非DICOM影像新增编辑 + /// + /// + /// + [HttpPost, Route("Inspection/Inspection/AddOrUpdateNoneDicomStudy")] + [UnitOfWork] + public async Task AddOrUpdateNoneDicomStudy(DataInspectionDto opt) + { + var fun = _noneDicomStudyService.AddOrUpdateNoneDicomStudy; + return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun); + } + + + /// + /// 删除 + /// + /// + /// + [HttpPost, Route("Inspection/Inspection/DeleteNoneDicomStudy")] + [UnitOfWork] + public async Task DeleteNoneDicomStudy(DataInspectionDto opt) + { + var fun = _noneDicomStudyService.DeleteNoneDicomStudy; + return await _inspectionService.Enforcement(opt.OptCommand.Id, opt.AuditInfo, opt.SignInfo, fun); + } + + + + #endregion diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml index cf2eaf063..541c13275 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.xml +++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml @@ -58,6 +58,41 @@ + + + 疾病进展确认评估 + + + + + + + 删除影像 + + + + + + + CRC RequestToQC 批量提交 + + + + + + + 非DICOM影像新增编辑 + + + + + + + 删除 + + + + 新增或添加访视计划 diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs index 6fc690788..ca690a1f0 100644 --- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs @@ -237,11 +237,11 @@ namespace IRaCIS.Core.Application.Service.Inspection var user = await _repository.FirstOrDefaultAsync(u => u.UserName == signDTO.UserName && u.Password == signDTO.PassWord); if (user == null) { - return ResponseOutput.NotOk("password error"); + throw new BusinessValidationFailedException("password error"); } else if (user.Status == UserStateEnum.Disable) { - return ResponseOutput.NotOk("The user has been disabled!"); + throw new BusinessValidationFailedException("The user has been disabled!"); } return ResponseOutput.Ok(); diff --git a/IRaCIS.Core.Infra.EFCore/UnitOfWork/EFUnitOfWorkFilter.cs b/IRaCIS.Core.Infra.EFCore/UnitOfWork/EFUnitOfWorkFilter.cs index 50dabe217..fd464e4c3 100644 --- a/IRaCIS.Core.Infra.EFCore/UnitOfWork/EFUnitOfWorkFilter.cs +++ b/IRaCIS.Core.Infra.EFCore/UnitOfWork/EFUnitOfWorkFilter.cs @@ -98,7 +98,6 @@ namespace IRaCIS.Core.Infra.EFCore { if (resultContext.Exception == null) { - //提交事务 await _transaction?.CommitAsync(); }