pacs查询

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();