From f4fd16d8fd6271b9017a3e404b92c5028d63253d Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 29 Feb 2024 14:01:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E6=A3=80=E6=9F=A5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/QC/QCOperationService.cs | 37 +++++++++++++++++-- .../ReadingClinicalDataService.cs | 3 +- .../Reading/Dto/ReadingClinicalDataDto.cs | 5 +++ .../Interface/IReadingClinicalDataService.cs | 5 ++- IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs | 7 +++- 5 files changed, 50 insertions(+), 7 deletions(-) diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index ef7a47d5c..0f57335a5 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -28,7 +28,8 @@ namespace IRaCIS.Core.Application.Image.QA private readonly IRepository _qcChallengeRepository; private readonly IRepository _dicomStudyRepository; private readonly IRepository _dicomSeriesrepository; - private readonly IRepository _subjectRepository; + private readonly IReadingClinicalDataService _readingClinicalDataService; + private readonly IRepository _subjectRepository; private readonly IRepository _readingClinicalDataRepository; private readonly IRepository _qCChallengeDialogrepository; private readonly IRepository _checkChallengeDialogrepository; @@ -43,7 +44,8 @@ namespace IRaCIS.Core.Application.Image.QA IRepository visitTaskRepository, IRepository dicomStudyRepository, IRepository dicomSeriesrepository, - IRepository subjectRepository, + IReadingClinicalDataService readingClinicalDataService, + IRepository subjectRepository, IRepository readingClinicalDataRepository, IRepository qCChallengeDialogrepository, IRepository checkChallengeDialogrepository, @@ -55,7 +57,8 @@ namespace IRaCIS.Core.Application.Image.QA _qcChallengeRepository = qcChallengeRepository; _dicomStudyRepository = dicomStudyRepository; this._dicomSeriesrepository = dicomSeriesrepository; - this._subjectRepository = subjectRepository; + this._readingClinicalDataService = readingClinicalDataService; + this._subjectRepository = subjectRepository; this._readingClinicalDataRepository = readingClinicalDataRepository; this._qCChallengeDialogrepository = qCChallengeDialogrepository; this._checkChallengeDialogrepository = checkChallengeDialogrepository; @@ -1220,7 +1223,33 @@ namespace IRaCIS.Core.Application.Image.QA public async Task CRCRequestToQC(CRCRequestToQCCommand cRCRequestToQCCommand) { - var trialId = cRCRequestToQCCommand.TrialId; + // 验证临床数据 是否有Pet类型 + #region 验证临床数据 是否有Pet类型 + foreach (var item in cRCRequestToQCCommand.SubjectVisitIds) + { + if (await _dicomStudyRepository.AnyAsync(x => x.SubjectVisitId == item && x.Modalities == "CT")) + { + var visit = await _subjectVisitRepository.Where(x => x.Id == item).FirstNotNullAsync(); + var clinicalData = await this._readingClinicalDataService.GetCRCClinicalData(new Service.Reading.Dto.GetCRCClinicalDataInDto() + { + IsBaseline = visit.IsBaseLine, + SubjectId = visit.SubjectId, + SubjectVisitId = item, + TrialId = cRCRequestToQCCommand.TrialId, + }); + + if (clinicalData.Any(x => x.ClinicalDataLevel == ClinicalLevel.Study && x.ClinicalUploadType == ClinicalUploadType.PDF && x.PDFFileList.Count() == 0)) + { + throw new BusinessValidationFailedException(_localizer["QCOperation_NeedStudyClinical"]); + } + } + + + } + #endregion + + + var trialId = cRCRequestToQCCommand.TrialId; var trialConfig = (await _trialRepository .Select(t => new { TrialId = t.Id, t.QCProcessEnum, t.IsImageConsistencyVerification, t.IsUrgent, t.IsHaveFirstGiveMedicineDate, t.ClinicalInformationTransmissionEnum }) diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs index 633c2597d..61f027698 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs @@ -195,7 +195,8 @@ namespace IRaCIS.Application.Services Id = x.Id, ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName.LanguageName(x.ClinicalDataTrialSet.ClinicalDataSetEnName, _userInfo.IsEn_Us) , ClinicalUploadType = x.ClinicalDataTrialSet.ClinicalUploadType, - ClinicalDataSetEnName=x.ClinicalDataTrialSet.ClinicalDataSetEnName, + ClinicalDataLevel=x.ClinicalDataTrialSet.ClinicalDataLevel, + ClinicalDataSetEnName =x.ClinicalDataTrialSet.ClinicalDataSetEnName, ClinicalDataTrialSetId = x.ClinicalDataTrialSet.Id, FileName = x.ClinicalDataTrialSet.FileName, UploadRole = x.ClinicalDataTrialSet.UploadRole, diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs index cd3713b1f..39262facc 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs @@ -87,6 +87,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public ClinicalUploadType ClinicalUploadType { get; set; } + /// + /// 临床级别 + /// + public ClinicalLevel ClinicalDataLevel { get; set; } + /// /// 上传角色 diff --git a/IRaCIS.Core.Application/Service/Reading/Interface/IReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/Interface/IReadingClinicalDataService.cs index 94705f59a..82c175fb6 100644 --- a/IRaCIS.Core.Application/Service/Reading/Interface/IReadingClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/Reading/Interface/IReadingClinicalDataService.cs @@ -24,6 +24,9 @@ namespace IRaCIS.Core.Application.Contracts Task> GetReadingClinicalList(GetReadingClinicalDataListIndto inDto); - Task DealVisiTaskClinicalDataSignedAsync(Guid trialId, Guid subjectId, Guid readingId, bool isVisit, Guid trialReadingCritrialId); + Task> GetCRCClinicalData(GetCRCClinicalDataInDto inDto); + + + Task DealVisiTaskClinicalDataSignedAsync(Guid trialId, Guid subjectId, Guid readingId, bool isVisit, Guid trialReadingCritrialId); } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index eef85caef..42f5cdb4a 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -1767,7 +1767,12 @@ public enum SUVChangeVSBaseline /// [DisplayAttribute(Name = "肿瘤学阅片")] OncologyRead = 3, - } + + /// + /// 检查 + /// + Study=4, + } /// /// 全局答案类型