中心调研初步调整

IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteEquipmentSurveyViewModel.cs

@@ -6,17 +6,9 @@
 namespace IRaCIS.Core.Application.Contracts
 {
     /// <summary> TrialSiteEquipmentSurveyView  列表视图模型 </summary>
-    public class TrialSiteEquipmentSurveyView
+    public class TrialSiteEquipmentSurveyView: TrialSiteEquipmentSurveyAddOrEdit
     {
-        public Guid Id { get; set; }
-        public Guid TrialSiteSurveyId { get; set; }
-        public string EquipmentType { get; set; } = string.Empty;
-        public Guid? EquipmentTypeId { get; set; }
       
-        public string Parameters { get; set; } = string.Empty;
-        public string ManufacturerName { get; set; } = string.Empty;
-        public string ScannerType { get; set; } = string.Empty;
-        public string Note { get; set; } = string.Empty;
         public DateTime CreateTime { get; set; }
         public Guid CreateUserId { get; set; }
         public DateTime UpdateTime { get; set; }
@@ -56,6 +48,36 @@ namespace IRaCIS.Core.Application.Contracts
         public string ManufacturerName { get; set; } = string.Empty;
         public string ScannerType { get; set; } = string.Empty;
         public string Note { get; set; } = string.Empty;
+
+
+        [Comment("扫描设备-New")]
+        public int EquipmentTypeEnum { get; set; }
+
+        public string OtherEquipmentType { get; set; }
+
+        [Comment("扫描设备厂商")]
+        public int ManufacturerType { get; set; }
+
+        [Comment("磁场强度 (1.5T / 3.0T)")]
+        public int MagneticFieldStrengthType { get; set; }
+
+        [Comment("体部线圈通道数 (≥16 或 ＜16)")]
+        public int BodyCoilChannelCount { get; set; }
+
+        [Comment("是否具备专用的PDFF脂肪定量序列（CSE-MRI序列）")]
+        public bool HasDedicatedPdfFatQuantificationSequence { get; set; }
+
+        [Comment("专用的PDFF脂肪定量序列类型 (当 HasDedicatedPdfFatQuantificationSequence = true 时有效)")]
+        public int? PdfFatQuantificationSequenceType { get; set; }
+
+        [Comment("其他序列详细说明 (当 PdfFatQuantificationSequenceType = Other 时建议填写)")]
+        public string OtherSequenceSpecification { get; set; }
+
+        [Comment("是否包含 T2/R2 校正（用于铁沉积校正）")]
+        public bool HasT2R2Correction { get; set; }
+
+        [Comment("是否可完整导出 PDFF 参数图及全部原始 DICOM 数据")]
+        public bool CanFullyExportPdfParameterMapsAndRawDicom { get; set; }
     }
 
 

IRaCIS.Core.Application/Service/SiteSurvey/_MapConfig.cs

@@ -39,8 +39,7 @@ namespace IRaCIS.Core.Application.AutoMapper
 
 
             //列表
-            CreateMap<TrialSiteEquipmentSurvey, TrialSiteEquipmentSurveyView>()
+            CreateMap<TrialSiteEquipmentSurvey, TrialSiteEquipmentSurveyView>();
-                .ForMember(t => t.EquipmentType, u => u.MapFrom(d => isEn_Us ? d.EquipmentType.Value : d.EquipmentType.ValueCN));
 
 
 

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs

@@ -260,6 +260,8 @@ namespace IRaCIS.Application.Contracts
 
         public List<SiteSurveyModifyFiled> ModifyFiledList { get; set; } = new List<SiteSurveyModifyFiled>();
 
+        public List<SiteSurveyEquipmentField> EquipmentControlFieldList { get; set; } = new List<SiteSurveyEquipmentField>();
+
         #endregion
 
 
@@ -273,7 +275,7 @@ namespace IRaCIS.Application.Contracts
 
     }
 
-    public class TrialConfigInfo: TrialExtraConfig
+    public class TrialConfigInfo : TrialExtraConfig
     {
         #region  视图模型返回 项目术语配置 ，实际数据库没有配置
         public List<TrialObjectNameConfig> TrialObjectNameList { get; set; }
@@ -311,6 +313,14 @@ namespace IRaCIS.Application.Contracts
     }
 
 
+    public class SiteSurveyEquipmentField
+    {
+        public string FiledName { get; set; }
 
+        public int ShowOrder { get; set; }
+
+        public bool IsView { get; set; }
+
+    }
 
 }

IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs

@@ -14,12 +14,52 @@ public class TrialSiteEquipmentSurvey : BaseFullAuditEntity
     #endregion
     public Guid TrialSiteSurveyId { get; set; }
 
+    [Comment("扫描设备-废弃")]
     public Guid EquipmentTypeId { get; set; }
+
+    [Comment("扫描设备参数")]
     public string Parameters { get; set; } = string.Empty;
 
+    [Comment("扫描设备厂商其他补充")]
     public string ManufacturerName { get; set; } = string.Empty;
+
+    [Comment("扫描设备型号")]
     public string ScannerType { get; set; } = string.Empty;
 
     public string Note { get; set; } = string.Empty;
+
+    #region 新增
+
+    [Comment("扫描设备-New")]
+    public int EquipmentTypeEnum { get; set; }
+
+    public string OtherEquipmentType { get; set; }
+
+    [Comment("扫描设备厂商")]
+    public int ManufacturerType { get; set; }
+
+    [Comment("磁场强度 (1.5T / 3.0T)")]
+    public int MagneticFieldStrengthType { get; set; }
+
+    [Comment("体部线圈通道数 (≥16 或 ＜16)")]
+    public int BodyCoilChannelCount { get; set; }
+
+    [Comment("是否具备专用的PDFF脂肪定量序列（CSE-MRI序列）")]
+    public bool HasDedicatedPdfFatQuantificationSequence { get; set; }
+
+    [Comment("专用的PDFF脂肪定量序列类型 (当 HasDedicatedPdfFatQuantificationSequence = true 时有效)")]
+    public int? PdfFatQuantificationSequenceType { get; set; }
+
+    [Comment("其他序列详细说明 (当 PdfFatQuantificationSequenceType = Other 时建议填写)")] 
+    public string OtherSequenceSpecification { get; set; }
+
+    [Comment("是否包含 T2/R2 校正（用于铁沉积校正）")]
+    public bool HasT2R2Correction { get; set; }
+
+    [Comment("是否可完整导出 PDFF 参数图及全部原始 DICOM 数据")]
+    public bool CanFullyExportPdfParameterMapsAndRawDicom { get; set; }
+
+    #endregion
+
 }
 

IRaCIS.Core.Infra.EFCore/Migrations/20260520060641_SiteSurveyEquipmentModify.cs

@@ -0,0 +1,223 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class SiteSurveyEquipmentModify : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "ScannerType",
+                table: "TrialSiteEquipmentSurvey",
+                type: "nvarchar(400)",
+                maxLength: 400,
+                nullable: false,
+                comment: "扫描设备型号",
+                oldClrType: typeof(string),
+                oldType: "nvarchar(400)",
+                oldMaxLength: 400);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Parameters",
+                table: "TrialSiteEquipmentSurvey",
+                type: "nvarchar(400)",
+                maxLength: 400,
+                nullable: false,
+                comment: "扫描设备参数",
+                oldClrType: typeof(string),
+                oldType: "nvarchar(400)",
+                oldMaxLength: 400);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ManufacturerName",
+                table: "TrialSiteEquipmentSurvey",
+                type: "nvarchar(400)",
+                maxLength: 400,
+                nullable: false,
+                comment: "扫描设备厂商其他补充",
+                oldClrType: typeof(string),
+                oldType: "nvarchar(400)",
+                oldMaxLength: 400);
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "EquipmentTypeId",
+                table: "TrialSiteEquipmentSurvey",
+                type: "uniqueidentifier",
+                nullable: false,
+                comment: "扫描设备-废弃",
+                oldClrType: typeof(Guid),
+                oldType: "uniqueidentifier");
+
+            migrationBuilder.AddColumn<int>(
+                name: "BodyCoilChannelCount",
+                table: "TrialSiteEquipmentSurvey",
+                type: "int",
+                nullable: false,
+                defaultValue: 0,
+                comment: "体部线圈通道数 (≥16 或 ＜16)");
+
+            migrationBuilder.AddColumn<bool>(
+                name: "CanFullyExportPdfParameterMapsAndRawDicom",
+                table: "TrialSiteEquipmentSurvey",
+                type: "bit",
+                nullable: false,
+                defaultValue: false,
+                comment: "是否可完整导出 PDFF 参数图及全部原始 DICOM 数据");
+
+            migrationBuilder.AddColumn<int>(
+                name: "EquipmentTypeEnum",
+                table: "TrialSiteEquipmentSurvey",
+                type: "int",
+                nullable: false,
+                defaultValue: 0,
+                comment: "扫描设备-New");
+
+            migrationBuilder.AddColumn<bool>(
+                name: "HasDedicatedPdfFatQuantificationSequence",
+                table: "TrialSiteEquipmentSurvey",
+                type: "bit",
+                nullable: false,
+                defaultValue: false,
+                comment: "是否具备专用的PDFF脂肪定量序列（CSE-MRI序列）");
+
+            migrationBuilder.AddColumn<bool>(
+                name: "HasT2R2Correction",
+                table: "TrialSiteEquipmentSurvey",
+                type: "bit",
+                nullable: false,
+                defaultValue: false,
+                comment: "是否包含 T2/R2 校正（用于铁沉积校正）");
+
+            migrationBuilder.AddColumn<int>(
+                name: "MagneticFieldStrengthType",
+                table: "TrialSiteEquipmentSurvey",
+                type: "int",
+                nullable: false,
+                defaultValue: 0,
+                comment: "磁场强度 (1.5T / 3.0T)");
+
+            migrationBuilder.AddColumn<int>(
+                name: "ManufacturerType",
+                table: "TrialSiteEquipmentSurvey",
+                type: "int",
+                nullable: false,
+                defaultValue: 0,
+                comment: "扫描设备厂商");
+
+            migrationBuilder.AddColumn<string>(
+                name: "OtherEquipmentType",
+                table: "TrialSiteEquipmentSurvey",
+                type: "nvarchar(400)",
+                maxLength: 400,
+                nullable: false,
+                defaultValue: "");
+
+            migrationBuilder.AddColumn<string>(
+                name: "OtherSequenceSpecification",
+                table: "TrialSiteEquipmentSurvey",
+                type: "nvarchar(400)",
+                maxLength: 400,
+                nullable: false,
+                defaultValue: "",
+                comment: "其他序列详细说明 (当 PdfFatQuantificationSequenceType = Other 时建议填写)");
+
+            migrationBuilder.AddColumn<int>(
+                name: "PdfFatQuantificationSequenceType",
+                table: "TrialSiteEquipmentSurvey",
+                type: "int",
+                nullable: true,
+                comment: "专用的PDFF脂肪定量序列类型 (当 HasDedicatedPdfFatQuantificationSequence = true 时有效)");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "BodyCoilChannelCount",
+                table: "TrialSiteEquipmentSurvey");
+
+            migrationBuilder.DropColumn(
+                name: "CanFullyExportPdfParameterMapsAndRawDicom",
+                table: "TrialSiteEquipmentSurvey");
+
+            migrationBuilder.DropColumn(
+                name: "EquipmentTypeEnum",
+                table: "TrialSiteEquipmentSurvey");
+
+            migrationBuilder.DropColumn(
+                name: "HasDedicatedPdfFatQuantificationSequence",
+                table: "TrialSiteEquipmentSurvey");
+
+            migrationBuilder.DropColumn(
+                name: "HasT2R2Correction",
+                table: "TrialSiteEquipmentSurvey");
+
+            migrationBuilder.DropColumn(
+                name: "MagneticFieldStrengthType",
+                table: "TrialSiteEquipmentSurvey");
+
+            migrationBuilder.DropColumn(
+                name: "ManufacturerType",
+                table: "TrialSiteEquipmentSurvey");
+
+            migrationBuilder.DropColumn(
+                name: "OtherEquipmentType",
+                table: "TrialSiteEquipmentSurvey");
+
+            migrationBuilder.DropColumn(
+                name: "OtherSequenceSpecification",
+                table: "TrialSiteEquipmentSurvey");
+
+            migrationBuilder.DropColumn(
+                name: "PdfFatQuantificationSequenceType",
+                table: "TrialSiteEquipmentSurvey");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ScannerType",
+                table: "TrialSiteEquipmentSurvey",
+                type: "nvarchar(400)",
+                maxLength: 400,
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(400)",
+                oldMaxLength: 400,
+                oldComment: "扫描设备型号");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Parameters",
+                table: "TrialSiteEquipmentSurvey",
+                type: "nvarchar(400)",
+                maxLength: 400,
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(400)",
+                oldMaxLength: 400,
+                oldComment: "扫描设备参数");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ManufacturerName",
+                table: "TrialSiteEquipmentSurvey",
+                type: "nvarchar(400)",
+                maxLength: 400,
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(400)",
+                oldMaxLength: 400,
+                oldComment: "扫描设备厂商其他补充");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "EquipmentTypeId",
+                table: "TrialSiteEquipmentSurvey",
+                type: "uniqueidentifier",
+                nullable: false,
+                oldClrType: typeof(Guid),
+                oldType: "uniqueidentifier",
+                oldComment: "扫描设备-废弃");
+        }
+    }
+}

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

@@ -15017,34 +15017,81 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<Guid>("Id")
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<int>("BodyCoilChannelCount")
+                        .HasColumnType("int")
+                        .HasComment("体部线圈通道数 (≥16 或 ＜16)");
+
+                    b.Property<bool>("CanFullyExportPdfParameterMapsAndRawDicom")
+                        .HasColumnType("bit")
+                        .HasComment("是否可完整导出 PDFF 参数图及全部原始 DICOM 数据");
+
                     b.Property<DateTime>("CreateTime")
                         .HasColumnType("datetime2");
 
                     b.Property<Guid>("CreateUserId")
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<int>("EquipmentTypeEnum")
+                        .HasColumnType("int")
+                        .HasComment("扫描设备-New");
+
                     b.Property<Guid>("EquipmentTypeId")
-                        .HasColumnType("uniqueidentifier");
+                        .HasColumnType("uniqueidentifier")
+                        .HasComment("扫描设备-废弃");
+
+                    b.Property<bool>("HasDedicatedPdfFatQuantificationSequence")
+                        .HasColumnType("bit")
+                        .HasComment("是否具备专用的PDFF脂肪定量序列（CSE-MRI序列）");
+
+                    b.Property<bool>("HasT2R2Correction")
+                        .HasColumnType("bit")
+                        .HasComment("是否包含 T2/R2 校正（用于铁沉积校正）");
+
+                    b.Property<int>("MagneticFieldStrengthType")
+                        .HasColumnType("int")
+                        .HasComment("磁场强度 (1.5T / 3.0T)");
 
                     b.Property<string>("ManufacturerName")
                         .IsRequired()
                         .HasMaxLength(400)
-                        .HasColumnType("nvarchar(400)");
+                        .HasColumnType("nvarchar(400)")
+                        .HasComment("扫描设备厂商其他补充");
+
+                    b.Property<int>("ManufacturerType")
+                        .HasColumnType("int")
+                        .HasComment("扫描设备厂商");
 
                     b.Property<string>("Note")
                         .IsRequired()
                         .HasMaxLength(400)
                         .HasColumnType("nvarchar(400)");
 
-                    b.Property<string>("Parameters")
+                    b.Property<string>("OtherEquipmentType")
                         .IsRequired()
                         .HasMaxLength(400)
                         .HasColumnType("nvarchar(400)");
 
+                    b.Property<string>("OtherSequenceSpecification")
+                        .IsRequired()
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)")
+                        .HasComment("其他序列详细说明 (当 PdfFatQuantificationSequenceType = Other 时建议填写)");
+
+                    b.Property<string>("Parameters")
+                        .IsRequired()
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)")
+                        .HasComment("扫描设备参数");
+
+                    b.Property<int?>("PdfFatQuantificationSequenceType")
+                        .HasColumnType("int")
+                        .HasComment("专用的PDFF脂肪定量序列类型 (当 HasDedicatedPdfFatQuantificationSequence = true 时有效)");
+
                     b.Property<string>("ScannerType")
                         .IsRequired()
                         .HasMaxLength(400)
-                        .HasColumnType("nvarchar(400)");
+                        .HasColumnType("nvarchar(400)")
+                        .HasComment("扫描设备型号");
 
                     b.Property<Guid>("TrialSiteSurveyId")
                         .HasColumnType("uniqueidentifier");