Compare commits
No commits in common. "df54375e6d86bad7db9f244e8ca98b013fca5dd7" and "b6149c4d328a38f5b91c55670bf67e3d604f1a82" have entirely different histories.
df54375e6d
...
b6149c4d32
|
|
@ -265,7 +265,6 @@ namespace IRaCIS.Core.Application.Service
|
|||
//中心调研 登陆
|
||||
public async Task AnolymousSendEmail(string researchProgramNo, string emailAddress, int verificationCode)
|
||||
{
|
||||
//throw new BusinessValidationFailedException("模拟邮件取数据或者发送异常！！！");
|
||||
|
||||
var messageToSend = new MimeMessage();
|
||||
//发件地址
|
||||
|
|
|
|||
|
|
@ -237,8 +237,6 @@ namespace IRaCIS.Core.Application.Service
|
|||
//单双中
|
||||
t.TrialReadingCriterion.ReadingType,
|
||||
|
||||
t.TrialReadingCriterion.IsGlobalReading,
|
||||
|
||||
t.TrialReadingCriterion.CriterionType,
|
||||
//有序与否
|
||||
t.TrialReadingCriterion.IsReadingTaskViewInOrder,
|
||||
|
|
@ -371,7 +369,7 @@ namespace IRaCIS.Core.Application.Service
|
|||
|
||||
|
||||
//仲裁在访视上 就没有全局阅片 没有阅片期
|
||||
if (taskInfo.ArbitrationRule == ArbitrationRule.Visit || (taskInfo.ArbitrationRule == ArbitrationRule.Reading && taskInfo.IsGlobalReading == false))
|
||||
if (taskInfo.ArbitrationRule == ArbitrationRule.Visit)
|
||||
{
|
||||
//找到 访视，裁判 所有有效任务(不可能有全局的) 访视和裁判任务的SourceSubjectVisitId 一样
|
||||
var taskList = await _visitTaskRepository.Where(t => t.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && t.IsAnalysisCreate == false && t.TaskState == TaskState.Effect &&
|
||||
|
|
@ -408,8 +406,8 @@ namespace IRaCIS.Core.Application.Service
|
|||
|
||||
|
||||
}
|
||||
//仲裁在阅片期 并且有阅片期
|
||||
else if (taskInfo.ArbitrationRule == ArbitrationRule.Reading && taskInfo.IsGlobalReading)
|
||||
//仲裁在阅片期
|
||||
else if (taskInfo.ArbitrationRule == ArbitrationRule.Reading)
|
||||
{
|
||||
//是访视任务 不可能是裁判任务（访视上不会生成裁判），也不会是全局任务（全局任务 SourceSubjectVisitId=null ）
|
||||
if (taskInfo.SourceSubjectVisitId != null)
|
||||
|
|
@ -870,14 +868,13 @@ namespace IRaCIS.Core.Application.Service
|
|||
var currentLatestPdVisitId = pdSubjectVisitIdList.Last();
|
||||
//标准配置
|
||||
var trialReadingCriterionConfig = await _readingQuestionCriterionTrialRepository.Where(t => t.Id == trialReadingCriterionId).Select(t => new
|
||||
{ TrialReadingCriterionId = t.Id, t.ReadingType, t.IsReadingTaskViewInOrder, t.CriterionType, t.ArbitrationRule, t.IsGlobalReading }).FirstNotNullAsync();
|
||||
{ TrialReadingCriterionId = t.Id, t.ReadingType, t.IsReadingTaskViewInOrder, t.CriterionType, t.ArbitrationRule }).FirstNotNullAsync();
|
||||
|
||||
// 项目双重
|
||||
if (trialReadingCriterionConfig.ReadingType == ReadingMethod.Double && trialReadingCriterionConfig.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
|
||||
{
|
||||
//仲裁在访视上面 或者有阅片期 但是没有全局任务
|
||||
if (trialReadingCriterionConfig.ArbitrationRule == ArbitrationRule.Visit ||
|
||||
(trialReadingCriterionConfig.ArbitrationRule == ArbitrationRule.Reading && trialReadingCriterionConfig.IsGlobalReading == false))
|
||||
//仲裁在访视上面
|
||||
if (trialReadingCriterionConfig.ArbitrationRule == ArbitrationRule.Visit)
|
||||
{
|
||||
//在两位阅片人读完访视后，如果有裁判者等裁判读完，如果无裁判则等第二个人的读完
|
||||
|
||||
|
|
@ -913,8 +910,8 @@ namespace IRaCIS.Core.Application.Service
|
|||
}
|
||||
|
||||
}
|
||||
//仲裁在阅片期上 并且有全局任务
|
||||
else if (trialReadingCriterionConfig.ArbitrationRule == ArbitrationRule.Reading && trialReadingCriterionConfig.IsGlobalReading)
|
||||
//仲裁在阅片期上
|
||||
else if (trialReadingCriterionConfig.ArbitrationRule == ArbitrationRule.Reading)
|
||||
{
|
||||
var existReadModule = await _readModuleRepository.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.SubjectVisitId == currentLatestPdVisitId && t.ReadingSetType == ReadingSetType.ImageReading)
|
||||
.FirstOrDefaultAsync();
|
||||
|
|
@ -926,7 +923,6 @@ namespace IRaCIS.Core.Application.Service
|
|||
}
|
||||
else
|
||||
{
|
||||
|
||||
var taskList = await _visitTaskRepository.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.IsAnalysisCreate == false && t.TaskState == TaskState.Effect && t.SouceReadModuleId == existReadModule.Id
|
||||
&& (t.ReadingCategory == ReadingCategory.Global || t.ReadingCategory == ReadingCategory.Judge)).ToListAsync();
|
||||
|
||||
|
|
|
|||
|
|
@ -680,7 +680,7 @@ namespace IRaCIS.Core.Application.Service
|
|||
if (allMedicalAuditList.All(t => t.IsApplyHeavyReading == false && t.AuditSignTime != null && t.AuditState == MedicalReviewAuditState.HaveSigned))
|
||||
{
|
||||
//自动发送
|
||||
await SafeMailHelper.Run(async () => await _trialEmailNoticeConfigService.BaseBusinessScenarioSendEmailAsync(medicalReviewInfo.VisitTaskId, false));
|
||||
await _trialEmailNoticeConfigService.BaseBusinessScenarioSendEmailAsync(medicalReviewInfo.VisitTaskId, false);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -3504,8 +3504,7 @@ namespace IRaCIS.Core.Application.Service
|
|||
|
||||
await _visitTaskRepository.SaveChangesAsync();
|
||||
|
||||
await SafeMailHelper.Run(async () => await _trialEmailNoticeConfigService.BaseBusinessScenarioSendEmailAsync(visitTaskId));
|
||||
|
||||
await _trialEmailNoticeConfigService.BaseBusinessScenarioSendEmailAsync(visitTaskId);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -501,8 +501,7 @@ namespace IRaCIS.Core.Application.Service
|
|||
// 创建任务关联关系
|
||||
await this.CreateTaskRelated(inDto.VisitTaskId);
|
||||
|
||||
await SafeMailHelper.Run(async () => await _trialEmailNoticeConfigService.BaseBusinessScenarioSendEmailAsync(inDto.VisitTaskId));
|
||||
|
||||
await _trialEmailNoticeConfigService.BaseBusinessScenarioSendEmailAsync(inDto.VisitTaskId);
|
||||
return ResponseOutput.Ok(result);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -288,8 +288,7 @@ namespace IRaCIS.Core.Application.Contracts
|
|||
|
||||
var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == userInfo.TrialId);
|
||||
|
||||
await SafeMailHelper.Run(async () => await _mailVerificationService.AnolymousSendEmail(trialInfo.ResearchProgramNo, userInfo.Email, verificationCode));
|
||||
|
||||
await _mailVerificationService.AnolymousSendEmail(trialInfo.ResearchProgramNo, userInfo.Email, verificationCode);
|
||||
|
||||
|
||||
return ResponseOutput.Ok();
|
||||
|
|
|
|||
Loading…
Reference in New Issue