renamed resources to match L3 SOP

WorldHealthOrganization · Jul 29, 2024 · 78ae5c4 · 78ae5c4
1 parent af3b926
commit 78ae5c4
Show file tree

Hide file tree

Showing 69 changed files with 444 additions and 473 deletions.
diff --git a/input/fsh.old/ddcc-transaction-test-examples.fsh b/input/fsh.old/ddcc-transaction-test-examples.fsh
@@ -1,17 +1,17 @@
-Instance:     DDCC-VS-TX-SHE-Parameters-1
+Instance:     DDCCVSTXSHEParameters1
 InstanceOf:   DDCCGenerateHealthCertificateParameters
 Usage:        #inline
 
 * parameter[+].name = "response"
-* parameter[=].resource = DDCC-VS-QuestionnaireResponse-Example
+* parameter[=].resource = DDCCVSQuestionnaireResponseExample
 
 
-Instance:     DDCC-TX-SHE-bundle-example-1
+Instance:     DDCCTXSHEbundleexample1
 InstanceOf:   DDCCSubmitHealthEventRequest
 Usage:        #example
 
 * type = #batch
-* entry[+].fullUrl = "http://www.example.org/fhir/Parameters/DDCC-VS-TX-SHE-Parameters-1"
-* entry[=].resource = DDCC-VS-TX-SHE-Parameters-1
+* entry[+].fullUrl = "http://www.example.org/fhir/Parameters/DDCCVSTXSHEParameters1"
+* entry[=].resource = DDCCVSTXSHEParameters1
 * entry[=].request.method = #POST
 * entry[=].request.url = "QuestionnaireResponse/$generateHealthCertificate"
diff --git a/input/fsh/cert-divoc-core-data-set.fsh b/input/fsh/cert-divoc-core-data-set.fsh
@@ -67,7 +67,7 @@ Some element descriptions in this logical model provide details that are not in
       * addressCountry from http://hl7.org/fhir/ValueSet/iso3166-1-3 (preferred)
       * postalCode 0..1 string "Postal code for area"
   * icd11Code 0..1 string "ICD-11 code of this vaccine type (no binding information in spec)" "The specification for DIVOC does not provide any information beyond that this is an ICD-11 code, so correspondingly there is no required binding to a specific ValueSet in this logical model."
-  * icd11Code from WHO_DDCC_Vaccines_COVID_19 (preferred)
+  * icd11Code from WHODDCCVaccinesCOVID19 (preferred)
   * prophylaxis 0..1 string "Descriptive details of the vaccine type"
 
   // Lab test specific elements

diff --git a/input/fsh/cert-icao-core-data-set.fsh b/input/fsh/cert-icao-core-data-set.fsh
@@ -57,7 +57,7 @@ Description:    "Data elements for the ICAO Visible Digital Seal Core Data Set.
 
     * ve 0..* BackboneElement "VaccinationEvent (Required for `icao.vacc` only, not used of `icao.test`)"
       * des 1..1 string  "Vaccine or Prophylaxis (ICD-11 MMS code descending from http://id.who.int/icd/entity/164949870)"
-      * des from WHO_DDCC_Vaccines_COVID_19 (required)
+      * des from WHODDCCVaccinesCOVID19 (required)
       * nam 1..1 string  "Vaccine Brand (medical product name)"
       * dis 0..1 string  "Disease or agent targeted (ICD-11 code)"
       * vd 1..* BackboneElement "VaccinationDetails"

diff --git a/input/fsh/ddcc-composition.fsh b/input/fsh/ddcc-composition.fsh
@@ -47,7 +47,7 @@ Title:          "DDCC:VS Composition"
 Description:    """ 
 Describes the logical structure for a Digital Documentation of COVID-19 Certificates - Vaccination Status (DDCC:VS).
 """
-* category = DDCC_Composition_Category_CodeSystem#ddcc-vs
+* category = DDCCCompositionCategoryCodeSystem#ddcc-vs
 * section ^slicing.discriminator[+].type = #value
 * section ^slicing.discriminator[=].path = "code"
 * section ^slicing.discriminator[+].type = #type
@@ -70,7 +70,7 @@ Title:          "DDCC:TR Composition"
 Description:    """ 
 Describes the logical structure for a Digital Documentation of COVID-19 Certificates - Test Result (DDCC:TR).
 """
-* category = DDCC_Composition_Category_CodeSystem#ddcc-tr
+* category = DDCCCompositionCategoryCodeSystem#ddcc-tr
 * section ^slicing.discriminator[+].type = #value
 * section ^slicing.discriminator[=].path = "code"
 * section ^slicing.discriminator[+].type = #type
@@ -87,20 +87,18 @@ Describes the logical structure for a Digital Documentation of COVID-19 Certific
 
 
 
-CodeSystem:     DDCC_Composition_Category_CodeSystem
-Id:             DDCC-Composition-Category-CodeSystem
+CodeSystem:     DDCCCompositionCategoryCodeSystem
 Title:          "DDCC Composition Category Codes"
 Description:    "Possible categories available for composition."
 * ^experimental = false
 * ^caseSensitive = true
 * #ddcc-vs      "DDCC:VS"
 * #ddcc-tr      "DDCC:TR"
 
-ValueSet:       DDCC_Composition_Category_ValueSet
-Id:             DDCC-Composition-Category-ValueSet
+ValueSet:       DDCCCompositionCategoryValueSet
 Title:          "DDCC Composition Category Codes"
 Description: 	"Categorization of DDCC Composition"
-* include codes from system DDCC_Composition_Category_CodeSystem
+* include codes from system DDCCCompositionCategoryCodeSystem
 
 Profile:        DDCCDocument
 Parent:         Bundle
@@ -219,18 +217,16 @@ The content attachment url will point to a DDCC Document.
 
 /*
 
-CodeSystem:     DDCC_SectionCode_CodeSystem
-Id:             DDCC-SectionCode-CodeSystem
+CodeSystem:     DDCCSectionCodeCodeSystem
 Title:          "DDCC QR SectionCode Usage Codes"
 Description:    "Section Codes for DDCC"
 * #vaccination  "DDCC: Vaccination Status"
 * #test         "DDCC: SARS-CoV-2 Test"
 * #recovery     "DDCC: Recovery Status"
 
-ValueSet:       DDCC_SectionCode_ValueSet
-Id:             DDCC-SectionCode-ValueSet
+ValueSet:       DDCCSectionCodeValueSet
 Description:   "Content section codes for DDCC."
-* include codes from system DDCC_SectionCode_CodeSystem
+* include codes from system DDCCSectionCodeCodeSystem
 
 */
 

diff --git a/input/fsh/ddcc-core-data-set.fsh b/input/fsh/ddcc-core-data-set.fsh
@@ -44,13 +44,12 @@ Title:          "WHO Digital Documentation of COVID Certificates"
 * birthDate -> "Patient.birthDate"
 * identifier -> "Patient.identifier"
 
-Logical:        DDCCCoreDataSet_VS
-Id:             DDCCCoreDataSet.VS
+Logical:        DDCCCoreDataSetVS
 Parent:         DDCCCoreDataSet
 Title:          "DDCC Core Data Set Logical Model for Vaccination Status"
 Description:    "Data elements for the DDCC Core Data Set for Vaccination Status.
 "
-* ^url = "http://smart.who.int/ddcc/StructureDefinition/DDCCCoreDataSet.VS"
+* ^url = "http://smart.who.int/ddcc/StructureDefinition/DDCCCoreDataSetVS"
 * ^version = "RC2"
 * ^abstract = true
 * ^status = #draft
@@ -59,7 +58,7 @@ Description:    "Data elements for the DDCC Core Data Set for Vaccination Status
 * vaccination 1..1 SU BackboneElement "Vaccination Event" "A vaccination event."
 * vaccination obeys who-ddcc-data-1
   * vaccine 1..1 SU Coding "Vaccine or prophylaxis" "Generic description of the vaccine or vaccine sub-type. e.g. COVID-19 mRNA vaccine, HPV vaccine."
-  * vaccine from WHO_DDCC_Vaccines_COVID_19 (preferred)
+  * vaccine from WHODDCCVaccinesCOVID19 (preferred)
   * brand 1..1 SU Coding "Vaccine brand" "The brand or trade name used to refer to the vaccine received."
   * manufacturer 0..1 SU Coding "Vaccine manufacturer" "Name of the manufacturer of the vaccine received. e.g. Serum institute of India, AstraZeneca. If vaccine manufacturer is unknown, market authorization holder is REQUIRED."
   * maholder 0..1 SU Coding "Vaccine market authorization holder" "Name of the market authorization holder of the vaccine received. If market authorization holder is unknown, vaccine manufacturer is REQUIRED."
@@ -76,12 +75,12 @@ Description:    "Data elements for the DDCC Core Data Set for Vaccination Status
   * signature 0..1 Signature "Signature of health worker" "REQUIRED for PAPER vaccination certificates ONLY. The health worker who provided the vaccination or the supervising clinician's hand-written signature."
   * practitioner 0..1 Identifier "Health worker identifier" "OPTIONAL for DIGITAL and PAPER vaccination certificates. The unique identifier for the health worker as determined by the member state. There can be more than one unique identifier used. (e.g. system generated ID, health profession number, cryptographic signature, or any other form of health worker unique identifier). This can be used in lieu of a paper-based signature." 
   * disease 0..1 Coding "Disease or agent targeted" "Name of disease vaccinated against (such as COVID-19)."
-  * disease from WHO_DDCC_Disease_Targeted_COVID_19 (preferred)
+  * disease from WHODDCCDiseaseTargetedCOVID19 (preferred)
   * nextDose 0..1 date "Due date of next dose" "Date on which the next vaccination should be administered, if a next dose is REQUIRED."
 
 
 Mapping:        DDCCCoreDataSetVSToImmunization
-Source:         DDCCCoreDataSet_VS
+Source:         DDCCCoreDataSetVS
 Target:         "http://smart.who.int/ddcc/StructureDefinition/DDCCImmunization"
 Id:             ddcc-immunization
 Title:          "WHO Digital Documentation of COVID Certificates"
@@ -104,35 +103,33 @@ Title:          "WHO Digital Documentation of COVID Certificates"
   * issuer -> "Immunization.protocolApplied.authority.identifier"
 
 Mapping:        DDCCCoreDataSetVSToImmunizationRecommendation
-Source:         DDCCCoreDataSet_VS
+Source:         DDCCCoreDataSetVS
 Target:         "http://smart.who.int/ddcc/StructureDefinition/DDCCImmunizationRecommendation"
 Id:             ddcc-immunization-recommendation
 Title:          "WHO Digital Documentation of COVID Certificates"
 
 * vaccination.nextDose -> "ImmunizationRecommendation.dateCriterion.value"
 
-Logical:        DDCCCoreDataSet_VS_PoV
-Id:             DDCCCoreDataSet.VS.PoV
+Logical:        DDCCCoreDataSetVSPoV
 //Parent:		Element
-Parent:         DDCCCoreDataSet_VS
+Parent:         DDCCCoreDataSetVS
 Title:          "DDCC Core Data Set Logical Model - Vaccination Status - Proof of Vaccination"
 Description:    "Data elements for the DDCC Core Data Set - Vaccination Status - Proof of Vaccination."
 
-* ^url = "http://smart.who.int/ddcc/StructureDefinition/DDCCCoreDataSet.VS.PoV"
+* ^url = "http://smart.who.int/ddcc/StructureDefinition/DDCCCoreDataSetVSPoV"
 * ^version = "RC2"
 * ^abstract = false
 * ^status = #draft
 * ^type = "http://smart.who.int/ddcc/StructureDefinition/DDCCCoreDataSet"
 
 
-Logical:        DDCCCoreDataSet_VS_CoC
-Id:             DDCCCoreDataSet.VS.CoC
+Logical:        DDCCCoreDataSetVSCoC
 //Parent:		Element
-Parent:         DDCCCoreDataSet_VS
+Parent:         DDCCCoreDataSetVS
 Title:          "DDCC Core Data Set Logical Model - Vaccination Status - Continuity of Care"
 Description:    "Data elements for the DDCC Core Data Set - Vaccination Status - Continuity of Care."
 
-* ^url = "http://smart.who.int/ddcc/StructureDefinition/DDCCCoreDataSet.VS.CoC"
+* ^url = "http://smart.who.int/ddcc/StructureDefinition/DDCCCoreDataSetVSCoC"
 * ^version = "RC2"
 * ^abstract = false
 * ^status = #draft
@@ -143,43 +140,42 @@ Description:    "Data elements for the DDCC Core Data Set - Vaccination Status -
 * vaccination.centre 1..1 
 
 Mapping:        DDCCCoreDataSetVSCoCToPatient
-Source:         DDCCCoreDataSet_VS_CoC
+Source:         DDCCCoreDataSetVSCoC
 Target:         "http://smart.who.int/ddcc/StructureDefinition/DDCCPatient"
 Id:             ddcc-vs-coc-immunization-recommendation
 Title:          "WHO Digital Documentation of COVID Certificates"
 
 * sex -> "Patient.gender"
 
-Logical:        DDCCCoreDataSet_TR
-Id:             DDCCCoreDataSet.TR
+Logical:        DDCCCoreDataSetTR
 Parent:         DDCCCoreDataSet
 Title:          "DDCC Core Data Set Logical Model for Test Result"
 Description:    "Data elements for the DDCC Core Data Set for Test Result."
 
-* ^url = "http://smart.who.int/ddcc/StructureDefinition/DDCCCoreDataSet.TR"
+* ^url = "http://smart.who.int/ddcc/StructureDefinition/DDCCCoreDataSetTR"
 * ^version = "RC2"
 * ^abstract = true
 * ^status = #draft
 * ^type = "http://smart.who.int/ddcc/StructureDefinition/DDCCCoreDataSet"
 
 * test 1..1 SU BackboneElement "Test Event" "A test event."
   * pathogen 1..1 SU Coding "Pathogen targeted" "Name of the pathogen being tested for (such as SARS-CoV-2). "
-  * pathogen from WHO_DDCC_Agent_Targeted_COVID_19 (preferred)
+  * pathogen from WHODDCCAgentTargetedCOVID19 (preferred)
   * type 1..1 SU Coding "Type of test" "Name of the type of test that was conducted e.g. NAAT."
-  * type from WHO_DDCC_Type_of_Test_COVID_19 (preferred)
+  * type from WHODDCCTypeofTestCOVID19 (preferred)
   * brand 0..1 SU Coding "Test brand" "The brand or trade name used to refer to the test conducted."
   * manufacturer 0..1 SU Coding "Test manufacturer" "Name of the manufacturer of the test conducted."
   * origin 0..1 SU Coding "Specimen Sample Origin" "The type of sample that was taken  e.g. Nasopharyngeal swab or Saliva specimen."
-  * origin from WHO_DDCC_Sample_Origin_COVID_19 (preferred)
+  * origin from WHODDCCSampleOriginCOVID19 (preferred)
   * date 1..1 SU dateTime "Date and time of sample collection" "Date and time when sample was collected."
   * result 0..1 Coding "Test result" "Detected or Not detected presence of SARS-CoV-2 infection."
-  * result from WHO_DDCC_Test_Result_COVID_19 (preferred)
+  * result from WHODDCCTestResultCOVID19 (preferred)
   * centre 0..1 Coding "Test centre or facility name" "A codable name or identifier of the facility responsible for conducting the test."
   * country 1..1 SU Coding "Test centre country" "The country in which the individual has been tested."
   * country from http://hl7.org/fhir/ValueSet/iso3166-1-3 (preferred) 
 
 Mapping:        DDCCCoreDataSetTRToObservation
-Source:         DDCCCoreDataSet_TR
+Source:         DDCCCoreDataSetTR
 Target:         "http://smart.who.int/ddcc/StructureDefinition/DDCCObservation"
 Id:             ddcc-observation
 Title:          "WHO Digital Documentation of COVID Certificates"
@@ -191,7 +187,7 @@ Title:          "WHO Digital Documentation of COVID Certificates"
   * result -> "Observation.value"
 
 Mapping:        DDCCCoreDataSetTRToSpecimen
-Source:         DDCCCoreDataSet_TR
+Source:         DDCCCoreDataSetTR
 Target:         "http://smart.who.int/ddcc/StructureDefinition/DDCCSpecimen"
 Id:             ddcc-specimen
 Title:          "WHO Digital Documentation of COVID Certificates"
@@ -201,7 +197,7 @@ Title:          "WHO Digital Documentation of COVID Certificates"
   * date -> "Specimen.collection.collected"
 
 Mapping:        DDCCCoreDataSetTRToTest
-Source:         DDCCCoreDataSet_TR
+Source:         DDCCCoreDataSetTR
 Target:         "http://smart.who.int/ddcc/StructureDefinition/DDCCTest"
 Id:             ddcc-test
 Title:          "WHO Digital Documentation of COVID Certificates"
@@ -213,7 +209,7 @@ Title:          "WHO Digital Documentation of COVID Certificates"
   * brand -> "Device.property.valueCode"
 
 Mapping:        DDCCCoreDataSetTRToDignosticReport
-Source:         DDCCCoreDataSet_TR
+Source:         DDCCCoreDataSetTR
 Target:         "http://smart.who.int/ddcc/StructureDefinition/DDCCDiagnosticReport"
 Id:             ddcc-diagnostic-report
 Title:          "WHO Digital Documentation of COVID Certificates"
@@ -223,7 +219,7 @@ Title:          "WHO Digital Documentation of COVID Certificates"
   * date -> "DiagnosticReport.effective"
 
 Mapping:        DDCCCoreDataSetTRToProcedure
-Source:         DDCCCoreDataSet_TR
+Source:         DDCCCoreDataSetTR
 Target:         "http://smart.who.int/ddcc/StructureDefinition/DDCCProcedure"
 Id:             ddcc-procedure
 Title:          "WHO Digital Documentation of COVID Certificates"

diff --git a/input/fsh/ddcc-device.fsh b/input/fsh/ddcc-device.fsh
@@ -13,15 +13,15 @@ Device resource.
 * patient 1..1 MS
 //* patient only Reference(DDCCPatient)
 * type 1..1 MS
-* type from WHO_DDCC_Type_of_Test_COVID_19
+* type from WHODDCCTypeofTestCOVID19
 * property ^slicing.discriminator.type = #value
 * property ^slicing.discriminator.path = "type"
 * property ^slicing.rules = #open
 * property contains pathogen 1..1 and brand 0..1
-* property[pathogen].type = DDCC_Device_Property_CodeSystem#pathogen
+* property[pathogen].type = DDCCDevicePropertyCodeSystem#pathogen
 * property[pathogen].valueCode 1..1
-* property[pathogen].valueCode from WHO_DDCC_Agent_Targeted_COVID_19
+* property[pathogen].valueCode from WHODDCCAgentTargetedCOVID19
 * property[pathogen].valueQuantity 0..0
-* property[brand].type = DDCC_Device_Property_CodeSystem#brand
+* property[brand].type = DDCCDevicePropertyCodeSystem#brand
 * property[brand].valueCode 1..1 
 * property[brand].valueQuantity 0..0
diff --git a/input/fsh/ddcc-diagnosticreport.fsh b/input/fsh/ddcc-diagnosticreport.fsh
@@ -11,7 +11,7 @@ DiagnosticReport resource.
 
 * status = #final (exactly)
 * code 1..1 MS
-* code from WHO_DDCC_Type_of_Test_COVID_19
+* code from WHODDCCTypeofTestCOVID19
 * subject 1..1 MS
 //* subject only Reference(DDCCPatient)
 * effective[x] 1..1 MS

diff --git a/input/fsh/ddcc-documentreference-qr.fsh b/input/fsh/ddcc-documentreference-qr.fsh
@@ -4,29 +4,28 @@ Id:           DDCCDocumentReferenceQR
 Title:        "DDCC DocumentReference return for QR"
 Description:  "DDCC DocumentReference for QR codes including the QR image and the serialized content."
 * type 1.. MS
-* type from DDCC_QR_Type_ValueSet (extensible)
+* type from DDCCQRTypeValueSet (extensible)
 * subject only Reference(DDCCPatient)
 * authenticator 1.. MS
 * authenticator only Reference(DDCCOrganization)
 * content ^slicing.discriminator.type = #value
 * content ^slicing.discriminator.path = "format"
 * content ^slicing.rules = #closed
 * content 2..* MS
-* content.format from DDCC_QR_Format_ValueSet (extensible)
+* content.format from DDCCQRFormatValueSet (extensible)
 * content contains qrImage 1..* MS and qrContent 1..1 MS and qrPDF 0..1 MS
 * content[qrImage].attachment.data 1..1 MS
 * content[qrImage].attachment.contentType 1..1 MS
-* content[qrImage].format = DDCC_QR_Format_CodeSystem#image
+* content[qrImage].format = DDCCQRFormatCodeSystem#image
 * content[qrContent].attachment.data 1..1 MS
 * content[qrContent].attachment.contentType 1..1 MS
-* content[qrContent].format = DDCC_QR_Format_CodeSystem#serialized
+* content[qrContent].format = DDCCQRFormatCodeSystem#serialized
 * content[qrPDF].attachment.data 1..1 MS
 * content[qrPDF].attachment.contentType 1..1 MS
-* content[qrPDF].format = DDCC_QR_Format_CodeSystem#pdf
+* content[qrPDF].format = DDCCQRFormatCodeSystem#pdf
 
 
-CodeSystem:     DDCC_QR_Type_CodeSystem
-Id:             DDCC-QR-Type-CodeSystem
+CodeSystem:     DDCCQRTypeCodeSystem
 Title:          "DDCC QR Category Usage Codes"
 Description:    "Possible formats available for QR usage."
 * ^experimental = false
@@ -38,15 +37,13 @@ Description:    "Possible formats available for QR usage."
 * #shc          "SMART Health Card"
 * #divoc        "DIVOC"
 
-ValueSet:       DDCC_QR_Type_ValueSet
-Id:             DDCC-QR-Type-ValueSet
+ValueSet:       DDCCQRTypeValueSet
 Title:          "DDCC QR Type Codes"
 Description: 	"Type of QR codes by their business usage"
-* include codes from system DDCC_QR_Type_CodeSystem
+* include codes from system DDCCQRTypeCodeSystem
 
 
-CodeSystem:     DDCC_QR_Format_CodeSystem
-Id:             DDCC-QR-Format-CodeSystem
+CodeSystem:     DDCCQRFormatCodeSystem
 Title:          "DDCC QR Format Codes"
 Description:    "Possible formats available for QR data."
 * ^experimental = false
@@ -55,8 +52,7 @@ Description:    "Possible formats available for QR data."
 * #serialized   "Serialized QR Content"
 * #pdf          "PDF version of the QR image"
 
-ValueSet:       DDCC_QR_Format_ValueSet
-Id:             DDCC-QR-Format-ValueSet
+ValueSet:       DDCCQRFormatValueSet
 Title:          "DDCC QR Format Codes"
 Description: 	"Format of the representation of QR code"
-* include codes from system DDCC_QR_Format_CodeSystem
+* include codes from system DDCCQRFormatCodeSystem