修改

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

@@ -13069,6 +13069,7 @@
             </summary>
         </member>
         <!-- Badly formed XML comment ignored for member "T:IRaCIS.Core.Application.MassTransit.Consumer.PMRepliedCheckChallengeEventConsumer" -->
+        <!-- Badly formed XML comment ignored for member "M:IRaCIS.Core.Application.MassTransit.Consumer.PMRepliedCheckChallengeEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.User},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CheckChallengeDialog},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallengeDialog},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})" -->
         <member name="T:IRaCIS.Core.Application.MassTransit.Consumer.CheckStateChangedToAuditEventConsumer">
             <summary>
             通知PM 进行一致性核查 (018,030)
@@ -13081,7 +13082,12 @@
         </member>
         <member name="T:IRaCIS.Core.Application.MassTransit.Consumer.QCClaimTaskEventConsumer">
             <summary>
-            QC 领取了质控任务  
+            QC 领取了质控任务 (007，008) 
+            </summary>
+        </member>
+        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.QCClaimTaskEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.User},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallenge},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallengeDialog},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>
+            QC 领取了质控任务 (007，008) 
             </summary>
         </member>
         <member name="T:IRaCIS.Core.Application.MassTransit.Consumer.MasstransitTestConsumer">
@@ -15009,6 +15015,11 @@
         <member name="T:IRaCIS.Core.Application.Contracts.TrialSiteSurveyQuery">
             <summary>TrialSiteSurveyQuery  列表查询参数模型</summary>
         </member>
+        <member name="T:IRaCIS.Core.Application.Contracts.UseUserIDGetDoctorIDOutDto">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.Contracts.TrialSiteSurveyAddOrEdit">
             <summary> TrialSiteSurveyAddOrEdit  列表查询参数模型</summary>
         </member>
@@ -15048,6 +15059,13 @@
             <param name="userInfo"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Contracts.TrialSiteSurveyService.UseUserIDGetDoctorID(IRaCIS.Core.Application.Contracts.UseUserIDGetDoctorIDInDto)">
+            <summary>
+            通过UserId获取Doctorid
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Contracts.TrialSiteSurveyService.VerifyEmialGetDoctorInfo(IRaCIS.Core.Application.Contracts.VerifyEmialGetDoctorInfoInDto)">
             <summary>
             验证邮箱验证码 获取医生信息Id

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

@@ -2,6 +2,7 @@
 using AutoMapper.EquivalencyExpression;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Contracts;
+using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Application.ViewModel;
 
 namespace IRaCIS.Core.Application.Service
@@ -15,8 +16,6 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-
-
             CreateMap<UserCommand, User>().ForMember(d => d.UserCode, x => x.Ignore());
             CreateMap<UserType, UserTypeMenuAddOrEdit>().ReverseMap()
                 .ForMember(t => t.UserTypeMenuList, u => u.MapFrom(c => c.MenuIds))

IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs

@@ -1598,6 +1598,165 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Guid QuestionId { get; set; }
 
         public string QuestionName { get; set; }
+
+        [NotMapped]
+        public List<string> ParentTriggerValueList
+        {
+            get
+            {
+                try
+                {
+                    return this.ParentTriggerValue.Split(',').ToList();
+                }
+                catch (Exception)
+                {
+
+                    return new List<string>();
+                }
+            }
+
+        }
+        [NotMapped]
+        public List<string> RelevanceValueList
+        {
+            get
+            {
+                try
+                {
+                    return this.RelevanceValue.Split(',').ToList();
+                }
+                catch (Exception)
+                {
+
+                    return new List<string>();
+                }
+            }
+
+        }
+
+        [Comment("系统表的问题Id    ReadingQuestionSystem的Id")]
+        public Guid ReadingQuestionId { get; set; }
+
+        public string Type { get; set; } = string.Empty;
+        public Guid? ParentId { get; set; }
+
+        [Comment("父问题触发值")]
+        public string ParentTriggerValue { get; set; } = string.Empty;
+
+
+
+
+        public IsRequired IsRequired { get; set; }
+
+        [Comment("排序号")]
+        public int ShowOrder { get; set; }
+
+        [Comment("值")]
+        public string TypeValue { get; set; } = string.Empty;
+
+        [Comment("是否启用")]
+        public bool IsEnable { get; set; }
+
+        [Comment("备注")]
+        public string Remark { get; set; } = string.Empty;
+
+        [Comment("显示父问题")]
+        public Guid? RelevanceId { get; set; }
+
+        [Comment("显示父问题的值")]
+        public string RelevanceValue { get; set; } = string.Empty;
+
+        [Comment("是否显示")]
+        public int ShowQuestion { get; set; }
+
+        [Comment("最大问题数")]
+        public int? MaxRowCount { get; set; }
+
+        [Comment("图片数量")]
+        public int? ImageCount { get; set; }
+
+        [Comment("数据表名称")]
+        public string DataTableName { get; set; } = string.Empty;
+
+        [Comment("数据列")]
+        public string DataTableColumn { get; set; } = string.Empty;
+        [Comment("关联父问题")]
+        public Guid? DependParentId { get; set; }
+
+        [Comment("是否关联")]
+        public IsDepend IsDepend { get; set; }
+
+        [Comment("表格问题类型")]
+        public TableQuestionType? TableQuestionType { get; set; }
+
+        [Comment("系统标准Id")]
+        public Guid SystemCriterionId { get; set; }
+
+        [Comment("问题标识")]
+        public QuestionMark? QuestionMark { get; set; }
+
+        [Comment("字典code")]
+        public string DictionaryCode { get; set; } = string.Empty;
+        [Comment("数值类型")]
+        public ValueOfType? ValueType { get; set; }
+
+        [Comment("单位")]
+        public ValueUnit? Unit { get; set; }
+
+        [Comment("问题英文名称")]
+        public string QuestionEnName { get; set; } = string.Empty;
+
+        [Comment("数据来源")]
+        public DataSources DataSource { get; set; } = DataSources.ManualEntry;
+
+        [Comment("限制编辑")]
+        public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
+
+        [Comment("最大答案长度")]
+        public int? MaxAnswerLength { get; set; }
+
+        [Comment("文件类型")]
+        public string? FileType { get; set; } = string.Empty;
+
+        [Comment("问题分类")]
+        public QuestionClassify? QuestionClassify { get; set; }
+
+        [Comment("复制病灶的时候 是否复制这个问题")]
+        public bool IsCopy { get; set; } = false;
+
+        [Comment("分类问题表格Id")]
+        public Guid? ClassifyTableQuestionId { get; set; }
+
+        [Comment("分类类型")]
+        public ClassifyType? ClassifyType { get; set; }
+
+        [Comment("分类算法")]
+        public string ClassifyAlgorithms { get; set; } = string.Empty;
+
+        [Comment("导出标识")]
+        public ExportIdentification? ExportIdentification { get; set; }
+
+        [Comment("导出结果")]
+        public string ExportResultStr { get; set; } = "[]";
+
+        [NotMapped]
+        public List<ExportResult> ExportResult
+        {
+            get
+            {
+                try
+                {
+                    var result = JsonConvert.DeserializeObject<List<ExportResult>>(this.ExportResultStr);
+                    return result == null ? new List<ExportResult>() : result;
+                }
+                catch (Exception)
+                {
+
+                    return new List<ExportResult>();
+                }
+
+            }
+        }
     }
 
 

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs

@@ -152,12 +152,9 @@ namespace IRaCIS.Core.Application.Service
          .Where(x => x.ReadingQuestionId == inDto.QuestionId)
            .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type == inDto.Type)
          .OrderBy(x => x.ShowOrder)
-         .Select(x => new GetCalculateTableQuestionsOutDto
+          .ProjectTo<GetCalculateTableQuestionsOutDto>(_mapper.ConfigurationProvider, new
-         ()
           {
-             QuestionId = x.Id,
+              isEn_Us = _userInfo.IsEn_Us,
-             QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us)
-
           }).ToListAsync();
 
             return result;
@@ -177,12 +174,9 @@ namespace IRaCIS.Core.Application.Service
          .Where(x => x.ReadingQuestionId == inDto.QuestionId)
            .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type == inDto.Type)
          .OrderBy(x => x.ShowOrder)
-         .Select(x => new GetCalculateTableQuestionsOutDto
+          .ProjectTo<GetCalculateTableQuestionsOutDto>(_mapper.ConfigurationProvider, new
-         ()
           {
-             QuestionId = x.Id,
+              isEn_Us = _userInfo.IsEn_Us,
-             QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us)
-
           }).ToListAsync();
 
             return result;

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

@@ -228,7 +228,15 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<ReadingQuestionTrial, GetCalculateQuestionsOutDto>();
 
 
-            CreateMap<ReadingQuestionSystem, GetCalculateQuestionsOutDto>();
+            CreateMap<ReadingQuestionSystem, GetSystemCalculateQuestionsOutDto>();
+
+
+            CreateMap<ReadingTableQuestionSystem, GetCalculateTableQuestionsOutDto>()
+                .ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName));
+
+            CreateMap<ReadingTableQuestionTrial, GetCalculateTableQuestionsOutDto>()
+             .ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName));
+
 
             CreateMap<ReadingTableQuestionTrial, ReadingTableQuestionTrialView>()
                    .ForMember(dest => dest.CreateUser, opt => opt.Ignore())