Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

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

@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Reactive.Subjects;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -96,13 +97,14 @@ public class UrgentMedicalReviewAddedEventConsumer(
 
             Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
             {
-                var topicStr = string.Format(input.topicStr, companyName, trialInfo.ResearchProgramNo);
+                var subjectName = taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode;
+                var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectName, taskInfo.TaskBlindName);
                 var htmlBodyStr = string.Format(
                    CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
                    userinfo.FullName,              // 用户名  {0}
                    trialInfo.ExperimentName,        // 项目   {1}
                    criterion.CriterionName,  // 阅片标准       {2}
-                   taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode, // 受试者 {3}
+                   subjectName, // 受试者 {3}
                    taskInfo.TaskBlindName,             // 访视  {4}
                    dictionValue[0],      // 任务类型            {5}
                    //dictionValue[1],     // 阅片人是否同意        {6}
@@ -196,13 +198,14 @@ public class UrgentIRRepliedMedicalReviewConsumer(
 
         Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
         {
-            var topicStr = string.Format(input.topicStr, companyName, trialInfo.ResearchProgramNo);
+            var subjectCode = taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode;
+            var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, taskInfo.TaskBlindName);
             var htmlBodyStr = string.Format(
                CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
                userinfo.FullName,              // 用户名  {0}
                trialInfo.ExperimentName,        // 项目   {1}
                criterion.CriterionName,  // 阅片标准       {2}
-               taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode, // 受试者 {3}
+               subjectCode, // 受试者 {3}
                taskInfo.TaskBlindName,             // 访视  {4}
                dictionValue[0],      // 任务类型            {5}
                dictionValue[1],     // 阅片人是否同意        {6}
@@ -309,12 +312,13 @@ public class UrgentMIMRepliedMedicalReviewConsumer(
 
         Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
         {
-            var topicStr = string.Format(input.topicStr, companyName, trialInfo.ResearchProgramNo);
+            var subjectCode = taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode;
+            var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, taskInfo.TaskBlindName);
             var htmlBodyStr = string.Format(
                CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
                userinfo.FullName,              // 用户名  {0}
                trialInfo.ExperimentName,        // 项目   {1}
-               taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode, // 受试者 {2}
+               subjectCode, // 受试者 {2}
                taskInfo.TaskBlindName,             // 访视  {3}
                criterion.CriterionName,  // 阅片标准       {4}
                dictionValue[0],      // 任务类型            {5}
@@ -407,12 +411,13 @@ public class UrgentIRApplyedReReadingConsumer(
 
             Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
             {
-                var topicStr = string.Format(input.topicStr, companyName, trialInfo.ResearchProgramNo);
+                var subjectCode = taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode;
+                var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo, subjectCode, taskInfo.TaskBlindName);
                 var htmlBodyStr = string.Format(
                    CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
                    userinfo.FullName,              // 用户名  {0}
                    trialInfo.ExperimentName,        // 项目   {1}
-                   taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode, // 受试者 {2}
+                   subjectCode, // 受试者 {2}
                    taskInfo.TaskBlindName,             // 访视  {3}
                    dictionValue[0],    // 任务类型 {4}
                    doctorInfo.FullName,                       // 阅片人 {5}

IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs

@@ -298,6 +298,16 @@ namespace IRaCIS.Application.Contracts
         public string WeChat { get; set; } = String.Empty;
         public int Nation { get; set; }
 
+        /// <summary>
+        /// 工作兼职
+        /// </summary>
+        public string WorkPartTime { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 工作兼职En
+        /// </summary>
+        public string WorkPartTimeEn { get; set; } = string.Empty;
+
 
     }
 

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -782,7 +782,7 @@ namespace IRaCIS.Core.Application.Service
             var criterionIdInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == trialReadingCriterionId).FirstNotNullAsync();
 
 
-            var groupIds = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == trialReadingCriterionId && x.Type == ReadingQestionType.Table || x.Type == ReadingQestionType.BasicTable).Select(x => x.GroupId).Distinct().ToListAsync();
+            var groupIds = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == trialReadingCriterionId &&( x.Type == ReadingQestionType.Table || x.Type == ReadingQestionType.BasicTable)).Select(x => x.GroupId).Distinct().ToListAsync();
 
             var questionIds = await _readingQuestionTrialRepository
                  .Where(x => x.IsShowInDicom)

IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs

@@ -14,12 +14,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
     public class ReadingCalculateService(IEnumerable<ICriterionCalculateService> _criterionServices,
        IRepository<VisitTask> _visitTaskRepository,
        IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
-       ICriterionCalculateService _useCriterion,
        IStringLocalizer _localizer, IUserInfo _userInfo
 
        ) : BaseService, IReadingCalculateService
     {
-
+        private ICriterionCalculateService _useCriterion;
         /// <summary>
         /// 标准和服务对应
         /// </summary>