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

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

@ -1298,13 +1298,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
_userInfo.AuditIdentification = "HCC";
var trialReadingCriterion=await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskinfo.TrialReadingCriterionId).FirstOrDefaultAsync();
var trialReadingCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskinfo.TrialReadingCriterionId).FirstOrDefaultAsync();
var tableRowAnswers = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == recistTask.Id).ProjectTo<CopyTableAnswerRowInfo>(_mapper.ConfigurationProvider).ToListAsync();
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();
@ -1323,7 +1324,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
rowInfo.OrganInfoId = newOrgan.Id;
}
}
if(rowInfo.MeasureData!=null)
if (rowInfo.MeasureData != null)
{
rowInfo.MeasureData = rowInfo.MeasureData.Replace(recistTask.Id.ToString(), taskinfo.Id.ToString());
}

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

@ -1733,18 +1733,20 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var entity = item.Entity as SCPStudySubjectVisit;
var sCPStudy=await _dbContext.SCPStudy.Where(x => x.Id == entity.SCPStudyId).FirstOrDefaultAsync();
var sCPStudy = await _dbContext.SCPStudy.Where(x => x.Id == entity.SCPStudyId).FirstOrDefaultAsync();
await InsertInspection<SCPStudySubjectVisit>(item.Entity as SCPStudySubjectVisit, type, x => new InspectionConvertDTO()
{
ObjectRelationParentId = x.SubjectId,
ObjectRelationParentId2=x.SubjectVisitId,
ObjectRelationParentId2 = x.SubjectVisitId,
ObjectRelationParentId3 = x.StudyId,
IsDistinctionInterface=false,
}, new
{
StudyTime = sCPStudy!=null? sCPStudy.StudyTime:null,
StudyTime = sCPStudy != null ? sCPStudy.StudyTime : null,
});
@ -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,8 +1867,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
await InsertInspection<TaskStudy>(item.Entity as TaskStudy, type, x => new InspectionConvertDTO()
{
ObjectRelationParentId = x.VisitTaskId,
},new {
ArmEnum= armEnum,
}, new
{
ArmEnum = armEnum,
});
}
@ -1914,7 +1922,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var extraIdentification = string.Empty;
Arm armEnum = Arm.SingleReadingArm;
if (entity.VisitTaskId!=null)
if (entity.VisitTaskId != null)
{
extraIdentification = "/VisitTask";
armEnum = await _dbContext.VisitTask.Where(x => x.Id == entity.VisitTaskId).Select(x => x.ArmEnum).FirstOrDefaultAsync();
@ -1925,7 +1933,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
await InsertInspection<NoneDicomStudyFile>(item.Entity as NoneDicomStudyFile, type, x => new InspectionConvertDTO()
{
TrialId= trialid,
TrialId = trialid,
ObjectRelationParentId = x.VisitTaskId,
ExtraIndentification = extraIdentification
}, new
@ -3422,7 +3430,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
await InsertInspection<VisitTask>(entity, type, x => new InspectionConvertDTO()
{
VisitTaskId = x.Id,
SubjectVisitId= subjectVisitId,
SubjectVisitId = subjectVisitId,
ExtraIndentification = extraIdentification,
IsDistinctionInterface = type == AuditOpt.Update && isDistinctionInterface ? true : false,
@ -3635,7 +3643,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
if (generalData.SubjectId != null)
{
if (generalData.TrialId == null )
if (generalData.TrialId == null)
{
var info = await _dbContext.Subject.Where(x => x.Id == generalData.SubjectId).Select(x => new { SubjectId = x.Id, x.TrialSiteId, x.TrialId, SubjectCode = x.Code, }).FirstOrDefaultAsync();
@ -3687,7 +3695,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//自定义 标识后面 补充由代码上层的 extraIdentification 附加
if (isSelfDefine)
{
result= $"{_userInfo.RequestUrl}/{entityTypeName}";
result = $"{_userInfo.RequestUrl}/{entityTypeName}";
}
else
{