From a8674fb55b6186f7171898177628056da5f522ee Mon Sep 17 00:00:00 2001 From: Luke Duncan Date: Tue, 12 Mar 2024 10:29:02 -0700 Subject: [PATCH] Fixed issue with vaccineType binding for logical models and added vaccineType valueset to the contained section for the questionnaires. --- input/fsh/models/IMMZD1ClientHistory.fsh | 1 - input/fsh/models/IMMZD1ClientHistoryHepatitisB.fsh | 2 ++ input/fsh/models/IMMZD1ClientHistoryMeasles.fsh | 3 ++- input/fsh/models/IMMZD1ClientHistoryPolio.fsh | 1 + input/fsh/models/IMMZD1ClientHistoryYellowFever.fsh | 2 ++ input/fsh/questionnaires/QIMMZD1ClientHistoryHepatitisB.fsh | 1 + input/fsh/questionnaires/QIMMZD1ClientHistoryMeasles.fsh | 1 + input/fsh/questionnaires/QIMMZD1ClientHistoryPolio.fsh | 1 + input/fsh/questionnaires/QIMMZD1ClientHistoryYellowFever.fsh | 1 + 9 files changed, 11 insertions(+), 2 deletions(-) diff --git a/input/fsh/models/IMMZD1ClientHistory.fsh b/input/fsh/models/IMMZD1ClientHistory.fsh index 2a467a2c3f..03c5f72188 100644 --- a/input/fsh/models/IMMZD1ClientHistory.fsh +++ b/input/fsh/models/IMMZD1ClientHistory.fsh @@ -36,7 +36,6 @@ Description: "Data elements for the IMMZ.D1 Capture Client History Data Diction * ^code[+] = IMMZ.D#DE19 * ^code[+] = $LNC#39236-5 * ^code[+] = $SCT#787859002 - * vaccineType from IMMZ.Z.DE23 * vaccineDate 0..1 date "Date and time of vaccination" "Represents the visit/encounter date, which is the date and time when the vaccine was administered to the client" * ^code[+] = IMMZ.D#DE20 * ^code[+] = $LNC#30952-6 \ No newline at end of file diff --git a/input/fsh/models/IMMZD1ClientHistoryHepatitisB.fsh b/input/fsh/models/IMMZD1ClientHistoryHepatitisB.fsh index d4593576d9..6e91b5b890 100644 --- a/input/fsh/models/IMMZD1ClientHistoryHepatitisB.fsh +++ b/input/fsh/models/IMMZD1ClientHistoryHepatitisB.fsh @@ -14,3 +14,5 @@ Description: "Data elements for the IMMZ.D1 Capture Client History Data Diction * hepbtype 1..1 Coding "Type of hepatitis B dose" "The type of hepatitis B vaccine dose administered to the client" * ^code[+] = IMMZ.D1#DE99 * hepbtype from IMMZ.D1.DE99 +* vaccineHistory.vaccineType from IMMZ.Z.DE6 + diff --git a/input/fsh/models/IMMZD1ClientHistoryMeasles.fsh b/input/fsh/models/IMMZD1ClientHistoryMeasles.fsh index 42ce870e75..923cb848a0 100644 --- a/input/fsh/models/IMMZD1ClientHistoryMeasles.fsh +++ b/input/fsh/models/IMMZD1ClientHistoryMeasles.fsh @@ -9,4 +9,5 @@ Description: "Data elements for the IMMZ.D1 Capture Client History Data Diction * ^code[+] = IMMZ.D1#DE92 * ^code[=] = $LNC#96381-9 * artStartDate 0..1 date "ART start date" "The date on which the client started or restarted antiretroviral therapy (ART)" - * ^code[+] = IMMZ.D1#DE49 \ No newline at end of file + * ^code[+] = IMMZ.D1#DE49 +* vaccineHistory.vaccineType from IMMZ.Z.DE9 \ No newline at end of file diff --git a/input/fsh/models/IMMZD1ClientHistoryPolio.fsh b/input/fsh/models/IMMZD1ClientHistoryPolio.fsh index 7d3a0745e6..cad0895b79 100644 --- a/input/fsh/models/IMMZD1ClientHistoryPolio.fsh +++ b/input/fsh/models/IMMZD1ClientHistoryPolio.fsh @@ -11,3 +11,4 @@ Description: "Data elements for the IMMZ.D1 Capture Client History Data Diction * ^code[+] = IMMZ.D1#DE35 * ^code[+] = $ICD11#XM0N50 * poliotype from IMMZ.D1.DE35 +* vaccineHistory.vaccineType from IMMZ.Z.DE14 \ No newline at end of file diff --git a/input/fsh/models/IMMZD1ClientHistoryYellowFever.fsh b/input/fsh/models/IMMZD1ClientHistoryYellowFever.fsh index afa56110e7..553f018fac 100644 --- a/input/fsh/models/IMMZD1ClientHistoryYellowFever.fsh +++ b/input/fsh/models/IMMZD1ClientHistoryYellowFever.fsh @@ -4,3 +4,5 @@ Parent: IMMZD1ClientHistory Description: "Data elements for the IMMZ.D1 Capture Client History Data Dictionary for Yellow Fever." * ^name = "IMMZ_D1_Client_History_YellowFever" + +* vaccineHistory.vaccineType from IMMZ.Z.DE23 diff --git a/input/fsh/questionnaires/QIMMZD1ClientHistoryHepatitisB.fsh b/input/fsh/questionnaires/QIMMZD1ClientHistoryHepatitisB.fsh index 712b84f378..df208cdbdc 100644 --- a/input/fsh/questionnaires/QIMMZD1ClientHistoryHepatitisB.fsh +++ b/input/fsh/questionnaires/QIMMZD1ClientHistoryHepatitisB.fsh @@ -13,6 +13,7 @@ Usage: #definition * contained[+] = IMMZ.D1.DE10 * contained[+] = IMMZ.D1.DE99 * contained[+] = IMMZ.D1.DE103 +* contained[+] = IMMZ.Z.DE6 * extension[+].url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-targetStructureMap" * extension[=].valueCanonical = "http://smart.who.int/ig/smart-immunizations/StructureMap/IMMZD1HepatitisBQRToResources" diff --git a/input/fsh/questionnaires/QIMMZD1ClientHistoryMeasles.fsh b/input/fsh/questionnaires/QIMMZD1ClientHistoryMeasles.fsh index a0972fa690..c7547ccdb4 100644 --- a/input/fsh/questionnaires/QIMMZD1ClientHistoryMeasles.fsh +++ b/input/fsh/questionnaires/QIMMZD1ClientHistoryMeasles.fsh @@ -12,6 +12,7 @@ Usage: #definition * derivedFrom = Canonical(QIMMZD1ClientHistory) * contained[+] = IMMZ.D1.DE10 * contained[+] = IMMZ.D1.DE103 +* contained[+] = IMMZ.Z.DE9 * extension[+].url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-targetStructureMap" * extension[=].valueCanonical = "http://smart.who.int/ig/smart-immunizations/StructureMap/IMMZD1MeaslesQRToResources" diff --git a/input/fsh/questionnaires/QIMMZD1ClientHistoryPolio.fsh b/input/fsh/questionnaires/QIMMZD1ClientHistoryPolio.fsh index 1984a5319b..013cbbf805 100644 --- a/input/fsh/questionnaires/QIMMZD1ClientHistoryPolio.fsh +++ b/input/fsh/questionnaires/QIMMZD1ClientHistoryPolio.fsh @@ -13,6 +13,7 @@ Usage: #definition * contained[+] = IMMZ.D1.DE10 * contained[+] = IMMZ.D1.DE35 * contained[+] = IMMZ.D1.DE103 +* contained[+] = IMMZ.Z.DE23 * extension[+].url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-targetStructureMap" * extension[=].valueCanonical = "http://smart.who.int/ig/smart-immunizations/StructureMap/IMMZD1PolioQRToResources" diff --git a/input/fsh/questionnaires/QIMMZD1ClientHistoryYellowFever.fsh b/input/fsh/questionnaires/QIMMZD1ClientHistoryYellowFever.fsh index 5e69a12f14..0c18677f3c 100644 --- a/input/fsh/questionnaires/QIMMZD1ClientHistoryYellowFever.fsh +++ b/input/fsh/questionnaires/QIMMZD1ClientHistoryYellowFever.fsh @@ -12,6 +12,7 @@ Usage: #definition * derivedFrom = Canonical(QIMMZD1ClientHistory) * contained[+] = IMMZ.D1.DE10 * contained[+] = IMMZ.D1.DE103 +* contained[+] = IMMZ.Z.DE23 * extension[+].url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-targetStructureMap" * extension[=].valueCanonical = "http://smart.who.int/ig/smart-immunizations/StructureMap/IMMZD1YellowFeverQRToResources"