update

WorldHealthOrganization · Aug 7, 2024 · 34cbe08 · 34cbe08
1 parent ec1617f
commit 34cbe08
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 25 deletions.
diff --git a/input/fsh/questionnaires/ICVPModel.fsh b/input/fsh/questionnaires/ICVPModel.fsh
@@ -1,10 +1,3 @@
-RuleSet: Question(linkId, text, type, repeats, required)
-* item[+].linkId = "{linkId}"
-* item[=].text = "{text}"
-* item[=].type = #{type}
-* item[=].repeats = {repeats}
-* item[=].required = {required}
-
 Instance: Questionnaire-ICVPModel
 InstanceOf: sdc-questionnaire-extr-smap
 Description: "Questionnaire for ICVP Logical Model"
@@ -17,23 +10,23 @@ Usage: #definition
 * item[=].answerValueSet = "http://terminology.hl7.org/ValueSet/v2-0001"
 * insert Question(nationality, Nationality, choice, false, false)
 * item[=].answerValueSet = "https://terminology.hl7.org/ValueSet-v3-Country.html" 
-* insert Question(nid, National Identification Document, false, false)
-* insert Question(guardian, Name of Parent or Guardian, false, false)
+* insert Question(nid, National Identification Document, string, false, false)
+* insert Question(guardian, Name of Parent or Guardian, string, false, false)
 * insert Question(vaccinDetails,Vaccine Certificate Details,group, true, true)
 * item[=]
-    * insert Question(doseNumber, Dose Number, string, false, true)
-    * insert Question(disease, Name of disease of condition vaccinated or received prophylaxis against, choice, false, true)
+  * insert Question(doseNumber, Dose Number, string, false, true)
+  * insert Question(disease, Name of disease of condition vaccinated or received prophylaxis against, choice, false, true)
  //   * item[=].answerValueSet = ""
-    * insert Question(vaccineClassification, Vaccine or Prophylaxis classification code, choice, false, true)
-    * item[=].answerValueSet = Canonical(ICVPVaccineCodes)
-    * insert Question(vaccineTradeItem, Vaccine Trade Item, string, false, false)
-    * insert Question(date, Date of Vaccination, date, false, true)
-    * insert Question(clinicianName, Name of supervising clinician, string, false, false)
-    * insert Question(issuer, Relevant authoring reponsible for issuing the certificate/, or for overseeing the administration center, string, false, false)
-    * insert Question(manufacturerId, Manufacturer ID, string, false, false)
-    * insert Question(manufacturer, Name of Manufacturer of Vaccine, string, false, true)
-    * insert Question(batchNo, Batch Number, string, false, true )
-    * insert Question(validityPeriod, Certificate Validity Period, group, false, false)
-    * item[=]
-        * insert Question(startDate, From, date, false, false)
-        * insert Question(endDate, To, date, false, false)
+  * insert Question(vaccineClassification, Vaccine or Prophylaxis classification code, choice, false, true)
+  * item[=].answerValueSet = Canonical(ICVPVaccineCodes)
+  * insert Question(vaccineTradeItem, Vaccine Trade Item, string, false, false)
+  * insert Question(date, Date of Vaccination, date, false, true)
+  * insert Question(clinicianName, Name of supervising clinician, string, false, false)
+  * insert Question(issuer, Relevant authoring reponsible for issuing the certificate\, or for overseeing the administration center, string, false, false)
+  * insert Question(manufacturerId, Manufacturer ID, string, false, false)
+  * insert Question(manufacturer, Name of Manufacturer of Vaccine, string, false, true)
+  * insert Question(batchNo, Batch Number, string, false, true )
+  * insert Question(validityPeriod, Certificate Validity Period, group, false, false)
+  * item[=]
+    * insert Question(startDate, From, date, false, false)
+    * insert Question(endDate, To, date, false, false)
diff --git a/input/fsh/rulesets/rulesets-questionnaires.fsh b/input/fsh/rulesets/rulesets-questionnaires.fsh
@@ -1,4 +1,4 @@
-RuleSet: Question(linkId, text, type, required, repeats)
+RuleSet: Question(linkId, text, type, repeats, required)
 * item[+].linkId = "{linkId}"
 * item[=].text = "{text}"
 * item[=].type = #{type}

diff --git a/sushi-config.yaml b/sushi-config.yaml
@@ -259,6 +259,7 @@ menu:
 dependencies:
   who.base: current
   hl7.fhir.uv.ips: current
+  hl7.fhir.uv.sdc: 3.0.0
   ihe.iti.mcsd: 
    id: IHE_ITI_mCSD
    uri: https://profiles.ihe.net/ITI/mCSD/ImplementationGuide/ihe.iti.mcsd