XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
hang 2025-07-02 10:20:26 +08:00
parent 0333002ffa 14b1a62a1f
commit 485e1359a9
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
View File

@ -157,16 +157,16 @@ public class ReadingQuestionTrial : BaseAddAuditEntity
public Guid? SystemParentId { get; set; } public Guid? SystemParentId { get; set; }
[Comment("答案分组")] [Comment("答案分组")]
public string AnswerGroup { get; set; } = string.Empty; public string AnswerGroup { get; set; } = "[]";
[Comment("答案组合")] [Comment("答案组合")]
public string AnswerCombination { get; set; } = string.Empty; public string AnswerCombination { get; set; } = "[]";
[Comment("裁判类型")] [Comment("裁判类型")]
public JudgeTypeEnum JudgeType { get; set; } = JudgeTypeEnum.AnswerDisaffinity; public JudgeTypeEnum JudgeType { get; set; } = JudgeTypeEnum.AnswerDisaffinity;
[Comment("裁判百分比或绝对值的相差值")] [Comment("裁判百分比或绝对值的相差值")]
public decimal? JudgeDifferenceValue { get; set; } public decimal? JudgeDifferenceValue { get; set; } = 0;
[Comment("裁判百分比或绝对值的相差值匹配规则")] [Comment("裁判百分比或绝对值的相差值匹配规则")]
public JudgeDifferenceType JudgeDifferenceType { get; set; } public JudgeDifferenceType JudgeDifferenceType { get; set; }

7
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -200,15 +200,22 @@ namespace IRaCIS.Core.Infra.EFCore.Common
break; break;
} }
var trialDicomAE =await _dbContext.TrialDicomAE.Where(t => t.TrialId == entity.Id).FirstOrDefaultAsync();
await InsertInspection<Trial>(item.Entity as Trial, type, x => new InspectionConvertDTO() await InsertInspection<Trial>(item.Entity as Trial, type, x => new InspectionConvertDTO()
{ {
TrialId = x.Id, TrialId = x.Id,
ExtraIndentification = extraIdentification, ExtraIndentification = extraIdentification,
}, new }, new
{ {
//TrialDicList = string.Join(",", trialDics) //TrialDicList = string.Join(",", trialDics)
CalledAE = trialDicomAE?.CalledAE,
IP = trialDicomAE?.IP,
Port = trialDicomAE?.Port,
IsTestOK = trialDicomAE?.IsTestOK,
ImageFormatListStr = string.Join("|", entity.ImageFormatList), ImageFormatListStr = string.Join("|", entity.ImageFormatList),
StudyNamesStr = string.Join("|", entity.StudyNameList.Where(x => x.IsChoose).Select(x => _userInfo.IsEn_Us ? x.EnName : x.Name)), StudyNamesStr = string.Join("|", entity.StudyNameList.Where(x => x.IsChoose).Select(x => _userInfo.IsEn_Us ? x.EnName : x.Name)),