update

jembi · Feb 3, 2024 · da3852f · da3852f
1 parent 94166d0
commit da3852f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/input/fsh/examples.fsh b/input/fsh/examples.fsh
@@ -59,6 +59,7 @@ Description: "A patient's highest education level attained"
 * category.coding.system  = "http://terminology.hl7.org/CodeSystem/observation-category"
 * subject = Reference (ImmunizationPatientExample)
 * performer = Reference(OrganizationExample)
+* extension[PropietaryEducationLevelToLOINCEducationLevel].valueCanonical = "http://openhie.org/fhir/zambia-immunizations/StructureMap/PropietaryEducationLevelToLOINCEducationLevel"
 
 Instance: TargetFacilityEncounterExample
 InstanceOf: TargetFacilityEncounter

diff --git a/input/fsh/extensions.fsh b/input/fsh/extensions.fsh
@@ -16,11 +16,13 @@ Description: "This is an extension to capture whether the patient's date of birt
 * ^context[+].type = #element
 * ^context[=].expression = "Patient.birthDate"
 
-Extension: PatientStructureMap
-Id: patient-structure-map
-Title: "Patient Structure Map"
-Description: "Patient Structure Map"
+Extension: StructureMaps
+Id: structure-map
+Title: "Structure Map"
+Description: "Structure maps used in this implementation guide."
 * value[x] 1..
 * value[x] only Canonical(StructureMap)
 * ^context[+].type = #element
-* ^context[=].expression = "Patient"
+* ^context[=].expression = "Patient"
+* ^context[+].type = #element
+* ^context[=].expression = "Observation"
diff --git a/input/fsh/smartcare.fsh b/input/fsh/smartcare.fsh
@@ -78,7 +78,7 @@ Description: "Is used to document demographics and other administrative informat
 * extension[religion].valueCodeableConcept.coding.system 1..1
 * extension[religion].valueCodeableConcept.coding.code 1..1
 
-* extension contains patient-structure-map named AdministrativeSexToAdministrativeGenderMap 1..1
+* extension contains structure-map named AdministrativeSexToAdministrativeGenderMap 1..1
 * extension[AdministrativeSexToAdministrativeGenderMap].valueCanonical = "http://openhie.org/fhir/zambia-immunizations/StructureMap/AdministrativeSexToAdministrativeGender"
 
 * maritalStatus 0..1 MS
@@ -191,6 +191,8 @@ Description: "A patient's highest education level attained"
 * valueCodeableConcept.coding.code 1..1
 * valueCodeableConcept.coding.system 1..1
 * valueCodeableConcept from VSLOINCEducationLevelAttained (required)
+* extension contains structure-map named PropietaryEducationLevelToLOINCEducationLevel 1..1
+* extension[PropietaryEducationLevelToLOINCEducationLevel].valueCanonical = "http://openhie.org/fhir/zambia-immunizations/StructureMap/PropietaryEducationLevelToLOINCEducationLevel"
 
 Profile: TargetFacilityEncounter
 Parent: Encounter

diff --git a/input/maps/PropietaryEducationLevelToLOINCEducationLevel.fml b/input/maps/PropietaryEducationLevelToLOINCEducationLevel.fml
@@ -21,10 +21,8 @@ group SetPatientEducationalLevel(source obs : srcObservation, target observation
     //    coding -> educationLevel.coding = translate(coding, 'http://openhie.org/fhir/zambia-immunizations/ConceptMap/ProprietaryEducationLevelToLOINCEducationLevel', 'code') "SetPatientEducation";
     //} "SetEducationalLevelCode";
 
-     obs.value as srcCodeable, 
-        srcCodeable.coding as srcCoding -> 
-    observation.value as tgtCodeable, 
-        tgtCodeable.coding as tgtCoding,
-        tgtCoding = translate(srcCoding, 'http://openhie.org/fhir/zambia-immunizations/ConceptMap/ProprietaryEducationLevelToLOINCEducationLevel', 'code') 
-        "SetPatientEducation";
+    obs.value as srcValue ->  observation.value as tgtValue,  tgtValue.coding as coding then {
+        srcValue.system as system -> coding.system = system "set vaccine code system";
+        srcValue.code as code -> coding.code = code "set vaccine code";
+    } "set vaccine";
 }