diff --git a/input/fsh/codesystems/DVCRelationshipStatus.fsh b/input/fsh/codesystems/DVCRelationshipStatus.fsh index f9874c54f..adfb96b33 100644 --- a/input/fsh/codesystems/DVCRelationshipStatus.fsh +++ b/input/fsh/codesystems/DVCRelationshipStatus.fsh @@ -3,4 +3,6 @@ Title : "Relationship Status for Contact in Patient" Description: "" * #Parent "Parent" "Parent" -* #Guardian "Guardian" "Guardian" \ No newline at end of file +* #Guardian "Guardian" "Guardian" + + diff --git a/input/fsh/codesystems/DiseaseTargeted.fsh b/input/fsh/codesystems/DiseaseTargeted.fsh new file mode 100644 index 000000000..15f5a9951 --- /dev/null +++ b/input/fsh/codesystems/DiseaseTargeted.fsh @@ -0,0 +1,16 @@ +CodeSystem: DiseaseTargeted +Title : "Disease Targeted" +Description: "" + +* #Cholera "Cholera" "Cholera" +* #HaemophilusInfluenzaeB "Haemophilus influenzae B" "Haemophilus influenzae B" +* #Diphtheria "Diphtheria" "Diphtheria" +* #Pertussis "Pertussis" "Pertussis" +* #Poliomyelitis "Poliomyelitis" "Poliomyelitis" +* #Typhoid "Typhoid" "Typhoid" +* #YellowFever "Yellow Fever" "Yellow Fever" +* #Dengue "Dengue" "Dengue" +* #Ebola "Ebola" "Ebola" +* #Mumps "Mumps" "Mumps" +* #Rubella "Rubella" "Rubella" +* #Encephalitis "Encephalitis" "Encephalitis" \ No newline at end of file diff --git a/input/fsh/codesystems/DoseNumber.fsh b/input/fsh/codesystems/DoseNumber.fsh new file mode 100644 index 000000000..3fa50ceba --- /dev/null +++ b/input/fsh/codesystems/DoseNumber.fsh @@ -0,0 +1,13 @@ +CodeSystem: doseNumber +Title: "Dose Number" +Description: "" + +* #Primary "Primary series" +* #ZeroDose "Dose 0" +* #Supplementary "Supplementary dose" +* #Booster "Booster dose" +* #FirstDose "First Dose" "First Dose in Primary Series" +* #SecondDose "Second Dose" "Second Dose in Primary Series" +* #ThirdDose "Third Dose" "Third Dose in Primary Series" +* #FourthDose "Fourth Dose" "Fourth Dose in Primary Series" +* #FifthDose "Fifth Dose" "Fifth Dose in Primary Series" \ No newline at end of file diff --git a/input/fsh/models/dvc.fsh b/input/fsh/models/DVCPayload.fsh similarity index 95% rename from input/fsh/models/dvc.fsh rename to input/fsh/models/DVCPayload.fsh index d5d2f2796..bb7a47b9d 100644 --- a/input/fsh/models/dvc.fsh +++ b/input/fsh/models/DVCPayload.fsh @@ -1,5 +1,5 @@ -Logical: DVC -Title: "DVC Payload" +Logical: DVCPayload +Title: "DVC HCERT Payload" Description: "Payload for Digital Vaccination Certificate - DVC CBOR Web Token Logical Model" * ^url = "http://smart.who.int/icvp/StructureDefinition/DVC" diff --git a/input/fsh/models/ICVPVaccineDetails.fsh b/input/fsh/models/ICVPVaccineDetails.fsh new file mode 100644 index 000000000..5b20b0e9d --- /dev/null +++ b/input/fsh/models/ICVPVaccineDetails.fsh @@ -0,0 +1,14 @@ +Logical: ModelICVPVaccineDetails +Parent: ModelVaccineDetails +Title: "ICVP - Vaccine Details" +Description: "Vaccine Data elements for the Model International Certificate of Vaccination or Prophylaxis." +* ^meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-shareablestructuredefinition" +* ^meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-publishablestructuredefinition" +* ^extension[http://hl7.org/fhir/tools/StructureDefinition/logical-target].valueBoolean = true +* ^status = #active +* ^experimental = true + + + +* disease from ICVPDiseaseTargeted (required) +* vaccineClassification from ICVPVaccineCodes (required) \ No newline at end of file diff --git a/input/fsh/models/icvp.fsh b/input/fsh/models/ModelDVC.fsh similarity index 85% rename from input/fsh/models/icvp.fsh rename to input/fsh/models/ModelDVC.fsh index c70e990b1..6aba12217 100644 --- a/input/fsh/models/icvp.fsh +++ b/input/fsh/models/ModelDVC.fsh @@ -1,6 +1,6 @@ -Logical: ModelICVP -Title: "ICVP" -Description: "Data elements for the Model International Certificate of Vaccination or Prophylaxis." +Logical: ModelDVC +Title: "DVC" +Description: "Data elements for Digital Vaccination Certificate." * ^meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-shareablestructuredefinition" * ^meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-publishablestructuredefinition" * ^extension[http://hl7.org/fhir/tools/StructureDefinition/logical-target].valueBoolean = true diff --git a/input/fsh/models/ModelICVP.fsh b/input/fsh/models/ModelICVP.fsh new file mode 100644 index 000000000..e085eaf36 --- /dev/null +++ b/input/fsh/models/ModelICVP.fsh @@ -0,0 +1,11 @@ +Logical: ModelICVP +Parent: ModelDVC +Title: "ICVP" +Description: "Data elements for the Model International Certificate of Vaccination or Prophylaxis." +* ^meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-shareablestructuredefinition" +* ^meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-publishablestructuredefinition" +* ^extension[http://hl7.org/fhir/tools/StructureDefinition/logical-target].valueBoolean = true +* ^status = #active +* ^experimental = true + +* vaccineDetails only ModelICVPVaccineDetails diff --git a/input/fsh/models/vaccineDetails.fsh b/input/fsh/models/vaccineDetails.fsh index c72ebc3f2..c4a350450 100644 --- a/input/fsh/models/vaccineDetails.fsh +++ b/input/fsh/models/vaccineDetails.fsh @@ -1,6 +1,6 @@ Logical: ModelVaccineDetails -Title: "ICVP - Vaccine Details" -Description: "Vaccine Data elements for the Model International Certificate of Vaccination or Prophylaxis." +Title: "DVC - Vaccine Details" +Description: "Vaccine Data elements for the Digital Vaccination Certificates" * ^meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-shareablestructuredefinition" * ^meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-publishablestructuredefinition" * ^extension[http://hl7.org/fhir/tools/StructureDefinition/logical-target].valueBoolean = true @@ -8,8 +8,11 @@ Description: "Vaccine Data elements for the Model International Certificate of * ^experimental = true * doseNumber 1..1 CodeableConcept "Dose Number" "Dose Number" +* doseNumber from doseNumber (required) * disease 1..1 Coding "Disease" "Name of disease or condition vaccinated or received prophylaxis against" +* disease from DiseaseTargeted (required) * vaccineClassification 1..1 CodeableConcept "Vaccine code" "Vaccine or prophylaxis classification code" +* vaccineClassification from DVCVaccines (required) * vaccineTradeItem 0..1 Identifier "vaccine trade item id" "Vaccine trade item id" * date 1..1 date "Date" "Date of vaccine" * clinicianName 0..1 string "Name of supervising clinician" "Name of supervising clinician, or relevant authority responsible for issuing this certificate, or for overseeing the administering centre" diff --git a/input/fsh/questionnaires/ICVPModel.fsh b/input/fsh/questionnaires/ICVPModel.fsh index 1136955db..aa05c59c9 100644 --- a/input/fsh/questionnaires/ICVPModel.fsh +++ b/input/fsh/questionnaires/ICVPModel.fsh @@ -5,6 +5,9 @@ Title: "ICVP Model Questionnaire" Usage: #definition * status = #draft * contained[+] = http://terminology.hl7.org/ValueSet/v2-0001 +* contained[+] = http://hl7.org/fhir/ValueSet/country +* contained[+] = ICVPDiseaseTargeted +* contained[+] = ICVPVaccineCodes * insert Question(name, Full Name of the client, string, false, true) @@ -12,14 +15,14 @@ Usage: #definition * insert Question(sex, Sex, choice, false, false) * 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" +* item[=].answerValueSet = "http://hl7.org/fhir/ValueSet/country" * 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) - // * item[=].answerValueSet = "" + * item[=].answerValueSet = Canonical(ICVPDiseaseTargeted) * insert Question(vaccineClassification, Vaccine or Prophylaxis classification code, choice, false, true) * item[=].answerValueSet = Canonical(ICVPVaccineCodes) * insert Question(vaccineTradeItem, Vaccine Trade Item, string, false, false) diff --git a/input/fsh/valuesets/DVCRelationshipStatus.fsh b/input/fsh/valuesets/DVCRelationshipStatus.fsh index e80a03029..5cc64d1d4 100644 --- a/input/fsh/valuesets/DVCRelationshipStatus.fsh +++ b/input/fsh/valuesets/DVCRelationshipStatus.fsh @@ -4,4 +4,5 @@ Title : "Relationship Status for Contact in Patient" Description: "" -* include codes from system $DVCRelationshipStatus \ No newline at end of file +* include codes from system $DVCRelationshipStatus + diff --git a/input/fsh/valuesets/DiseaseTargeted.fsh b/input/fsh/valuesets/DiseaseTargeted.fsh new file mode 100644 index 000000000..b45714597 --- /dev/null +++ b/input/fsh/valuesets/DiseaseTargeted.fsh @@ -0,0 +1,15 @@ +Alias: $DiseaseTargeted = http://worldhealthorganization.github.io/smart-icvp/DiseaseTargeted +ValueSet: DiseaseTargeted +Id: Disease-Targeted +Title : "Disease Targeted" +Description: "" + +* include codes from system $DiseaseTargeted + +ValueSet: ICVPDiseaseTargeted +Id: ICVP-Disease-Targeted +Title : "ICVP Disease Targeted" +Description: "" + +* $DiseaseTargeted#YellowFever "Yellow Fever" +* $DiseaseTargeted#Poliomyelitis "Poliomyelitis" diff --git a/input/fsh/valuesets/DoseNumber.fsh b/input/fsh/valuesets/DoseNumber.fsh new file mode 100644 index 000000000..309473d31 --- /dev/null +++ b/input/fsh/valuesets/DoseNumber.fsh @@ -0,0 +1,7 @@ +Alias: $doseNumber = http://worldhealthorganization.github.io/smart-icvp/doseNumber +ValueSet: doseNumber +Title : "Dose Number" +Description: "" + + +* include codes from system $doseNumber \ No newline at end of file