From b38183f0ee47bf0be4e2091b77536f54d098819a Mon Sep 17 00:00:00 2001
From: rmrlangford <richard.langford@jembi.org>
Date: Mon, 5 Feb 2024 09:33:57 +0200
Subject: [PATCH] updated

---
 input/fsh/examples.fsh                               |  2 +-
 input/fsh/smartcare.fsh                              |  2 +-
 .../maps/AdministrativeSexToAdministrativeGender.fml |  4 ++--
 ...PropietaryEducationLevelToLOINCEducationLevel.fml | 12 +++++++++---
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/input/fsh/examples.fsh b/input/fsh/examples.fsh
index 90f680cb7..c83b884b9 100644
--- a/input/fsh/examples.fsh
+++ b/input/fsh/examples.fsh
@@ -91,7 +91,7 @@ Instance: ChiefAtBirthRelatedPersonExample
 InstanceOf: ChiefAtBirthRelatedPerson
 Usage: #example
 Title: "Chief at Birth"
-Description: "Patient'a chief at birth."
+Description: "Patient's chief at birth."
 * patient = Reference(ImmunizationPatientExample)
 * name[+].use = #official
 * name[=].family = "Jones"
diff --git a/input/fsh/smartcare.fsh b/input/fsh/smartcare.fsh
index d850a072a..95ea1853a 100644
--- a/input/fsh/smartcare.fsh
+++ b/input/fsh/smartcare.fsh
@@ -314,7 +314,7 @@ Profile: ChiefAtBirthRelatedPerson
 Parent: RelationToPatient
 Id: chief-at-birth-relation-to-patient
 Title: "Chief at Birth"
-Description: "Patient'a chief at birth."
+Description: "Patient's chief at birth."
 * relationship 1..1
 * relationship = $SCT#303119007
 * name.family 1..1
diff --git a/input/maps/AdministrativeSexToAdministrativeGender.fml b/input/maps/AdministrativeSexToAdministrativeGender.fml
index 7487b17bb..0b86c7bfd 100644
--- a/input/maps/AdministrativeSexToAdministrativeGender.fml
+++ b/input/maps/AdministrativeSexToAdministrativeGender.fml
@@ -4,8 +4,8 @@
 /// title = 'Administrative Sex To Administrative Gender'
 /// status = 'active'
 
-uses "http://openhie.org/fhir/zambia-immunizations/StructureDefinition/immunization-patient" alias srcPatient as source
-uses "http://openhie.org/fhir/zambia-immunizations/StructureDefinition/immunization-patient" alias tgtPatient as target
+uses "http://hl7.org/fhir/StructureDefinition/Patient" alias srcPatient as source
+uses "http://hl7.org/fhir/StructureDefinition/Patient" alias tgtPatient as target
 
 group SetPatientGender(source pat : srcPatient, target patient : tgtPatient) {
      pat.gender as gender -> patient.gender = translate(gender, 'http://openhie.org/fhir/zambia-immunizations/ConceptMap/AdministrativeSexToAdministrativeGender', 'code') "SetGender";
diff --git a/input/maps/PropietaryEducationLevelToLOINCEducationLevel.fml b/input/maps/PropietaryEducationLevelToLOINCEducationLevel.fml
index 889ea9e17..e6fce4dee 100644
--- a/input/maps/PropietaryEducationLevelToLOINCEducationLevel.fml
+++ b/input/maps/PropietaryEducationLevelToLOINCEducationLevel.fml
@@ -7,7 +7,7 @@
 uses "http://hl7.org/fhir/StructureDefinition/Observation" alias srcObservation as source
 uses "http://hl7.org/fhir/StructureDefinition/Observation" alias tgtObservation as target
 
-group SetPatientEducationalLevel(source obs : srcObservation, target observation : tgtObservation) {
+group SetPatientEducationalLevel(source obs : srcObservation, source coding: Coding, target observation : tgtObservation, target codeableConcept : CodeableConcept) {
     /*obs.value -> observation.value = create('CodeableConcept') as value then {
         obs.value -> value.coding = create('Coding') as coding then {
             obs.value -> coding = translate(obs.value, 'http://openhie.org/fhir/zambia-immunizations/ConceptMap/ProprietaryEducationLevelToLOINCEducationLevel', 'code') "SetPatientEducation";
@@ -15,7 +15,7 @@ group SetPatientEducationalLevel(source obs : srcObservation, target observation
     } "SetEducationalLevelCode";
     obs.value -> observation.value = obs.value  "SetPatientEducationalLevel";*/
 
-    //pat.value as coding -> observation.value = translate(coding, 'http://openhie.org/fhir/zambia-immunizations/ConceptMap/ProprietaryEducationLevelToLOINCEducationLevel', 'code') "SetPatientEducation";
+
 
     //obs.value.first() as coding -> observation.value as educationLevel then {
     //    coding -> educationLevel.coding = translate(coding, 'http://openhie.org/fhir/zambia-immunizations/ConceptMap/ProprietaryEducationLevelToLOINCEducationLevel', 'code') "SetPatientEducation";
@@ -27,5 +27,11 @@ group SetPatientEducationalLevel(source obs : srcObservation, target observation
         } "set code";
     } "set";*/
 
-    //obs.value : CodeableConcept -> observation.value;
+    /*obs.value : CodeableConcept as value,
+    value first as srcValueCodeableConcept,
+    observation.value : CodeableConcept as dstValueCodeableConcept then {
+        srcValueCodeableConcept -> dstValueCodeableConcept = translate(srcValueCodeableConcept, 'http://openhie.org/fhir/zambia-immunizations/ConceptMap/ProprietaryEducationLevelToLOINCEducationLevel', 'code') "SetPatientEducation";
+    } "TEST";*/
+
+     
 }
\ No newline at end of file