diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index dd2f698ba..4858ea708 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -467,24 +467,34 @@ 排序字段 - + - 页码 + 受试者ID - + - 每页大小 + 模块类型 - + - 排序字段 + 模块名称 - + - 排序字段 + 是否加急 + + + + + 访视ID + + + + + 状态 @@ -2735,7 +2745,7 @@ 删除 - + @@ -2781,6 +2791,20 @@ 获取读片模块 + + + 新增或者修改 + + + + + + + 删除 + + + + Dashboard统计、全局工作量统计、入组两个维度统计(按照项目、按照人) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs index 031112417..d434af5c8 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs @@ -7,31 +7,50 @@ using System.Threading.Tasks; namespace IRaCIS.Core.Application.Service.Reading.Dto { - public class GetReadModuleDto + public class GetReadModuleDto:PageInput { public Guid? TrialId { get; set; } - - /// - /// 页码 - /// - public int PageIndex { get; set; } = 1; - - /// - /// 每页大小 - /// - public int PageSize { get; set; } = 10; - - /// - /// 排序字段 - /// - public string? SortField { get; set; } - - /// - /// 排序字段 - /// - public bool SortAsc { get; set; } = true; } + + + + public class ReadModuleAddOrEdit + { + public 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; } + } + + public class GetReadModuleOutDto : ReadModule { diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs index 9a305e05b..41e3082ab 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs @@ -21,6 +21,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public string ReadingPeriodName { get; set; } + public string Remark { get; set; } + /// /// 阅片范围 /// @@ -29,7 +31,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 截止日期 /// - public DateTime ExpirationDate { get; set; } + public DateTime? ExpirationDate { get; set; } /// /// 截止访视 diff --git a/IRaCIS.Core.Application/Service/Reading/PreviousPDFService.cs b/IRaCIS.Core.Application/Service/Reading/PreviousPDFService.cs index 2403eae3b..7f56e7d9f 100644 --- a/IRaCIS.Core.Application/Service/Reading/PreviousPDFService.cs +++ b/IRaCIS.Core.Application/Service/Reading/PreviousPDFService.cs @@ -65,7 +65,6 @@ namespace IRaCIS.Application.Services x.FileName, x.UploadType, x.Id, - }).ToListAsync(); return list; } @@ -77,13 +76,13 @@ namespace IRaCIS.Application.Services /// /// 删除 /// - /// + /// /// [HttpDelete("{previousPDFId:guid}")] public async Task DeletePreviousPDF(Guid previousPDFId) { - var success = await _repository.BatchDeleteAsync(t => t.Id == previousPDFId); - return ResponseOutput.Result(success); + var success = await _previousPDFRepository.DeleteFromQueryAsync(t => t.Id == previousPDFId,true); + return ResponseOutput.Result(true); } } } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs index 534208521..3b7619521 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs @@ -20,13 +20,16 @@ namespace IRaCIS.Application.Services public IRepository _subjectVisitRepository; private readonly IRepository _subjectRepository; + private readonly IRepository _readModuleRepository; public ReadModuleService(IRepository subjectVisitRepository, - IRepository subjectRepository + IRepository subjectRepository, + IRepository readModuleRepository ) { _subjectVisitRepository = subjectVisitRepository; this._subjectRepository = subjectRepository; + this._readModuleRepository = readModuleRepository; } @@ -60,7 +63,7 @@ namespace IRaCIS.Application.Services }).ToList() }); var pageList = await subjectquery.ToPagedListAsync(dto.PageIndex, dto.PageSize, dto.SortField == null ? "SiteCode" : dto.SortField, - dto.SortAsc); + dto.Asc); return (pageList, new { @@ -69,9 +72,32 @@ namespace IRaCIS.Application.Services } + /// + /// 新增或者修改 + /// + /// + /// + [HttpPost] + public async Task AddOrUpdateReadModuleService(ReadModuleAddOrEdit addOrEditReadModule) + { + var entity = await _repository.InsertOrUpdateAsync(addOrEditReadModule, true); + return ResponseOutput.Ok(entity.Id.ToString()); + } + + + + /// + /// 删除 + /// + /// + /// + [HttpDelete("{readModuleId:guid}")] + public async Task DeleteReadModule(Guid readModuleId) + { + var success = await _readModuleRepository.DeleteFromQueryAsync(t => t.Id == readModuleId, true); + return ResponseOutput.Result(true); + } - - } } diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs index c90c840fe..b6b794624 100644 --- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs @@ -24,10 +24,13 @@ namespace IRaCIS.Core.Application.Service CreateMap(); + CreateMap(); + + + - } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs index ff2bc4e71..37de27a1c 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs @@ -34,7 +34,7 @@ namespace IRaCIS.Core.Domain.Models /// /// 截止日期 /// - public DateTime ExpirationDate { get; set; } + public DateTime? ExpirationDate { get; set; } /// /// 截止访视 @@ -61,6 +61,11 @@ namespace IRaCIS.Core.Domain.Models /// public Guid CreateUserId { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } public List ReadingPeriodSites { get; set; } = new List(); }