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

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

@@ -8327,6 +8327,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>
             斑块编号
@@ -8337,6 +8362,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
@@ -8897,6 +8942,16 @@
             单位
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingReportDto.ShowChartTypeEnum">
+            <summary>
+            显示图表类型
+            </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>
             高亮问题的答案
@@ -11052,6 +11107,16 @@
             数据来源
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.ShowChartTypeEnum">
+            <summary>
+            显示图表类型
+            </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
@@ -11135,6 +11200,16 @@
             数据来源
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemAddOrEdit.ShowChartTypeEnum">
+            <summary>
+            显示图表类型
+            </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>
             单位
@@ -11578,6 +11653,16 @@
             数据来源
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.ShowChartTypeEnum">
+            <summary>
+            显示图表类型
+            </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>
             问题英文名称
@@ -11653,6 +11738,16 @@
             数据来源
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ShowChartTypeEnum">
+            <summary>
+            显示图表类型
+            </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>
             单位
@@ -11908,6 +12003,16 @@
             默认值
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCalculateTableQuestionsOutDto.ShowChartTypeEnum">
+            <summary>
+            显示图表类型
+            </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>
             分类编辑类型  是否可编辑
@@ -12088,6 +12193,16 @@
             数据来源
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.ShowChartTypeEnum">
+            <summary>
+            显示图表类型
+            </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>
             单位
@@ -12453,6 +12568,16 @@
             数据来源
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.ShowChartTypeEnum">
+            <summary>
+            显示图表类型
+            </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

@@ -136,6 +136,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string? ReportMark { get; set; }
 
+        /// <summary>
+        /// 显示图表类型
+        /// </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

@@ -431,6 +431,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// 数据来源
         /// </summary>
         public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
+
+        /// <summary>
+        /// 显示图表类型
+        /// </summary>
+        public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
+
+        /// <summary>
+        /// 选项类型
+        /// </summary>
+        public OptionType OptionTypeEnum { get; set; } = OptionType.Defalut;
+
         public Guid? Id { get; set; }
 
 
@@ -561,6 +572,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
 
+        /// <summary>
+        /// 显示图表类型
+        /// </summary>
+        public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
+
+        /// <summary>
+        /// 选项类型
+        /// </summary>
+        public OptionType OptionTypeEnum { get; set; } = OptionType.Defalut;
+
         /// <summary>
         /// 单位
         /// </summary>
@@ -1245,6 +1266,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
 
+        /// <summary>
+        /// 显示图表类型
+        /// </summary>
+        public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
+
+        /// <summary>
+        /// 选项类型
+        /// </summary>
+        public OptionType OptionTypeEnum { get; set; } = OptionType.Defalut;
+
         /// <summary>
         /// 问题英文名称
         /// </summary>
@@ -1356,6 +1387,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
 
+        /// <summary>
+        /// 显示图表类型
+        /// </summary>
+        public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
+
+        /// <summary>
+        /// 选项类型
+        /// </summary>
+        public OptionType OptionTypeEnum { get; set; } = OptionType.Defalut;
+
         /// <summary>
         /// 单位
         /// </summary>
@@ -1821,6 +1862,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         [Comment("数据来源")]
         public DataSources DataSource { get; set; } = DataSources.ManualEntry;
 
+        /// <summary>
+        /// 显示图表类型
+        /// </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;
 
@@ -2227,6 +2278,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
 
+        /// <summary>
+        /// 显示图表类型
+        /// </summary>
+        public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
+
+        /// <summary>
+        /// 选项类型
+        /// </summary>
+        public OptionType OptionTypeEnum { get; set; } = OptionType.Defalut;
+
         /// <summary>
         /// 单位
         /// </summary>
@@ -2639,6 +2700,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
 
+        /// <summary>
+        /// 显示图表类型
+        /// </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

@@ -136,6 +136,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 GroupName = x.GroupName,
                 GroupEnName = x.GroupEnName,
                 IsShowInDicom = x.IsShowInDicom,
+                ShowChartTypeEnum=x.ShowChartTypeEnum,
+                OptionTypeEnum= x.OptionTypeEnum,
                 Type = x.Type,
                 GroupId = x.GroupId,
                 QuestionType = x.QuestionType,
@@ -163,6 +165,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     GroupName = x.GroupName,
                     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,
@@ -230,7 +234,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                             QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
                             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

@@ -378,6 +378,40 @@ namespace IRaCIS.Core.Domain.Share
         ReportResult = 2,
     }
 
+    /// <summary>
+    /// 显示图表的类型
+    /// </summary>
+    public enum ShowChartType
+    {
+        /// <summary>
+        /// 不显示
+        /// </summary>
+        NotShow = 0,
+
+        /// <summary>
+        /// 柱状图
+        /// </summary>
+        BarGraph = 1,
+
+    }
+
+    /// <summary>
+    /// 选项类型
+    /// </summary>
+    public enum OptionType
+    {
+       /// <summary>
+       /// 默认
+       /// </summary>
+       Defalut=0,
+
+        /// <summary>
+        /// 多选
+        /// </summary>
+        Multiple = 1,
+
+    }
+
     /// <summary>
     /// 数据来源
     /// </summary>

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

@@ -176,6 +176,16 @@ public class ReadingQuestionSystem : BaseAddAuditEntity
     [Comment("数据来源")]
     public DataSources DataSource { get; set; } = DataSources.ManualEntry;
 
+    /// <summary>
+    /// 显示图表类型
+    /// </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

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

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

@@ -130,6 +130,16 @@ public class ReadingTableQuestionSystem : BaseAddAuditEntity
     [Comment("数据来源")]
     public DataSources DataSource { get; set; } = DataSources.ManualEntry;
 
+    /// <summary>
+    /// 显示图表类型
+    /// </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

@@ -143,6 +143,16 @@ public class ReadingTableQuestionTrial : BaseAddAuditEntity
     [Comment("数据来源")]
     public DataSources DataSource { get; set; } = DataSources.ManualEntry;
 
+    /// <summary>
+    /// 显示图表类型
+    /// </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

@@ -6284,6 +6284,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasColumnType("int")
                         .HasComment("最大问题数");
 
+                    b.Property<int>("OptionTypeEnum")
+                        .HasColumnType("int");
+
                     b.Property<string>("OrderMark")
                         .IsRequired()
                         .HasMaxLength(400)
@@ -6590,6 +6593,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasColumnType("int")
                         .HasComment("最大问题数");
 
+                    b.Property<int>("OptionTypeEnum")
+                        .HasColumnType("int");
+
                     b.Property<string>("OrderMark")
                         .IsRequired()
                         .HasMaxLength(400)
@@ -7128,6 +7134,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasColumnType("int")
                         .HasComment("最大问题数");
 
+                    b.Property<int>("OptionTypeEnum")
+                        .HasColumnType("int");
+
                     b.Property<Guid?>("ParentId")
                         .HasColumnType("uniqueidentifier");
 
@@ -7362,6 +7371,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");
 
@@ -16980,7 +16992,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();
@@ -20424,6 +20436,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
 
                     b.Navigation("LesionList");
 
+                    b.Navigation("OncologyResultList");
+
                     b.Navigation("ReadingNoneDicomMarkList");
 
                     b.Navigation("ReadingTaskQuestionAnswerList");