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

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -1967,6 +1967,13 @@
             <param name="inQuery"></param>
             <returns></returns>
         </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)">
             <summary>
             评估访视 判断结果    影像筛选状态  手动添加/编辑接口

IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs

@@ -126,7 +126,7 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         [HttpPost]
         [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)
         {

IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs

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

IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs

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