From 5944db5e896b15a8ae06c4c05c2c46776e8b83af Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 21 Dec 2022 10:50:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/IRaCIS.Core.Application.xml | 5 +++++ .../Reading/ClinicalData/ReadingClinicalDataService.cs | 10 +++++++--- .../Service/Reading/Dto/ReadingClinicalDataDto.cs | 6 ++++++ .../MedicalAudit/ReadingMedicineQuestionService.cs | 2 +- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 3c073b31c..2c16b878b 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -2050,6 +2050,11 @@ 是否完整 + + + 访视Id 或者模块Id + + 项目配置临床类型Name diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs index 6feb917ce..942b0ffc4 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs @@ -447,6 +447,7 @@ namespace IRaCIS.Application.Services { ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel, SubjectId = x.SubjectId, + ReadingId= x.ReadingId, ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName, ClinicalDataTrialSetId = x.ClinicalDataTrialSetId, IsSign = x.IsSign, @@ -477,9 +478,12 @@ namespace IRaCIS.Application.Services result = result.Where(x => !(x.ClinicalUploadType == ClinicalUploadType.PDF && x.FileList.Count() == 0)).ToList(); // 需要排除表格为空的数据 - var tablecount = (await _previousHistoryRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).CountAsync()) + - (await _previousOtherRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).CountAsync()) + - (await _previousSurgeryRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).CountAsync()); + + var readingIds = result.Select(x => x.ReadingId).ToList(); + + var tablecount = (await _previousHistoryRepository.Where(x => readingIds.Contains(x.SubjectVisitId)).CountAsync()) + + (await _previousOtherRepository.Where(x => readingIds.Contains(x.SubjectVisitId)).CountAsync()) + + (await _previousSurgeryRepository.Where(x => readingIds.Contains(x.SubjectVisitId)).CountAsync()); if (tablecount == 0) { diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs index 53d4aa661..e983afb4f 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs @@ -298,6 +298,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public Guid Id { get; set; } + /// + /// 访视Id 或者模块Id + /// + public Guid ReadingId { get; set; } + + /// /// 项目配置临床类型Name /// diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs index 3586d5f4b..5f52e81e4 100644 --- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs @@ -137,7 +137,7 @@ namespace IRaCIS.Core.Application.Service #endregion - #region 项目 + #region 项目 /// 获取项目的医学审核问题 ///