From b955d14708cb13650617103adba1d8e122ae34f1 Mon Sep 17 00:00:00 2001 From: Rukshan Date: Tue, 30 Sep 2025 12:39:27 +0600 Subject: [PATCH 1/3] refactor: :recycle: standerdize valueset filenames and references --- input/fsh/extensions/language.fsh | 4 ++-- input/fsh/profile/immunization-profile.fsh | 6 +++--- ...n-reaction-valueset.fsh => BDImmunizationReactionVS.fsh} | 0 ...ization-route-valueset.fsh => BDImmunizationRouteVS.fsh} | 2 +- ...unization-site-valueset.fsh => BDImmunizationSiteVs.fsh} | 2 +- input/fsh/valueSets/{languageVS.fsh => BDLanguage.fsh} | 2 +- .../valueSets/{bd-vaccine-valueset.fsh => BDVaccineVS.fsh} | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) rename input/fsh/valueSets/{bd-immunization-reaction-valueset.fsh => BDImmunizationReactionVS.fsh} (100%) rename input/fsh/valueSets/{bd-immunization-route-valueset.fsh => BDImmunizationRouteVS.fsh} (89%) rename input/fsh/valueSets/{bd-immunization-site-valueset.fsh => BDImmunizationSiteVs.fsh} (89%) rename input/fsh/valueSets/{languageVS.fsh => BDLanguage.fsh} (65%) rename input/fsh/valueSets/{bd-vaccine-valueset.fsh => BDVaccineVS.fsh} (90%) diff --git a/input/fsh/extensions/language.fsh b/input/fsh/extensions/language.fsh index 57b313e..b98b53c 100644 --- a/input/fsh/extensions/language.fsh +++ b/input/fsh/extensions/language.fsh @@ -1,10 +1,10 @@ Extension: Language Description: "Language" -Id: language +Id: language Title: "Language Extension" Context: Patient // Religion using standard HL7 extension * extension contains http://hl7.org/fhir/StructureDefinition/language named language 1..1 -* extension[language].valueCode from LanguageValueSet \ No newline at end of file +* extension[language].valueCode from BDLanguageVS \ No newline at end of file diff --git a/input/fsh/profile/immunization-profile.fsh b/input/fsh/profile/immunization-profile.fsh index a57e9a3..b1cbfec 100644 --- a/input/fsh/profile/immunization-profile.fsh +++ b/input/fsh/profile/immunization-profile.fsh @@ -19,7 +19,7 @@ Description: "Bangladesh Immunization Profile" * reasonReference only Reference(Condition or Observation or DiagnosticReport) * vaccineCode 1..1 -* vaccineCode from BDVaccineValueSet (required) +* vaccineCode from BDVaccineVS (required) //* ^url = "https://fhir.dghs.gov.bd/core/StructureDefinition/bd-medication" @@ -52,11 +52,11 @@ Description: "Bangladesh Immunization Profile" * site 0..1 * site ^definition = "Body site of administration" -* site from BDImmunizationSiteValueSet +* site from BDImmunizationSiteVS * route 0..1 * route ^definition = "Route of administration" -* route from BDImmunizationRouteValueSet +* route from BDImmunizationRouteVS * doseQuantity 0..1 * doseQuantity ^definition = "Amount of vaccine administered" diff --git a/input/fsh/valueSets/bd-immunization-reaction-valueset.fsh b/input/fsh/valueSets/BDImmunizationReactionVS.fsh similarity index 100% rename from input/fsh/valueSets/bd-immunization-reaction-valueset.fsh rename to input/fsh/valueSets/BDImmunizationReactionVS.fsh diff --git a/input/fsh/valueSets/bd-immunization-route-valueset.fsh b/input/fsh/valueSets/BDImmunizationRouteVS.fsh similarity index 89% rename from input/fsh/valueSets/bd-immunization-route-valueset.fsh rename to input/fsh/valueSets/BDImmunizationRouteVS.fsh index 08e0e3b..c637107 100644 --- a/input/fsh/valueSets/bd-immunization-route-valueset.fsh +++ b/input/fsh/valueSets/BDImmunizationRouteVS.fsh @@ -1,4 +1,4 @@ -ValueSet: BDImmunizationRouteValueSet +ValueSet: BDImmunizationRouteVS Id: bd-immunization-route-valueset Title: "Bangladesh Immunization Route Value Set" Description: "Allowed administration routes for vaccines in Bangladesh." diff --git a/input/fsh/valueSets/bd-immunization-site-valueset.fsh b/input/fsh/valueSets/BDImmunizationSiteVs.fsh similarity index 89% rename from input/fsh/valueSets/bd-immunization-site-valueset.fsh rename to input/fsh/valueSets/BDImmunizationSiteVs.fsh index ac98f10..a1cea62 100644 --- a/input/fsh/valueSets/bd-immunization-site-valueset.fsh +++ b/input/fsh/valueSets/BDImmunizationSiteVs.fsh @@ -1,4 +1,4 @@ -ValueSet: BDImmunizationSiteValueSet +ValueSet: BDImmunizationSiteVS Id: bd-immunization-site-valueset Title: "Bangladesh Immunization Site Value Set" Description: "Allowed administration sites for vaccines in Bangladesh." diff --git a/input/fsh/valueSets/languageVS.fsh b/input/fsh/valueSets/BDLanguage.fsh similarity index 65% rename from input/fsh/valueSets/languageVS.fsh rename to input/fsh/valueSets/BDLanguage.fsh index 0a5b001..8181266 100644 --- a/input/fsh/valueSets/languageVS.fsh +++ b/input/fsh/valueSets/BDLanguage.fsh @@ -1,4 +1,4 @@ -ValueSet: LanguageValueSet +ValueSet: BDLanguageVS Id: language-valueset Title: "Allowed Languages" Description: "Only English and Bengali are allowed" diff --git a/input/fsh/valueSets/bd-vaccine-valueset.fsh b/input/fsh/valueSets/BDVaccineVS.fsh similarity index 90% rename from input/fsh/valueSets/bd-vaccine-valueset.fsh rename to input/fsh/valueSets/BDVaccineVS.fsh index 883685d..812eb49 100644 --- a/input/fsh/valueSets/bd-vaccine-valueset.fsh +++ b/input/fsh/valueSets/BDVaccineVS.fsh @@ -1,4 +1,4 @@ -ValueSet: BDVaccineValueSet +ValueSet: BDVaccineVS Id: bd-vaccine-valueset Title: "Bangladesh Vaccine Value Set" Description: "Allowed vaccines for immunization in Bangladesh." From e2dafa016057e35e571b30c403e089a40717332d Mon Sep 17 00:00:00 2001 From: Rukshan Date: Tue, 30 Sep 2025 12:40:32 +0600 Subject: [PATCH 2/3] refactor: :recycle: standerdize valueset ids --- input/fsh/valueSets/BDImmunizationReactionVS.fsh | 2 +- input/fsh/valueSets/BDImmunizationRouteVS.fsh | 2 +- input/fsh/valueSets/BDImmunizationSiteVs.fsh | 2 +- input/fsh/valueSets/BDLanguage.fsh | 2 +- input/fsh/valueSets/BDVaccineVS.fsh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/input/fsh/valueSets/BDImmunizationReactionVS.fsh b/input/fsh/valueSets/BDImmunizationReactionVS.fsh index 8c1ce54..9cc5312 100644 --- a/input/fsh/valueSets/BDImmunizationReactionVS.fsh +++ b/input/fsh/valueSets/BDImmunizationReactionVS.fsh @@ -1,5 +1,5 @@ ValueSet: BDImmunizationReactionValueSet -Id: bd-immunization-reaction-valueset +Id: bd-immunization-reaction-vs Title: "Bangladesh Immunization Reaction Value Set" Description: "Allowed vaccine reactions for immunization in Bangladesh." * ^url = "https://fhir.dghs.gov.bd/core/ValueSet/bd-immunization-reaction-valueset" diff --git a/input/fsh/valueSets/BDImmunizationRouteVS.fsh b/input/fsh/valueSets/BDImmunizationRouteVS.fsh index c637107..7d58f9c 100644 --- a/input/fsh/valueSets/BDImmunizationRouteVS.fsh +++ b/input/fsh/valueSets/BDImmunizationRouteVS.fsh @@ -1,5 +1,5 @@ ValueSet: BDImmunizationRouteVS -Id: bd-immunization-route-valueset +Id: bd-immunization-route-vs Title: "Bangladesh Immunization Route Value Set" Description: "Allowed administration routes for vaccines in Bangladesh." * ^url = "https://fhir.dghs.gov.bd/core/ValueSet/bd-immunization-route-valueset" diff --git a/input/fsh/valueSets/BDImmunizationSiteVs.fsh b/input/fsh/valueSets/BDImmunizationSiteVs.fsh index a1cea62..9fb3ffe 100644 --- a/input/fsh/valueSets/BDImmunizationSiteVs.fsh +++ b/input/fsh/valueSets/BDImmunizationSiteVs.fsh @@ -1,5 +1,5 @@ ValueSet: BDImmunizationSiteVS -Id: bd-immunization-site-valueset +Id: bd-immunization-site-vs Title: "Bangladesh Immunization Site Value Set" Description: "Allowed administration sites for vaccines in Bangladesh." * ^url = "https://fhir.dghs.gov.bd/core/ValueSet/bd-immunization-site-valueset" diff --git a/input/fsh/valueSets/BDLanguage.fsh b/input/fsh/valueSets/BDLanguage.fsh index 8181266..0eb7173 100644 --- a/input/fsh/valueSets/BDLanguage.fsh +++ b/input/fsh/valueSets/BDLanguage.fsh @@ -1,5 +1,5 @@ ValueSet: BDLanguageVS -Id: language-valueset +Id: bd-language-vs Title: "Allowed Languages" Description: "Only English and Bengali are allowed" * http://hl7.org/fhir/ValueSet/languages#en "English" diff --git a/input/fsh/valueSets/BDVaccineVS.fsh b/input/fsh/valueSets/BDVaccineVS.fsh index 812eb49..1ebb60d 100644 --- a/input/fsh/valueSets/BDVaccineVS.fsh +++ b/input/fsh/valueSets/BDVaccineVS.fsh @@ -1,5 +1,5 @@ ValueSet: BDVaccineVS -Id: bd-vaccine-valueset +Id: bd-vaccine-vs Title: "Bangladesh Vaccine Value Set" Description: "Allowed vaccines for immunization in Bangladesh." * ^url = "https://fhir.dghs.gov.bd/core/ValueSet/bd-vaccine-valueset" From 56c68be788660d9d1bae0944b5f0e1c1be701f23 Mon Sep 17 00:00:00 2001 From: Rukshan Date: Tue, 30 Sep 2025 12:47:03 +0600 Subject: [PATCH 3/3] feat: :sparkles: add encounter referencing to medication request --- input/fsh/profile/BDMedicationRequest.fsh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/input/fsh/profile/BDMedicationRequest.fsh b/input/fsh/profile/BDMedicationRequest.fsh index 0632d58..0f97eb9 100644 --- a/input/fsh/profile/BDMedicationRequest.fsh +++ b/input/fsh/profile/BDMedicationRequest.fsh @@ -12,7 +12,9 @@ Description: "Profile of MedicationRequest Bangladesh Standard V2" * medication[x] only Reference(BDMedication) or CodeableConcept * subject only Reference(BDPatientProfile) -// TODO: BDEncounter referencing +* encounter 0..1 MS +* encounter only Reference(BDEncounterProfile) +* encounter ^definition = "The encounter during which this prescription was created." * authoredOn 1..1 * requester 1..1