diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 20ce8b5fe..fdaaa3040 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1558,6 +1558,13 @@ + + + 批量删除一般文件记录 + + + + 项目-培训记录 @@ -1567,7 +1574,7 @@ - + 项目-培训记录 @@ -1576,6 +1583,34 @@ + + + 获取培训记录列表 + + + + + + + 批量新增培训记录 + + + + + + + 授权文档 + + + + + + + 批量删除培训记录 + + + + 获取某个月下的某些医生最终确认的工作量,用于计算月度费用 diff --git a/IRaCIS.Core.Application/Service/Document/DTO/TrialTrianingRecordViewModel.cs b/IRaCIS.Core.Application/Service/Document/DTO/TrialTrianingRecordViewModel.cs index dd4ffd540..a551eef87 100644 --- a/IRaCIS.Core.Application/Service/Document/DTO/TrialTrianingRecordViewModel.cs +++ b/IRaCIS.Core.Application/Service/Document/DTO/TrialTrianingRecordViewModel.cs @@ -61,8 +61,14 @@ public class TrialTrianingRecordQuery : PageInput public int? TrianingCount { get; set; } - public DateOnly? TrianingDate { get; set; } - + public DateOnly? TrianingDateStartTime { get; set; } + + public DateOnly? TrianingDateEndTime { get; set; } + + public DateTime? UpdateStartTime { get; set; } + + public DateTime? UpdateEndTime { get; set; } + public int? TrianingState { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Document/TrialTrianingRecordService.cs b/IRaCIS.Core.Application/Service/Document/TrialTrianingRecordService.cs index 7a44b0ab8..ef3ab1e2d 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialTrianingRecordService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialTrianingRecordService.cs @@ -39,7 +39,10 @@ public class TrialTrianingRecordService(IRepository< var trialTrianingRecordQueryable = _trialTrianingRecordRepository .Where(x => x.TrialFileTypeId == inDto.TrialFileTypeId) .WhereIf(inDto.FileName.IsNotNullOrEmpty(), x => x.TrialFileRecord.FileName.Contains(inDto.FileName)) - .WhereIf(inDto.TrianingDate!=null, x => x.TrianingDate==inDto.TrianingDate) + .WhereIf(inDto.TrianingDateStartTime != null, x => x.TrianingDate >= inDto.TrianingDateStartTime) + .WhereIf(inDto.TrianingDateEndTime != null, x => x.TrianingDate <= inDto.TrianingDateEndTime) + .WhereIf(inDto.UpdateStartTime != null, x => x.UpdateTime >= inDto.UpdateStartTime) + .WhereIf(inDto.UpdateEndTime != null, x => x.UpdateTime < inDto.UpdateEndTime.Value.AddDays(1)) .ProjectTo(_mapper.ConfigurationProvider); var pageList = await trialTrianingRecordQueryable.ToPagedListAsync(inDto);