From 6f09114bda54d404e732b84437da42bdc41fec43 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Mon, 25 Apr 2022 10:26:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/Controllers/InspectionController.cs | 6 +++--- IRaCIS.Core.API/IRaCIS.Core.API.xml | 2 +- IRaCIS.Core.Application/IRaCIS.Core.Application.xml | 7 ++++++- .../Service/QC/DTO/QARecordViewModel.cs | 11 +++++++++++ .../Service/QC/Interface/IQCOperationService.cs | 2 +- .../Service/QC/QCOperationService.cs | 6 +++--- IRaCIS.Core.Domain/Visit/SubjectVisit.cs | 5 +++++ 7 files changed, 30 insertions(+), 9 deletions(-) diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs index f1e0ae540..6c585bb0f 100644 --- a/IRaCIS.Core.API/Controllers/InspectionController.cs +++ b/IRaCIS.Core.API/Controllers/InspectionController.cs @@ -219,11 +219,11 @@ namespace IRaCIS.Core.API.Controllers /// [HttpPost, Route("Inspection/QCOperation/CloseCheckChallenge")] [UnitOfWork] - public async Task CloseCheckChallenge(DataInspectionDto opt) + public async Task CloseCheckChallenge(DataInspectionDto opt) { var fun = _qCOperationService.CloseCheckChallenge; - - return await _inspectionService.Enforcement(opt.OptCommand.Id, opt.AuditInfo, opt.SignInfo, fun); + opt.AuditInfo.Reason = opt.OptCommand.CloseCheckChallenge; + return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun); } /// diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml index 606a4d13c..0608ee5b8 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.xml +++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml @@ -104,7 +104,7 @@ 一致性核查 质疑的添加/回复 - + 删除QC质疑记录 diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 69ddb8a82..7a2c53f77 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -704,6 +704,11 @@ PreviousPDFAddOrEdit 列表查询参数模型 + + + 关闭一致性质疑Dto + + QCQuestionConfigureView 列表视图模型 @@ -1446,7 +1451,7 @@ - + 关闭 一致性核查质疑 diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs index 735e6374a..f405721d6 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs @@ -424,6 +424,17 @@ namespace IRaCIS.Core.Application.Contracts.DTO } + /// + /// 关闭一致性质疑Dto + /// + public class CloseCheckChallengeDto + { + public Guid subjectVisitId { get; set; } + + public string CloseCheckChallenge { get; set; } + } + + public class CheckChallengeDialogCommand { public string TalkContent { get; set; } = String.Empty; diff --git a/IRaCIS.Core.Application/Service/QC/Interface/IQCOperationService.cs b/IRaCIS.Core.Application/Service/QC/Interface/IQCOperationService.cs index 16a34f746..44a5b794e 100644 --- a/IRaCIS.Core.Application/Service/QC/Interface/IQCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/Interface/IQCOperationService.cs @@ -23,7 +23,7 @@ namespace IRaCIS.Core.Application.Image.QA Task AddOrUpdateQCChallenge(QCChallengeCommand qaQuestionCommand, Guid trialId, [FromRoute] TrialQCProcess trialQCProcess, [FromRoute] CurrentQC currentQCType); Task AddOrUpdateQCQuestionAnswerList(QCQuestionAnswerCommand[] qcQuestionAnswerCommands, Guid trialId, Guid subjectVisitId, [FromRoute] TrialQCProcess trialQCProcess, [FromRoute] CurrentQC currentQCType); Task AddQCChallengeReply(QADialogCommand qaDialogCommand); - Task CloseCheckChallenge(Guid subjectVisitId); + Task CloseCheckChallenge(CloseCheckChallengeDto input); Task CloseQCChallenge(Guid qcChallengeId, Guid subjectVisitId, [FromRoute] QCChallengeCloseEnum closeEnum, [FromRoute] string closeReason); Task CRCRequestReUpload(Guid qcChallengeId); Task CRCRequestToQC(CRCRequestToQCCommand cRCRequestToQCCommand); diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index 39d964d8f..e585e9b27 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -296,10 +296,10 @@ namespace IRaCIS.Core.Application.Image.QA /// [HttpPut("{trialId:guid}/{subjectVisitId:guid}")] [TypeFilter(typeof(TrialResourceFilter))] - public async Task CloseCheckChallenge(Guid subjectVisitId) + public async Task CloseCheckChallenge(CloseCheckChallengeDto input) { - var sv = await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == subjectVisitId); + var sv = await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == input.subjectVisitId); if (sv == null) return Null404NotFound(sv); @@ -307,7 +307,7 @@ namespace IRaCIS.Core.Application.Image.QA { ResponseOutput.NotOk("执行一致性核查的访视 不允许关闭质疑!"); } - + sv.CloseTheReason = input.CloseCheckChallenge; sv.CheckChallengeState = CheckChanllengeTypeEnum.Closed; await _repository.SaveChangesAsync(); diff --git a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs index 82c5d536f..b5afd27ac 100644 --- a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs +++ b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs @@ -130,6 +130,11 @@ namespace IRaCIS.Core.Domain.Models public bool IsEnrollmentConfirm { get; set; } + /// + /// 关闭一致性质疑原因 + /// + public string CloseTheReason { get; set; } + //导航属性