diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs index 0fb644ccb..062536121 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs @@ -49,23 +49,32 @@ namespace IRaCIS.Application.Services return ResponseOutput.Ok(entity.Id.ToString()); } - /// - /// 分页获取 - /// - /// - /// - [HttpPost] - public async Task> GetClinicalDataSetList(ClinicalDataQuery query) - { - var readquery = _clinicalDataSetRepository.AsQueryable() - .Where( x => x.TrialId == query.TrialId) - .WhereIf(query.ClinicalDataSetName!=string.Empty,x=>x.ClinicalDataSetName.Contains(query.ClinicalDataSetName)) - .ProjectTo(_mapper.ConfigurationProvider); - var pageList = await readquery.ToPagedListAsync(query.PageIndex, query.PageSize, query.SortField == null ? "CreateTime" : query.SortField, - query.Asc); + ///// + ///// 分页获取 + ///// + ///// + ///// + //[HttpPost] + //public async Task> GetClinicalDataSetList(ClinicalDataQuery query) + //{ + // var readquery = _clinicalDataSetRepository.AsQueryable() + // .Where( x => x.TrialId == query.TrialId) + // .WhereIf(query.ClinicalDataSetName!=string.Empty,x=>x.ClinicalDataSetName.Contains(query.ClinicalDataSetName)) + // .ProjectTo(_mapper.ConfigurationProvider); + // var pageList = await readquery.ToPagedListAsync(query.PageIndex, query.PageSize, query.SortField == null ? "CreateTime" : query.SortField, + // query.Asc); - return pageList; - } + // return pageList; + //} + + ///// + ///// 设置项目 + ///// + ///// + //public async Task SetClinicalDataCheck() + //{ + // _clinicalDataSetRepository.UpdateAsync() + //} /// /// 获取系统临床数据 @@ -79,6 +88,13 @@ namespace IRaCIS.Application.Services .ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); } + /// + /// 获取项目的临床数据 + /// + /// + /// + + [HttpGet] public async Task> GetTrialClinicalDataSetList(AddTrialClinicalDataSetInDto inDto) { await this.AddTrialClinicalDataSet(inDto); diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs index 4d43661d2..bed681d48 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs @@ -39,6 +39,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 上传方式 /// public ClinicalUploadType ClinicalUploadType { get; set; } + + /// + /// 是否启用 + /// + public bool IsEnable { get; set; } + + /// + /// 是否勾选 + /// + public bool IsCheck { get; set; } } public class ClinicalDataView : ClinicalData @@ -139,6 +149,26 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto } + + public class SetClinicalDataCheckIndto + { + /// + /// 项目ID + /// + public Guid TrialId { get; set; } + + List<> + + /// + /// 勾选的ID + /// + public List CheckIds { get; set; } + + /// + /// 启用的ID + /// + public List EnableIds { get; set; } + } public class AddTrialClinicalDataSetInDto { public Guid TrialId { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs index f7601135f..02893de6f 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs @@ -165,7 +165,7 @@ namespace IRaCIS.Application.Services SiteId = x.Key.SiteId, SubjectCode = x.Key.SubjectCode, SubjectId = x.Key.SubjectId, - Data = x.ToList() + Data = x.OrderBy(x=>x.ModuleType).ThenBy(x=>x.VisitNum).ToList(), }).ToList(); PageOutput pageOutput = new PageOutput()