Fixed issue with vaccineType binding for logical models and added vaccineType valueset to the contained section for the questionnaires.

Author: lukeaduncan

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 

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
+

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
+  * ^code[+] = IMMZ.D1#DE49
+* vaccineHistory.vaccineType from IMMZ.Z.DE9

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

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

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"

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"

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"

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"