Added more examples for validator OAS spec

NHSDigital · Jan 17, 2025 · 797d7ff · 797d7ff
1 parent d58a0eb
commit 797d7ff
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 45 deletions.
diff --git a/src/main/kotlin/uk/nhs/england/fhirvalidator/configuration/OpenApiConfig.kt b/src/main/kotlin/uk/nhs/england/fhirvalidator/configuration/OpenApiConfig.kt
@@ -86,6 +86,27 @@ open class OpenApiConfig(@Qualifier("R4") val ctx : FhirContext,
         examples.put("Patient PDS",
             Example().value(OASExamples().loadFHIRExample("Patient-PDS.json",ctx))
         )
+        examples.put("Observation - Weight",
+            Example().value(OASExamples().loadFHIRExample("Observation-EMIS-IM1-Weight.json",ctx))
+        )
+        examples.put("Observation - Blood Pressure",
+            Example().value(OASExamples().loadFHIRExample("Observation-EMIS-IM1-BloodPressure.json",ctx))
+        )
+        examples.put("Document (FHIR) - Clinical Note",
+            Example().value(OASExamples().loadFHIRExample("FHIRDocument-EMIS-IM1-ab2539ee-fd55-4abc-9898-d4c1520dd2ba.json",ctx))
+        )
+        examples.put("MedicationRequest (prescription)",
+            Example().value(OASExamples().loadFHIRExample("MedicationRequest-EMIS-IM1-Amoxicillin.json",ctx))
+        )
+        examples.put("Patient",
+            Example().value(OASExamples().loadFHIRExample("Patient-EMIS-IM1-3.json",ctx))
+        )
+        examples.put("Practitioner",
+            Example().value(OASExamples().loadFHIRExample("Practitioner-EMIS-IM1-4435f523-44ae-4cfb-903d-570b2887812c.json",ctx))
+        )
+        examples.put("QuestionnaireResponse - Vital Signs",
+            Example().value(OASExamples().loadFHIRExample("QuestionnaireResponse-VitalSigns.json",ctx))
+        )
         examples.put("FHIR Message - Diagnostics Report (Unsolicited Observations)",
             Example().value(OASExamples().loadFHIRExample("Bundle-message-Diagnostics-unsolicited-observations.json",ctx))
         )

diff --git a/src/main/kotlin/uk/nhs/england/fhirvalidator/util/FhirSystems.java b/src/main/kotlin/uk/nhs/england/fhirvalidator/util/FhirSystems.java
@@ -10,10 +10,6 @@
 public final class FhirSystems {
     public static final String EMIS_PRACTITIONER =  "https://emis.com/Id/Practitioner/GUID";
 
-    public static final String EXTENSION_LOCATION_TYPE = "http://fhir.virtuallyhealthcare.co.uk/LocationType";
-
-    public static final String EXTENSION_LOCATION = "http://fhir.virtuallyhealthcare.co.uk/Location";
-
     public static final String NHS_GMP_NUMBER = "https://fhir.hl7.org.uk/Id/gmp-number";
 
     public static final String NHS_GMC_NUMBER = "https://fhir.hl7.org.uk/Id/gmc-number";
@@ -22,12 +18,6 @@ public final class FhirSystems {
 
     public static final String ODS_CODE = "https://fhir.nhs.uk/Id/ods-organization-code";
 
-    public static final String VIRTUALLY_CONNECTION_TYPE = "http://fhir.virtuallyhealthcare.co.uk/ConnectionType";
-
-    public static final String AWS_LOCATION_IDENTIFIER = "https://fhir.virtually.healthcare/Id/Location";
-
-    public static final String AWS_TASK_IDENTIFIER = "https://fhir.virtually.healthcare/Id/Task";
-
     public static final String EMIS_PATIENT_IDENTIFIER = "https://emis.com/Id/Patient/DBID";
     public static final String EMIS_PATIENT_ODS_IDENTIFIER = "https://emis.com/Id/Patient/ID";
 

diff --git a/src/main/resources/Examples/FHIRDocument-EMIS-IM1-ab2539ee-fd55-4abc-9898-d4c1520dd2ba.json b/src/main/resources/Examples/FHIRDocument-EMIS-IM1-ab2539ee-fd55-4abc-9898-d4c1520dd2ba.json
@@ -1,11 +1,6 @@
 {
   "resourceType": "Bundle",
   "id": "ab2539ee-fd55-4abc-9898-d4c1520dd2ba",
-  "meta": {
-    "profile" : [
-      "https://fhir.virtually.healthcare/StructureDefinition/FHIRDocument"
-    ]
-  },
   "identifier": {
     "use": "usual",
     "system": "https://tools.ietf.org/html/rfc4122",

diff --git a/src/main/resources/Examples/MedicationRequest-EMIS-IM1-Amoxicillin.json b/src/main/resources/Examples/MedicationRequest-EMIS-IM1-Amoxicillin.json
@@ -1,11 +1,6 @@
 {
   "resourceType": "MedicationRequest",
   "id": "50002932",
-  "meta": {
-    "profile" : [
-      "https://fhir.virtually.healthcare/StructureDefinition/MedicationRequest"
-    ]
-  },
   "identifier": [
     {
       "use": "secondary",

diff --git a/src/main/resources/Examples/Observation-EMIS-IM1-BloodPressure.json b/src/main/resources/Examples/Observation-EMIS-IM1-BloodPressure.json
@@ -1,11 +1,6 @@
 {
   "resourceType": "Observation",
   "id": "3114",
-  "meta": {
-    "profile" : [
-      "https://fhir.virtually.healthcare/StructureDefinition/Observation"
-    ]
-  },
   "identifier": [
     {
       "use": "secondary",

diff --git a/src/main/resources/Examples/Observation-EMIS-IM1-Weight.json b/src/main/resources/Examples/Observation-EMIS-IM1-Weight.json
@@ -1,11 +1,6 @@
 {
   "resourceType": "Observation",
   "id": "3201",
-  "meta": {
-    "profile" : [
-      "https://fhir.virtually.healthcare/StructureDefinition/Observation"
-    ]
-  },
   "identifier": [
     {
       "use": "secondary",

diff --git a/src/main/resources/Examples/Patient-EMIS-IM1-3.json b/src/main/resources/Examples/Patient-EMIS-IM1-3.json
@@ -1,11 +1,6 @@
 {
   "resourceType": "Patient",
   "id": "3",
-  "meta": {
-    "profile" : [
-      "https://fhir.virtually.healthcare/StructureDefinition/Patient"
-    ]
-  },
   "identifier": [
     {
       "use": "usual",

diff --git a/src/main/resources/Examples/Practitioner-EMIS-IM1-4435f523-44ae-4cfb-903d-570b2887812c.json b/src/main/resources/Examples/Practitioner-EMIS-IM1-4435f523-44ae-4cfb-903d-570b2887812c.json
@@ -1,11 +1,6 @@
 {
   "resourceType": "Practitioner",
   "id": "4435f523-44ae-4cfb-903d-570b2887812c",
-  "meta": {
-    "profile" : [
-      "https://fhir.virtually.healthcare/StructureDefinition/Practitioner"
-    ]
-  },
   "extension": [
     {
       "url": "http://fhir.virtuallyhealthcare.co.uk/Role",

diff --git a/src/main/resources/Examples/QuestionnaireResponse-VitalSigns.json b/src/main/resources/Examples/QuestionnaireResponse-VitalSigns.json
@@ -1,11 +1,6 @@
 {
   "resourceType": "QuestionnaireResponse",
   "id": "questionnaireresponse-vital-signs",
-  "meta": {
-    "profile" : [
-      "https://fhir.virtually.healthcare/StructureDefinition/QuestionnaireResponse"
-    ]
-  },
   "questionnaire": "https://fhir.virtually.healthcare/Questionnaire/VitalSigns",
   "identifier" : {
     "system" : "https://tools.ietf.org/html/rfc4122",