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

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Uat_Study
he 2023-03-20 11:34:03 +08:00
parent 8ee34d7656 107c95aa9f
commit 41d08f71a3
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -1967,6 +1967,13 @@
<param name="inQuery"></param> <param name="inQuery"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.SubjectCriteriaEvaluationService.GetHaveGeneratedTaskList(IRaCIS.Core.Application.ViewModel.HaveGeneratedTaskQuery)">
<summary>
已生成任务列表
</summary>
<param name="inQuery"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.SubjectCriteriaEvaluationService.AddOrUpdateSubjectCriteriaEvaluationVisitFilter(IRaCIS.Core.Application.ViewModel.SubjectCriteriaEvaluationVisitFilterAddOrEdit)"> <member name="M:IRaCIS.Core.Application.Service.SubjectCriteriaEvaluationService.AddOrUpdateSubjectCriteriaEvaluationVisitFilter(IRaCIS.Core.Application.ViewModel.SubjectCriteriaEvaluationVisitFilterAddOrEdit)">
<summary> <summary>
评估访视 判断结果 影像筛选状态 手动添加/编辑接口 评估访视 判断结果 影像筛选状态 手动添加/编辑接口

2
IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
View File

@ -126,7 +126,7 @@ namespace IRaCIS.Core.Application.Service
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[UnitOfWork] [UnitOfWork]
[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] //[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
public async Task<IResponseOutput> ConfirmGenerateSelfConsistentTask(ConsistentConfirmGenerateCommand inCommand, [FromServices] IVisitTaskHelpeService _visitTaskCommonService) public async Task<IResponseOutput> ConfirmGenerateSelfConsistentTask(ConsistentConfirmGenerateCommand inCommand, [FromServices] IVisitTaskHelpeService _visitTaskCommonService)
{ {

12
IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
View File

@ -343,7 +343,7 @@ namespace IRaCIS.Core.Application.Service
.Include(t => t.TrialEmailNoticeUserList).FirstOrDefaultAsync(); .Include(t => t.TrialEmailNoticeUserList).FirstOrDefaultAsync();
if (emailConfig == null || emailConfig.IsAutoSend == false) if (emailConfig == null || (emailConfig.IsAutoSend == false && isHandSend==null))
{ {
//throw new BusinessValidationFailedException("找不到该项目标准场景下邮件的配置"); //throw new BusinessValidationFailedException("找不到该项目标准场景下邮件的配置");
@ -924,7 +924,15 @@ namespace IRaCIS.Core.Application.Service
{ {
var filePath = await BaseBusinessScenarioSendEmailAsync(task.Id, true, EmailStoreSendMode.OnlyStoreLocalNotSentEmail, string.Empty); var filePath = await BaseBusinessScenarioSendEmailAsync(task.Id, true, EmailStoreSendMode.OnlyStoreLocalNotSentEmail, string.Empty);
return ResponseOutput.Ok(new { RelativePath = filePath, TaskName = task.TaskName, VisitTaskId = task.Id }); if (string.IsNullOrEmpty(filePath))
{
return ResponseOutput.NotOk("邮件手动生成失败，请联系开发核实该场景失败原因");
}
else
{
return ResponseOutput.Ok(new { RelativePath = filePath, TaskName = task.TaskName, VisitTaskId = task.Id });
}
} }

4
IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs
View File

@ -456,7 +456,9 @@ namespace IRaCIS.Application.Services
} }
return ResponseOutput.Result(await _enrollRepository.SaveChangesAsync());
await _enrollRepository.SaveChangesAsync();
return ResponseOutput.Ok();
} }