From 4143146226c83a750e905dd0d1f3ab0d6cf633df Mon Sep 17 00:00:00 2001 From: rmrlangford Date: Fri, 2 Feb 2024 09:27:25 +0200 Subject: [PATCH 1/5] updated --- input/fsh/conceptmaps/client-registration.fsh | 4 +- input/fsh/examples.fsh | 40 ++++++-- input/fsh/smartcare.fsh | 94 ++++++++++++++----- input/fsh/terminology.fsh | 2 +- 4 files changed, 108 insertions(+), 32 deletions(-) diff --git a/input/fsh/conceptmaps/client-registration.fsh b/input/fsh/conceptmaps/client-registration.fsh index 4f7753b1b..4d69861ca 100644 --- a/input/fsh/conceptmaps/client-registration.fsh +++ b/input/fsh/conceptmaps/client-registration.fsh @@ -37,7 +37,7 @@ Usage: #definition * date = "2024-01-31" * group[+] - * source = $PROPRrietary_EDU_LEVEL + * source = $PROPRIETARY_EDU_LEVEL * target = $LNC * insert ElementMap(CertificateGraduate, LA30193-9, equivalent) * insert ElementMap(DegreeGraduate, LA32469-1, equivalent) @@ -51,7 +51,7 @@ Usage: #definition * group[+] * source = $LNC - * target = $PROPRrietary_EDU_LEVEL + * target = $PROPRIETARY_EDU_LEVEL * insert ElementMap(LA30193-9, CertificateGraduate, equivalent) * insert ElementMap(LA32469-1, DegreeGraduate, equivalent) * insert ElementMap(LA12459-6, DiplomaGraduate, equivalent) diff --git a/input/fsh/examples.fsh b/input/fsh/examples.fsh index 847ae0c2d..c5d3bae43 100644 --- a/input/fsh/examples.fsh +++ b/input/fsh/examples.fsh @@ -70,13 +70,15 @@ Description: "Represents the current facility at which the patient is receiving Instance: OrganizationExample InstanceOf: ServiceProvider Usage: #example -Title: "Organization" -Description: "Organization providing health related services." +Title: "Healthcare Service Provider" +Description: "An organization that provides healthcare services." * identifier[XX].value = "facility-1" -* identifier[XX].system = "http://openhie.org/fhir/zambia-immunizations/identifier/organization" +* identifier[XX].system = "http://openhie.org/fhir/zambia-immunizations/identifier/healthcare-service-provider" * identifier[XX].type.coding.code = #XX * identifier[XX].type.coding.system = "http://terminology.hl7.org/CodeSystem/v2-0203" -* identifier[XX].type.text = "Organization identifier" +* identifier[XX].type.text = "Healthcare service provider identifier" +* type.coding.system = "http://terminology.hl7.org/CodeSystem/organization-type" +* type.coding.code = #prov * name = "Facility one" Instance: ChiefAtBirthRelatedPersonExample @@ -136,7 +138,7 @@ Description: "Records the current occupation for the guardian" * status = #final * code = $LNC#11341-5 * encounter = Reference(TargetFacilityEncounterExample) -* effectiveDateTime = "2022-11-30" +* effectivePeriod.start = "2017-03-01" * category.coding.code = #social-history * category.coding.system = "http://terminology.hl7.org/CodeSystem/observation-category" * subject = Reference (ImmunizationPatientExample) @@ -221,4 +223,30 @@ Description: "Records the home language for the patient" * performer = Reference(OrganizationExample) * valueCodeableConcept.coding.code = #Chokwe * valueCodeableConcept.coding.system = "http://openhie.org/fhir/zambia-immunizations/CodeSystem/cs-home-language" -* valueCodeableConcept.text = "Chokwe" \ No newline at end of file +* valueCodeableConcept.text = "Chokwe" + +Instance: MedicalInsuranceCompanyExample +InstanceOf: MedicalInsuranceCompany +Usage: #example +Title: "Medical Insurance Company" +Description: "A company that provides insurance to its subscribers that may include healthcare related policies." +* identifier[XX].value = "medical-insurance-company-1" +* identifier[XX].system = "http://openhie.org/fhir/zambia-immunizations/identifier/medical-insurance-company" +* identifier[XX].type.coding.code = #XX +* identifier[XX].type.coding.system = "http://terminology.hl7.org/CodeSystem/v2-0203" +* identifier[XX].type.text = "Medical insurance company identifier" +* type.coding.system = "http://terminology.hl7.org/CodeSystem/organization-type" +* type.coding.code = #ins +* name = "Medical Insurance Company 1" + +Instance: MedicalInsuranceExample +InstanceOf: MedicalInsurance +Usage: #example +Title: "Insurance or Medical Plan" +Description: "Insurance or medical plan details" +* status = #active +* kind = #insurance +* beneficiary = Reference(ImmunizationPatientExample) +* subscriberId.value = "504342245" +* subscriberId.system = "http://openhie.org/fhir/zambia-immunizations/identifier/beneficiary-insurance-id" +* policyHolder = Reference(MedicalInsuranceCompanyExample) diff --git a/input/fsh/smartcare.fsh b/input/fsh/smartcare.fsh index 704cab20f..f83cebb3b 100644 --- a/input/fsh/smartcare.fsh +++ b/input/fsh/smartcare.fsh @@ -198,28 +198,6 @@ Description: "Represents the current facility at which the patient is receiving * subject 1..1 * actualPeriod 1..1 -Profile: ServiceProvider -Parent: Organization -Id: organization -Title: "Organization" -Description: "Organization providing health related services." -* identifier 0..* -* identifier ^definition = - "reason(s) why this should be supported." -* identifier ^slicing.discriminator.type = #value -* identifier ^slicing.discriminator.path = "system" -* identifier ^slicing.rules = #open -* identifier ^slicing.ordered = false -* identifier ^slicing.description = "Slice based on the type of identifier." -* identifier contains - XX 1..1 -* identifier[XX].value 1..1 -* identifier[XX].system = "http://openhie.org/fhir/zambia-immunizations/identifier/organization" -* identifier[XX].type.coding.code = #XX -* identifier[XX].type.coding.system = "http://terminology.hl7.org/CodeSystem/v2-0203" -* identifier[XX].type.text = "Organization identifier" -* name 1..1 - Profile: GenericObservation Parent: Observation Id: generic-social-hsitory-observation-profile @@ -340,4 +318,74 @@ Description: "Records the home language for the patient" * effectiveDateTime ^definition = "reason(s) why this should be supported." * valueCodeableConcept 1..1 -* valueCodeableConcept from VSHomeLanguage (extensible) \ No newline at end of file +* valueCodeableConcept from VSHomeLanguage (extensible) + +Profile: MedicalInsurance +Parent: Coverage +Id: medical-insurance +Title: "Insurance or Medical Plan" +Description: "Insurance or medical plan details" +* status 1..1 +* kind 1..1 +* kind = #insurance +* beneficiary only Reference(ImmunizationPatient) +* subscriberId 1..1 +* subscriberId.value 1..1 +* subscriberId.system 1..1 +* subscriberId.system = "http://openhie.org/fhir/zambia-immunizations/identifier/beneficiary-insurance-id" +* policyHolder 1..1 +* policyHolder only Reference(MedicalInsuranceCompany) + +Profile: MedicalInsuranceCompany +Parent: Organization +Id: medical-insurance-company +Title: "Medical Insurance Company" +Description: "A company that provides insurance to its subscribers that may include healthcare related policies." +* identifier 0..* +* identifier ^definition = + "reason(s) why this should be supported." +* identifier ^slicing.discriminator.type = #value +* identifier ^slicing.discriminator.path = "system" +* identifier ^slicing.rules = #open +* identifier ^slicing.ordered = false +* identifier ^slicing.description = "Slice based on the type of identifier." +* identifier contains + XX 0..1 +* identifier[XX].value 1..1 +* identifier[XX].system = "http://openhie.org/fhir/zambia-immunizations/identifier/medical-insurance-company" +* identifier[XX].type.coding.code = #XX +* identifier[XX].type.coding.system = "http://terminology.hl7.org/CodeSystem/v2-0203" +* identifier[XX].type.text = "Medical insurance company identifier" +* type 1..1 +* type.coding.code 1..1 +* type.coding.system 1..1 +* type.coding.system = "http://terminology.hl7.org/CodeSystem/organization-type" +* type.coding.code = #ins +* name 1..1 + +Profile: ServiceProvider +Parent: Organization +Id: healthcare-service-provider +Title: "Healthcare Service Provider" +Description: "An organization that provides healthcare services." +* identifier 0..* +* identifier ^definition = + "reason(s) why this should be supported." +* identifier ^slicing.discriminator.type = #value +* identifier ^slicing.discriminator.path = "system" +* identifier ^slicing.rules = #open +* identifier ^slicing.ordered = false +* identifier ^slicing.description = "Slice based on the type of identifier." +* identifier contains + XX 1..1 +* identifier[XX].value 1..1 +* identifier[XX].system = "http://openhie.org/fhir/zambia-immunizations/identifier/healthcare-service-provider" +* identifier[XX].type.coding.code = #XX +* identifier[XX].type.coding.system = "http://terminology.hl7.org/CodeSystem/v2-0203" +* identifier[XX].type.text = "Healthcare service provider identifier" +* type 1..1 +* type.coding.code 1..1 +* type.coding.system 1..1 +* type.coding.system = "http://terminology.hl7.org/CodeSystem/organization-type" +* type.coding.code = #prov +* name 1..1 \ No newline at end of file diff --git a/input/fsh/terminology.fsh b/input/fsh/terminology.fsh index 45b37446b..1a60f261c 100644 --- a/input/fsh/terminology.fsh +++ b/input/fsh/terminology.fsh @@ -2,7 +2,7 @@ Alias: $LNC = http://loinc.org Alias: $SCT = http://snomed.info/sct Alias: $GENDER = http://hl7.org/fhir/administrative-gender Alias: $SEX = http://terminology.hl7.org/CodeSystem/v2-0001 -Alias: $PROPRrietary_EDU_LEVEL = http://openhie.org/fhir/zambia-immunizations/CodeSystem/cs-proprietary-education-level-attained +Alias: $PROPRIETARY_EDU_LEVEL = http://openhie.org/fhir/zambia-immunizations/CodeSystem/cs-proprietary-education-level-attained Alias: $PARENT_RELATIONSHIP_CODES = http://terminology.hl7.org/CodeSystem/v3-RoleCode CodeSystem: CSProprietaryEducationLevelAttained From 464a4e732d0318c6c9342f1b209cba0e5fdd2f36 Mon Sep 17 00:00:00 2001 From: rmrlangford Date: Fri, 2 Feb 2024 09:43:19 +0200 Subject: [PATCH 2/5] updated --- input/fsh/examples.fsh | 1 - input/fsh/extensions.fsh | 23 +---------------------- input/fsh/smartcare.fsh | 3 --- 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/input/fsh/examples.fsh b/input/fsh/examples.fsh index c5d3bae43..56a75aebc 100644 --- a/input/fsh/examples.fsh +++ b/input/fsh/examples.fsh @@ -17,7 +17,6 @@ Description: "Is used to document demographics and other administrative informat * birthDate.extension[IsEstimatedDOB].valueBoolean = false * maritalStatus.coding.code = #M * maritalStatus.coding.system = "http://terminology.hl7.org/CodeSystem/v3-MaritalStatus" -//* maritalStatus.extension[DateFirstMarried].valueDateTime = "2001-11-10T12:05:17+02:00" * extension[bornInZambia].valueBoolean = true * link[+].other = Reference(SpouseRelatedPersonExample) * link[=].type = #seealso diff --git a/input/fsh/extensions.fsh b/input/fsh/extensions.fsh index 92695cb1e..42b4b3fe1 100644 --- a/input/fsh/extensions.fsh +++ b/input/fsh/extensions.fsh @@ -14,25 +14,4 @@ Description: "This is an extension to capture whether the patient's date of birt * value[x] only boolean * value[x] 1.. * ^context[+].type = #element -* ^context[=].expression = "Patient.birthDate" - -/*Extension: EducationLevelAttained -Id: education-level-attained -Title: "Patient's highest education level attained" -Description: "A list of education levels." -* value[x] only CodeableConcept -* valueCodeableConcept from VSLOINCEducationLevelAttained (required) -* valueCodeableConcept.text = "Highest education level attained" -* valueCodeableConcept.coding.system 1..1 -* valueCodeableConcept.coding.code 1..1 -* ^context[0].type = #element -* ^context[0].expression = "Patient"*/ - -/*Extension: DateOfFirstMarriage -Id: date-of-first-marriage -Title: "Patient's Date of First Marriage" -Description: "This is an extension to capture the date when the patient first got married." -* value[x] only dateTime -* value[x] 1.. -* ^context[+].type = #element -* ^context[=].expression = "Patient.maritalStatus"*/ \ No newline at end of file +* ^context[=].expression = "Patient.birthDate" \ No newline at end of file diff --git a/input/fsh/smartcare.fsh b/input/fsh/smartcare.fsh index f83cebb3b..20e93429f 100644 --- a/input/fsh/smartcare.fsh +++ b/input/fsh/smartcare.fsh @@ -83,9 +83,6 @@ Description: "Is used to document demographics and other administrative informat * maritalStatus.coding.system 1..1 * maritalStatus ^definition = "reason(s) why this should be supported." -//* maritalStatus.extension contains DateOfFirstMarriage named DateFirstMarried 0..1 MS -//* maritalStatus.extension[DateFirstMarried] ^definition = -// "reason(s) why this should be supported." * link 1..* * link.other only Reference(SpouseRelatedPerson or GuardianRelatedPerson or PatientMotherRelatedPerson or PatientFatherRelatedPerson or RelativeRelatedPerson or ChiefAtBirthRelatedPerson) * contact 0..* MS From 9224ca3db2f4a737e01a87d11f25aa12b6237adb Mon Sep 17 00:00:00 2001 From: rmrlangford Date: Fri, 2 Feb 2024 12:11:01 +0200 Subject: [PATCH 3/5] updated --- input/fsh/terminology.fsh | 53 ++++++++++++++++++++++++++++++++++++++- input/ignoreWarnings.txt | 6 ++--- sushi-config.yaml | 4 ++- 3 files changed, 58 insertions(+), 5 deletions(-) diff --git a/input/fsh/terminology.fsh b/input/fsh/terminology.fsh index 1a60f261c..5674b83df 100644 --- a/input/fsh/terminology.fsh +++ b/input/fsh/terminology.fsh @@ -4,6 +4,7 @@ Alias: $GENDER = http://hl7.org/fhir/administrative-gender Alias: $SEX = http://terminology.hl7.org/CodeSystem/v2-0001 Alias: $PROPRIETARY_EDU_LEVEL = http://openhie.org/fhir/zambia-immunizations/CodeSystem/cs-proprietary-education-level-attained Alias: $PARENT_RELATIONSHIP_CODES = http://terminology.hl7.org/CodeSystem/v3-RoleCode +Alias: $ICD11 = http://id.who.int/icd11/mms CodeSystem: CSProprietaryEducationLevelAttained Id: cs-proprietary-education-level-attained @@ -93,4 +94,54 @@ Id: vs-home-language Title: "Patient's Home Language" Description: "A list of languages." * ^experimental = false -* include codes from system CSHomeLanguage \ No newline at end of file +* include codes from system CSHomeLanguage + +ValueSet: CCVaccines +Id: vs-vaccines +Title: "Vaccine Codes" +Description: "A List of Vaccine Codes Use In Zambia" +* ^experimental = false +* $ICD11#XM8866 "BBIBP-CorV" +* $ICD11#J07AE "Cholera vaccines" +* $ICD11#XM8NQ0 "Comirnaty®" +* $ICD11#XM1AG7 "Convidecia" +* $ICD11#XM7HT3 "CoronaVac®" +* $ICD11#XM1G90 "Covaxin" +* $ICD11#XM85P5 "Covi-Vac" +* $ICD11#XM68M6 "COVID-19 vaccine" +* $ICD11#XM4YL8 "COVID-19 Vaccine AstraZeneca" +* $ICD11#XM6QV1 "COVID-19 Vaccine Janssen" +* $ICD11#XM3DT5 "COVID-19 Vaccine Moderna" +* $ICD11#XM6AT1 "COVID-19 vaccine, DNA based" +* $ICD11#XM1NL1 "COVID-19 vaccine, inactivated virus" +* $ICD11#XM5DF6 "COVID-19 vaccine, live attenuated virus" +* $ICD11#XM9QW8 "COVID-19 vaccine, non-replicating viral vector" +* $ICD11#XM0CX4 "COVID-19 vaccine, replicating viral vector" +* $ICD11#XM0GQ8 "COVID-19 vaccine, RNA based" +* $ICD11#XM1J92 "COVID-19 vaccine, virus like particle (VLP)" +* $ICD11#XM5JC5 "COVID-19 vaccine, virus protein subunit" +* $ICD11#XM2YG8 "COVIran Barakat" +* $ICD11#XM97T2 "Covishield®" +* $ICD11#J07AF01 "diphtheria toxoid" +* $ICD11#07AF01 "diphtheria toxoid" +* $ICD11#J07CA11 "diphtheria-haemophilus influenzae B-pertussis-tetanus-hepatitis B" +* $ICD11#XM6SZ8 "EpiVacCorona" +* $ICD11#XM5ZJ4 "Gam-Covid-Vac" +* $ICD11#XM9FQ7 "Hayat-Vax" +* $ICD11#XM3U61 "Inactivated SARS-CoV-2 vaccine" +* $ICD11#XM9TQ1 "KCONVAC" +* $ICD11#J07BD53 "measles, combinations with rubella, live attenuated" +* $ICD11#XM4EC8 "MVC-COV1901" +* $ICD11#J07BM01 "papillomavirus (human types 6, 11, 16, 18)" +* $ICD11#J07AL02 "pneumococcus, purified polysaccharides antigen conjugated" +* $ICD11#J07BF02 "poliomyelitis oral, trivalent, live attenuated" +* $ICD11#J07BF03 "poliomyelitis, trivalent, inactivated, whole virus" +* $ICD11#XM97N6 "QazVac" +* $ICD11#XM3CT4 "Recombinant SARS-CoV-2 vaccine" +* $ICD11#J07BH01 "rota virus, live attenuated" +* $ICD11#XM3PG0 "Soberana-02" +* $ICD11#XM5QM6 "Sputnik-Light" +* $ICD11#J07AM51 "tetanus toxoid, combinations with diphtheria toxoid" +* $ICD11#J07AN01 "tuberculosis, live attenuated" +* $SCT#82622003 "Vitamin A" +* $ICD11#XM52P3 "ZyCov-D" \ No newline at end of file diff --git a/input/ignoreWarnings.txt b/input/ignoreWarnings.txt index d03142bca..90efa4934 100644 --- a/input/ignoreWarnings.txt +++ b/input/ignoreWarnings.txt @@ -1,5 +1,5 @@ == Suppressed Messages == -# Add warning and/or information messages here after you've confirmed that they aren't really a problem -# (And include comments like this justifying why) -# See https://github.com/FHIR/sample-ig/blob/master/input/ignoreWarnings.txt for examples \ No newline at end of file +# This is a known issue that is being addressed: https://chat.fhir.org/#narrow/stream/179166-implementers/topic/IG +Unknown System 'http://id.who.int/icd11/mms' specified, so Concepts and Filters can't be checked (Details: A definition for CodeSystem 'http://id.who.int/icd11/mms' could not be found, so the code cannot be validated) +Error from http://tx.fhir.org/r4: Unable to provide support for code system http://id.who.int/icd11/mms \ No newline at end of file diff --git a/sushi-config.yaml b/sushi-config.yaml index 426e6a084..c78473999 100644 --- a/sushi-config.yaml +++ b/sushi-config.yaml @@ -173,7 +173,9 @@ jurisdiction: http://unstats.un.org/unsd/methods/m49/m49.htm#001 "World" # values, the value in the YAML should be a sequence/array. For a # partial list of allowed parameters see: # https://confluence.hl7.org/display/FHIR/Implementation+Guide+Parameters -#parameters: +parameters: + path-resource: + - input/maps # excludettl: true # validation: [allow-any-extensions, no-broken-links] From f87e4608ce01188b6e25ff8c23bd60bb736771f4 Mon Sep 17 00:00:00 2001 From: rmrlangford Date: Fri, 2 Feb 2024 12:30:22 +0200 Subject: [PATCH 4/5] updatee --- input/fsh/examples.fsh | 12 ++++++++++++ input/fsh/smartcare.fsh | 18 +++++++++++++++++- input/fsh/terminology.fsh | 2 +- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/input/fsh/examples.fsh b/input/fsh/examples.fsh index 56a75aebc..8dd026047 100644 --- a/input/fsh/examples.fsh +++ b/input/fsh/examples.fsh @@ -249,3 +249,15 @@ Description: "Insurance or medical plan details" * subscriberId.value = "504342245" * subscriberId.system = "http://openhie.org/fhir/zambia-immunizations/identifier/beneficiary-insurance-id" * policyHolder = Reference(MedicalInsuranceCompanyExample) + +Instance: VaccinesExample +InstanceOf: Vaccines +Usage: #example +Title: "Vaccine Administration" +Description: "Records the vaccine administered to the patient." +* status = #completed +* vaccineCode = $SCT#82622003 +* patient = Reference(ImmunizationPatientExample) +* occurrenceDateTime = "2022-11-30" +* encounter = Reference(TargetFacilityEncounterExample) +* protocolApplied.doseNumber = "0" \ No newline at end of file diff --git a/input/fsh/smartcare.fsh b/input/fsh/smartcare.fsh index 20e93429f..af84db09f 100644 --- a/input/fsh/smartcare.fsh +++ b/input/fsh/smartcare.fsh @@ -385,4 +385,20 @@ Description: "An organization that provides healthcare services." * type.coding.system 1..1 * type.coding.system = "http://terminology.hl7.org/CodeSystem/organization-type" * type.coding.code = #prov -* name 1..1 \ No newline at end of file +* name 1..1 + +Profile: Vaccines +Parent: Immunization +Id: Vaccines +Title: "Vaccine Administration" +Description: "Records the vaccine administered to the patient." +* status 1..1 +* vaccineCode 1..1 +* vaccineCode from VSVaccines (extensible) +* patient 1..1 +* patient only Reference(ImmunizationPatient) +* occurrenceDateTime 1..1 +* occurrenceDateTime only dateTime +* encounter 1..1 +* encounter only Reference(TargetFacilityEncounter) +* protocolApplied.doseNumber \ No newline at end of file diff --git a/input/fsh/terminology.fsh b/input/fsh/terminology.fsh index 5674b83df..d4fbee799 100644 --- a/input/fsh/terminology.fsh +++ b/input/fsh/terminology.fsh @@ -96,7 +96,7 @@ Description: "A list of languages." * ^experimental = false * include codes from system CSHomeLanguage -ValueSet: CCVaccines +ValueSet: VSVaccines Id: vs-vaccines Title: "Vaccine Codes" Description: "A List of Vaccine Codes Use In Zambia" From 9792ab69e5bc732369536032240646bf499934f2 Mon Sep 17 00:00:00 2001 From: rmrlangford Date: Fri, 2 Feb 2024 15:42:56 +0200 Subject: [PATCH 5/5] updated --- input/fsh/examples.fsh | 14 +++++++++----- input/fsh/smartcare.fsh | 28 +++++++++++++++++++++------- input/fsh/terminology.fsh | 11 ++++++++++- 3 files changed, 40 insertions(+), 13 deletions(-) diff --git a/input/fsh/examples.fsh b/input/fsh/examples.fsh index 8dd026047..d77f20260 100644 --- a/input/fsh/examples.fsh +++ b/input/fsh/examples.fsh @@ -7,10 +7,15 @@ Description: "Is used to document demographics and other administrative informat * identifier[NUPIN][=].system = "http://openhie.org/fhir/zambia-immunizations/identifier/patient-nupin" * identifier[NRC][+].value = "999999/99/9" * identifier[NRC][=].system = "http://openhie.org/fhir/zambia-immunizations/identifier/patient-nrc" -* name[+][official].use = #official -* name[=][official].family = "Smith" -* name[=][official].given[+] = "Jane" -* name[=][official].given[+] = "Maria" + +* name[+][otherName].use = #official +* name[=][otherName].family = "Smith" +* name[=][otherName].given[+] = "Jane" +* name[=][otherName].given[+] = "Maria" + +* 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" @@ -178,7 +183,6 @@ Description: "This profile acts as a base profile from which more specific Relat * name[+].use = #official * name[=].given[+] = "Olivia" * name[=].family = "Smith" -* relationship = $PARENT_RELATIONSHIP_CODES#MTH Instance: RelativeRelatedPersonExample InstanceOf: RelativeRelatedPerson diff --git a/input/fsh/smartcare.fsh b/input/fsh/smartcare.fsh index af84db09f..ca9cd4aaa 100644 --- a/input/fsh/smartcare.fsh +++ b/input/fsh/smartcare.fsh @@ -35,7 +35,6 @@ Description: "Is used to document demographics and other administrative informat * identifier[NRC].system 1..1 * identifier[NRC].system = "http://openhie.org/fhir/zambia-immunizations/identifier/patient-nrc" -* name 1..* * name 1..* * name ^slicing.discriminator.type = #value * name ^slicing.discriminator.path = "use" @@ -43,18 +42,17 @@ Description: "Is used to document demographics and other administrative informat * name ^slicing.ordered = false * name ^slicing.description = "Slice based on the type of identifier." * name contains - official 1..1 and + otherName 1..1 and nickname 0..1 MS -* name[official].given 1..* -* name[official].family 1..1 -* name[official].use 1..1 -* name[official].use = #official +* name[otherName].given 1..* +* name[otherName].family 1..1 +* name[otherName].use 1..1 +* name[otherName].use from HumanNameCodes (required) * name[nickname] ^definition = "reason(s) why this should be supported." * name[nickname].given 1..* -* name[nickname].family 1..1 * name[nickname].use 1..1 * name[nickname].use = #nickname @@ -76,6 +74,9 @@ Description: "Is used to document demographics and other administrative informat * extension[religion] ^definition = "reason(s) why this should be supported." * extension[religion].valueCodeableConcept.text 1..1 +* extension[religion].valueCodeableConcept.coding 1..1 +* extension[religion].valueCodeableConcept.coding.system 1..1 +* extension[religion].valueCodeableConcept.coding.code 1..1 * maritalStatus 0..1 MS * maritalStatus.coding 1..1 @@ -124,6 +125,7 @@ Description: "This profile acts as a base profile from which more specific Relat * patient 1..1 * patient only Reference(ImmunizationPatient) +* relationship.coding 1..1 * relationship.coding.code 1..1 * relationship.coding.system 1..1 * name 0..* MS @@ -182,6 +184,9 @@ Description: "A patient's highest education level attained" * effectiveDateTime ^definition = "reason(s) why this should be supported." * valueCodeableConcept 1..1 +* valueCodeableConcept.coding 1..1 +* valueCodeableConcept.coding.code 1..1 +* valueCodeableConcept.coding.system 1..1 * valueCodeableConcept from VSLOINCEducationLevelAttained (required) Profile: TargetFacilityEncounter @@ -191,7 +196,9 @@ Title: "Target Facility Encounter" Description: "Represents the current facility at which the patient is receiving health services." * status 1..1 * class 1..1 +* class.coding 1..1 * class.coding.code = #AMB +* class.coding.system = "http://terminology.hl7.org/CodeSystem/v3-ActCode" * subject 1..1 * actualPeriod 1..1 @@ -203,6 +210,7 @@ Description: "This profile acts as a base profile from which more specific socia * status 1..1 * code 1..1 * category 1..1 +* category.coding 1..1 * category.coding.code 1..1 * category.coding.code = #social-history * category.coding.system 1..1 @@ -212,6 +220,7 @@ Description: "This profile acts as a base profile from which more specific socia * subject 1..1 * subject only Reference(ImmunizationPatient) * valueCodeableConcept only CodeableConcept +* valueCodeableConcept.coding 1..1 * valueCodeableConcept.coding.system 1..1 * valueCodeableConcept.coding.code 1..1 * valueCodeableConcept.text 1..1 @@ -354,6 +363,7 @@ Description: "A company that provides insurance to its subscribers that may incl * identifier[XX].type.coding.system = "http://terminology.hl7.org/CodeSystem/v2-0203" * identifier[XX].type.text = "Medical insurance company identifier" * type 1..1 +* type.coding 1..1 * type.coding.code 1..1 * type.coding.system 1..1 * type.coding.system = "http://terminology.hl7.org/CodeSystem/organization-type" @@ -381,6 +391,7 @@ Description: "An organization that provides healthcare services." * identifier[XX].type.coding.system = "http://terminology.hl7.org/CodeSystem/v2-0203" * identifier[XX].type.text = "Healthcare service provider identifier" * type 1..1 +* type.coding 1..1 * type.coding.code 1..1 * type.coding.system 1..1 * type.coding.system = "http://terminology.hl7.org/CodeSystem/organization-type" @@ -394,6 +405,9 @@ Title: "Vaccine Administration" Description: "Records the vaccine administered to the patient." * status 1..1 * vaccineCode 1..1 +* vaccineCode.coding 1..1 +* vaccineCode.coding.code 1..1 +* vaccineCode.coding.system 1..1 * vaccineCode from VSVaccines (extensible) * patient 1..1 * patient only Reference(ImmunizationPatient) diff --git a/input/fsh/terminology.fsh b/input/fsh/terminology.fsh index d4fbee799..746c4a630 100644 --- a/input/fsh/terminology.fsh +++ b/input/fsh/terminology.fsh @@ -5,6 +5,7 @@ Alias: $SEX = http://terminology.hl7.org/CodeSystem/v2-0001 Alias: $PROPRIETARY_EDU_LEVEL = http://openhie.org/fhir/zambia-immunizations/CodeSystem/cs-proprietary-education-level-attained Alias: $PARENT_RELATIONSHIP_CODES = http://terminology.hl7.org/CodeSystem/v3-RoleCode Alias: $ICD11 = http://id.who.int/icd11/mms +Alias: $HumanName = http://hl7.org/fhir/name-use CodeSystem: CSProprietaryEducationLevelAttained Id: cs-proprietary-education-level-attained @@ -144,4 +145,12 @@ Description: "A List of Vaccine Codes Use In Zambia" * $ICD11#J07AM51 "tetanus toxoid, combinations with diphtheria toxoid" * $ICD11#J07AN01 "tuberculosis, live attenuated" * $SCT#82622003 "Vitamin A" -* $ICD11#XM52P3 "ZyCov-D" \ No newline at end of file +* $ICD11#XM52P3 "ZyCov-D" + +ValueSet: HumanNameCodes +Id: vs-human-name-codes +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