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

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

Test_HIR_Net8
hang 2025-09-03 15:21:05 +08:00
parent e9b3b012f9 d5d3d6e1c9
commit 697ac6f57b
2 changed files with 208 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
View File

@ -1305,6 +1305,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var tableQuestionList = await _readingTableQuestionTrialRepository.Where(x => x.TrialCriterionId == taskinfo.TrialReadingCriterionId).ToListAsync(); var tableQuestionList = await _readingTableQuestionTrialRepository.Where(x => x.TrialCriterionId == taskinfo.TrialReadingCriterionId).ToListAsync();
foreach (var rowInfo in tableRowAnswers) foreach (var rowInfo in tableRowAnswers)
{ {
rowInfo.ReportMark = rowInfo.RowMark;
var question = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == taskinfo.TrialReadingCriterionId && x.LesionType == rowInfo.LesionType).FirstOrDefaultAsync(); var question = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == taskinfo.TrialReadingCriterionId && x.LesionType == rowInfo.LesionType).FirstOrDefaultAsync();
var organ = await _organInfoRepository.Where(x => x.Id == rowInfo.OrganInfoId).FirstOrDefaultAsync(); var organ = await _organInfoRepository.Where(x => x.Id == rowInfo.OrganInfoId).FirstOrDefaultAsync();

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

@ -1741,6 +1741,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
ObjectRelationParentId2 = x.SubjectVisitId, ObjectRelationParentId2 = x.SubjectVisitId,
ObjectRelationParentId3 = x.StudyId, ObjectRelationParentId3 = x.StudyId,
IsDistinctionInterface=false,
}, new }, new
{ {
@ -1766,6 +1768,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var reason = string.Empty; var reason = string.Empty;
if (type == AuditOpt.Add)
{
isDistinctionInterface = false;
}
#region 处理标识 #region 处理标识
switch (_userInfo.RequestUrl.ToLower()) switch (_userInfo.RequestUrl.ToLower())
@ -1860,7 +1867,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
await InsertInspection<TaskStudy>(item.Entity as TaskStudy, type, x => new InspectionConvertDTO() await InsertInspection<TaskStudy>(item.Entity as TaskStudy, type, x => new InspectionConvertDTO()
{ {
ObjectRelationParentId = x.VisitTaskId, ObjectRelationParentId = x.VisitTaskId,
},new { }, new
{
ArmEnum = armEnum, ArmEnum = armEnum,
}); });
} }