将项目配置从json中挪出来

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

@@ -584,7 +584,7 @@
             <summary>
             更新系统邮件配置
             </summary>
-            <param name="basicSystemConfigOption"></param>
+            <param name="emailConfig"></param>
             <returns></returns>
         </member>
         <member name="P:IRaCIS.Core.Application.Service.Common.TU_TR_RSBaseModel.ResearchProgramNo">
@@ -18933,6 +18933,11 @@
             受试者ID
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.DTO.TrialVisitQADTO.IsSupportQCDownloadImage">
+            <summary>
+            QC质控下载
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Contracts.DTO.QAStudyInfoDTO.PatientSex">
             <summary>
             性别
@@ -19393,6 +19398,16 @@
             检查名称列表
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.BasicTrialConfig.IsSupportQCDownloadImage">
+            <summary>
+            QC质控下载
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.BasicTrialConfig.IsOpenLostVistRead">
+            <summary>
+            打开失访可读
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Contracts.TrialProcessConfig.IsImageQualityControl">
             <summary>
             影像质控风险控制

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -1016,9 +1016,9 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
         if (critrion.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
         {
-            var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.TrialExtraConfigJsonStr }).FirstOrDefault();
+            var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.IsOpenLostVistRead }).FirstOrDefault();
 
-            var extralConfig = JsonConvert.DeserializeObject<TrialExtraConfig>(extralObj?.TrialExtraConfigJsonStr) ?? new TrialExtraConfig();
+            //var extralConfig = JsonConvert.DeserializeObject<TrialExtraConfig>(extralObj?.TrialExtraConfigJsonStr) ?? new TrialExtraConfig();
 
             var visitQuery = _visitTaskRepository.Where(x => x.TrialId == inQuery.TrialId && x.DoctorUserId == _userInfo.UserRoleId && x.TaskState == TaskState.Effect && x.Subject.IsSubjectQuit == false)
 
@@ -1027,7 +1027,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             .WhereIf(critrion.IsAutoCreate == false, t => !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum))
 
            // 前序 不存在 未一致性核查未通过的
-           .Where(t => !t.Subject.SubjectVisitList.Where(t => extralConfig.IsOpenLostVistRead ? t.IsLostVisit == false : true).Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum >= sv.VisitNum))
+           .Where(t => !t.Subject.SubjectVisitList.Where(t => extralObj.IsOpenLostVistRead ? t.IsLostVisit == false : true).Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum >= sv.VisitNum))
            //.WhereIf(critrion.IsAutoCreate == false, t => t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Any(t => t.IsGeneratedTask == false) ?
            //t.VisitTaskNum <= t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.IsGeneratedTask == false).Min(t => t.SubjectVisit.VisitNum) : true)
            //.Where(t => t.Subject.SubjectVisitList.Any(t => t.CheckState != CheckStateEnum.CVPassed) ? t.VisitTaskNum <= t.Subject.SubjectVisitList.Where(t => t.CheckState != CheckStateEnum.CVPassed).Min(t => t.VisitNum) : true)
@@ -1050,14 +1050,14 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                 UnReadTaskCount = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned).Count(),
 
                 //未读 里可读任务量   
-                UnReadCanReadTaskCount = x.Where(t => extralConfig.IsOpenLostVistRead ? true : t.IsFrontTaskNeedSignButNotSign == false).Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true)
+                UnReadCanReadTaskCount = x.Where(t => extralObj.IsOpenLostVistRead ? true : t.IsFrontTaskNeedSignButNotSign == false).Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true)
                 //不能对包含聚合或子查询的表达式执行聚合函数
                 //&& !x.Any(t => t.ReadingTaskState != ReadingTaskState.HaveSigned && t.IsNeedClinicalDataSign == true && t.IsClinicalDataSign == false && t.VisitTaskNum<y.VisitTaskNum )
                 ).Count(),
 
 
                 UnReadCanReadTaskList = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned)
-                .Where(t => extralConfig.IsOpenLostVistRead ? true : t.IsFrontTaskNeedSignButNotSign == false)
+                .Where(t => extralObj.IsOpenLostVistRead ? true : t.IsFrontTaskNeedSignButNotSign == false)
                 .Where(y => /*y.IsFrontTaskNeedSignButNotSign == false &&*/ (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true))
                 .OrderBy(x => x.VisitTaskNum)
                 .Select(u => new IRUnreadTaskView()

IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs

@@ -263,6 +263,12 @@ namespace IRaCIS.Core.Application.Contracts.DTO
 
     public class TrialVisitQADTO
     {
+
+        /// <summary>
+        /// QC质控下载
+        /// </summary>
+        public bool IsSupportQCDownloadImage { get; set; } = false;
+
         public bool ExistsManual { get; set; }
         public bool IsHaveStudyClinicalData { get; set; }
         public bool QCRiskControl { get; set; }

IRaCIS.Core.Application/Service/QC/QCListService.cs

@@ -421,6 +421,7 @@ namespace IRaCIS.Core.Application.Image.QA
 
             List<SecondReviewDto> secondReviewList = new List<SecondReviewDto>();
 
+            var isSupportQCImageDownload = _trialRepository.Where(t => t.Id == sv.TrialId).Select(t => t.IsSupportQCDownloadImage).FirstOrDefault();
 
             if (sv.SecondReviewState != SecondReviewState.None)
             {
@@ -459,6 +460,7 @@ namespace IRaCIS.Core.Application.Image.QA
 
             return new TrialVisitQADTO
             {
+                IsSupportQCDownloadImage = isSupportQCImageDownload,
                 QCQuestionAnswerList = qacheckList,
                 QCRiskControl = _verifyConfig.CurrentValue.QCRiskControl,
                 SecondReviewList = secondReviewList,

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

@@ -87,6 +87,17 @@ namespace IRaCIS.Core.Application.Contracts
         public List<TrialObjectNameConfig> TrialObjectNameList { get; set; }
 
 
+        /// <summary>
+        /// QC质控下载
+        /// </summary>
+        public bool IsSupportQCDownloadImage { get; set; } = false;
+
+        /// <summary>
+        /// 打开失访可读
+        /// </summary>
+        public bool IsOpenLostVistRead { get; set; } = true;
+
+
     }
 
     public class ConfigTrialProcessInfoVerificationInDto

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

@@ -243,11 +243,16 @@ namespace IRaCIS.Application.Contracts
     }
     public class TrialExtraConfig
     {
-        #region QC 影像下载
+        #region QC 影像下载--下个版本删除
 
         //QC质控
         public bool IsSupportQCDownloadImage { get; set; } = false;
 
+        /// <summary>
+        /// 打开失访可读
+        /// </summary>
+        public bool IsOpenLostVistRead { get; set; } = true;
+
         #endregion
 
 
@@ -265,10 +270,7 @@ namespace IRaCIS.Application.Contracts
         #endregion
 
 
-        /// <summary>
+
-        /// 打开失访可读
-        /// </summary>
-        public bool IsOpenLostVistRead { get; set; } = true;
 
 
 

IRaCIS.Core.Application/TestService.cs

@@ -154,6 +154,8 @@ namespace IRaCIS.Core.Application.Service
 
                 var jsonInfo = extralConfig.ToJsonStr();
 
+                
+
                 await _trialRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Id, u => new Trial() { TrialExtraConfigJsonStr = jsonInfo });
             }
 

IRaCIS.Core.Domain/Trial/Trial.cs

@@ -324,6 +324,16 @@ public partial class Trial : BaseFullDeleteAuditEntity
     [Comment("最大的NoneDicom检查编号 整型")]
     public int MaxNoneDicomCode { get; set; }
 
+    /// <summary>
+    /// QC质控下载
+    /// </summary>
+    public bool IsSupportQCDownloadImage { get; set; } = false;
+
+    /// <summary>
+    /// 打开失访可读
+    /// </summary>
+    public bool IsOpenLostVistRead { get; set; } = true;
+
 }
 
 public enum TrialDataStore

IRaCIS.Core.Infra.EFCore/Migrations/20260521033216_modifyTrialJson.cs

@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class modifyTrialJson : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "IsOpenLostVistRead",
+                table: "Trial",
+                type: "bit",
+                nullable: false,
+                defaultValue: true);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "IsSupportQCDownloadImage",
+                table: "Trial",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IsOpenLostVistRead",
+                table: "Trial");
+
+            migrationBuilder.DropColumn(
+                name: "IsSupportQCDownloadImage",
+                table: "Trial");
+        }
+    }
+}

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

@@ -12642,6 +12642,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasColumnType("bit")
                         .HasComment("是否 提醒受试者编号规则");
 
+                    b.Property<bool>("IsOpenLostVistRead")
+                        .HasColumnType("bit");
+
                     b.Property<bool>("IsPACSConnect")
                         .HasColumnType("bit");
 
@@ -12677,6 +12680,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<bool>("IsSubjectSexView")
                         .HasColumnType("bit");
 
+                    b.Property<bool>("IsSupportQCDownloadImage")
+                        .HasColumnType("bit");
+
                     b.Property<bool>("IsTrialBasicLogicConfirmed")
                         .HasColumnType("bit");