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

@@ -90,7 +90,7 @@ public class UrgentMedicalReviewAddedEventConsumer(
             {
                 var topicStr = string.Format(input.topicStr, companyName, trialInfo.ResearchProgramNo);
                 var htmlBodyStr = string.Format(
-                   CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                    CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
                    userinfo.FullName,              // 用户名
                    trialInfo.ExperimentName,        // 项目
                    criterion.CriterionName,  // 阅片标准
@@ -105,7 +105,7 @@ public class UrgentMedicalReviewAddedEventConsumer(
                 return (topicStr, htmlBodyStr);
             };
 
-        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, EmailBusinessScenario.EligibilityVerification_MedicalQC, messageToSend, emailConfigFunc);
+        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, EmailBusinessScenario.SiteSurveyReject, messageToSend, emailConfigFunc);
 
         await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
     }

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

@@ -318,11 +318,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     public class ReadingTableQuestionTrialAddOrEdit
     {
 
-        public Guid? ClassifyTableQuestionId { get; set; }
-
-        public string ClassifyAlgorithms { get; set; } = string.Empty;
-
-
         /// <summary>
         /// 自定义计算标记
         /// </summary>
@@ -467,12 +462,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public ValueOfType? ValueType { get; set; }
 
-        public bool IsCopy { get; set; } = false;
-
-        public Guid? ClassifyTableQuestionId { get; set; }
-
-        public string ClassifyAlgorithms { get; set; } = string.Empty;
-
         /// <summary>
         /// 问题分类
         /// </summary>
@@ -845,16 +834,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Guid Id { get; set; }
 
-        /// <summary>
-        /// 导出标识
-        /// </summary>
-        public ExportIdentification? ExportIdentification { get; set; }
-
-        /// <summary>
-        /// 导出结果
-        /// </summary>
-        public ExportResult? ExportResult { get; set; }
-
         /// <summary>
         /// 分组
         /// </summary>
@@ -1119,14 +1098,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     public class ReadingQuestionSystemView
     {
-
-
-        [Comment("导出标识")]
-        public ExportIdentification? ExportIdentification { get; set; }
-
-        [Comment("导出结果")]
-        public ExportResult? ExportResult { get; set; }
-
         /// <summary>
         /// 数值类型
         /// </summary>
@@ -1665,19 +1636,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     }
     public class AddOrUpdateReadingQuestionSystemInDto
     {
-
-
-
-        /// <summary>
-        /// 导出标识
-        /// </summary>
-        public ExportIdentification? ExportIdentification { get; set; }
-
-        /// <summary>
-        /// 导出结果
-        /// </summary>
-        public ExportResult? ExportResult { get; set; }
-
         /// <summary>
         /// 数值类型
         /// </summary>
@@ -1896,16 +1854,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public Guid? Id { get; set; }
 
-        /// <summary>
-        /// 导出标识
-        /// </summary>
-        public ExportIdentification? ExportIdentification { get; set; }
-
-        /// <summary>
-        /// 导出结果
-        /// </summary>
-        public ExportResult? ExportResult { get; set; }
-
         public bool IsAdditional { get; set; }
 
         /// <summary>

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs

@@ -667,9 +667,6 @@ namespace IRaCIS.Core.Application.Service.RC
             // 标准的默认值 标准默认值
             foreach (var criterion in needAddCriterionList)
             {
-
-
-
                 switch (criterion.CriterionType)
                 {
                     case CriterionType.IVUS:

IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs

@@ -369,31 +369,6 @@ namespace IRaCIS.Core.Domain.Share
 
     }
 
-    /// <summary>
-    /// 导出标识
-    /// </summary>
-    public enum ExportIdentification
-    {
-        /// <summary>
-        /// 无
-        /// </summary>
-        None = 0,
-
-    }
-
-    /// <summary>
-    /// 导出结果
-    /// </summary>
-    public enum ExportResult
-    {
-        /// <summary>
-        /// 无
-        /// </summary>
-        None = 0,
-
-    }
-
-
 
     /// <summary>
     /// 自定义计算标记

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

@@ -190,10 +190,4 @@ public class ReadingQuestionSystem : BaseAddAuditEntity
 
     [Comment("高亮问题的答案")]
     public string HighlightAnswer { get; set; } = "[]";
-
-    [Comment("导出标识")]
-    public ExportIdentification? ExportIdentification { get; set; }
-
-    [Comment("导出结果")]
-    public ExportResult? ExportResult { get; set; }
 }

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

@@ -255,12 +255,6 @@ public class ReadingQuestionTrial : BaseAddAuditEntity
     public QuestionClassify? QuestionClassify { get; set; }
     [Comment("高亮问题的答案")]
     public string HighlightAnswer { get; set; } = "[]";
-
-    [Comment("导出标识")]
-    public ExportIdentification? ExportIdentification { get; set; }
-
-    [Comment("导出结果")]
-    public ExportResult? ExportResult { get; set; }
 }
 public class CalculateInfo
 {

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

@@ -72,7 +72,6 @@ public class ReadingTableQuestionSystem : BaseAddAuditEntity
     [Comment("是否启用")]
     public bool IsEnable { get; set; }
 
-    [Comment("备注")]
     public string Remark { get; set; } = string.Empty;
 
     [Comment("显示父问题")]
@@ -132,9 +131,4 @@ public class ReadingTableQuestionSystem : BaseAddAuditEntity
 
     [Comment("问题分类")]
     public QuestionClassify? QuestionClassify { get; set; }
-
-    [Comment("复制病灶的时候 是否复制这个问题")]
-    public bool IsCopy { get; set; } = false;
-
-
 }

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

@@ -84,7 +84,7 @@ public class ReadingTableQuestionTrial : BaseAddAuditEntity
 
     public string TypeValue { get; set; } = string.Empty;
     public bool IsEnable { get; set; }
-    [Comment("注释")]
+
     public string Remark { get; set; } = string.Empty;
     public Guid? RelevanceId { get; set; }
 
@@ -112,9 +112,6 @@ public class ReadingTableQuestionTrial : BaseAddAuditEntity
     [Comment("数值类型")]
     public ValueOfType? ValueType { get; set; }
 
-    [Comment("分类算法")]
-    public string ClassifyAlgorithms { get; set; } = string.Empty;
-
     [Comment("单位")]
     public ValueUnit? Unit { get; set; }
 
@@ -145,13 +142,9 @@ public class ReadingTableQuestionTrial : BaseAddAuditEntity
 
     [Comment("问题分类")]
     public QuestionClassify? QuestionClassify { get; set; }
-
     [Comment("复制病灶的时候 是否复制这个问题")]
     public bool IsCopy { get; set; } = false;
 
     [Comment("系统表格问题Id")]
     public Guid? SystemTableQuestionId { get; set; }
-
-    [Comment("分类问题表格Id")]
-    public Guid? ClassifyTableQuestionId { get; set; }
 }

IRaCIS.Core.Infra.EFCore/Migrations/20241015015326_Question.cs

@@ -1,143 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace IRaCIS.Core.Infra.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class Question : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<string>(
-                name: "Remark",
-                table: "ReadingTableQuestionTrial",
-                type: "nvarchar(400)",
-                maxLength: 400,
-                nullable: false,
-                comment: "注释",
-                oldClrType: typeof(string),
-                oldType: "nvarchar(400)",
-                oldMaxLength: 400);
-
-            migrationBuilder.AddColumn<string>(
-                name: "ClassifyAlgorithms",
-                table: "ReadingTableQuestionTrial",
-                type: "nvarchar(400)",
-                maxLength: 400,
-                nullable: false,
-                defaultValue: "",
-                comment: "分类算法");
-
-            migrationBuilder.AddColumn<Guid>(
-                name: "ClassifyTableQuestionId",
-                table: "ReadingTableQuestionTrial",
-                type: "uniqueidentifier",
-                nullable: true,
-                comment: "分类问题表格Id");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Remark",
-                table: "ReadingTableQuestionSystem",
-                type: "nvarchar(400)",
-                maxLength: 400,
-                nullable: false,
-                comment: "备注",
-                oldClrType: typeof(string),
-                oldType: "nvarchar(400)",
-                oldMaxLength: 400);
-
-            migrationBuilder.AddColumn<bool>(
-                name: "IsCopy",
-                table: "ReadingTableQuestionSystem",
-                type: "bit",
-                nullable: false,
-                defaultValue: false,
-                comment: "复制病灶的时候 是否复制这个问题");
-
-            migrationBuilder.AddColumn<int>(
-                name: "ExportIdentification",
-                table: "ReadingQuestionTrial",
-                type: "int",
-                nullable: true,
-                comment: "导出标识");
-
-            migrationBuilder.AddColumn<int>(
-                name: "ExportResult",
-                table: "ReadingQuestionTrial",
-                type: "int",
-                nullable: true,
-                comment: "导出结果");
-
-            migrationBuilder.AddColumn<int>(
-                name: "ExportIdentification",
-                table: "ReadingQuestionSystem",
-                type: "int",
-                nullable: true,
-                comment: "导出标识");
-
-            migrationBuilder.AddColumn<int>(
-                name: "ExportResult",
-                table: "ReadingQuestionSystem",
-                type: "int",
-                nullable: true,
-                comment: "导出结果");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "ClassifyAlgorithms",
-                table: "ReadingTableQuestionTrial");
-
-            migrationBuilder.DropColumn(
-                name: "ClassifyTableQuestionId",
-                table: "ReadingTableQuestionTrial");
-
-            migrationBuilder.DropColumn(
-                name: "IsCopy",
-                table: "ReadingTableQuestionSystem");
-
-            migrationBuilder.DropColumn(
-                name: "ExportIdentification",
-                table: "ReadingQuestionTrial");
-
-            migrationBuilder.DropColumn(
-                name: "ExportResult",
-                table: "ReadingQuestionTrial");
-
-            migrationBuilder.DropColumn(
-                name: "ExportIdentification",
-                table: "ReadingQuestionSystem");
-
-            migrationBuilder.DropColumn(
-                name: "ExportResult",
-                table: "ReadingQuestionSystem");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Remark",
-                table: "ReadingTableQuestionTrial",
-                type: "nvarchar(400)",
-                maxLength: 400,
-                nullable: false,
-                oldClrType: typeof(string),
-                oldType: "nvarchar(400)",
-                oldMaxLength: 400,
-                oldComment: "注释");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Remark",
-                table: "ReadingTableQuestionSystem",
-                type: "nvarchar(400)",
-                maxLength: 400,
-                nullable: false,
-                oldClrType: typeof(string),
-                oldType: "nvarchar(400)",
-                oldMaxLength: 400,
-                oldComment: "备注");
-        }
-    }
-}

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

@@ -5434,14 +5434,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasColumnType("nvarchar(400)")
                         .HasComment("字典code");
 
-                    b.Property<int?>("ExportIdentification")
-                        .HasColumnType("int")
-                        .HasComment("导出标识");
-
-                    b.Property<int?>("ExportResult")
-                        .HasColumnType("int")
-                        .HasComment("导出结果");
-
                     b.Property<string>("FileType")
                         .IsRequired()
                         .HasMaxLength(400)
@@ -5692,14 +5684,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasColumnType("nvarchar(400)")
                         .HasComment("字典code");
 
-                    b.Property<int?>("ExportIdentification")
-                        .HasColumnType("int")
-                        .HasComment("导出标识");
-
-                    b.Property<int?>("ExportResult")
-                        .HasColumnType("int")
-                        .HasComment("导出结果");
-
                     b.Property<string>("FileType")
                         .IsRequired()
                         .HasMaxLength(400)
@@ -6270,10 +6254,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasColumnType("nvarchar(400)")
                         .HasComment("文件类型");
 
-                    b.Property<bool>("IsCopy")
-                        .HasColumnType("bit")
-                        .HasComment("复制病灶的时候 是否复制这个问题");
-
                     b.Property<int>("IsDepend")
                         .HasColumnType("int")
                         .HasComment("是否关联");
@@ -6343,8 +6323,7 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<string>("Remark")
                         .IsRequired()
                         .HasMaxLength(400)
-                        .HasColumnType("nvarchar(400)")
+                        .HasColumnType("nvarchar(400)");
-                        .HasComment("备注");
 
                     b.Property<int>("ShowOrder")
                         .HasColumnType("int")
@@ -6403,16 +6382,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasColumnType("nvarchar(max)")
                         .HasComment("自定义计算标记");
 
-                    b.Property<string>("ClassifyAlgorithms")
-                        .IsRequired()
-                        .HasMaxLength(400)
-                        .HasColumnType("nvarchar(400)")
-                        .HasComment("分类算法");
-
-                    b.Property<Guid?>("ClassifyTableQuestionId")
-                        .HasColumnType("uniqueidentifier")
-                        .HasComment("分类问题表格Id");
-
                     b.Property<DateTime>("CreateTime")
                         .HasColumnType("datetime2");
 
@@ -6524,8 +6493,7 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<string>("Remark")
                         .IsRequired()
                         .HasMaxLength(400)
-                        .HasColumnType("nvarchar(400)")
+                        .HasColumnType("nvarchar(400)");
-                        .HasComment("注释");
 
                     b.Property<int>("ShowOrder")
                         .HasColumnType("int");