diff --git a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs index a00d34e3c..1881ebd74 100644 --- a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs +++ b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs @@ -135,6 +135,13 @@ namespace IRaCIS.Application.Services } + public async Task GetBasicDataTranslateItem(string parentCode, string childCode) + { + return (await _dicRepository.Where(t => t.Parent.Code == parentCode && t.Code == childCode) + .ProjectTo(_mapper.ConfigurationProvider).FirstOrDefaultAsync()) + .IfNullThrowConvertException(); + } + /// /// 获取所有下拉框 枚举 bool 数据 /// diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index af7d67268..2832f66d2 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -49,8 +49,8 @@ namespace IRaCIS.Core.Application.Image.QA _subjectVisitRepository = subjectVisitRepository; _dicomStudyRepository = dicomStudyRepository; _mediator = mediator; - this._trialRepository = trialRepository; - this._inspectionService = inspectionService; + _trialRepository = trialRepository; + _inspectionService = inspectionService; } #region QC质疑 以及回复 关闭 @@ -255,6 +255,7 @@ namespace IRaCIS.Core.Application.Image.QA var qaReply = _mapper.Map(checkDialogCommand); qaReply.CreateUser = _userInfo.RealName; + qaReply.UserTypeEnum = (UserTypeEnum)_userInfo.UserTypeEnumInt; await _repository.AddAsync(qaReply); @@ -2005,7 +2006,10 @@ namespace IRaCIS.Core.Application.Image.QA } } + await _subjectVisitRepository.BatchUpdateAsync(t => t.Id == subjectVisitId, + u => new SubjectVisit() { ForwardState = ForwardStateEnum.Forwarded, ForwardUserId = _userInfo.Id, ForwardTime = DateTime.Now }); + keyValuePairs["ForwardState"] = "转发成功"; } catch (Exception e) { @@ -2015,10 +2019,7 @@ namespace IRaCIS.Core.Application.Image.QA keyValuePairs["ForwardState"] = "转发失败"; } - await _subjectVisitRepository.BatchUpdateAsync(t => t.Id == subjectVisitId, - u => new SubjectVisit() { ForwardState = ForwardStateEnum.Forwarded, ForwardUserId = _userInfo.Id, ForwardTime = DateTime.Now }); - keyValuePairs["ForwardState"] = "转发成功"; data.JsonDetail = JsonConvert.SerializeObject(keyValuePairs); datas.Add(data);