From 94f0dd28986b7bfb405c906f45e23687f5b22289 Mon Sep 17 00:00:00 2001
From: dotasek <david.otasek@smilecdr.com>
Date: Mon, 18 Dec 2023 18:15:57 -0500
Subject: [PATCH] Fix isPrimitiveType

---
 .../validator/VersionSpecificWorkerContextWrapper.java   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java
index b46ad93d59d..29f6baa8910 100644
--- a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java
+++ b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java
@@ -533,16 +533,13 @@ public class VersionSpecificWorkerContextWrapper extends I18nBase implements IWo
 		return allStructures.stream()
 				.filter(structureDefinition ->
 						structureDefinition.getKind() == StructureDefinition.StructureDefinitionKind.PRIMITIVETYPE)
-				.anyMatch(structureDefinition -> s.equals(structureDefinition.getType()));
+				.anyMatch(structureDefinition -> s.equals(structureDefinition.getName()));
 	}
 
 	@Override
 	public boolean isDataType(String s) {
-		List<StructureDefinition> allStructures = new ArrayList<>(allStructures());
-		return allStructures.stream()
-				.filter(structureDefinition ->
-						structureDefinition.getKind() == StructureDefinition.StructureDefinitionKind.COMPLEXTYPE)
-				.anyMatch(structureDefinition -> s.equals(structureDefinition.getType()));
+		// List<StructureDefinition> allStructures = new ArrayList<>(allStructures());
+		return !isPrimitiveType(s);
 	}
 
 	@Override