updates

input/fsh/models/dvc.fsh

@@ -9,20 +9,21 @@ Description:     "Data elements for the Digital Vaccination Certificate Core Dat
 
 * n 1..1 string "Person name"
 * dob 1..1 date "Date of birth in YYYY-MM-DD format"
-* s 1..1 code "Sex"
-* ntl 1..1 code "Nationality"
+* s 0..1 code "Sex"
+* ntl 0..1 code "Nationality"
 * nid 0..1 string "National Identification Document"
 * gn 0..1 string "Parent or Guardian Name"
  // Vaccination group -------------------------------------------------------
-* v 0..* BackboneElement "Vaccination Group (see element details)"
+* v 1..1 BackboneElement "Vaccination Group (see element details)"
   * tg 1..1 code "Name of disease or condition vaccinated or received prophylaxis against"
-  * vp 1..1 string "Vaccine or prophylaxis classification code"
+  * vp 1..1 code "Vaccine or prophylaxis classification code"
   * mp 0..1 id "Vaccine Trade item id"
   * ma 1..1 string "manufacturer name"
   * mid 0..1 id "manufacturer id"
   * dt 1..1 date "Date of vaccination, YYYY-MM-DD format"
   * bo 1..1 string "Batch No"
-  * val 1..1 Period "Certificate Validity period"
+  * vls 0..1 date "Certificate Validity periods start date"
+  * vle 0..1 date "Certificate Validity periods end date"
   * cn 0..1 string "Name of supervising clinician"
   * is 0..1 string "Certificate issuer (organization name)"
   * is obeys mustHaveIsOrCn

input/fsh/models/icvp.fsh

@@ -9,8 +9,8 @@ Description:  "Data elements for the Model International Certificate of Vaccinat
 
 * name 1..1 string "Name" "The full name of the client"
 * dob 1..1 date "Date of Birth" "Date of Birth"
-* sex 1..1 code "Sex" "Sex"
-* nationality 1..1 code "Nationality" "Nationality"
+* sex 0..1 code "Sex" "Sex"
+* nationality 0..1 code "Nationality" "Nationality"
 * nid 0..1 string "National Identification Document" "National Identification Document"
 * guardian 0..1 string "Parent/Guardian" "Name of Parent or Guardian"
 * vaccineDetails 1..* ModelVaccineDetails "Vaccine Details" "Vaccine Details"

input/fsh/models/vaccineDetails.fsh

@@ -17,7 +17,7 @@ Description:  "Vaccine Data elements for the Model International Certificate of
 * manufacturerId 0..1 Identifier "Manufacture ID" "Manufacturer ID"
 * manufacturer 1..1 string "Name of Manufacturer of vaccine" "Name Manufacturer of vaccine"
 * batchNo 1..1 string "Batch No" "Batch No"
-* validityPeriod 1..1 Period "Certificate validity period" "Certificate validity period"
+* validityPeriod 0..1 Period "Certificate validity period" "Certificate validity period"
 * issuer obeys mustHaveIssuerOrClinician
 * clinicianName obeys mustHaveIssuerOrClinician
 

input/fsh/profiles/DICVPIPS.fsh

@@ -0,0 +1,6 @@
+Profile: DICVPBundle
+Parent: BundleUvIps
+Title : "Digital ICVP Certificate"
+Description : "Digital ICVP Certificate"
+
+* section[sectionImmunizations].entry only Reference(DVCImmunization)

input/fsh/profiles/DIVCPBundle.fsh

@@ -0,0 +1,27 @@
+Profile: DICVPBundle
+Parent: Bundle
+Title : "Digital ICVP Certificate"
+Description : "Digital ICVP Certificate"
+
+* ^publisher = "WHO"
+* . ^short = "Digital ICVP Certificate Bundle"
+* . ^definition = "Digital ICVP Certificate Bundle."
+* identifier 1.. MS
+* type = #document (exactly)
+* timestamp 1.. MS
+* entry MS
+* entry ^slicing.discriminator[0].type = #type
+* entry ^slicing.discriminator[=].path = "resource"
+* entry ^slicing.discriminator[+].type = #profile
+* entry ^slicing.discriminator[=].path = "resource"
+* entry ^slicing.rules = #open
+* entry contains
+    composition 1..1 and
+    patient 1..1 and
+    immunization 0..* 
+/* entry[composition].resource 1..
+* entry[composition].resource only CompositionUvIps
+* entry[patient].resource 1..
+* entry[patient].resource only PatientUvIps*/
+* entry[immunization].resource 1..
+* entry[immunization].resource only DVCImmunization

input/fsh/profiles/DVCImmunization.fsh

@@ -0,0 +1,7 @@
+Profile: DVCImmunization
+Parent: ImmunizationUvIps
+Id: DVC-ImmunizationUvIps
+Title: "DVC Immunization"
+Description: "This profile represents Immunization record for Digital Vaccine Certificates"
+
+* vaccineCode from DVCVaccines (required)