From e563d21563ba3d0aa2704776eebdb81a3bb1c599 Mon Sep 17 00:00:00 2001 From: wxd <123@qq.com> Date: Wed, 29 May 2024 16:20:54 +0800 Subject: [PATCH] =?UTF-8?q?pacs=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ThirdPartyPublicInterfaceAppService.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Shentun.Peis.Application/ThirdPartyPublicInterfaces/ThirdPartyPublicInterfaceAppService.cs b/src/Shentun.Peis.Application/ThirdPartyPublicInterfaces/ThirdPartyPublicInterfaceAppService.cs index 29455d01..7f959562 100644 --- a/src/Shentun.Peis.Application/ThirdPartyPublicInterfaces/ThirdPartyPublicInterfaceAppService.cs +++ b/src/Shentun.Peis.Application/ThirdPartyPublicInterfaces/ThirdPartyPublicInterfaceAppService.cs @@ -376,13 +376,13 @@ namespace Shentun.Peis.ThirdPartyPublicInterfaces //检查类型检索 //仪器类别ID - var deviceTypeId = (from columnReference in await _columnReferenceRepository.GetQueryableAsync() - join columnReferenceCode in await _columnReferenceCodeRepository.GetQueryableAsync() on columnReference.Id equals columnReferenceCode.ColumnReferenceId - join columnReferenceInterface in await _columnReferenceInterfaceRepository.GetQueryableAsync() on columnReferenceCode.Id equals columnReferenceInterface.ColumnReferenceCodeId - where columnReference.DisplayName == "仪器类别" && columnReferenceInterface.InterfaceCodeValue == input.xmlx - select columnReferenceCode.CodeValue).FirstOrDefault(); + var deviceTypeIds = (from columnReference in await _columnReferenceRepository.GetQueryableAsync() + join columnReferenceCode in await _columnReferenceCodeRepository.GetQueryableAsync() on columnReference.Id equals columnReferenceCode.ColumnReferenceId + join columnReferenceInterface in await _columnReferenceInterfaceRepository.GetQueryableAsync() on columnReferenceCode.Id equals columnReferenceInterface.ColumnReferenceCodeId + where columnReference.DisplayName == "仪器类别" && columnReferenceInterface.InterfaceCodeValue == input.xmlx + select columnReferenceCode.CodeValue).ToList(); - query = query.Where(m => m.asbitem.DeviceTypeId == Guid.Parse(deviceTypeId)); + query = query.Where(m => m.asbitem.DeviceTypeId != null && deviceTypeIds.Contains(m.asbitem.DeviceTypeId.ToString())); } var queryList = query.ToList();