diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs index 6d1fd4594..dc8052af2 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs @@ -157,16 +157,16 @@ public class ReadingQuestionTrial : BaseAddAuditEntity public Guid? SystemParentId { get; set; } [Comment("答案分组")] - public string AnswerGroup { get; set; } = string.Empty; + public string AnswerGroup { get; set; } = "[]"; [Comment("答案组合")] - public string AnswerCombination { get; set; } = string.Empty; + public string AnswerCombination { get; set; } = "[]"; [Comment("裁判类型")] public JudgeTypeEnum JudgeType { get; set; } = JudgeTypeEnum.AnswerDisaffinity; [Comment("裁判百分比或绝对值的相差值")] - public decimal? JudgeDifferenceValue { get; set; } + public decimal? JudgeDifferenceValue { get; set; } = 0; [Comment("裁判百分比或绝对值的相差值匹配规则")] public JudgeDifferenceType JudgeDifferenceType { get; set; } diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index b1d7a7de8..7370349ed 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -200,15 +200,22 @@ namespace IRaCIS.Core.Infra.EFCore.Common break; } + var trialDicomAE =await _dbContext.TrialDicomAE.Where(t => t.TrialId == entity.Id).FirstOrDefaultAsync(); await InsertInspection(item.Entity as Trial, type, x => new InspectionConvertDTO() { TrialId = x.Id, + ExtraIndentification = extraIdentification, }, new { //TrialDicList = string.Join(",", trialDics) + + CalledAE = trialDicomAE?.CalledAE, + IP = trialDicomAE?.IP, + Port = trialDicomAE?.Port, + IsTestOK = trialDicomAE?.IsTestOK, ImageFormatListStr = string.Join("|", entity.ImageFormatList), StudyNamesStr = string.Join("|", entity.StudyNameList.Where(x => x.IsChoose).Select(x => _userInfo.IsEn_Us ? x.EnName : x.Name)),