diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs
index e7f08410f..d967834a3 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs
@@ -288,7 +288,7 @@ namespace IRaCIS.Core.Application.ViewModel
}
///ReadingMedicineTrialQuestionQuery 列表查询参数模型
- public class ReadingMedicineTrialQuestionQuery
+ public class ReadingMedicineTrialQuestionQuery:PageInput
{
///
/// 项目Id
diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs
index 64fe6ee86..0a35dbe12 100644
--- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs
@@ -141,7 +141,7 @@ namespace IRaCIS.Core.Application.Service
///
///
[HttpPost]
- public async Task<(List, object)> GetReadingMedicineTrialQuestionList(ReadingMedicineTrialQuestionQuery inDto)
+ public async Task<(PageOutput, object)> GetReadingMedicineTrialQuestionList(ReadingMedicineTrialQuestionQuery inDto)
{
var query = _readingMedicineTrialQuestionRepository.AsQueryable()
.Where(x => x.TrialId == inDto.TrialId && x.TrialReadingCriterionId == inDto.TrialReadingCriterionId)
@@ -154,11 +154,11 @@ namespace IRaCIS.Core.Application.Service
var isConfirmMedicineQuestion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).Select(x => x.IsConfirmMedicineQuestion).FirstOrDefaultAsync();
- var questionList = await query.ToListAsync();
+ var questionList = await query.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField, inDto.Asc);
return (questionList, new
{
IsConfirmMedicineQuestion = isConfirmMedicineQuestion,
- QuestionCount = questionList.Count(),
+ //QuestionCount = questionList.Count(),
});
}
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 685f0fc6d..9b67048c8 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -9,6 +9,7 @@ using IRaCIS.Core.Application.Contracts;
using IRaCIS.Core.Infrastructure;
using IRaCIS.Core.Application.Service;
using IRaCIS.Core.Application.ViewModel;
+using IRaCIS.Core.Application.Interfaces;
namespace IRaCIS.Application.Services
{
@@ -46,6 +47,8 @@ namespace IRaCIS.Application.Services
private readonly IRepository _noneDicomStudyFileSystem;
private readonly IRepository _readingQuestionTrialRepository;
+ private readonly ITrialEmailNoticeConfigService _trialEmailNoticeConfigService;
+
public ReadingImageTaskService(
IMapper mapper,
@@ -73,6 +76,7 @@ namespace IRaCIS.Application.Services
IRepository readingQuestionCriterionTrialRepository,
IRepository readingQuestionCriterionSystemRepository,
IRepository ReadingQuestionSystem,
+ ITrialEmailNoticeConfigService trialEmailNoticeConfigService
IRepository noneDicomStudyFileSystem,
IRepository readingQuestionTrialRepository
)
@@ -1176,6 +1180,8 @@ namespace IRaCIS.Application.Services
await _visitTaskRepository.SaveChangesAsync();
+
+ await _trialEmailNoticeConfigService.BaseBusinessScenarioSendEmailAsync(visitTaskId);
}