diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
index 8920b42f7..a117c8b59 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
@@ -759,7 +759,7 @@ namespace IRaCIS.Core.Application.Service
                 //先预先生成了邮件，发送预先生成的邮件
                 sendEmailConfig.EmailAttachMentConfigList.Add(new EmailAttachMentConfig()
                 {
-                    FileName = emailConfig.FileName,
+                    FileName = $"{taskInfo.SubjectCode}_{emailConfig.FileName}",
 
                     FileStream = File.OpenRead(phyPath),
                 });
@@ -812,7 +812,7 @@ namespace IRaCIS.Core.Application.Service
 
                 sendEmailConfig.EmailAttachMentConfigList.Add(new EmailAttachMentConfig()
                 {
-                    FileName = emailConfig.FileName,
+                    FileName =$"{taskInfo.SubjectCode}_{emailConfig.FileName}" ,
 
                     FileStream = memoryStream
                 });
@@ -874,23 +874,38 @@ namespace IRaCIS.Core.Application.Service
                     //入组确认不用管项目的 有序 无序  单重  双重  阅片
 
                     //找到最早签名的
-                    var task = await _visitTaskRepository.Where(t => t.SourceSubjectVisitId == exisitBaseline.Id && t.TaskState == TaskState.Effect && t.IsAnalysisCreate == false
+                    var firstSignTask = await _visitTaskRepository.Where(t => t.SourceSubjectVisitId == exisitBaseline.Id /*&& t.TaskState == TaskState.Effect*/ && t.IsAnalysisCreate == false
                                                            && t.ReadingTaskState == ReadingTaskState.HaveSigned && t.TrialReadingCriterionId == trialReadingCriterionId).OrderBy(t=>t.SignTime).FirstOrDefaultAsync();
 
-                    //如果存在做完的该任务
 
-                    if (task == null)
+                    if (firstSignTask != null)
                     {
-                        return ResponseOutput.NotOk("基线任务没有阅片完！");
+                        var task = await _visitTaskRepository.Where(t => t.SourceSubjectVisitId == exisitBaseline.Id && t.TaskState == TaskState.Effect  && t.DoctorUserId== firstSignTask.DoctorUserId && t.IsAnalysisCreate == false
+                                                         && t.ReadingTaskState == ReadingTaskState.HaveSigned && t.TrialReadingCriterionId == trialReadingCriterionId).OrderBy(t => t.SignTime).FirstOrDefaultAsync();
+
+                        //如果存在做完的该任务
+
+                        if (task == null)
+                        {
+                            return ResponseOutput.NotOk("做入组确认的阅片人基线任务没有阅片完！");
+                        }
+                        else
+                        {
+                            var filePath = await BaseBusinessScenarioSendEmailAsync(task.Id, true, EmailStoreSendMode.OnlyStoreLocalNotSentEmail, string.Empty);
+
+                            return ResponseOutput.Ok(new { RelativePath = filePath, TaskName = task.TaskName, VisitTaskId = task.Id });
+
+
+                        }
                     }
                     else
                     {
-                        var filePath = await BaseBusinessScenarioSendEmailAsync(task.Id, true, EmailStoreSendMode.OnlyStoreLocalNotSentEmail, string.Empty);
-
-                        return ResponseOutput.Ok(new { RelativePath = filePath, TaskName = task.TaskName, VisitTaskId = task.Id });
-
-
+                        return ResponseOutput.NotOk("当前未有阅片人读完基线任务！");
                     }
+                  
+
+
+                  
 
                 }
             }