修改

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -9772,6 +9772,21 @@
             问题英文分组
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ExportIdentification">
+            <summary>
+            导出标识
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ClassifyAlgorithms">
+            <summary>
+            分类算法
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ClassifyQuestionId">
+            <summary>
+            分类问题Id
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ValueType">
             <summary>
             数值类型
@@ -10142,6 +10157,21 @@
             导出标识
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.ExportResultStr">
+            <summary>
+            导出结果
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.ClassifyAlgorithms">
+            <summary>
+            分类算法
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.ClassifyQuestionId">
+            <summary>
+            分类问题Id
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.ValueType">
             <summary>
             数值类型

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

@@ -112,11 +112,89 @@ public class UrgentMedicalReviewAddedEventConsumer(
 }
 
 //IR 回复医学反馈通知MIM
-public class UrgentIRRepliedMedicalReviewConsumer : IConsumer<UrgentIRRepliedMedicalReview>
+public class UrgentIRRepliedMedicalReviewConsumer(
+      IRepository<User> _userRepository,
+       IRepository<TaskMedicalReview> _taskMedicalReviewRepository,
+      IRepository<Trial> _trialRepository,
+      IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
+      IRepository<VisitTask> _visitTaskRepository,
+         IRepository<Dictionary> _dictionaryRepository,
+      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
+      IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<UrgentIRRepliedMedicalReview>
 {
-    public Task Consume(ConsumeContext<UrgentIRRepliedMedicalReview> context)
+    private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
+
+
+    //IR 回复医学反馈通知MIM
+    public async Task Consume(ConsumeContext<UrgentIRRepliedMedicalReview> context)
     {
-        throw new NotImplementedException();
+        //Console.WriteLine("发送【加急的医学反馈任务  通知MIM】邮件！！！");
+        //var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+
+        //var medicalReviewId = context.Message.MedicalReviewId;
+
+        //var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == medicalReviewId).Include(x => x.VisitTask).Include(x => x.MedicalManagerUser).FirstOrDefaultAsync();
+
+
+
+        //if (medicalReview.MedicalManagerUserId == null)
+        //{
+        //    Console.WriteLine("MIMId为空 ID" + medicalReviewId);
+        //    return;
+        //}
+        //var criterion = await _readingQuestionCriterionTrialRepository.FirstOrDefaultAsync(x => x.Id == medicalReview.VisitTask.TrialReadingCriterionId);
+        //var userinfo = await _userRepository.Where(x => x.Id == medicalReview.MedicalManagerUserId).FirstOrDefaultAsync();
+
+        //var taskInfo = await _visitTaskRepository.Where(x => x.Id == medicalReview.VisitTaskId).Include(x => x.SourceSubjectVisit).Include(x => x.ReadModule).Include(x => x.Subject).FirstNotNullAsync();
+
+
+        //var messageToSend = new MimeMessage();
+        ////发件地址
+        //messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
+        //messageToSend.To.Add(new MailboxAddress(String.Empty, userinfo.EMail));
+
+        //var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == medicalReview.TrialId);
+        //var companyName = isEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+
+
+        //var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
+        //{
+
+        //    DictionaryRepository = _dictionaryRepository,
+        //    IsEn_US = isEn_US,
+
+
+        //    DictionaryList = new List<DictionaryDto>()
+        //    {
+        //     new DictionaryDto (){DictionaryCode= "ReadingCategory",EnumValue=taskInfo.ReadingCategory.GetEnumInt(), },
+        //     new DictionaryDto (){DictionaryCode= "MedicalReviewDoctorUserIdea",EnumValue=medicalReview.DoctorUserIdeaEnum.GetEnumInt(), },
+        //     new DictionaryDto (){DictionaryCode= "MedicalReviewAuditState",EnumValue=medicalReview.AuditState.GetEnumInt(), },
+        //     new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=taskInfo.IsUrgent.ToString(), }
+        //    }
+        //});
+
+        //Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
+        //{
+        //    var topicStr = string.Format(input.topicStr, companyName, trialInfo.ResearchProgramNo);
+        //    var htmlBodyStr = string.Format(
+        //       CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+        //       userinfo.FullName,              // 用户名
+        //       trialInfo.ExperimentName,        // 项目
+        //       criterion.CriterionName,  // 阅片标准
+        //       taskInfo.BlindSubjectCode.IsNullOrEmpty() ? taskInfo.Subject.Code : taskInfo.BlindSubjectCode, // 受试者
+        //       taskInfo.TaskBlindName,             // 访视
+        //       dictionValue[0],      // 任务类型
+        //       dictionValue[1],     // 阅片人是否同意
+        //       dictionValue[2],     // 审核状态
+        //       dictionValue[3]    // 是否加急
+        //        );
+
+        //    return (topicStr, htmlBodyStr);
+        //};
+
+        //await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, EmailBusinessScenario.EligibilityVerification_MedicalQC, messageToSend, emailConfigFunc);
+
+        //await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
     }
 }
 

IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs

@@ -471,6 +471,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public bool IsCopy { get; set; } = false;
 
+
         public Guid? ClassifyTableQuestionId { get; set; }
 
         public string ClassifyAlgorithms { get; set; } = string.Empty;
@@ -1139,10 +1140,24 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     public class ReadingQuestionSystemView
     {
 
-
+        /// <summary>
+        /// 导出标识
+        /// </summary>
         [Comment("导出标识")]
         public ExportIdentification? ExportIdentification { get; set; }
 
+        /// <summary>
+        /// 分类算法
+        /// </summary>
+        [Comment("分类算法")]
+        public string ClassifyAlgorithms { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 分类问题Id
+        /// </summary>
+        [Comment("分类问题Id")]
+        public Guid? ClassifyQuestionId { get; set; }
+
         public string ExportResultStr { get; set; } = "[]";
 
         public List<ExportResult> ExportResult
@@ -1721,10 +1736,22 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public ExportIdentification? ExportIdentification { get; set; }
 
-
+        /// <summary>
-        [Comment("导出结果")]
+        /// 导出结果
+        /// </summary>
         public string ExportResultStr { get; set; } = "[]";
 
+        /// <summary>
+        /// 分类算法
+        /// </summary>
+      
+        public string ClassifyAlgorithms { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 分类问题Id
+        /// </summary>
+        public Guid? ClassifyQuestionId { get; set; }
+
         public List<ExportResult> ExportResult { get; set; } = new List<ExportResult>();
 
         /// <summary>

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs

@@ -197,6 +197,12 @@ public class ReadingQuestionSystem : BaseAddAuditEntity
     [Comment("导出结果")]
     public string ExportResultStr { get; set; } = "[]";
 
+    [Comment("分类算法")]
+    public string ClassifyAlgorithms { get; set; } = string.Empty;
+
+    [Comment("分类问题Id")]
+    public Guid? ClassifyQuestionId { get; set; }
+
     [NotMapped]
     public List<ExportResult> ExportResult
     {

IRaCIS.Core.Infra.EFCore/Migrations/20241015063950_questionc.cs

@@ -0,0 +1,43 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class questionc : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "ClassifyAlgorithms",
+                table: "ReadingQuestionSystem",
+                type: "nvarchar(400)",
+                maxLength: 400,
+                nullable: false,
+                defaultValue: "",
+                comment: "分类算法");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "ClassifyQuestionId",
+                table: "ReadingQuestionSystem",
+                type: "uniqueidentifier",
+                nullable: true,
+                comment: "分类问题Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ClassifyAlgorithms",
+                table: "ReadingQuestionSystem");
+
+            migrationBuilder.DropColumn(
+                name: "ClassifyQuestionId",
+                table: "ReadingQuestionSystem");
+        }
+    }
+}

IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs

@@ -5408,6 +5408,16 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<Guid>("Id")
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<string>("ClassifyAlgorithms")
+                        .IsRequired()
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)")
+                        .HasComment("分类算法");
+
+                    b.Property<Guid?>("ClassifyQuestionId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasComment("分类问题Id");
+
                     b.Property<int>("ConvertShowType")
                         .HasColumnType("int")
                         .HasComment("转化显示类型");