From 68ac0941c2b42f35bdf2ecb1854284ec3ae50ba9 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Thu, 2 Jun 2022 14:01:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/Dto/GetReadModuleDto.cs | 5 +---- .../Service/Reading/Dto/ReadingPeriodSetViewModel.cs | 8 ++++---- .../Service/Reading/ReadModuleService.cs | 10 +++++----- IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs | 5 +++++ IRaCIS.Core.Domain/Reading/ReadModule.cs | 3 +-- IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs | 12 ++---------- IRaCIS.Core.Domain/Reading/ReadingPeriodSite.cs | 4 ++-- 7 files changed, 20 insertions(+), 27 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs index 01b521c37..3935427b4 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs @@ -29,7 +29,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 截止访视 /// - public decimal? ExpirationVisit { get; set; } + public decimal? ExpirationVisitNum { get; set; } /// /// 访视计划ID @@ -41,7 +41,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public Guid SubjectId { get; set; } - /// /// 名称 /// @@ -197,7 +196,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public bool IsFinalVisit { get; set; } = false; - /// /// 上一访视 /// @@ -228,7 +226,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public bool IsEnrollmentConfirm { get; set; } = false; - } diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs index bee32dceb..1e468a4cb 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs @@ -36,7 +36,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 截止访视 /// - public decimal? ExpirationVisit { get; set; } + public decimal? ExpirationVisitNum { get; set; } /// /// 访视计划ID @@ -46,7 +46,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 是否生效 /// - public int? IsTakeEffect { get; set; } = 0; + public ReadingPeriodStatus IsTakeEffect { get; set; } = ReadingPeriodStatus.NotTakeEffect; public List SiteIds { get; set; } = new List(); @@ -85,7 +85,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 截止访视 /// - public decimal? ExpirationVisit { get; set; } + public decimal? ExpirationVisitNum { get; set; } /// /// 访视计划ID @@ -143,7 +143,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 截止访视 /// - public decimal? ExpirationVisit { get; set; } + public decimal? ExpirationVisitNum { get; set; } /// /// 项目ID diff --git a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs index 77d5f2320..e5129d2d9 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs @@ -131,12 +131,12 @@ namespace IRaCIS.Application.Services ///// ///// //[NonDynamicWebApi] - //public async Task GetVisitSubmitStateEnum(SubjectVisit visit) + //public async Task GetVisitSubmitStateEnum(SubjectVisit visit) //{ // if (visit.SubmitState != SubmitStateEnum.Submitted) // { - // return SubmitStateEnum.ToSubmit - // } + // return ReadModuleEnum.ImageUpload; + // }else if() //} @@ -197,9 +197,9 @@ namespace IRaCIS.Application.Services visits = visits.Where(x => x.LatestScanDate <= dto.ExpirationDate.Value).ToList(); } - if (dto.ExpirationVisit != null) + if (dto.ExpirationVisitNum != null) { - visits = visits.Where(x => x.VisitNum <= dto.ExpirationVisit).ToList(); + visits = visits.Where(x => x.VisitNum <= dto.ExpirationVisitNum).ToList(); } var visit = visits.OrderByDescending(x => x.VisitNum).FirstOrDefault(); diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index b3c8e35a3..c9ecf712a 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -60,6 +60,11 @@ namespace IRaCIS.Core.Domain.Share.Reading /// public enum ReadingPeriodStatus { + /// + /// 未生效 + /// + NotTakeEffect=0, + /// /// 已生效 /// diff --git a/IRaCIS.Core.Domain/Reading/ReadModule.cs b/IRaCIS.Core.Domain/Reading/ReadModule.cs index 88606795c..481fcd130 100644 --- a/IRaCIS.Core.Domain/Reading/ReadModule.cs +++ b/IRaCIS.Core.Domain/Reading/ReadModule.cs @@ -66,11 +66,10 @@ namespace IRaCIS.Core.Domain.Models public Guid? LastVisitIdSetId { get; set; } /// - /// 对应阅片期 + /// 裁判对应原阅片模块的Id /// public Guid? ReadModuleId { get; set; } - /// /// 对应 /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs index 2d7f145a2..50ab3f8a0 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs @@ -39,7 +39,7 @@ namespace IRaCIS.Core.Domain.Models /// /// 截止访视 /// - public decimal? ExpirationVisit { get; set; } + public decimal? ExpirationVisitNum { get; set; } /// /// 访视计划ID @@ -65,18 +65,10 @@ namespace IRaCIS.Core.Domain.Models /// /// 备注 /// - public string? Remark { get; set; } + public string Remark { get; set; } = string.Empty; public List ReadingPeriodSites { get; set; } = new List(); - } - - public enum ReadingPeriodSetTakeEffectEnum - { - - } - - } diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriodSite.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriodSite.cs index 8195ec03c..1a0aa598a 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriodSite.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriodSite.cs @@ -31,8 +31,6 @@ namespace IRaCIS.Core.Domain.Models /// public Guid SiteId { get; set; } - - /// /// 创建时间 /// @@ -49,6 +47,8 @@ namespace IRaCIS.Core.Domain.Models /// public Site Site { get; set; } + + public ReadingPeriodSet ReadingPeriodSet { get; set; }