From 8a5b9ecb112c3220b4adeebf02c69ee33d7db34a Mon Sep 17 00:00:00 2001 From: wxd <123@qq.com> Date: Wed, 21 Aug 2024 15:29:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E6=89=93=E6=9D=A1=E7=A0=81=E6=97=A0?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=97=B6=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PrintReports/PrintReportAppService.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs index 2df7111..54e8fd2 100644 --- a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs +++ b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs @@ -302,7 +302,7 @@ namespace Shentun.Peis.PrintReports requiresNew: false, isTransactional: false )) { - var query2 = (from patient in await _patientRepository.GetQueryableAsync() + var query = (from patient in await _patientRepository.GetQueryableAsync() join patientRegister in await _patientRegisterRepository.GetQueryableAsync() on patient.Id equals patientRegister.PatientId join sex in await _sexRegisterRepository.GetQueryableAsync() on patientRegister.SexId equals sex.Id @@ -315,7 +315,7 @@ namespace Shentun.Peis.PrintReports from sampleTypeHaveEmpty in ee.DefaultIfEmpty() join sampleGroupDetail in await _sampleGroupDetailRepository.GetQueryableAsync() on asbitem.Id equals sampleGroupDetail.AsbitemId into sampleGroupDetailTemp from sampleTypeHaveEmptyHaveEmpty in sampleGroupDetailTemp.DefaultIfEmpty() - join sampleGroup in await _sampleGroupRepository.GetQueryableAsync() + join sampleGroup in await _sampleGroupRepository.GetQueryableAsync() on sampleTypeHaveEmptyHaveEmpty.SampleGroupId equals sampleGroup.Id into sampleGroupTemp from sampleGroupHaveEmpty in sampleGroupTemp.DefaultIfEmpty() where (patientRegister.Id == input.PatientRegisterId && registerCheckAsbitem.LisRequestId != null) @@ -332,11 +332,12 @@ namespace Shentun.Peis.PrintReports sampleGroupName = sampleGroupHaveEmpty != null ? sampleGroupHaveEmpty.DisplayName : "", samplePrintCount = sampleGroupHaveEmpty != null ? sampleGroupHaveEmpty.SamplePrintCount : 0 } - ); + ).ToList(); - var ggg = query2.ToQueryString(); - - var query = query2.ToList(); + if (query.Count == 0) + { + return new List(); + } lisRequests = query.Select(o => o.lisRequest).Distinct().ToList(); //发送第三方LIS申请