update to canonicals

WorldHealthOrganization · Oct 22, 2023 · da317c7 · da317c7
1 parent d9cbabc
commit da317c7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 23 deletions.
diff --git a/input/fsh/questionnaires/QIMMZCRegisterClient.fsh b/input/fsh/questionnaires/QIMMZCRegisterClient.fsh
@@ -3,12 +3,10 @@ InstanceOf: sdc-questionnaire-extr-smap
 Title: "Client Registration Questionnaire"
 Description: "Immunization - Client Registration Questionnaire"
 Usage: #definition
-* id = "IMMZCRegisterClient"
 * version = "2023"
 * status = #draft
 * subjectType = #Patient
 * language = #en
-* status = #draft
 * contained[+] = IMMZ.C.DE5
 //* contained[+] = YesNoUnknown
 
@@ -49,7 +47,7 @@ Usage: #definition
 
 * insert Question(sex, Sex,choice,true,false)
 * item[=]
-  * answerValueSet = "#IMMZ.C.DE5"
+  * answerValueSet = Canonical(IMMZ.C.DE5)
   * code[+] = IMMZ.C#DE5
   * code[+] = $LNC#46098-0	"Sex"
   * code[+] = $SCT#184100006 "Patient sex (observable entity)"
@@ -96,18 +94,3 @@ Usage: #definition
   * code[+] = IMMZ.C#DE20
 
 
-/*
-
-* phone 1..1 string "Client's phone number"
-  * code[+] = IMMZ.C#DE18
-  * code[+] = $LNC#42077-8 "Patient Phone number"
-  * code[+] = $SCT#184103008 "Patient telephone number (observable entity)"
-* administrativeArea 0..1 CodeableConcept "The name of the city/municipality/town/village of where the client lives"
-  * code[+] = IMMZ.C#DE19
-  * code[+] = $LNC#56799-0 "Address"
-  * code[+] = $SCT#184097001 "Patient address (observable entity)"
-* healthWorker 1..1 boolean "Is the client an active and participating health worker. This data element is used mainly for reporting and indicators purposes."
-  * code[+] = IMMZ.C#DE20
-  
-
-*/
diff --git a/input/fsh/questionnaires/QIMMZD1ClientHistoryMeasles.fsh b/input/fsh/questionnaires/QIMMZD1ClientHistoryMeasles.fsh
@@ -26,7 +26,7 @@ Usage: #definition
   * code[+] = IMMZ.D1#DE81
 * insert Question(hivStatus, The current human immunodeficiency virus HIV status of the client, choice, false, false)
 * item[=]
-  * answerValueSet = "#IMMZ.D1.DE10"
+  * answerValueSet = Canonical(IMMZ.D1.DE10)
   * code[+] = IMMZ.D1#DE10
   * code[+] = $LNC#55277-8
   * code[+] = $SCT#278977008
@@ -47,7 +47,7 @@ Usage: #definition
 * item[=]
   * insert Question(vaccineType, Vaccine type/category that was administered or was to be administered. Any vaccine code available in the IMMZ.Z Vaccine Library list of codes applies in this data element, choice, true, false)
   * item[=]
-    * answerValueSet = "#IMMZ.Z.DE9"
+    * answerValueSet = Canonical(IMMZ.Z.DE9)
     * code[+] = IMMZ.D1#DE19
     * code[+] = $LNC#39236-5
     * code[+] = $SCT#787859002

diff --git a/input/fsh/questionnaires/QIMMZD4CheckContraindicationsMeasles.fsh b/input/fsh/questionnaires/QIMMZD4CheckContraindicationsMeasles.fsh
@@ -3,7 +3,6 @@ InstanceOf: sdc-questionnaire-extr-smap
 Title: "Check Contraindications Questionnaire"
 Description: "Immunization - Check Contraindications Questionnaire"
 Usage: #definition
-* id = "IMMZD4CheckContraindicationsMeasles"
 * version = "2023"
 * status = #draft
 * subjectType = #Patient
@@ -15,7 +14,8 @@ Usage: #definition
 * extension[=].valueCanonical = "http://smart.who.int/ig/smart-immunizations/StructureMap/IMMZD4QRToResources"
 
 
-* insert Question(contraindications, Specific situations or medical conditions in which it is advised or recommended to avoid or delay administering a particular vaccine, choice, false, true)
+//* insert Question(contraindications, Specific situations or medical conditions in which it is advised or recommended to avoid or delay administering a particular vaccine, choice, false, true)
+* insert Question(contraindications, Contraindications, choice, false, true)
 * item[=]
-  * answerValueSet = "#IMMZ.D4.DE161"
+  * answerValueSet = Canonical(IMMZ.D4.DE161)
   * code[+] = IMMZ.D4#DE161