XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改映射

Uat_Study
hang 2023-08-25 18:46:58 +08:00
parent 451ffec65b
commit f24f60cdef
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -338,7 +338,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
await subjectVisitClinicalDialogRepository.AddAsync(new SubjectVisitClinicalDialog() { SubjectVisitId = (Guid)taskInfo.SourceSubjectVisitId, Content = content }, true); await subjectVisitClinicalDialogRepository.AddAsync(new SubjectVisitClinicalDialog() { SubjectVisitId = (Guid)taskInfo.SourceSubjectVisitId, Content = content }, true);
BackgroundJob.Enqueue( () => emailSendService.SendClinicalDataQuestionAsync(visiTaskId, content).Wait()); BackgroundJob.Enqueue(() => emailSendService.SendClinicalDataQuestionAsync(visiTaskId, content));
return ResponseOutput.Ok(); return ResponseOutput.Ok();
} }
@ -346,7 +346,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
public async Task<List<ClinicalDataDialog>> GetClinicalDataDialog(Guid visiTaskId, public async Task<List<ClinicalDataDialog>> GetClinicalDataDialog(Guid visiTaskId,
[FromServices] IRepository<SubjectVisitClinicalDialog> _subjectVisitClinicalDialogRepository) [FromServices] IRepository<SubjectVisitClinicalDialog> _subjectVisitClinicalDialogRepository)
{ {
var subjectVisitId= await _visitTaskRepository.Where(t => t.Id == visiTaskId).Select(t=>t.SourceSubjectVisitId).FirstOrDefaultAsync(); var subjectVisitId = await _visitTaskRepository.Where(t => t.Id == visiTaskId).Select(t => t.SourceSubjectVisitId).FirstOrDefaultAsync();
var list = _subjectVisitClinicalDialogRepository.Where(t => t.SubjectVisitId == subjectVisitId).ProjectTo<ClinicalDataDialog>(_mapper.ConfigurationProvider).OrderByDescending(t => t.CreateTime).ToList(); var list = _subjectVisitClinicalDialogRepository.Where(t => t.SubjectVisitId == subjectVisitId).ProjectTo<ClinicalDataDialog>(_mapper.ConfigurationProvider).OrderByDescending(t => t.CreateTime).ToList();
return list; return list;

5
IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
View File

@ -38,10 +38,11 @@ namespace IRaCIS.Core.Application.Service
.ForMember(o => o.OncologyTaskTypeCount, t => t.MapFrom(u => u.SubjectVisitTaskList.Where(t => t.ReadingCategory == ReadingCategory.Oncology && t.TrialReadingCriterionId == trialReadingCriterionId && t.TaskState == TaskState.Effect).Select(t => t.VisitTaskNum).Distinct().Count())) .ForMember(o => o.OncologyTaskTypeCount, t => t.MapFrom(u => u.SubjectVisitTaskList.Where(t => t.ReadingCategory == ReadingCategory.Oncology && t.TrialReadingCriterionId == trialReadingCriterionId && t.TaskState == TaskState.Effect).Select(t => t.VisitTaskNum).Distinct().Count()))
.ForMember(o => o.JudgeTaskTypeCount, t => t.MapFrom(u => u.SubjectVisitTaskList.Where(t => t.ReadingCategory == ReadingCategory.Judge && t.TrialReadingCriterionId == trialReadingCriterionId && t.TaskState == TaskState.Effect).Select(t => t.VisitTaskNum).Distinct().Count())); .ForMember(o => o.JudgeTaskTypeCount, t => t.MapFrom(u => u.SubjectVisitTaskList.Where(t => t.ReadingCategory == ReadingCategory.Judge && t.TrialReadingCriterionId == trialReadingCriterionId && t.TaskState == TaskState.Effect).Select(t => t.VisitTaskNum).Distinct().Count()));
CreateMap<SubjectVisitClinicalDialog, ClinicalDataDialog>();
CreateMap<SubjectVisit, VisitGenerataTaskDTO>(); CreateMap<SubjectVisit, VisitGenerataTaskDTO>();

2
IRaCIS.Core.Application/Service/Document/EmailSendService.cs
View File

@ -85,7 +85,7 @@ namespace IRaCIS.Core.Application.Service
{ {
var topicStr = string.Format(_userInfo.IsEn_Us ? trialEmailConfig.EmailTopic : trialEmailConfig.EmailTopicCN, taskInfo.ResearchProgramNo, taskInfo.SubjectCode); var topicStr = string.Format(_userInfo.IsEn_Us ? trialEmailConfig.EmailTopic : trialEmailConfig.EmailTopicCN, taskInfo.ResearchProgramNo, taskInfo.SubjectCode);
var htmlBodyStr = string.Format(_userInfo.IsEn_Us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN, var htmlBodyStr = string.Format(_userInfo.IsEn_Us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN,
taskInfo.ResearchProgramNo, taskInfo.SubjectCode, resultStr); _userInfo.UserName, taskInfo.ResearchProgramNo, taskInfo.SubjectCode, resultStr);
return (topicStr, htmlBodyStr); return (topicStr, htmlBodyStr);
}; };