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
he 2025-08-04 09:32:44 +08:00
parent ed40a896f2 1c58ba7e28
commit 83f9a66f7a
2 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IRaCIS.Core.Application/Service/QC/QCOperationService.cs
View File

@ -1415,11 +1415,10 @@ namespace IRaCIS.Core.Application.Image.QA
.WhereIf(isDistinguishType, t => isSecondReview == true ? t.SecondReviewState == SecondReviewState.WaitAudit : t.SecondReviewState == SecondReviewState.None) .WhereIf(isDistinguishType, t => isSecondReview == true ? t.SecondReviewState == SecondReviewState.WaitAudit : t.SecondReviewState == SecondReviewState.None)
.WhereIf(isDistinguishType, t => ishaveQCChallenge == true ? t.QCChallengeList.Any() : !t.QCChallengeList.Any()) .WhereIf(isDistinguishType, t => ishaveQCChallenge == true ? t.QCChallengeList.Any() : !t.QCChallengeList.Any())
//区分类型，当前做的不是复核任务 //区分类型，当前做的不是复核任务
.WhereIf(isDistinguishType && isSecondReview == false, t => t.AuditState != AuditStateEnum.QCPassed) .WhereIf(isDistinguishType && isSecondReview == false, t => t.AuditState != AuditStateEnum.QCPassed && t.PreliminaryAuditUserId != _userInfo.UserRoleId)
.WhereIf(isDistinguishType && isSecondReview == false, t => t.AuditState >= AuditStateEnum.PrimaryQCPassed ? t.PreliminaryAuditUserId != _userInfo.UserRoleId : true)
//不区分任务类型， 当前做完的任何类型都要默认满足下面条件 //不区分任务类型， 当前做完的任何类型都要默认满足下面条件
.WhereIf(isDistinguishType == false, t => (t.SecondReviewState == SecondReviewState.WaitAudit && t.AuditState == AuditStateEnum.QCPassed) || (t.AuditState != AuditStateEnum.QCPassed)) .WhereIf(isDistinguishType == false, t => (t.SecondReviewState == SecondReviewState.WaitAudit && t.AuditState == AuditStateEnum.QCPassed) || (t.AuditState != AuditStateEnum.QCPassed && t.PreliminaryAuditUserId != _userInfo.UserRoleId))
.Where(x => !x.SubjectVisitImageBackRecordList.Any(t => t.ImageBackState == ImageBackStateEnum.None)) .Where(x => !x.SubjectVisitImageBackRecordList.Any(t => t.ImageBackState == ImageBackStateEnum.None))

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

@ -549,9 +549,12 @@ namespace IRaCIS.Core.Infra.EFCore.Common
ExtraIndentification = extraIdentification ExtraIndentification = extraIdentification
}, new { ParentQuestionShowOrder = parentQuestionShowOrder, }, new
{
ParentQuestionShowOrder = parentQuestionShowOrder,
OperatingTime = DateTime.Now, OperatingTime = DateTime.Now,
RelavantQuestionShowOrder = relavantQuestionShowOrder }); RelavantQuestionShowOrder = relavantQuestionShowOrder
});
} }
//系统标准表格问题 //系统标准表格问题
@ -1394,7 +1397,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
ExtraIndentification = extraIdentification ExtraIndentification = extraIdentification
},new { }, new
{
IsHaveQuestion = isHaveQuestion, IsHaveQuestion = isHaveQuestion,
}); });
} }
@ -2278,12 +2282,12 @@ namespace IRaCIS.Core.Infra.EFCore.Common
armEnum = await _dbContext.VisitTask.Where(x => x.Id == entity.VisitTaskId).Select(x => x.ArmEnum).FirstOrDefaultAsync(); armEnum = await _dbContext.VisitTask.Where(x => x.Id == entity.VisitTaskId).Select(x => x.ArmEnum).FirstOrDefaultAsync();
} }
var noneDicomStudy = await _dbContext.NoneDicomStudy.Where(x => x.Id == entity.NoneDicomStudyId).IgnoreQueryFilters().FirstNotNullAsync(); //var noneDicomStudy = await _dbContext.NoneDicomStudy.FindAsync(entity.NoneDicomStudyId);
await InsertInspection<NoneDicomStudyFile>(item.Entity as NoneDicomStudyFile, type, x => new InspectionConvertDTO() await InsertInspection<NoneDicomStudyFile>(item.Entity as NoneDicomStudyFile, type, x => new InspectionConvertDTO()
{ {
SubjectVisitId = noneDicomStudy.SubjectVisitId, //SubjectVisitId = noneDicomStudy.SubjectVisitId,
SubjectId = noneDicomStudy.SubjectId, //SubjectId = noneDicomStudy.SubjectId,
ObjectRelationParentId = x.VisitTaskId, ObjectRelationParentId = x.VisitTaskId,
ObjectRelationParentId2 = x.NoneDicomStudyId, ObjectRelationParentId2 = x.NoneDicomStudyId,
ObjectRelationParentId3 = x.OriginNoneDicomStudyId, ObjectRelationParentId3 = x.OriginNoneDicomStudyId,