diff --git a/input/fsh/conceptmaps/client-registration.fsh b/input/fsh/conceptmaps/client-registration.fsh index 4d69861ca..15065df23 100644 --- a/input/fsh/conceptmaps/client-registration.fsh +++ b/input/fsh/conceptmaps/client-registration.fsh @@ -1,28 +1,3 @@ -Instance: AdministrativeSexToAdministrativeGender -InstanceOf: ConceptMap -Title: "Administrative Sex To Administrative Gender" -Description: "Mapping to and from FHIR Administrative Sex coding to FHIR Administrative Gender." -Usage: #definition - -* name = "AdministrativeSexToAdministrativeGender" -* description = "Mapping to and from FHIR Administrative Sex coding to FHIR Administrative Gender." -* title = "ConceptMap to and From administrative sex to administrative gender" -* status = #active -* experimental = false -* date = "2024-01-30" - -* group[+] - * source = $SEX - * target = $GENDER - * insert ElementMap(M, male, equivalent) - * insert ElementMap(F, female, equivalent) - -* group[+] - * source = $GENDER - * target = $SEX - * insert ElementMap(male, M, equivalent) - * insert ElementMap(female, F, equivalent) - Instance: ProprietaryEducationLevelToLOINCEducationLevel InstanceOf: ConceptMap Title: "Proprietary Education Level to LOINC Education Level" diff --git a/input/fsh/examples.fsh b/input/fsh/examples.fsh index c83b884b9..254d66902 100644 --- a/input/fsh/examples.fsh +++ b/input/fsh/examples.fsh @@ -16,7 +16,6 @@ Description: "Is used to document demographics and other administrative informat * name[+][nickname].use = #nickname * name[=][nickname].given[+] = "Smitty" -* gender = #female * birthDate = "1990-12-12" * birthDate.extension[birthTime].valueDateTime = "1983-05-22T16:40:17+02:00" * birthDate.extension[IsEstimatedDOB].valueBoolean = false @@ -29,7 +28,7 @@ Description: "Is used to document demographics and other administrative informat * extension[religion].valueCodeableConcept.coding.system = "http://terminology.hl7.org/CodeSystem/v3-ReligiousAffiliation" * extension[religion].valueCodeableConcept.text = "Christian (non-Catholic, non-specific)" * managingOrganization = Reference(OrganizationExample) -* extension[AdministrativeSexToAdministrativeGenderMap].valueCanonical = "http://openhie.org/fhir/zambia-immunizations/StructureMap/AdministrativeSexToAdministrativeGender" +* extension[sex].valueCodeableConcept = $SEX#F Instance: SpouseRelatedPersonExample InstanceOf: SpouseRelatedPerson @@ -59,7 +58,6 @@ 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 index a397dc9d7..716b1cee8 100644 --- a/input/fsh/extensions.fsh +++ b/input/fsh/extensions.fsh @@ -16,13 +16,12 @@ Description: "This is an extension to capture whether the patient's date of birt * ^context[+].type = #element * ^context[=].expression = "Patient.birthDate" -Extension: StructureMaps -Id: structure-map -Title: "Structure Map" -Description: "Structure maps used in this implementation guide." +Extension: AdministrativeSex +Id: administrative-sex +Title: "Administrative Sex" +Description: "This is an extension to capture that patient's administrative sex." +* value[x] only CodeableConcept +* valueCodeableConcept from AdministrativeSex (required) * value[x] 1.. -* value[x] only Canonical(StructureMap) * ^context[+].type = #element -* ^context[=].expression = "Patient" -* ^context[+].type = #element -* ^context[=].expression = "Observation" \ No newline at end of file +* ^context[=].expression = "Patient" \ No newline at end of file diff --git a/input/fsh/smartcare.fsh b/input/fsh/smartcare.fsh index 95ea1853a..a623724eb 100644 --- a/input/fsh/smartcare.fsh +++ b/input/fsh/smartcare.fsh @@ -56,7 +56,6 @@ Description: "Is used to document demographics and other administrative informat * name[nickname].use 1..1 * name[nickname].use = #nickname -* gender 1..1 * birthDate 1..1 * birthDate.extension contains patient-birthTime named birthTime 0..1 MS * birthDate.extension[birthTime] ^definition = @@ -78,8 +77,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 structure-map named AdministrativeSexToAdministrativeGenderMap 1..1 -* extension[AdministrativeSexToAdministrativeGenderMap].valueCanonical = "http://openhie.org/fhir/zambia-immunizations/StructureMap/AdministrativeSexToAdministrativeGender" +* extension contains AdministrativeSex named sex 1..1 * maritalStatus 0..1 MS * maritalStatus.coding 1..1 @@ -191,8 +189,6 @@ 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/fsh/terminology.fsh b/input/fsh/terminology.fsh index 746c4a630..1ad0e4dde 100644 --- a/input/fsh/terminology.fsh +++ b/input/fsh/terminology.fsh @@ -153,4 +153,12 @@ Title: "HumanName Codes" Description: "A List of HumanName Codes Exlcuding Nickname" * ^experimental = false * include codes from system $HumanName -* exclude $HumanName#nickname \ No newline at end of file +* exclude $HumanName#nickname + +ValueSet: AdministrativeSex +Id: vs-administrative-sex +Title: "Administrative Sex" +Description: "A List of Administrative Sex codes." +* ^experimental = false +* $SEX#M "Male" +* $SEX#F "Female" \ No newline at end of file diff --git a/input/maps/AdministrativeSexToAdministrativeGender.fml b/input/maps/AdministrativeSexToAdministrativeGender.fml deleted file mode 100644 index 0b86c7bfd..000000000 --- a/input/maps/AdministrativeSexToAdministrativeGender.fml +++ /dev/null @@ -1,12 +0,0 @@ -/// url = 'http://openhie.org/fhir/zambia-immunizations/StructureMap/AdministrativeSexToAdministrativeGender' -/// name = 'AdministrativeSexToAdministrativeGender' -/// description = 'Maps the Administrative Sex codes To Administrative Gender codes.' -/// title = 'Administrative Sex To Administrative Gender' -/// status = 'active' - -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"; -} \ No newline at end of file