From e7c389ea0f5d056bd1dd55f17a0f04bb5296e8bf Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 20 Mar 2023 09:18:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=8F=91=E9=80=81=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=20=20=20=E5=8C=BB=E7=94=9F=E5=85=A5=E7=BB=84bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml  |  7 +++++++
 .../Service/Allocation/TaskConsistentRuleService.cs  |  2 +-
 .../Document/TrialEmailNoticeConfigService.cs        | 12 ++++++++++--
 .../Service/WorkLoad/EnrollService.cs                |  4 +++-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 5655c9a01..01c6b6209 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/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>
             评估访视 判断结果    影像筛选状态  手动添加/编辑接口
diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
index 4ed8bb466..1a07a8802 100644
--- a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
+++ b/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)
         {
diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
index cd3052765..2b13297b3 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
+++ b/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,7 +924,15 @@ namespace IRaCIS.Core.Application.Service
                         {
                             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 });
+
+                            }
 
 
                         }
diff --git a/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs b/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs
index c158875a0..a0eee033a 100644
--- a/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs
+++ b/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();
 
         }