添加字段

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

@@ -8692,6 +8692,31 @@
             第三次
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.OCTFCTUploadData.MacrophageInfiltrationMeasurement">
+            <summary>
+            巨噬细胞浸润测量
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.OCTFCTUploadData.MacrophageInfiltrationAngle">
+            <summary>
+            巨噬细胞浸润角度测量
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.OCTFCTUploadData.MicrochannelMeasurement">
+            <summary>
+            微通道测量
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.OCTFCTUploadData.CholesterolCrystalMeasurement">
+            <summary>
+            胆固醇结晶测量
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.OCTFCTUploadData.LumenAreaMeasurement">
+            <summary>
+            官腔面积测量
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.OCTInfo.PlaqueNum">
             <summary>
             斑块编号
@@ -8702,6 +8727,26 @@
             值
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.OCTInfo.MacrophageInfiltrationMeasurement">
+            <summary>
+            巨噬细胞浸润测量
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.OCTInfo.MacrophageInfiltrationAngle">
+            <summary>
+            巨噬细胞浸润角度测量
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.OCTInfo.MicrochannelMeasurement">
+            <summary>
+            微通道测量
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.OCTInfo.CholesterolCrystalMeasurement">
+            <summary>
+            胆固醇结晶测量
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto">
             <summary>
             阅片计算Dto
@@ -9267,6 +9312,11 @@
             显示图表类型
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingReportDto.OptionTypeEnum">
+            <summary>
+            选项类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingReportDto.HighlightAnswer">
             <summary>
             高亮问题的答案
@@ -11572,6 +11622,11 @@
             显示图表类型
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.OptionTypeEnum">
+            <summary>
+            选项类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.DictionaryCode">
             <summary>
             字典code
@@ -11660,6 +11715,11 @@
             显示图表类型
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemAddOrEdit.OptionTypeEnum">
+            <summary>
+            选项类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemAddOrEdit.Unit">
             <summary>
             单位
@@ -12103,6 +12163,11 @@
             显示图表类型
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.OptionTypeEnum">
+            <summary>
+            选项类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.QuestionEnName">
             <summary>
             问题英文名称
@@ -12183,6 +12248,11 @@
             显示图表类型
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.OptionTypeEnum">
+            <summary>
+            选项类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.Unit">
             <summary>
             单位
@@ -12443,6 +12513,11 @@
             显示图表类型
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCalculateTableQuestionsOutDto.OptionTypeEnum">
+            <summary>
+            选项类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCalculateTableQuestionsOutDto.ClassifyEditType">
             <summary>
             分类编辑类型  是否可编辑
@@ -12628,6 +12703,11 @@
             显示图表类型
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.OptionTypeEnum">
+            <summary>
+            选项类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.Unit">
             <summary>
             单位
@@ -12993,6 +13073,11 @@
             显示图表类型
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.OptionTypeEnum">
+            <summary>
+            选项类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.Unit">
             <summary>
             单位

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

@@ -143,6 +143,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
 
+        /// <summary>
+        /// 选项类型
+        /// </summary>
+        public OptionType OptionTypeEnum { get; set; } = OptionType.Defalut;
+
         /// <summary>
         /// 高亮问题的答案
         /// </summary>

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

@@ -437,6 +437,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
 
+        /// <summary>
+        /// 选项类型
+        /// </summary>
+        public OptionType OptionTypeEnum { get; set; } = OptionType.Defalut;
+
         public Guid? Id { get; set; }
 
 
@@ -572,6 +577,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
 
+        /// <summary>
+        /// 选项类型
+        /// </summary>
+        public OptionType OptionTypeEnum { get; set; } = OptionType.Defalut;
+
         /// <summary>
         /// 单位
         /// </summary>
@@ -1257,6 +1267,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
 
+        /// <summary>
+        /// 选项类型
+        /// </summary>
+        public OptionType OptionTypeEnum { get; set; } = OptionType.Defalut;
+
         /// <summary>
         /// 问题英文名称
         /// </summary>
@@ -1373,6 +1388,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
 
+        /// <summary>
+        /// 选项类型
+        /// </summary>
+        public OptionType OptionTypeEnum { get; set; } = OptionType.Defalut;
+
         /// <summary>
         /// 单位
         /// </summary>
@@ -1843,6 +1863,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
 
+        /// <summary>
+        /// 选项类型
+        /// </summary>
+        public OptionType OptionTypeEnum { get; set; } = OptionType.Defalut;
+
         [Comment("限制编辑")]
         public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
 
@@ -2254,6 +2279,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
 
+        /// <summary>
+        /// 选项类型
+        /// </summary>
+        public OptionType OptionTypeEnum { get; set; } = OptionType.Defalut;
+
         /// <summary>
         /// 单位
         /// </summary>
@@ -2666,6 +2696,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
 
+        /// <summary>
+        /// 选项类型
+        /// </summary>
+        public OptionType OptionTypeEnum { get; set; } = OptionType.Defalut;
+
         /// <summary>
         /// 单位
         /// </summary>

IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs

@@ -145,6 +145,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 GroupEnName = x.GroupEnName,
                 IsShowInDicom = x.IsShowInDicom,
                 ShowChartTypeEnum=x.ShowChartTypeEnum,
+                OptionTypeEnum= x.OptionTypeEnum,
                 Type = x.Type,
                 GroupId = x.GroupId,
                 QuestionType = x.QuestionType,
@@ -173,6 +174,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     GroupEnName = x.GroupEnName,
                     QuestionId = x.Id,
                     ShowChartTypeEnum = x.ShowChartTypeEnum,
+                    OptionTypeEnum = x.OptionTypeEnum,
                     IsShowInDicom = x.IsShowInDicom,
                     QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
                     LesionType = x.LesionType,
@@ -241,6 +243,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                             QuestionId = x.ReadingQuestionId,
                             TableQuestionId = x.Id,
                             ShowChartTypeEnum = x.ShowChartTypeEnum,
+                            OptionTypeEnum = x.OptionTypeEnum,
                             Type = x.Type,
                             LesionType = question.LesionType,
                             TableQuestionType = x.TableQuestionType,

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

@@ -395,6 +395,23 @@ namespace IRaCIS.Core.Domain.Share
 
     }
 
+    /// <summary>
+    /// 选项类型
+    /// </summary>
+    public enum OptionType
+    {
+       /// <summary>
+       /// 默认
+       /// </summary>
+       Defalut=0,
+
+        /// <summary>
+        /// 多选
+        /// </summary>
+        Multiple = 1,
+
+    }
+
     /// <summary>
     /// 数据来源
     /// </summary>

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

@@ -181,6 +181,11 @@ public class ReadingQuestionSystem : BaseAddAuditEntity
     /// </summary>
     public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
 
+    /// <summary>
+    /// 选项类型
+    /// </summary>
+    public OptionType OptionTypeEnum { get; set; } = OptionType.Defalut;
+
     [Comment("最大答案长度")]
     public int? MaxAnswerLength { get; set; }
 

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

@@ -243,6 +243,11 @@ public class ReadingQuestionTrial : BaseAddAuditEntity
     /// </summary>
     public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
 
+    /// <summary>
+    /// 选项类型
+    /// </summary>
+    public OptionType OptionTypeEnum { get; set; } = OptionType.Defalut;
+
     [Comment("问题英文名称")]
     public string QuestionEnName { get; set; } = string.Empty;
 

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

@@ -135,6 +135,11 @@ public class ReadingTableQuestionSystem : BaseAddAuditEntity
     /// </summary>
     public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
 
+    /// <summary>
+    /// 选项类型
+    /// </summary>
+    public OptionType OptionTypeEnum { get; set; } = OptionType.Defalut;
+
     [Comment("限制编辑")]
     public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
 

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

@@ -148,6 +148,11 @@ public class ReadingTableQuestionTrial : BaseAddAuditEntity
     /// </summary>
     public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
 
+    /// <summary>
+    /// 选项类型
+    /// </summary>
+    public OptionType OptionTypeEnum { get; set; } = OptionType.Defalut;
+
     [Comment("最大答案长度")]
     public int? MaxAnswerLength { get; set; }
 

IRaCIS.Core.Infra.EFCore/Migrations/20251204092307_OptionTypeEnum.cs

@@ -0,0 +1,62 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class OptionTypeEnum : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "OptionTypeEnum",
+                table: "ReadingTableQuestionTrial",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "OptionTypeEnum",
+                table: "ReadingTableQuestionSystem",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "OptionTypeEnum",
+                table: "ReadingQuestionTrial",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "OptionTypeEnum",
+                table: "ReadingQuestionSystem",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "OptionTypeEnum",
+                table: "ReadingTableQuestionTrial");
+
+            migrationBuilder.DropColumn(
+                name: "OptionTypeEnum",
+                table: "ReadingTableQuestionSystem");
+
+            migrationBuilder.DropColumn(
+                name: "OptionTypeEnum",
+                table: "ReadingQuestionTrial");
+
+            migrationBuilder.DropColumn(
+                name: "OptionTypeEnum",
+                table: "ReadingQuestionSystem");
+        }
+    }
+}

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

@@ -6700,6 +6700,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasColumnType("int")
                         .HasComment("最大问题数");
 
+                    b.Property<int>("OptionTypeEnum")
+                        .HasColumnType("int");
+
                     b.Property<string>("OrderMark")
                         .IsRequired()
                         .HasMaxLength(400)
@@ -7005,6 +7008,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasColumnType("int")
                         .HasComment("最大问题数");
 
+                    b.Property<int>("OptionTypeEnum")
+                        .HasColumnType("int");
+
                     b.Property<string>("OrderMark")
                         .IsRequired()
                         .HasMaxLength(400)
@@ -7553,6 +7559,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasColumnType("int")
                         .HasComment("最大问题数");
 
+                    b.Property<int>("OptionTypeEnum")
+                        .HasColumnType("int");
+
                     b.Property<Guid?>("ParentId")
                         .HasColumnType("uniqueidentifier");
 
@@ -7790,6 +7799,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<int?>("MaxRowCount")
                         .HasColumnType("int");
 
+                    b.Property<int>("OptionTypeEnum")
+                        .HasColumnType("int");
+
                     b.Property<Guid?>("ParentId")
                         .HasColumnType("uniqueidentifier");
 
@@ -17808,7 +17820,7 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .IsRequired();
 
                     b.HasOne("IRaCIS.Core.Domain.Models.VisitTask", "OncologyVisitTask")
-                        .WithMany()
+                        .WithMany("OncologyResultList")
                         .HasForeignKey("OncologyTaskId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
@@ -21294,6 +21306,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
 
                     b.Navigation("LesionList");
 
+                    b.Navigation("OncologyResultList");
+
                     b.Navigation("ReadingNoneDicomMarkList");
 
                     b.Navigation("ReadingTaskQuestionAnswerList");