From 2da10559c724f1b0d734b54bf94ee9b0e1df32c7 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Tue, 26 Apr 2022 10:18:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/InspectionController.cs | 28 +++++++++++++++++++ IRaCIS.Core.API/IRaCIS.Core.API.xml | 14 ++++++++++ .../IRaCIS.Core.Application.xml | 2 +- .../Service/Inspection/DTO/InspectionModel.cs | 15 +++++++++- .../Interface/ITrialConfigService.cs | 3 +- .../TrialSiteUser/TrialConfigService.cs | 12 +++++--- .../Service/Visit/VisitPlanService.cs | 12 ++++---- 7 files changed, 72 insertions(+), 14 deletions(-) diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs index 6efb789d..37051f6e 100644 --- a/IRaCIS.Core.API/Controllers/InspectionController.cs +++ b/IRaCIS.Core.API/Controllers/InspectionController.cs @@ -84,6 +84,34 @@ namespace IRaCIS.Core.API.Controllers #region 文件管理 + /// + /// 废除项目 + /// + /// + /// + [HttpPost, Route("Inspection/TrialConfig/AbandonTrial")] + [UnitOfWork] + public async Task AbandonTrial(DataInspectionDto opt) + { + var fun = await _trialConfigService.AbandonTrial(opt.OptCommand.trialId,opt.OptCommand.isAbandon); + return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo,null, fun); + } + + /// + /// 修改项目状态项目 + /// + /// + /// + [HttpPost, Route("Inspection/TrialConfig/UpdateTrialState")] + [UnitOfWork] + public async Task UpdateTrialState(DataInspectionDto opt) + { + var fun = await _trialConfigService.UpdateTrialState(opt.OptCommand.trialId, opt.OptCommand.trialStatusStr, opt.OptCommand.reason); + opt.AuditInfo.Reason = opt.OptCommand.reason; + return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, null, fun); + } + + /// /// /// diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml index 18b148c9..8fb8d91c 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.xml +++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml @@ -57,6 +57,20 @@ Financials /Monthly Payment 列表查询接口 + + + 废除项目 + + + + + + + 修改项目状态项目 + + + + diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 4d586452..c70940d3 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1652,7 +1652,7 @@ - + 更新项目状态 diff --git a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs index d32a7728..7605a7f0 100644 --- a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs +++ b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs @@ -110,7 +110,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO ////需要单独处理 //public string IP { get; set; } - public DateTime? CreateTime { get; set; } + public DateTime? CreateTime { get; set; } = DateTime.Now; public bool NeedSava { get; set; } = true; @@ -363,6 +363,19 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO } + public class UpdateTrialState + { + public Guid trialId { get; set; } + public string trialStatusStr { get; set; } + public string reason { get; set; } + } + + public class AbandonTrial + { + public Guid trialId { get; set; } + public bool isAbandon { get; set; } + } + public class GetDataInspectionDto : PageInput { diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialConfigService.cs index f86c4670..91735d1d 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialConfigService.cs @@ -6,7 +6,8 @@ namespace IRaCIS.Application.Interfaces { public interface ITrialConfigService { - + Task UpdateTrialState(Guid trialId, string trialStatusStr, string? reason); + Task AbandonTrial(Guid trialId, bool isAbandon); Task GetTrialConfigInfo(Guid trialId); Task ConfigTrialBasicInfo(BasicTrialConfig trialConfig); diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index ee38855d..95a33a0b 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -14,10 +14,14 @@ namespace IRaCIS.Core.Application public class TrialConfigService : BaseService, ITrialConfigService { private readonly IRepository _trialRepository; + private readonly IEasyCachingProvider _provider; - public TrialConfigService(IRepository trialRepository) + public TrialConfigService(IRepository trialRepository, + IEasyCachingProvider provider + ) { _trialRepository = trialRepository; + this._provider = provider; } /// @@ -187,7 +191,7 @@ namespace IRaCIS.Core.Application /// [HttpPut("{trialId:guid}/{signId:guid}/{trialStatusStr}/{reason?}")] [UnitOfWork] - public async Task UpdateTrialState(Guid trialId, string trialStatusStr, Guid signId, string? reason, [FromServices] IEasyCachingProvider _provider) + public async Task UpdateTrialState(Guid trialId, string trialStatusStr, string? reason) { var trial = (await _trialRepository.Where(t => t.Id == trialId, true).IgnoreQueryFilters().FirstOrDefaultAsync()).IfNullThrowException(); @@ -227,10 +231,10 @@ namespace IRaCIS.Core.Application await _repository.SaveChangesAsync(); - var success = await _repository.BatchUpdateAsync(t => t.Id == signId, u => new TrialSign() { IsCompleted = true }); + //var success = await _repository.BatchUpdateAsync(t => t.Id == signId, u => new TrialSign() { IsCompleted = true }); - return ResponseOutput.Result(success); + return ResponseOutput.Ok(); } /// diff --git a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs index f63a0d3e..dd1d38ff 100644 --- a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs +++ b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs @@ -265,7 +265,6 @@ namespace IRaCIS.Application.Services t.VisitNum, t.IsBaseLine, t.BlindName, - t.Description, IsConfirmed = true, }).ToListAsync(); @@ -368,9 +367,8 @@ namespace IRaCIS.Application.Services BlindName = x.BlindName, IsBaseLine = x.IsBaseLine, - IsCheckBack = x.IsBaseLine, - IsUrgent = trial.IsSubjectExpeditedView, + IsUrgent = false, }; subjectVisits.Add(subjectVisit); @@ -399,11 +397,11 @@ namespace IRaCIS.Application.Services VisitWindowLeft = x.VisitWindowLeft, VisitWindowRight = x.VisitWindowRight, IsEnrollment = y.IsEnrollment, - IsUrgent = trial.IsSubjectExpeditedView, + IsUrgent = false, IsFinalVisit = subjectVisit.IsFinalVisit, IsLostVisit = subjectVisit.IsLostVisit, - PDState = trial.IsPDProgressView, + PDState = false, }), }); @@ -415,7 +413,7 @@ namespace IRaCIS.Application.Services SubjectVisitId = guid, SubjectCode = y.Code, BlindName = x.BlindName, - ParentId = dataindtid, + //ParentId = dataindtid, SubjectVisitName = x.VisitName, IsSign = false, TrialId = x.TrialId, @@ -437,7 +435,7 @@ namespace IRaCIS.Application.Services VisitWindowRight = x.VisitWindowRight, IsFinalVisit = subjectVisit.IsFinalVisit, IsLostVisit = subjectVisit.IsLostVisit, - PDState = trial.IsPDProgressView, + PDState = false, }), });