Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/Common/ExcelExportService.cs

@@ -1251,6 +1251,8 @@ namespace IRaCIS.Core.Application.Service.Common
                         //Uploader = t.Uploader.UserName,
                         //UploadTime = t.CreateTime
 
+                        SubjectStatus=t.Subject.Status
+
                     });
 
             var svExpression2 = QCCommon.GetNoneDicomStudySubjectVisitFilter(studyQuery.VisitPlanArray);
@@ -1283,7 +1285,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
                      //Uploader = t.CreateUser.UserName,
                      //UploadTime = t.CreateTime
-
+                     SubjectStatus = t.Subject.Status
                  });
 
 

IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs

@@ -29,7 +29,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public new List<UserTypeEnum> ToUserTypeList => TrialEmailNoticeUserList.Where(t => t.EmailUserType == EmailUserType.To).Select(t => t.UserType).ToList();
         public new List<UserTypeEnum> CopyUserTypeList => TrialEmailNoticeUserList.Where(t => t.EmailUserType == EmailUserType.Copy).Select(t => t.UserType).ToList();
 
-
+        public List<CriterionType>? SysCriterionTypeList { get; set; }
     }
 
 

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

@@ -11,7 +11,7 @@ namespace IRaCIS.Core.Application.Service
     {
         Task SendEnrollOrPdEmail(Guid visitTaskId, bool? isEnrollment, bool? isPDConfirm);
 
-        Task<(TrialEmailNoticeConfig?, SMTPEmailConfig?)> BuildEmailConfig(Guid trialId, EmailBusinessScenario businessScenario, Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc, Guid? siteId = null);
+        Task<(TrialEmailNoticeConfig?, SMTPEmailConfig?)> BuildEmailConfig(Guid trialId, CriterionType criterionType, EmailBusinessScenario businessScenario, Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc, Guid? siteId = null);
     }
 
     public class EmailSendService(IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigRepository,
@@ -57,6 +57,7 @@ namespace IRaCIS.Core.Application.Service
                 t.Trial.Sponsor.SponsorName,
                 t.SourceSubjectVisit.VisitName,
                 t.TrialId,
+                t.TrialReadingCriterion.CriterionType,
 
             }).FirstNotNullAsync();
 
@@ -77,7 +78,7 @@ namespace IRaCIS.Core.Application.Service
                     return (topicStr, htmlBodyStr, isEn_us, null);
                 };
 
-                await SendTrialEmailAsync(taskInfo.TrialId, businessScenarioEnum, topicAndHtmlFunc, taskInfo.TrialSiteId);
+                await SendTrialEmailAsync(taskInfo.TrialId, taskInfo.CriterionType, businessScenarioEnum, topicAndHtmlFunc, taskInfo.TrialSiteId);
             }
             else
             {
@@ -92,7 +93,7 @@ namespace IRaCIS.Core.Application.Service
                     return (topicStr, htmlBodyStr, isEn_us, null);
                 };
 
-                await SendTrialEmailAsync(taskInfo.TrialId, businessScenarioEnum, topicAndHtmlFunc, taskInfo.TrialSiteId);
+                await SendTrialEmailAsync(taskInfo.TrialId, taskInfo.CriterionType, businessScenarioEnum, topicAndHtmlFunc, taskInfo.TrialSiteId);
             }
 
 
@@ -102,9 +103,9 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-        public async Task SendTrialEmailAsync(Guid trialId, EmailBusinessScenario businessScenario, Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc, Guid? trialSiteId = null,  Func<TrialEmailNoticeConfig, SMTPEmailConfig, SMTPEmailConfig> emailAttachFunc = null)
+        public async Task SendTrialEmailAsync(Guid trialId, CriterionType criterionType, EmailBusinessScenario businessScenario, Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc, Guid? trialSiteId = null, Func<TrialEmailNoticeConfig, SMTPEmailConfig, SMTPEmailConfig> emailAttachFunc = null)
         {
-            var (trialEmailConfig, sendEmailConfig) = await BuildEmailConfig(trialId, businessScenario, topicAndHtmlFunc, trialSiteId);
+            var (trialEmailConfig, sendEmailConfig) = await BuildEmailConfig(trialId, criterionType, businessScenario, topicAndHtmlFunc, trialSiteId);
 
             if (sendEmailConfig != null)
             {
@@ -114,10 +115,10 @@ namespace IRaCIS.Core.Application.Service
         }
 
 
-        public async Task<(TrialEmailNoticeConfig?, SMTPEmailConfig?)> BuildEmailConfig(Guid trialId, EmailBusinessScenario businessScenario, Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc, Guid? trialSiteId = null)
+        public async Task<(TrialEmailNoticeConfig?, SMTPEmailConfig?)> BuildEmailConfig(Guid trialId, CriterionType criterionType, EmailBusinessScenario businessScenario, Func<TrialEmailNoticeConfig, (string topicStr, string htmlBodyStr, bool isEn_us, Guid? onlyToUserId)> topicAndHtmlFunc, Guid? trialSiteId = null)
         {
             //找到配置
-            var trialEmailConfig = await _trialEmailNoticeConfigRepository.Where(t => t.TrialId == trialId  && t.BusinessScenarioEnum == businessScenario, ignoreQueryFilters: true)
+            var trialEmailConfig = await _trialEmailNoticeConfigRepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == businessScenario && t.CriterionTypeList.Any(t => t == criterionType), ignoreQueryFilters: true)
            .Include(t => t.TrialEmailNoticeUserList).Include(t => t.TrialEmailBlackUserList).FirstOrDefaultAsync();
 
 

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

@@ -308,7 +308,7 @@ namespace IRaCIS.Core.Application.Service
             };
 
 
-            var (trialEmailConfig, sendEmailConfig) = await _emailSendService.BuildEmailConfig(taskInfo.TrialId, businessScenarioEnum, topicAndHtmlFunc, taskInfo.TrialSiteId);
+            var (trialEmailConfig, sendEmailConfig) = await _emailSendService.BuildEmailConfig(taskInfo.TrialId, taskInfo.CriterionType, businessScenarioEnum, topicAndHtmlFunc, taskInfo.TrialSiteId);
 
             #endregion
 
@@ -1599,7 +1599,7 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi
 
             }).FirstNotNullAsync();
 
-            //var list = await _readingQuestionCriterionTrialRepository.Where(t => t.TrialId == trialId && t.IsConfirm).Select(t => new { t.CriterionType, TrialReadingCriterionId = t.Id }).ToListAsync();
+            var list = await _readingQuestionCriterionTrialRepository.Where(t => t.TrialId == trialId && t.IsConfirm).Select(t => new { t.CriterionType, TrialReadingCriterionId = t.Id }).ToListAsync();
 
 
             var addList = _mapper.Map<List<TrialEmailNoticeConfig>>(batchAddList);
@@ -1620,6 +1620,9 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi
 
                 //item.TrialReadingCriterionId = list.FirstOrDefault(t => t.CriterionType == item.CriterionTypeEnum)?.TrialReadingCriterionId;
 
+                item.CriterionTypeList = item.CriterionTypeList.Where(t => list.Any(c => c.CriterionType == t)).ToList();
+
+
                 item.TrialEmailNoticeUserList.AddRange(batchAddList.Where(t => t.Id == item.SysEmailNoticeConfigId)
                     .SelectMany(t => t.ToUserTypeList).Select(t => new TrialEmailNoticeUser() { EmailUserType = EmailUserType.To, UserType = t }));
 
@@ -1634,16 +1637,25 @@ x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.Readi
             await _trialEmailNoticeConfigRepository.SaveChangesAsync();
 
             //处理定时任务
-            var taskInfoList = await _trialEmailNoticeConfigRepository.Where(t => t.TrialId == trialId && t.EmailCron != string.Empty && t.IsAutoSend)
+            var taskInfoList = await _trialEmailNoticeConfigRepository.Where(t => t.TrialId == trialId && t.EmailCron != string.Empty)
-             .Select(t => new { t.Id, t.Code, TrialCode = t.Trial.TrialCode, t.EmailCron, t.BusinessScenarioEnum, t.TrialId })
+             .Select(t => new { t.Id, t.Code, TrialCode = t.Trial.TrialCode, t.EmailCron, t.BusinessScenarioEnum, t.TrialId, t.IsEnable, t.IsAutoSend })
              .ToListAsync();
 
             foreach (var task in taskInfoList)
             {
+
                 //利用主键作为任务Id
                 var jobId = $"{task.TrialId}({task.TrialCode})_({task.BusinessScenarioEnum})";
 
-                HangfireJobHelper.AddOrUpdateTrialCronJob(jobId, trialId, task.BusinessScenarioEnum, task.EmailCron);
+                if (task.IsEnable && task.IsAutoSend)
+                {
+                    HangfireJobHelper.AddOrUpdateTrialCronJob(jobId, trialId, task.BusinessScenarioEnum, task.EmailCron);
+
+                }
+                else
+                {
+                    HangfireJobHelper.RemoveCronJob(jobId);
+                }
             }
 
             return ResponseOutput.Ok();

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

@@ -100,7 +100,7 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<TrialEmailNoticeConfig, TrialEmailNoticeConfigView>()
-
+                .ForMember(d => d.SysCriterionTypeList, c => c.MapFrom(t => t.SysEmailNoticeConfig.CriterionTypeList))               
                 .ForMember(d => d.TrialCriterionName, c => c.MapFrom(t => t.TrialReadingCriterion.CriterionName))
                  .ForMember(d => d.TrialEmailNoticeUserList, c => c.MapFrom(t => t.TrialEmailNoticeUserList));
 

IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs

@@ -318,6 +318,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         //审核通过时间
         public DateTime? AuditTime => QCProcessEnum == TrialQCProcess.SingleAudit ? PreliminaryAuditTime : (QCProcessEnum == TrialQCProcess.DoubleAudit ? ReviewAuditTime : null);
+
+
     }
 
 
@@ -735,6 +737,8 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class UnionStudyExportDTO
     {
+        [DictionaryTranslateAttribute("Subject_Visit_Status")]
+        public SubjectStatus SubjectStatus { get; set; }
 
         public string Modality { get; set; } = string.Empty;
 

IRaCIS.Core.Application/Service/QC/_MapConfig.cs

@@ -134,6 +134,7 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<SubjectVisit, PMKCheckEXportDTO>()
              .ForMember(d => d.TalkContent, u => u.MapFrom(s => s.CheckChallengeDialogList.OrderByDescending(y => y.CreateTime).Select(x => x.TalkContent).FirstOrDefault()))
              .ForMember(d => d.SubjectCode, u => u.MapFrom(s => s.Subject.Code))
+              .ForMember(d => d.SubjectStatus, u => u.MapFrom(s => s.Subject.Status))
              .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.TrialSite.TrialSiteCode))
 
               .ForMember(d => d.CheckDialogList, u => u.MapFrom(s => s.CheckChallengeDialogList))