diff --git a/IRaCIS.Core.Application/Service/QC/ClinicalDataService.cs b/IRaCIS.Core.Application/Service/QC/ClinicalDataService.cs index beae239ae..3d8eeaea2 100644 --- a/IRaCIS.Core.Application/Service/QC/ClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/QC/ClinicalDataService.cs @@ -7,7 +7,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Hosting; using IRaCIS.Core.Domain.Share; -using IRaCIS.Core.Infra.EFCore; namespace IRaCIS.Core.Application.Contracts { @@ -166,8 +165,8 @@ namespace IRaCIS.Core.Application.Contracts [HttpDelete("{trialId:guid}/{previousHistoryId:guid}")] public async Task DeletePreviousHistory(Guid previousHistoryId) { - var success = await _previousHistoryRepository.BatchDeleteNoTrackingAsync(t => t.Id == previousHistoryId); - return ResponseOutput.Result(success); + await _previousHistoryRepository.DeleteFromQueryAsync(t => t.Id == previousHistoryId,true); + return ResponseOutput.Ok(); } @@ -191,8 +190,8 @@ namespace IRaCIS.Core.Application.Contracts [HttpDelete("{trialId:guid}/{previousOtherId:guid}")] public async Task DeletePreviousOther(Guid previousOtherId) { - var success = await _previousOtherRepository.BatchDeleteNoTrackingAsync(t => t.Id == previousOtherId); - return ResponseOutput.Result(success); + await _previousOtherRepository.DeleteFromQueryAsync(t => t.Id == previousOtherId,true); + return ResponseOutput.Ok(); } @@ -216,8 +215,8 @@ namespace IRaCIS.Core.Application.Contracts [HttpDelete("{trialId:guid}/{previousSurgeryId:guid}")] public async Task DeletePreviousSurgery(Guid previousSurgeryId) { - var success = await _previousSurgeryRepository.BatchDeleteNoTrackingAsync(t => t.Id == previousSurgeryId); - return ResponseOutput.Result(success); + var success = await _previousSurgeryRepository.DeleteFromQueryAsync(t => t.Id == previousSurgeryId,true); + return ResponseOutput.Ok(); } [HttpGet("{subjectVisitId:guid}")] @@ -242,8 +241,8 @@ namespace IRaCIS.Core.Application.Contracts public async Task DeletePreviousPDF(Guid previousPDFId) { - var success = await _previousPdfRepository.BatchDeleteNoTrackingAsync(t => t.Id == previousPDFId); - return ResponseOutput.Result(success); + await _previousPdfRepository.DeleteFromQueryAsync(t => t.Id == previousPDFId,true); + return ResponseOutput.Ok(); } diff --git a/IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs b/IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs index 069ca901f..1e96d27fe 100644 --- a/IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs +++ b/IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs @@ -34,14 +34,12 @@ namespace IRaCIS.Core.Application.Contracts public bool? IsEnrollmentConfirm { get; set; } public DateTime? SubjectFirstGiveMedicineTime { get; set; } - //public bool IsOutEnromentVisit { get; set; } + public Guid? OutPlanPreviousVisitId { get; set; } - //public bool IsUrgent { get; set; } - } diff --git a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs index c803c5440..205a2f3e1 100644 --- a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs +++ b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs @@ -449,7 +449,7 @@ namespace IRaCIS.Core.Infra.EFCore { foreach (var verifyItem in verify.Where(t => t.verifyType != VerifyEnum.OnlyUpdate && t.IsVerify)) { - if (await _dbSet.IgnoreQueryFilters().AnyAsync(verifyItem.VerifyExp).ConfigureAwait(false)) + if (await _dbSet.AnyAsync(verifyItem.VerifyExp).ConfigureAwait(false)) { throw new BusinessValidationFailedException(verifyItem.VerifyMsg); }