中心调研初步调整

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>()
-                .ForMember(t => t.EquipmentType, u => u.MapFrom(d => isEn_Us ? d.EquipmentType.Value : d.EquipmentType.ValueCN));
+            CreateMap<TrialSiteEquipmentSurvey, TrialSiteEquipmentSurveyView>();
 
 
 

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; }
+
+    }
 
 }