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

@@ -16877,35 +16877,6 @@
             <param name="trialConfig"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.TrialConfigService.GetTrialBodyPartList(System.Guid)">
-            <summary>
-            获取项目部位配置列表
-            </summary>
-            <param name="trialId"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.TrialConfigService.AddOrUpdateTrialBodyPart(IRaCIS.Core.Application.Contracts.AddOrUpdateTrialBodyPartCommand)">
-            <summary>
-            添加更新 项目部位配置
-            </summary>
-            <param name="incommand"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.TrialConfigService.GetTrialExtralConfig(System.Guid)">
-            <summary>
-            获取项目额外配置
-            </summary>
-            <param name="trialId"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.TrialConfigService.GetTrialPacsConfigInfo(System.Guid,Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemPacsConfig})">
-            <summary>
-            获取项目Pacs 配置
-            </summary>
-            <param name="trialId"></param>
-            <param name="optionsMonitor"></param>
-            <returns></returns>
-        </member>
         <member name="T:IRaCIS.Core.Application.Triggers.ChallengeStateTrigger">
             <summary>
             访视 质疑状态  触发修改

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

@@ -4,7 +4,6 @@
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
 
-using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 namespace IRaCIS.Core.Application.Contracts

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

@@ -1,9 +1,7 @@
 using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Domain.Share.Reading;
-using Newtonsoft.Json;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace IRaCIS.Core.Application.Contracts
 {
@@ -68,10 +66,6 @@ namespace IRaCIS.Core.Application.Contracts
 
         public List<string> ModalityList { get; set; } = new List<string>();
 
-        public string TrialObjectNameConfigStr { get; set; }
-
-        public List<TrialObjectNameConfig> TrialObjectNameList { get; set; } 
-
 
     }
 

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

@@ -236,48 +236,7 @@ namespace IRaCIS.Application.Contracts
     }
 
 
-    public class TrialExtraConfig
-    {
-        #region QC 影像下载
 
-        //QC质控
-        public bool IsSupportQCDownloadImage { get; set; } = false;
-
-        #endregion
-
-
-
-        #region 中心调研
-
-        public List<string> NotShowFieldList { get; set; } = new List<string>();
-
-        public List<SiteSurveyModifyFiled> ModifyFiledList { get; set; } = new List<SiteSurveyModifyFiled>();
-
-        #endregion
-
-
-        #region 项目术语配置
-        public List<TrialObjectNameConfig> TrialObjectNameList {  get; set; }   
-        #endregion
-    }
-
-    public class TrialPacsInfo
-    {
-        public int Port { get; set; }
-
-        public string Ip { get; set; }
-
-        public string TrialCalledAE { get; set; }
-    }
-
-    public class SiteSurveyModifyFiled
-    {
-        public string NeedModifyFiled { get; set; }
-
-        public string ReplaceContent { get; set; }
-
-        public string ReplaceContentCN { get; set; }
-    }
 
 
 

IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs

@@ -1,5 +1,4 @@
-using IRaCIS.Application.Contracts;
+using IRaCIS.Application.Interfaces;
-using IRaCIS.Application.Interfaces;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.Helper;
@@ -907,8 +906,6 @@ namespace IRaCIS.Core.Application
             var trialInfo = (await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialConfig.TrialId)).IfNullThrowException();
 
             trialConfig.Modalitys = $"{String.Join('|', trialConfig.ModalityList)}";
-
-            trialConfig.TrialObjectNameConfigStr=JsonConvert.SerializeObject(trialConfig.TrialObjectNameList);
             _mapper.Map(trialConfig, trialInfo);
             trialInfo.UpdateTime = DateTime.Now;
 
@@ -1293,22 +1290,14 @@ namespace IRaCIS.Core.Application
         }
 
 
-        /// <summary>
+
-        /// 获取项目部位配置列表
-        /// </summary>
-        /// <param name="trialId"></param>
-        /// <returns></returns>
         public async Task<IResponseOutput<List<TrialBodyPartView>>> GetTrialBodyPartList(Guid trialId)
         {
             var list = await _trialRepository.Where(t => t.Id == trialId).SelectMany(t => t.TrialBodyPartList).Select(t => new TrialBodyPartView() { Code = t.Code, Name = _userInfo.IsEn_Us ? t.Name : t.NameCN, Id = t.Id, IsHandAdd = t.IsHandAdd }).ToListAsync();
 
             return ResponseOutput.Ok(list);
         }
-        /// <summary>
+
-        /// 添加更新 项目部位配置
-        /// </summary>
-        /// <param name="incommand"></param>
-        /// <returns></returns>
         public async Task<IResponseOutput> AddOrUpdateTrialBodyPart(AddOrUpdateTrialBodyPartCommand incommand)
         {
 
@@ -1344,27 +1333,13 @@ namespace IRaCIS.Core.Application
 
         }
 
-        /// <summary>
-        /// 获取项目额外配置
-        /// </summary>
-        /// <param name="trialId"></param>
-        /// <returns></returns>
         public async Task<TrialExtraConfig> GetTrialExtralConfig(Guid trialId)
         {
-            var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.TrialExtraConfigJsonStr, t.TrialObjectNameConfigStr }).FirstOrDefault();
+            var extralConfig = _trialRepository.Where(t => t.Id == trialId).Select(t => t.TrialExtraConfigJsonStr).FirstOrDefault() ?? string.Empty;
 
-            var extralConfig = JsonConvert.DeserializeObject<TrialExtraConfig>(extralObj?.TrialExtraConfigJsonStr) ?? new TrialExtraConfig();
+            return JsonConvert.DeserializeObject<TrialExtraConfig>(extralConfig) ?? new TrialExtraConfig();
-
-            extralConfig.TrialObjectNameList = JsonConvert.DeserializeObject<List<TrialObjectNameConfig>>(extralObj?.TrialObjectNameConfigStr) ?? new List<TrialObjectNameConfig>();
-
-            return extralConfig;
         }
-        /// <summary>
+
-        /// 获取项目Pacs 配置
-        /// </summary>
-        /// <param name="trialId"></param>
-        /// <param name="optionsMonitor"></param>
-        /// <returns></returns>
         public async Task<TrialPacsInfo> GetTrialPacsConfigInfo(Guid trialId, [FromServices] IOptionsMonitor<SystemPacsConfig> optionsMonitor)
         {
             var trialCode = await _trialRepository.Where(t => t.Id == trialId).Select(t => t.TrialCode).FirstOrDefaultAsync();

IRaCIS.Core.Domain.Share/Trial/TrialExpedited.cs

@@ -41,7 +41,46 @@ namespace IRaCIS.Core.Domain.Share
 
     }
 
+    public class TrialExtraConfig
+    {
+        #region MyRegion
 
+        //QC质控
+        public bool IsSupportQCDownloadImage { get; set; } = false;
+
+        #endregion
+
+
+
+        #region 中心调研
+
+        public List<string> NotShowFieldList { get; set; } = new List<string>();
+
+        public List<SiteSurveyModifyFiled> ModifyFiledList { get; set; } = new List<SiteSurveyModifyFiled>();
+
+        #endregion
+
+
+
+    }
+
+    public class TrialPacsInfo
+    {
+        public int Port { get; set; }
+
+        public string Ip { get; set; }
+
+        public string TrialCalledAE { get; set; }
+    }
+
+    public class SiteSurveyModifyFiled
+    {
+        public string NeedModifyFiled { get; set; }
+
+        public string ReplaceContent { get; set; }
+
+        public string ReplaceContentCN { get; set; }
+    }
 
     public enum DeclarationType
     {

IRaCIS.Core.Domain/Trial/Trial.cs

@@ -258,19 +258,4 @@ public partial class Trial : BaseFullDeleteAuditEntity
     public bool IsPACSConnect { get; set; }
 
     public bool IsTrialPACSConfirmed { get; set; }
-
-    [Comment("项目术语配置Json字符串")]
-    [StringLength(1000)]
-    public string TrialObjectNameConfigStr { get; set; }
-
-    [NotMapped]
-    public List<TrialObjectNameConfig> TrialObjectNameList => JsonConvert.DeserializeObject<List<TrialObjectNameConfig>>(TrialObjectNameConfigStr) ?? new List<TrialObjectNameConfig>();
-}
-
-public class TrialObjectNameConfig
-{
-    public string Name { get; set; }
-
-    public string TrialName { get; set; }
-
 }

IRaCIS.Core.Infra.EFCore/Migrations/20241107022734_TrialConfigAddTrialName.cs

@@ -1,31 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace IRaCIS.Core.Infra.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class TrialConfigAddTrialName : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "TrialObjectNameConfigStr",
-                table: "Trial",
-                type: "nvarchar(1000)",
-                maxLength: 1000,
-                nullable: false,
-                defaultValue: "",
-                comment: "项目术语配置Json字符串");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "TrialObjectNameConfigStr",
-                table: "Trial");
-        }
-    }
-}

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

@@ -10407,12 +10407,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<DateTime?>("TrialFinishedTime")
                         .HasColumnType("datetime2");
 
-                    b.Property<string>("TrialObjectNameConfigStr")
-                        .IsRequired()
-                        .HasMaxLength(1000)
-                        .HasColumnType("nvarchar(1000)")
-                        .HasComment("项目术语配置Json字符串");
-
                     b.Property<string>("TrialStatusStr")
                         .IsRequired()
                         .HasMaxLength(400)