代码提交

2024-10-15 10:03:47 +08:00
parent 6709f0c653
commit ffd29eb268
12 changed files with 18152 additions and 10 deletions
@@ -12773,19 +12773,49 @@
            字典仓储
            </summary>
        </member>
-        <member name="P:IRaCIS.Core.Application.MassTransit.Consumer.TranslationDictionaryDto.DictionaryCode">
+        <member name="P:IRaCIS.Core.Application.MassTransit.Consumer.TranslationDictionaryDto.IsEn_US">
+            <summary>
+            是否是英文
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.MassTransit.Consumer.TranslationDictionaryDto.DictionaryList">
+            <summary>
+            字典
+            </summary>
+        </member>
+        <member name="T:IRaCIS.Core.Application.MassTransit.Consumer.DictionaryDto">
+            <summary>
+            字典对象
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.MassTransit.Consumer.DictionaryDto.DictionaryCode">
            <summary>
            字典Code
            </summary>
        </member>
-        <member name="P:IRaCIS.Core.Application.MassTransit.Consumer.TranslationDictionaryDto.EnumValue">
+        <member name="P:IRaCIS.Core.Application.MassTransit.Consumer.DictionaryDto.EnumValue">
            <summary>
            枚举值
            </summary>
        </member>
-        <member name="P:IRaCIS.Core.Application.MassTransit.Consumer.TranslationDictionaryDto.IsEn_US">
+        <member name="P:IRaCIS.Core.Application.MassTransit.Consumer.DictionaryData.DictionaryCode">
            <summary>
-            是否是英文
+            字典Code
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.MassTransit.Consumer.DictionaryData.EnumValue">
+            <summary>
+            枚举值
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.MassTransit.Consumer.DictionaryData.Value">
+            <summary>
+            值
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.MassTransit.Consumer.DictionaryData.ValueCN">
+            <summary>
+            返回
            </summary>
        </member>
        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.ConsistencyCheckConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomStudy},IRaCIS.Core.Domain.Share.IUserInfo,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Subject},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSite},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudy},AutoMapper.IMapper,Microsoft.Extensions.Localization.IStringLocalizer)">
@@ -12834,7 +12864,7 @@
            加急的医学反馈任务  通知MIM
            </summary>
        </member>
-        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.UrgentMedicalReviewAddedEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.User},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskMedicalReview},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteSurvey},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
+        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.UrgentMedicalReviewAddedEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.User},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskMedicalReview},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
            <summary>
            加急的医学反馈任务  通知MIM
            </summary>
@@ -90,7 +90,7 @@ public class UrgentMedicalReviewAddedEventConsumer(
            {
                var topicStr = string.Format(input.topicStr, companyName, trialInfo.ResearchProgramNo);
                var htmlBodyStr = string.Format(
-                    CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
+                   CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
                   userinfo.FullName,              // 用户名
                   trialInfo.ExperimentName,        // 项目
                   criterion.CriterionName,  // 阅片标准
@@ -105,7 +105,7 @@ public class UrgentMedicalReviewAddedEventConsumer(
                return (topicStr, htmlBodyStr);
            };

-        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, EmailBusinessScenario.SiteSurveyReject, messageToSend, emailConfigFunc);
+        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, EmailBusinessScenario.EligibilityVerification_MedicalQC, messageToSend, emailConfigFunc);

        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
    }
@@ -318,6 +318,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
    public class ReadingTableQuestionTrialAddOrEdit
    {

+        public Guid? ClassifyTableQuestionId { get; set; }
+
+        public string ClassifyAlgorithms { get; set; } = string.Empty;
+
+
        /// <summary>
        /// 自定义计算标记
        /// </summary>
@@ -462,6 +467,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
        /// </summary>
        public ValueOfType? ValueType { get; set; }

+        public bool IsCopy { get; set; } = false;
+
+        public Guid? ClassifyTableQuestionId { get; set; }
+
+        public string ClassifyAlgorithms { get; set; } = string.Empty;
+
        /// <summary>
        /// 问题分类
        /// </summary>
@@ -834,6 +845,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto

        public Guid Id { get; set; }

+        /// <summary>
+        /// 导出标识
+        /// </summary>
+        public ExportIdentification? ExportIdentification { get; set; }
+
+        /// <summary>
+        /// 导出结果
+        /// </summary>
+        public ExportResult? ExportResult { get; set; }
+
        /// <summary>
        /// 分组
        /// </summary>
@@ -1098,6 +1119,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto

    public class ReadingQuestionSystemView
    {
+
+
+        [Comment("导出标识")]
+        public ExportIdentification? ExportIdentification { get; set; }
+
+        [Comment("导出结果")]
+        public ExportResult? ExportResult { get; set; }
+
        /// <summary>
        /// 数值类型
        /// </summary>
@@ -1636,6 +1665,19 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
    }
    public class AddOrUpdateReadingQuestionSystemInDto
    {
+
+
+
+        /// <summary>
+        /// 导出标识
+        /// </summary>
+        public ExportIdentification? ExportIdentification { get; set; }
+
+        /// <summary>
+        /// 导出结果
+        /// </summary>
+        public ExportResult? ExportResult { get; set; }
+
        /// <summary>
        /// 数值类型
        /// </summary>
@@ -1854,6 +1896,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
        /// </summary>
        public Guid? Id { get; set; }

+        /// <summary>
+        /// 导出标识
+        /// </summary>
+        public ExportIdentification? ExportIdentification { get; set; }
+
+        /// <summary>
+        /// 导出结果
+        /// </summary>
+        public ExportResult? ExportResult { get; set; }
+
        public bool IsAdditional { get; set; }

        /// <summary>
@@ -667,6 +667,9 @@ namespace IRaCIS.Core.Application.Service.RC
            // 标准的默认值 标准默认值
            foreach (var criterion in needAddCriterionList)
            {
+
+
+
                switch (criterion.CriterionType)
                {
                    case CriterionType.IVUS: