diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 3e9cfbdce..0da7c3bf2 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -13281,6 +13281,13 @@ + + + 获取检查类型临床数据 + + + + 获取CRC上传的文件 diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index 71d460c9b..16e29bac4 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -1230,12 +1230,13 @@ namespace IRaCIS.Core.Application.Image.QA //[Authorize(Policy = IRaCISPolicy.CRC)] public async Task CRCRequestToQC(CRCRequestToQCCommand cRCRequestToQCCommand) { - + List modalitieTypess = new List() { "PT、CT", "CT、PT", "PET-CT" }; // 验证临床数据 是否有Pet类型 #region 验证临床数据 是否有Pet类型 foreach (var item in cRCRequestToQCCommand.SubjectVisitIds) { - if (await _dicomStudyRepository.AnyAsync(x => x.SubjectVisitId == item && (x.ModalityForEdit.Contains("PT")&& x.ModalityForEdit.Contains("CT")))) + + if (await _dicomStudyRepository.AnyAsync(x => x.SubjectVisitId == item && modalitieTypess.Contains(x.Modalities))) { var visit = await _subjectVisitRepository.Where(x => x.Id == item).FirstNotNullAsync(); var clinicalData = await this._readingClinicalDataService.GetStudyClinicalData(new Service.Reading.Dto.GetStudyClinicalDataInDto() diff --git a/IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs b/IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs index 6c4336d22..04e0c5d44 100644 --- a/IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs +++ b/IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs @@ -72,7 +72,9 @@ namespace IRaCIS.Core.Application.Triggers // 检查类型 ModalityForEdit // 检查模态 Modalities var modalities = context.Entity.Modalities; - if (modalities.Contains("PT") && modalities.Contains("CT")) + List modalitieTypess = new List() { "PT、CT", "CT、PT", "PET-CT"}; + + if (modalitieTypess.Contains(modalities)) { await _iClinicalAnswerService.AddStudyClinical(new Service.Reading.Dto.AddStudyClinicalInDto() {