update

WorldHealthOrganization · Sep 16, 2024 · d45a77b · d45a77b
1 parent 18de065
commit d45a77b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/input/fsh/examples/DVCPayloadExample.fsh b/input/fsh/examples/DVCPayloadExample.fsh
@@ -8,7 +8,7 @@ Usage: #example
 * s = #female
 * ntl = #IND 
 * v.dn = #FirstDose
-* v.tg = #1f03
+* v.tg = #1F03
 * v.vp = #XM28X5
 * v.dt = "2024-01-23"
 * v.cn = "Dr. A"

diff --git a/input/fsh/examples/ModelDVCExample.fsh b/input/fsh/examples/ModelDVCExample.fsh
@@ -8,7 +8,7 @@ Usage: #example
 * sex =  #female
 * nationality = #IND
 * vaccineDetails[0].disease.display = "Measles"
-* vaccineDetails[=].disease.code = #1f03
+* vaccineDetails[=].disease.code = #1F03
 * vaccineDetails[=].disease.system = "http://id.who.int/icd/release/11/mms"
 * vaccineDetails[=].vaccineClassification.coding.display = "Measles vaccines"
 * vaccineDetails[=].vaccineClassification.coding.code = #XM28X5

diff --git a/input/fsh/models/DVCPayload.fsh b/input/fsh/models/DVCPayload.fsh
@@ -26,10 +26,9 @@ Description:     "Payload for Digital Vaccination Certificate - DVC CBOR Web Tok
   * vle 0..1 date "Certificate Validity periods end date"
   * cn 0..1 string "Name of supervising clinician"
   * is 0..1 id "Certificate issuer id (referenced organization)"
-  * is obeys mustHaveIsOrCn
-  * cn obeys mustHaveIsOrCn
+* obeys mustHaveIsOrCn
 
 Invariant: mustHaveIsOrCn
 Description: "Either issuer or clinicianName must be present"
-Expression: "is.exists() or cn.exists()"
+Expression: "v.is.exists() or v.cn.exists()"
 Severity: #error
diff --git a/input/fsh/models/ModelDVC.fsh b/input/fsh/models/ModelDVC.fsh
@@ -14,4 +14,10 @@ Description:  "Data elements for Digital Vaccination Certificate."
 * nid 0..1 string "National Identification Document" "National Identification Document"
 * guardian 0..1 string "Parent/Guardian" "Name of Parent or Guardian"
 * issuer 0..1 Reference(Organization) "Document issuer" "Document issuer"
-* vaccineDetails 1..* ModelVaccineDetails "Vaccine Details" "Vaccine Details"
+* vaccineDetails 1..* ModelVaccineDetails "Vaccine Details" "Vaccine Details"
+* obeys mustHaveIssuerOrClinician
+
+Invariant: mustHaveIssuerOrClinician
+Description: "Either issuer or clinicianName must be present"
+Expression: "vaccineDetails.issuer.exists() or vaccineDetails.clinicianName.exists()"
+Severity: #error
diff --git a/input/fsh/models/vaccineDetails.fsh b/input/fsh/models/vaccineDetails.fsh
@@ -21,10 +21,4 @@ Description:  "Vaccine Data elements for the Digital Vaccination Certificates"
 * manufacturer 1..1 string "Name of Manufacturer of vaccine" "Name Manufacturer of vaccine"
 * batchNo 1..1 string "Batch No" "Batch No"
 * validityPeriod 0..1 Period "Certificate validity period" "Certificate validity period"
-* issuer obeys mustHaveIssuerOrClinician
-* clinicianName obeys mustHaveIssuerOrClinician
 
-Invariant: mustHaveIssuerOrClinician
-Description: "Either issuer or clinicianName must be present"
-Expression: "issuer.exists() or clinicianName.exists()"
-Severity: #error