diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs index 5fcaf50f3..e5b910015 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs @@ -424,7 +424,11 @@ namespace IRaCIS.Application.Services }); - await _readModuleRepository.DeleteFromQueryAsync(t => t.Id == readModuleId, true); + await _readModuleRepository.UpdatePartialFromQueryAsync(t => t.Id == readModuleId, x => new ReadModule() + { + + IsDeleted = true + }); await _readModuleRepository.SaveChangesAsync(); return ResponseOutput.Result(true); } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs index 9f1eaa9b5..8127eeeef 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs @@ -128,9 +128,17 @@ namespace IRaCIS.Application.Services [HttpDelete("{readingPeriodSetId:guid}")] public async Task DeleteReadingPeriodSet(Guid readingPeriodSetId) { - await _readingPeriodSetRepository.DeleteFromQueryAsync(t => t.Id == readingPeriodSetId, true); - await _readingPeriodPlanRepository.DeleteFromQueryAsync(t => t.ReadingPeriodSetId == readingPeriodSetId, true); + await _readingPeriodSetRepository.UpdatePartialFromQueryAsync(t => t.Id == readingPeriodSetId, x => new ReadingPeriodSet() + { + IsDeleted = true + }) ; + await _readingPeriodPlanRepository.UpdatePartialFromQueryAsync(t => t.ReadingPeriodSetId == readingPeriodSetId, x => new ReadingPeriodPlan() + { + IsDeleted = true + + }) ; + await _readingPeriodPlanRepository.SaveChangesAsync(); return ResponseOutput.Ok(); } @@ -304,7 +312,10 @@ namespace IRaCIS.Application.Services TaskState = TaskState.Adbandon }); - await _readModuleRepository.DeleteFromQueryAsync(x => x.ReadingPeriodSetId == indto.Id); + await _readModuleRepository.UpdatePartialFromQueryAsync(x => x.ReadingPeriodSetId == indto.Id,x=>new ReadModule() { + + IsDeleted=true + }); } var readQuery = await _readingPeriodSetRepository.UpdatePartialFromQueryAsync(indto.Id, x => new ReadingPeriodSet() @@ -369,7 +380,14 @@ namespace IRaCIS.Application.Services ReadingPeriodSetId = inDto.ReadingPeriodSetId }); }); - await _readingPeriodPlanRepository.DeleteFromQueryAsync(x => x.ReadingPeriodSetId == inDto.ReadingPeriodSetId); + + + await _readingPeriodPlanRepository.UpdatePartialFromQueryAsync(x => x.ReadingPeriodSetId == inDto.ReadingPeriodSetId, x => new ReadingPeriodPlan() + { + IsDeleted = true + + }); + await _readingPeriodPlanRepository.SaveChangesAsync(); await _readingPeriodPlanRepository.AddRangeAsync(plans); var result = await _readingPeriodPlanRepository.SaveChangesAsync(); diff --git a/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs b/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs index 2dd4538ee..03d28c4db 100644 --- a/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs +++ b/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs @@ -62,7 +62,10 @@ namespace IRaCIS.Core.Application.Triggers if (readingPeriodSet != null) { await _readingPeriodPlanRepository.DeleteFromQueryAsync(x => x.ReadingPeriodSetId == readingPeriodSet.Id && x.SubjectVisitId == subjectVisit.Id); - await _readModuleRepository.DeleteFromQueryAsync(x => x.SubjectVisitId == subjectVisit.Id && x.ReadingPeriodSetId == readingPeriodSet.Id); + await _readModuleRepository.UpdatePartialFromQueryAsync(x => x.SubjectVisitId == subjectVisit.Id && x.ReadingPeriodSetId == readingPeriodSet.Id,x=> new ReadModule() { + IsDeleted = true + + }); await _readModuleRepository.SaveChangesAsync(); @@ -139,7 +142,10 @@ namespace IRaCIS.Core.Application.Triggers }); - await _readModuleRepository.DeleteFromQueryAsync(x => x.ReadingSetType == ReadingSetType.ImageReading && x.TrialReadingCriterionId == item.Id && x.SubjectVisitId == subjectVisitId, true); + await _readModuleRepository.UpdatePartialFromQueryAsync(x => x.ReadingSetType == ReadingSetType.ImageReading && x.TrialReadingCriterionId == item.Id && x.SubjectVisitId == subjectVisitId, x=> new ReadModule() { + + IsDeleted = true + }); await _readModuleRepository.AddAsync(new ReadModule() { diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs index 8ea49ccc3..a73e3b3e1 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs @@ -110,12 +110,15 @@ namespace IRaCIS.Core.Domain.Models /// public Guid CreateUserId { get; set; } + + public int? NumberOfFrames { get; set; } + public Guid UpdateUserId { get; set; } //string UpdateUserName { get; set; } public DateTime UpdateTime { get; set; } - public int? NumberOfFrames { get; set; } + public bool IsDeleted { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs index 3996e483d..ff2560769 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs @@ -11,7 +11,7 @@ namespace IRaCIS.Core.Domain.Models ///读片模块 /// [Table("ReadModule")] - public class ReadModule : Entity, IAuditAdd + public class ReadModule : Entity, IAuditAdd, IAuditUpdate, ISoftDelete { [JsonIgnore] @@ -67,12 +67,25 @@ namespace IRaCIS.Core.Domain.Models /// public Guid TrialId { get; set; } + public Guid UpdateUserId { get; set; } + + public DateTime UpdateTime { get; set; } + + + + + public bool IsDeleted { get; set; } + + public DateTime? DeletedTime { get; set; } + + public Guid? DeleteUserId { get; set; } + ///// ///// ///// //public decimal VisitNum { get; set; } - // [JsonIgnore] + // [JsonIgnore] ///// ///// 对应 ///// diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs index ec443e4a8..543a5c2f0 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs @@ -11,7 +11,7 @@ namespace IRaCIS.Core.Domain.Models /// 阅片计划 /// [Table("ReadingPeriodPlan")] - public class ReadingPeriodPlan : Entity, IAuditAdd + public class ReadingPeriodPlan : Entity, IAuditAdd, IAuditUpdate, ISoftDelete { /// @@ -46,6 +46,19 @@ namespace IRaCIS.Core.Domain.Models /// public Guid CreateUserId { get; set; } + public Guid UpdateUserId { get; set; } + + public DateTime UpdateTime { get; set; } + + + + + public bool IsDeleted { get; set; } + + public DateTime? DeletedTime { get; set; } + + public Guid? DeleteUserId { get; set; } + } diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs index 3f30a53ba..d191a6328 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs @@ -12,7 +12,7 @@ namespace IRaCIS.Core.Domain.Models ///阅片期设置 只会设计到所有人 或者某个Site 针对全局 /// [Table("ReadingPeriodSet")] - public class ReadingPeriodSet : Entity, IAuditAdd + public class ReadingPeriodSet : Entity, IAuditAdd, IAuditUpdate, ISoftDelete { /// @@ -84,7 +84,20 @@ namespace IRaCIS.Core.Domain.Models /// public ReadingSetType ReadingSetType { get; set; } - [JsonIgnore] + public Guid UpdateUserId { get; set; } + + public DateTime UpdateTime { get; set; } + + + + + public bool IsDeleted { get; set; } + + public DateTime? DeletedTime { get; set; } + + public Guid? DeleteUserId { get; set; } + + [JsonIgnore] public List ReadingPeriodSites { get; set; } = new List();