From 4e11cc7db386a05a9c73589960e2926f2e245de6 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Tue, 27 Feb 2024 14:44:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E9=98=85=E7=89=87=E6=A0=87?= =?UTF-8?q?=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/InspectionController.cs | 29 ++++++++++++---- IRaCIS.Core.API/IRaCIS.Core.API.xml | 6 ++++ .../IRaCIS.Core.Application.xml | 7 ++++ .../Reading/Dto/ReadingQuestionViewModel.cs | 8 +++++ .../ReadingCriterionService.cs | 24 +++++++++----- .../Interface/ITrialConfigService.cs | 8 ++++- .../TrialSiteUser/TrialConfigService.cs | 33 +++++++++++++++---- 7 files changed, 93 insertions(+), 22 deletions(-) diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs index b9a7877bc..7de33aaae 100644 --- a/IRaCIS.Core.API/Controllers/InspectionController.cs +++ b/IRaCIS.Core.API/Controllers/InspectionController.cs @@ -419,13 +419,30 @@ namespace IRaCIS.Core.API.Controllers } + /// + /// 重置并同步项目阅片标准 + /// + /// + [HttpPost, Route("Inspection/ReadingCriterion/ResetAndAsyncCriterion")] + [UnitOfWork] + [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - /// - /// CRC RequestToQC 批量提交 - /// - /// - /// - [HttpPost, Route("Inspection/QCOperation/CRCRequestToQC")] + public async Task ResetAndAsyncCriterion(DataInspectionDto opt) + { + var singid = await _inspectionService.RecordSing(opt.SignInfo); + var result = await _trialConfigService.ResetAndAsyncCriterion(opt.Data); + await _inspectionService.CompletedSign(singid, result); + return result; + } + + + + /// + /// CRC RequestToQC 批量提交 + /// + /// + /// + [HttpPost, Route("Inspection/QCOperation/CRCRequestToQC")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] [UnitOfWork] public async Task CRCRequestToQC(DataInspectionDto opt) diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml index 9f901627f..3580ca96a 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.xml +++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml @@ -208,6 +208,12 @@ + + + 重置并同步项目阅片标准 + + + CRC RequestToQC 批量提交 diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index ea0d004b3..1e08ec5c2 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -11923,6 +11923,13 @@ + + + 重置并同步标准 + + + + 同步项目标准字典信息 diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index 3b55fe1bf..eca632b44 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -232,6 +232,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public List CodeList { get; set; } } + public class ResetAndAsyncCriterionInDto + { + public Guid TrialReadingCriterionId { get; set; } + } + public class ResetAndAsyncCriterionOutDto + { + + } public class SetSystemGlobalInfoInDto { diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs index 2f9caca99..2d0ae041e 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs @@ -5,6 +5,8 @@ using IRaCIS.Core.Infrastructure; using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Application.Service.Reading.Dto; using Panda.DynamicWebApi.Attributes; +using IRaCIS.Core.Application.Contracts; +using IRaCIS.Application.Interfaces; namespace IRaCIS.Core.Application.Service.RC { @@ -22,7 +24,8 @@ namespace IRaCIS.Core.Application.Service.RC private readonly IRepository _readingCriterionDictionaryRepository; private readonly IRepository _readingTrialCriterionDictionaryRepository; private readonly IRepository _visitTaskRepository; - private readonly IRepository _systemCriterionDictionaryCodeRepository; + private readonly ITrialConfigService _trialConfigService; + private readonly IRepository _systemCriterionDictionaryCodeRepository; private readonly IRepository _readingTableQuestionAnswerRepository; private readonly IRepository _readingTableAnswerRowInfoRepository; @@ -35,7 +38,8 @@ namespace IRaCIS.Core.Application.Service.RC IRepository readingCriterionDictionaryRepository, IRepository readingTrialCriterionDictionaryRepository, IRepository visitTaskRepository, - IRepository systemCriterionDictionaryCodeRepository, + ITrialConfigService trialConfigService, + IRepository systemCriterionDictionaryCodeRepository, IRepository readingTableQuestionTrialRepository, IRepository readingTableQuestionAnswerRepository, IRepository readingTableAnswerRowInfoRepository, @@ -50,7 +54,8 @@ namespace IRaCIS.Core.Application.Service.RC this._readingCriterionDictionaryRepository = readingCriterionDictionaryRepository; this._readingTrialCriterionDictionaryRepository = readingTrialCriterionDictionaryRepository; this._visitTaskRepository = visitTaskRepository; - this._systemCriterionDictionaryCodeRepository = systemCriterionDictionaryCodeRepository; + this._trialConfigService = trialConfigService; + this._systemCriterionDictionaryCodeRepository = systemCriterionDictionaryCodeRepository; this._readingTableQuestionAnswerRepository = readingTableQuestionAnswerRepository; this._readingTableAnswerRowInfoRepository = readingTableAnswerRowInfoRepository; this._readingTaskQuestionAnswer = readingTaskQuestionAnswer; @@ -123,12 +128,13 @@ namespace IRaCIS.Core.Application.Service.RC return ResponseOutput.Ok(); } - /// - /// 设置系统全局阅片阅片信息 - /// - /// - /// - [HttpPost] + + /// + /// 设置系统全局阅片阅片信息 + /// + /// + /// + [HttpPost] [UnitOfWork] public async Task SetSystemGlobalInfo(SetSystemGlobalInfoInDto inDto) { diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialConfigService.cs index 75ec6836c..7a06d0fb5 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialConfigService.cs @@ -1,6 +1,7 @@ using IRaCIS.Core.Application.Contracts; using Microsoft.AspNetCore.Mvc; using IRaCIS.Core.Infra.EFCore; +using IRaCIS.Core.Application.Service.Reading.Dto; namespace IRaCIS.Application.Interfaces { @@ -20,6 +21,11 @@ namespace IRaCIS.Application.Interfaces Task TrialConfigSignatureConfirm(SignConfirmDTO signConfirmDTO); + Task AsyncTrialCriterionDictionary(AsyncTrialCriterionDictionaryInDto inDto); - } + Task ResetAndAsyncCriterion(ResetAndAsyncCriterionInDto inDto); + + + + } } diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index 4d1125b99..da254adad 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -194,12 +194,33 @@ namespace IRaCIS.Core.Application return trialInfo; } - /// - /// 同步项目标准字典信息 - /// - /// - /// - [HttpPost] + /// + /// 重置并同步标准 + /// + /// + /// + public async Task ResetAndAsyncCriterion(ResetAndAsyncCriterionInDto inDto) + { + await _readingQuestionCriterionTrialRepository.BatchUpdateNoTrackingAsync(x => x.Id == inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial + { + SynchronizeOriginalTime = null, + SynchronizeTime = DateTime.Now.AddYears(-20), + IsSigned = false, + ReadingInfoSignTime = null, + + }); + + await AsyncTrialCriterionDictionary(new AsyncTrialCriterionDictionaryInDto() { TrialReadingCriterionId = inDto.TrialReadingCriterionId }); + return ResponseOutput.Ok(true); + } + + + /// + /// 同步项目标准字典信息 + /// + /// + /// + [HttpPost] public async Task AsyncTrialCriterionDictionary(AsyncTrialCriterionDictionaryInDto inDto) {