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
continuous-integration/drone/push Build is passing
Details
commit
697ac6f57b
|
|
@ -1305,6 +1305,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||
var tableQuestionList = await _readingTableQuestionTrialRepository.Where(x => x.TrialCriterionId == taskinfo.TrialReadingCriterionId).ToListAsync();
|
||||
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 organ = await _organInfoRepository.Where(x => x.Id == rowInfo.OrganInfoId).FirstOrDefaultAsync();
|
||||
|
|
|
|||
|
|
@ -1741,6 +1741,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
|||
ObjectRelationParentId2 = x.SubjectVisitId,
|
||||
ObjectRelationParentId3 = x.StudyId,
|
||||
|
||||
IsDistinctionInterface=false,
|
||||
|
||||
|
||||
}, new
|
||||
{
|
||||
|
|
@ -1766,6 +1768,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
|||
|
||||
var reason = string.Empty;
|
||||
|
||||
if (type == AuditOpt.Add)
|
||||
{
|
||||
isDistinctionInterface = false;
|
||||
}
|
||||
|
||||
#region 处理标识
|
||||
|
||||
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()
|
||||
{
|
||||
ObjectRelationParentId = x.VisitTaskId,
|
||||
},new {
|
||||
}, new
|
||||
{
|
||||
ArmEnum = armEnum,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue