From e902fe88d0a2d9191790c6554e0115ed6801e663 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Tue, 1 Jul 2025 17:41:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index b1d7a7de8..619dedd4f 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -200,15 +200,21 @@ 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)), From f52e35379f7f98e038dcbff4e39eb5927e90eca7 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Tue, 1 Jul 2025 17:56:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 619dedd4f..7370349ed 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -211,6 +211,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common { //TrialDicList = string.Join(",", trialDics) + CalledAE = trialDicomAE?.CalledAE, IP = trialDicomAE?.IP, Port = trialDicomAE?.Port, From 14b1a62a1f271f21b1c8d71745f02bce8183d1e8 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Wed, 2 Jul 2025 10:01:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A3=81=E5=88=A4?= =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReadingCriterionQuestion/ReadingQuestionTrial.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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; }