From 6f562252e4f96269f55a2f5c38999ccc76faa7a5 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 1 Jun 2022 16:19:55 +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 --- .../IRaCIS.Core.Application.xml | 112 ++++++++++++------ .../Service/Reading/Dto/GetReadModuleDto.cs | 39 ++++++ .../Service/Reading/ReadModuleService.cs | 36 +++++- 3 files changed, 149 insertions(+), 38 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index f8cb6d604..279eddc4b 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -467,39 +467,14 @@ 排序字段 - - - 受试者ID - - - - - 模块类型 - - - - - 模块名称 - - - - - 是否加急 - - - - - 访视ID - - - - - 状态 - - - Id + Id(阅片期Id 或者 访视ID) + + + + + 名称 @@ -512,11 +487,6 @@ 模块类型 - - - 模块名称 - - 是否加急 @@ -527,6 +497,31 @@ 访视ID + + + 访视名称 + + + + + 截止访视 + + + + + 截止访视名称 + + + + + 对应阅片期 + + + + + 对应Name + + 状态 @@ -537,6 +532,51 @@ 创建时间 + + + 受试者Code + + + + + 中心Id + + + + + 是否为末次访视 + + + + + 上一访视 + + + + + 上一访视名称 + + + + + 中心ID + + + + + 是否为访视 + + + + + 是否为PD进展 + + + + + 入组确认评估 + + 当前页索引 diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs index 82f026b67..30f6acc46 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs @@ -11,6 +11,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public class GetReadModuleDto:PageInput { public Guid? TrialId { get; set; } + + public Guid? SubjectId { get; set; } } @@ -22,6 +24,43 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto } + public class GetReadModuleSingleIndto + { + public Guid Id { get; set; } + + public Guid SubjectId { get; set; } + + + } + + + public class GetReadModuleSingleOutdto + { + public Guid Id { get; set; } + + + + /// + /// 模块类型 + /// + public ModuleTypeEnum ModuleType { get; set; } + + /// + /// 访视ID + /// + public Guid? SubjectVisitId { get; set; } + + + /// + /// 访视名称 + /// + public string SubjectVisitName { get; set; } + + /// + /// 干系人 + /// + public string Stakeholders { get; set; } + } public class GetReadModuleOutDto { diff --git a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs index f3dc46db8..b9750c22a 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs @@ -40,7 +40,9 @@ namespace IRaCIS.Application.Services [HttpPost] public async Task<(PageOutput,object)> GetReadModule(GetReadModuleDto dto) { - var subjectquery = _subjectRepository.WhereIf(dto.TrialId!=null, x => x.TrialId == dto.TrialId).Include(x => x.SubjectVisitList).Include(x=>x.Site) + var subjectquery = _subjectRepository.WhereIf(dto.TrialId!=null, x => x.TrialId == dto.TrialId) + .WhereIf(dto.SubjectId != null, x => x.Id == dto.SubjectId) + .Include(x => x.SubjectVisitList).Include(x=>x.Site) .Select(x => new GetReadModuleDtoOut { SiteCode = x.Site.SiteCode, @@ -91,20 +93,50 @@ namespace IRaCIS.Application.Services Status=y.Status, SubjectCode= x.SubjectCode, SiteCode=x.SiteCode, + SubjectVisitId= y.SubjectVisitId, + SubjectVisitName=y.SubjectVisit.VisitName, // 截止访视名称 CutOffVisitId = y.SubjectVisitId, // 截止访视 - CutOffVisitName = y.SubjectVisit.VisitName // 截止访视名称 + CutOffVisitName = y.SubjectVisit.VisitName, // 截止访视名称 ReadModuleId=y.ReadModuleId, ReadModuleName=y.ReadModuleModel.ModuleName, + IsUrgent = y.IsUrgent })); + + x.Data.OrderBy(y => y.ModuleType); }); + return (pageList, new { MaxLength = pageList.CurrentPageData.ToList().Max(x => x.Data.Count) }); } + /// + /// 获取单条信息 + /// + /// + /// + [HttpPost] + public async Task GetReadModuleSingle(GetReadModuleSingleIndto dto) + { + var data = await GetReadModule(new GetReadModuleDto() + { + SubjectId = dto.SubjectId, + }); + + var GetReadModuleOutDto = data.Item1.CurrentPageData.FirstOrDefault().Data.Where(x => x.Id == dto.Id).Select(x => new GetReadModuleSingleOutdto() + { + Id = x.Id.Value, + ModuleType = x.ModuleType, + SubjectVisitId = x.SubjectVisitId, + SubjectVisitName = x.SubjectVisitName, + Stakeholders = string.Empty + }).FirstOrDefault(); + + return GetReadModuleOutDto; + } /// /// 新增或者修改