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

Uat_IRC_Net8
hang 2025-08-06 10:56:08 +08:00
parent fcdee39356 7e54b4fdd6
commit 677a7f7bd7
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
View File

@ -1206,10 +1206,11 @@ namespace IRaCIS.Core.Application.Service
{ {
IsShow= lefttrialshow==null? data.IsDefaultChoice : lefttrialshow.IsShow, IsShow= lefttrialshow==null? data.IsDefaultChoice : lefttrialshow.IsShow,
FrontAuditConfigId = data.Id, FrontAuditConfigId = data.Id,
data.Sort,
Description = _userInfo.IsEn_Us ? data.Description : data.DescriptionCN Description = _userInfo.IsEn_Us ? data.Description : data.DescriptionCN
}; };
return result.Where(x=>x.IsShow).Distinct().ToList(); return result.Where(x=>x.IsShow).Distinct().OrderBy(x=>x.Sort).ToList();
} }
/// <summary> /// <summary>

2
IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFCalculateService.cs
View File

@ -417,7 +417,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
FristAddTaskNum = taskinfo.VisitTaskNum, FristAddTaskNum = taskinfo.VisitTaskNum,
IsCurrentTaskAdd = true, IsCurrentTaskAdd = true,
BlindName = taskinfo.TaskBlindName, BlindName = taskinfo.TaskBlindName,
OrderMark = tableQuestion.OrderMark + num.GetLesionMark(), OrderMark = tableQuestion.OrderMark,
VisitTaskId = visitTaskId, VisitTaskId = visitTaskId,
TrialId = taskinfo.TrialId, TrialId = taskinfo.TrialId,
QuestionId = tableQuestion.Id, QuestionId = tableQuestion.Id,

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

@ -3855,11 +3855,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//处理标识 因为触发器在稽查后才进行操作 //处理标识 因为触发器在稽查后才进行操作
if (entity.OrderMark == string.Empty) entity.OrderMark = await _dbContext.ReadingQuestionTrial.Where(x => x.Id == entity.QuestionId).Select(x => x.OrderMark).FirstOrDefaultAsync();
{
entity.OrderMark = await _dbContext.ReadingQuestionTrial.Where(x => x.Id == entity.QuestionId).Select(x => x.OrderMark).FirstOrDefaultAsync();
}
entity.RowMark = entity.OrderMark+ entity.RowIndex.GetLesionMark(); entity.RowMark = entity.OrderMark+ entity.RowIndex.GetLesionMark();