diff --git a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs index 9b1f7acbc..3598e4295 100644 --- a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs @@ -122,7 +122,7 @@ namespace IRaCIS.Core.Application.Service [HttpPost] public async Task> GetChildrenItem(GetChildrenItem item) { - var list =await (from data in _repository.GetQueryable().Where(x => x.Identification == item.Identification) + var list =await (from data in _repository.GetQueryable().Where(x => x.Identification == item.Identification&&x.Identification!=string.Empty&&x.Identification!=null) join childrenType in _repository.GetQueryable() on data.Id equals childrenType.ParentId select childrenType).OrderBy(x=>x.Sort).ToListAsync(); return list; diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index 237790b1b..e9c5e06e0 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -32,6 +32,7 @@ namespace IRaCIS.Core.Application.Image.QA private readonly IRepository _dicomStudyRepository; private readonly IRepository _dicomSeriesrepository; private readonly IRepository _subjectRepository; + private readonly IRepository _qCChallengeDialogrepository; private readonly IRepository _trialRepository; private readonly IMediator _mediator; @@ -43,7 +44,8 @@ namespace IRaCIS.Core.Application.Image.QA IMediator mediator, IRepository dicomStudyRepository, IRepository dicomSeriesrepository, - IRepository subjectRepository + IRepository subjectRepository, + IRepository qCChallengeDialogrepository ) { _dicomFileStoreHelper = dicomFileStoreHelper; @@ -52,6 +54,7 @@ namespace IRaCIS.Core.Application.Image.QA _dicomStudyRepository = dicomStudyRepository; this._dicomSeriesrepository = dicomSeriesrepository; this._subjectRepository = subjectRepository; + this._qCChallengeDialogrepository = qCChallengeDialogrepository; _mediator = mediator; _trialRepository = trialRepository; } @@ -229,7 +232,7 @@ namespace IRaCIS.Core.Application.Image.QA { var qaReply = _mapper.Map(qaDialogCommand); - await _repository.AddAsync(qaReply); + await _qCChallengeDialogrepository.AddAsync(qaReply); qaReply.UserTypeEnum = (UserTypeEnum)_userInfo.UserTypeEnumInt; diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 7b7ad8b36..dd0c68cce 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -237,7 +237,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common //一致性核查 foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(CheckChallengeDialog))) { - type = _userInfo.UserTypeShortName + "/" + type; + await InsertInspection(item, type, x => new DataInspection() { GeneralId = x.Id,