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

IRaCIS.Core.Application/MassTransit/Consumer/SiteSurverEmailConsumer.cs

@@ -110,7 +110,7 @@ public class UserSiteSurveySubmitedEventConsumer(
             return (topicStr, htmlBodyStr);
         };
 
-        var scenario = _trialSiteSurveyRepository.Any(t => t.Id != trialSiteSurveyId && t.TrialId == siteSurveyInfo.TrialId && t.TrialSiteId == siteSurveyInfo.TrialSiteId) ?
+        var scenario = _trialSiteSurveyRepository.Where(t => t.Id != trialSiteSurveyId && t.TrialId == siteSurveyInfo.TrialId && t.TrialSiteId == siteSurveyInfo.TrialSiteId).IgnoreQueryFilters().Any() ?
           EmailBusinessScenario.Approval_UpdateSiteSurvey : EmailBusinessScenario.Approval_SubmitSiteSurvey;
 
         await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, scenario, messageToSend, emailConfigFunc);

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

@@ -1493,6 +1493,8 @@ namespace IRaCIS.Core.Application.Service.Common
                         if (findJudge.ReadingTaskState == ReadingTaskState.HaveSigned)
                         {
                             item.IsJudgeSelect = findJudge.JudgeArmEnum == item.ArmEnum ? true : false;
+
+                            item.JudgeNote = findJudge.JudgeArmEnum == item.ArmEnum ? findJudge.JudgeNote : string.Empty;
                         }
                         else
                         {

IRaCIS.Core.Application/Service/Doctor/TrialExperienceService.cs

@@ -114,6 +114,7 @@ namespace IRaCIS.Core.Application.Service
                 #region 临床试验
 
                 var trialExperienceList = await _trialExperienceRepository.Where(o => o.DoctorId == inDto.DoctorId)
+                   .Where(x=>x.TrialId==null||x.TrialId!=inDto.TrialId)
                   .Where(x => x.ExperienceDataType == ExperienceDataType.System || x.ExperienceDataType == ExperienceDataType.SystemAuto).Include(x => x.ExperienceCriteriaList).ToListAsync();
                 List<TrialExperienceCriteria> criteriaList = new List<TrialExperienceCriteria>();
                 foreach (var item in trialExperienceList)

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

@@ -1244,7 +1244,7 @@ namespace IRaCIS.Core.Application.Service
         {
             var trialConfig = _trialRepository.Where(t => t.Id == inQuery.TrialId).Select(t => new { t.IsEnrollementQualificationConfirm, t.IsPDProgressView }).First();
 
-            var emailNoticeConfigQueryable = _emailNoticeConfigRepository.Where(t=>t.BusinessLevelEnum==BusinessLevel.Trial)        
+            var emailNoticeConfigQueryable = _emailNoticeConfigRepository.Where(t => t.BusinessLevelEnum == BusinessLevel.Trial)
            .WhereIf(inQuery.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == inQuery.BusinessScenarioEnum)
            .WhereIf(inQuery.IsReturnRequired != null, t => t.IsReturnRequired == inQuery.IsReturnRequired)
            .WhereIf(inQuery.IsEnable != null, t => t.IsEnable == inQuery.IsEnable)
@@ -1348,6 +1348,19 @@ namespace IRaCIS.Core.Application.Service
 
             await _trialEmailNoticeConfigRepository.SaveChangesAsync();
 
+            //处理定时任务
+            var taskInfoList = await _trialEmailNoticeConfigRepository.Where(t => t.TrialId== trialId && t.EmailCron != string.Empty && t.IsAutoSend)
+             .Select(t => new { t.Id, t.Code, TrialCode = t.Trial.TrialCode, t.EmailCron, t.BusinessScenarioEnum, t.TrialId })
+             .ToListAsync();
+
+            foreach (var task in taskInfoList)
+            {
+                //利用主键作为任务Id
+                var jobId = $"{task.TrialId}({task.TrialCode})_({task.BusinessScenarioEnum})";
+
+                HangfireJobHelper.AddOrUpdateTrialCronJob(jobId, trialId, task.BusinessScenarioEnum, task.EmailCron);
+            }
+
             return ResponseOutput.Ok();
 
 
@@ -1453,7 +1466,12 @@ namespace IRaCIS.Core.Application.Service
 
                 await _trialEmailNoticeConfigRepository.SaveChangesAsync();
 
-                var jobId = $"{addOrEditTrialEmailNoticeConfig.TrialId}_{id}";
+                var cronInfo = await _trialEmailNoticeConfigRepository.Where(t => t.Id == addOrEditTrialEmailNoticeConfig.Id)
+            .Select(t => new { t.Id, t.Code, TrialCode = t.Trial.TrialCode, t.EmailCron, t.BusinessScenarioEnum, t.TrialId })
+            .FirstAsync();
+
+                var jobId = $"{cronInfo.TrialId}({cronInfo.TrialCode})_({cronInfo.BusinessScenarioEnum})";
+
 
                 if (addOrEditTrialEmailNoticeConfig.IsAutoSend)
                 {
@@ -1575,8 +1593,12 @@ namespace IRaCIS.Core.Application.Service
         [HttpDelete("{trialEmailNoticeConfigId:guid}")]
         public async Task<IResponseOutput> DeleteTrialEmailNoticeConfig(Guid trialEmailNoticeConfigId)
         {
-            var trialId = await _trialEmailNoticeConfigRepository.Where(t => t.Id == trialEmailNoticeConfigId).Select(t => t.TrialId).FirstOrDefaultAsync();
+
-            var jobId = $"{trialId}_{trialEmailNoticeConfigId}";
+            var cronInfo = await _trialEmailNoticeConfigRepository.Where(t => t.Id == trialEmailNoticeConfigId)
+           .Select(t => new { t.Id, t.Code, TrialCode = t.Trial.TrialCode, t.EmailCron, t.BusinessScenarioEnum, t.TrialId })
+           .FirstAsync();
+
+            var jobId = $"{cronInfo.TrialId}({cronInfo.TrialCode})_({cronInfo.BusinessScenarioEnum})";
 
             HangfireJobHelper.RemoveCronJob(jobId);
 

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

@@ -255,7 +255,7 @@ namespace IRaCIS.Core.Application.Service
                 (arbitrationRule == ArbitrationRule.Reading ?
                 u.Subject.SubjectVisitTaskList.Any(t => t.TaskState == TaskState.Effect && t.IsAnalysisCreate == false && t.ReadingCategory == ReadingCategory.Judge && t.TrialReadingCriterionId == trialReadingCriterionId && u.VisitTaskNum < t.VisitTaskNum) :
                 false)))
-               .ForMember(o => o.JudgeNote, t => t.MapFrom(u => u.JudgeVisitTask.JudgeResultRemark))
+               .ForMember(o => o.JudgeNote, t => t.MapFrom(u => u.ReadingCategory==ReadingCategory.Judge? u.JudgeResultRemark : u.JudgeVisitTask.JudgeResultRemark))
                .ForMember(o => o.VisitNote, t => t.MapFrom(u => u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.AdjustReason).FirstOrDefault()!.Answer))
                .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode))
                .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code))

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

@@ -472,11 +472,13 @@ namespace IRaCIS.Core.Application.Service
                                     IndicationTypeId= trial.IndicationTypeId,
                                     ExperienceDataType = dataType,
                                     TrialId = trial.Id,
+                                    OtherCriterion= item.CriterionType.GetEnumInt()=="0"? item.CriterionName:string.Empty,
                                     VisitReadingCount = 0,
                                     ExperienceCriteriaList = new List<TrialExperienceCriteria>() {
 
                                     new TrialExperienceCriteria()
                                     {
+                                     DoctorId=doctorId,
                                      EvaluationCriteriaId=criterionTypeList.Where(x=>x.Code==item.CriterionType.GetEnumInt()).Select(x=>x.Id).FirstOrDefault()
                                     }
                                 }

IRaCIS.Core.Application/Triggers/BeforeSaveTrigger/UserLogTrigger.cs

@@ -34,7 +34,12 @@ namespace IRaCIS.Core.Application.Triggers
         {
             var user = context.Entity;
 
+            if (context.ChangeType == ChangeType.Added)
+            {
                 await _userLogReposiotry.AddAsync(new UserLog() { OptType = UserOptType.AddUser, OptUserId = user.Id, LoginUserId = _userInfo.Id, IP = _userInfo.IP });
+
+            }
+
         }
     }
 }