From ad98de74503b74442afa173f47ab540fb35b9ad7 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 1 Jun 2022 15:21:45 +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 --- .../Service/Reading/Dto/GetReadModuleDto.cs | 91 ++++++++++--------- .../Service/Reading/ReadModuleService.cs | 32 ++++--- .../Reading/ReadingPeriodSetService.cs | 4 +- IRaCIS.Core.Domain/Reading/ReadModule.cs | 21 +++++ IRaCIS.Core.Domain/Visit/SubjectVisit.cs | 6 ++ 5 files changed, 96 insertions(+), 58 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs index f33b8b63d..1cfc5863b 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs @@ -1,4 +1,5 @@ -using IRaCIS.Core.Domain.Share.Reading; +using IRaCIS.Core.Domain.Share; +using IRaCIS.Core.Domain.Share.Reading; using System; using System.Collections.Generic; using System.Linq; @@ -15,39 +16,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto - public class ReadModuleAddOrEdit + public class ReadModuleAddOrEdit: ReadModule { - public Guid? Id { get; set; } + public new Guid? Id { get; set; } - /// - /// 受试者ID - /// - public Guid? SubjectId { get; set; } - - /// - /// 模块类型 - /// - public ModuleTypeEnum ModuleType { get; set; } - - /// - /// 模块名称 - /// - public string ModuleName { get; set; } - - /// - /// 是否加急 - /// - public bool? IsUrgent { get; set; } - - /// - /// 访视ID - /// - public Guid? SubjectVisitId { get; set; } - - /// - /// 状态 - /// - public ReadModuleEnum? Status { get; set; } } @@ -55,7 +27,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto { /// - /// Id + /// Id(阅片期Id 或者 访视ID) /// public Guid? Id { get; set; } @@ -69,11 +41,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public ModuleTypeEnum ModuleType { get; set; } - /// - /// 模块名称 - /// - public string ModuleName { get; set; } - /// /// 是否加急 /// @@ -84,6 +51,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public Guid? SubjectVisitId { get; set; } + /// + /// 访视名称 + /// + public string SubjectVisitName { get; set; } + /// /// 状态 /// @@ -94,19 +66,56 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public DateTime CreateTime { get; set; } + /// + /// 受试者Code + /// public string SubjectCode { get; set; } + /// + /// 中心Id + /// public string SiteCode { get; set; } - + /// + /// 是否为末次访视 + /// public bool IsFinalVisit { get; set; } = false; - public string VisitName { get; set; } + /// + /// 上一访视 + /// + public Guid? OutPlanPreviousVisitId { get; set; } + /// + /// 上一访视名称 + /// + public string OutPlanPreviousVisitName { get; set; } + + /// + /// 中心ID + /// public Guid? SiteId { get; set; } + + /// + /// 是否为访视 + /// + public bool IsVisit { get; set; } + + /// + /// 是否为PD进展 + /// + public PDStateEnum PDState { get; set; } = PDStateEnum.None; + + /// + /// 入组确认评估 + /// + public bool IsEnrollmentConfirm { get; set; } = false; + + } + public class GetReadModuleResultDto { /// @@ -133,8 +142,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 数据 /// public List CurrentPageData { get; set; } - - } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs index fca2a94c9..29f075ff2 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs @@ -47,21 +47,25 @@ namespace IRaCIS.Application.Services SiteId = x.SiteId, SubjectCode = x.Code, SubjectId = x.Id, - Data=x.SubjectVisitList.Select(y=>new GetReadModuleOutDto() + Data=x.SubjectVisitList.OrderBy(y=>y.InPlan).Select(y=>new GetReadModuleOutDto() { - CreateTime = y.CreateTime, - Id = y.Id, - IsFinalVisit=y.IsFinalVisit, // 是否末次访视 + Id = y.Id, //id + ModuleType = y.InPlan ? ModuleTypeEnum.InPlanSubjectVisit : ModuleTypeEnum.OutPlanSubjectVisit, // 模块类型 + IsUrgent = x.IsUrgent, // 是否加急 + SubjectVisitId = y.Id, // 访视ID + SubjectVisitName=y.VisitName, // 访视名称 + Status= y.SubmitState== SubmitStateEnum.None|| y.SubmitState== SubmitStateEnum.ToSubmit? ReadModuleEnum.ImageUpload: ReadModuleEnum.ImageUpload, // 访视模块 + CreateTime = y.CreateTime, // 创建时间 + SubjectCode = y.Subject.Code, // 受试者code + SiteCode = x.Site.SiteCode, // 中心Code + IsFinalVisit=y.IsFinalVisit, // 是否为末次评估 + OutPlanPreviousVisitId = y.OutPlanPreviousVisitId, // 上一访视 + OutPlanPreviousVisitName = y.OutPlanPreviousVisit.VisitName, // 上一访视名称 + SiteId = x.Site.Id, // 中心ID + IsVisit=true, // 是否为访视 + PDState = y.PDState, // PD 进展 + IsEnrollmentConfirm=y.IsEnrollmentConfirm, // SubjectId = x.Id, - SubjectVisitId = y.Id, - IsUrgent = x.IsUrgent, - ModuleType = y.InPlan ? ModuleTypeEnum.InPlanSubjectVisit : ModuleTypeEnum.OutPlanSubjectVisit, // - SubjectCode = y.Subject.Code, - SiteCode = x.Site.SiteCode, - SiteId = x.Site.Id, - VisitName = y.VisitName, - - }).ToList() }); @@ -80,7 +84,7 @@ namespace IRaCIS.Application.Services CreateTime = y.CreateTime, Id = y.Id, SubjectId=x.SubjectId, - + ModuleType=y.ModuleType, })); }); diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs index ec6a6f2b3..c216806c8 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriodSetService.cs @@ -112,8 +112,8 @@ namespace IRaCIS.Application.Services var readquery =await _readingPeriodSetRepository.UpdatePartialNowNoQueryAsync(indto.Id, x => new ReadingPeriodSet() { IsTakeEffect = indto.IsTakeEffect }); - bool result= await _readingPeriodSetRepository.SaveChangesAsync(); - return ResponseOutput.Result(result); + + return ResponseOutput.Result(true); } diff --git a/IRaCIS.Core.Domain/Reading/ReadModule.cs b/IRaCIS.Core.Domain/Reading/ReadModule.cs index 60eeecdbd..150ee9797 100644 --- a/IRaCIS.Core.Domain/Reading/ReadModule.cs +++ b/IRaCIS.Core.Domain/Reading/ReadModule.cs @@ -65,6 +65,27 @@ namespace IRaCIS.Core.Domain.Models /// public Guid? LastVisitIdSetId { get; set; } + /// + /// 阅片期配置 + /// + [ForeignKey("ReadingPeriodSetId")] + public ReadingPeriodSet ReadingPeriodSet { get; set; } = new ReadingPeriodSet(); + + + /// + /// 阅片期配置 + /// + [ForeignKey("SubjectVisitId")] + public SubjectVisit SubjectVisit { get; set; } = new SubjectVisit(); + + + + /// + /// 阅片期配置 + /// + [ForeignKey("LastVisitIdSetId")] + public SubjectVisit LastSubjectVisit { get; set; } = new SubjectVisit(); + } diff --git a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs index 9576dee2e..e0163b989 100644 --- a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs +++ b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs @@ -100,8 +100,14 @@ namespace IRaCIS.Core.Domain.Models public DateTime? CheckPassedTime { get; set; } + /// + /// 上一访视 + /// public Guid? OutPlanPreviousVisitId { get; set; } + [ForeignKey("OutPlanPreviousVisitId")] + public SubjectVisit OutPlanPreviousVisit { get; set; } + //public Guid? ClinicalDataSignUserId { get; set; } //public DateTime? ClinicalDataSignTime { get; set; }