aligning to nzbase

HL7NZ · Jun 2, 2020 · bb2463b · bb2463b
1 parent 95987bc
commit bb2463b
Show file tree

Hide file tree

Showing 31 changed files with 11 additions and 1,683 deletions.
diff --git a/fsh/config.yaml → fsh/config.yamlNOTUSED b/fsh/config.yaml → fsh/config.yamlNOTUSED
diff --git a/...xtensions/extension-informationsource.fsh → ...nsions/extension-informationsource.fshDEP b/...xtensions/extension-informationsource.fsh → ...nsions/extension-informationsource.fshDEP
diff --git a/...nsions/extension-informationsourceMod.fsh → ...ons/extension-informationsourceMod.fshDEP b/...nsions/extension-informationsourceMod.fsh → ...ons/extension-informationsourceMod.fshDEP
diff --git a/fsh/package.json b/fsh/package.json
@@ -7,7 +7,7 @@
  "description": "The FHIRb  API for the NHI",
  "dependencies": {
     "hl7.fhir.r4.core": "4.0.1",
-    "hl7.org.nz.base" : "current"
+    "hl7.org.nz.base" : "dev"
  },
  "usage-stats-opt-out" : true,
  "language": "en",

diff --git a/fsh/profile-NhiPatient.fsh b/fsh/profile-NhiPatient.fsh
@@ -42,30 +42,14 @@ Description:    "The Patient resource exposed by the NHI."
     $birthPlace named birthPlace 0..1 
 */
 
-/*
-//identifier. Slice to have current (use=official) and dormant (use=old)
-* identifier ^slicing.discriminator.type = #value
-* identifier ^slicing.discriminator.path = "use"
-* identifier ^slicing.rules = #openAtEnd
-
-* identifier contains 
-    NHI 0..1 MS and
-    dormant 0..* MS
-
-* identifier[NHI].system = "https://standards.digital.health.nz/id/nhi"
-* identifier[NHI].use = #official (exactly)
 
-* identifier[dormant].system = "https://standards.digital.health.nz/id/nhi"
-* identifier[dormant].use = #old (exactly)
-
-*/
 
 //Name is required, and there are extensions for source, and isPreferred
 * name  1..*
 * name.extension contains
     $informationsource named informationsource 0..1 and
     $preferred named preferred 0..1
-* name.extension[informationsource].valueCodeableConcept from  https://standards.digital.health.nz/fhir/ValueSet/name-informationsource
+* name.extension[informationsource].valueCodeableConcept from  http:/hl7.org.nz/fhir/ValueSet/infosource
 
 //The gender has an extension for the original text that was used to establish it (eg from a form)
 * gender.extension contains 
@@ -75,12 +59,12 @@ Description:    "The Patient resource exposed by the NHI."
 * birthDate 1..1
 * birthDate.extension contains  
     $informationsource named informationsource 0..1 
-* birthDate.extension[informationsource].valueCodeableConcept from  https://standards.digital.health.nz/fhir/ValueSet/birthdate-informationsource
+* birthDate.extension[informationsource].valueCodeableConcept from  http:/hl7.org.nz/fhir/ValueSet/infosource
 
 //date of death has an extension for source, which is bound to the deathdate information source valueset
 * deceasedDateTime.extension contains   
     $informationsource named informationsource 0..1
-* deceasedDateTime.extension[informationsource].valueCodeableConcept from  https://standards.digital.health.nz/fhir/ValueSet/deathdate-informationsource
+* deceasedDateTime.extension[informationsource].valueCodeableConcept from  http:/hl7.org.nz/fhir/ValueSet/infosource
 
 // address is required and has a number of extensions. It uses NhiAddress which takes NzAddress and adds NHI specific extensions...
 * address only NhiAddress

diff --git a/fsh/terminology/AddressNotValidated-cs.fsh b/fsh/terminology/AddressNotValidated-cs.fsh
@@ -3,7 +3,7 @@ Title: "Address Not Validated reason"
 Description: "The reason why the address was not validated"
 * ^url = https://standards.digital.health.nz/fhir/ValueSet/addressnotvalidatedreason
 
-* codes from system https://standards.digital.health.nz/cs/addressnotvalidatedreason
+* codes from system http://hl7.org.nz/ValueSet/addressnotvalidatedreason
 
 CodeSystem: AddressNotValidated
 Title: "Address Not Validated reason"

diff --git a/fsh/terminology/Informationsource.fsh → fsh/terminology/Informationsource.fshDEP b/fsh/terminology/Informationsource.fsh → fsh/terminology/Informationsource.fshDEP
diff --git a/fsh/terminology/citizenship.fsh → fsh/terminology/citizenship.fshDEP b/fsh/terminology/citizenship.fsh → fsh/terminology/citizenship.fshDEP
diff --git a/fsh/terminology/dhb.fsh → fsh/terminology/dhb.fshDEP b/fsh/terminology/dhb.fsh → fsh/terminology/dhb.fshDEP
diff --git a/fsh/terminology/domicilecode.fsh → fsh/terminology/domicilecode.fshDEP b/fsh/terminology/domicilecode.fsh → fsh/terminology/domicilecode.fshDEP
diff --git a/fsh/terminology/ethnicity.fsh → fsh/terminology/ethnicity.fshDEP b/fsh/terminology/ethnicity.fsh → fsh/terminology/ethnicity.fshDEP
diff --git a/input/ImplementationGuide-hl7.org.nz.nhi.json b/input/ImplementationGuide-hl7.org.nz.nhi.json
@@ -29,7 +29,7 @@
       "uri": "http://hl7.org.nz/fhir/ImplementationGuide/hl7.org.nz.base",
       "packageId": "hl7.org.nz.base",
       "id": "hl7_org_nz_base",
-      "version": "current"
+      "version": "dev"
     }
   ],
   "definition": {
@@ -66,14 +66,6 @@
         "description": "A small-area-based index providing a measure of neighbourhood deprivation",
         "exampleBoolean": false
       },
-      {
-        "reference": {
-          "reference": "StructureDefinition/informationsource"
-        },
-        "name": "Informationsource",
-        "description": "The source of the information",
-        "exampleBoolean": false
-      },
       {
         "reference": {
           "reference": "StructureDefinition/isPrimaryAddress"
@@ -114,86 +106,6 @@
         "description": "The reason why the address was not validated",
         "exampleBoolean": false
       },
-      {
-        "reference": {
-          "reference": "ValueSet/BirthDateInformationsource"
-        },
-        "name": "BirthDate Information source",
-        "description": "The source of data for date of birth",
-        "exampleBoolean": false
-      },
-      {
-        "reference": {
-          "reference": "ValueSet/CitizenshipInformationsource"
-        },
-        "name": "Citizenship Information source",
-        "description": "The source of data for Citizenship",
-        "exampleBoolean": false
-      },
-      {
-        "reference": {
-          "reference": "ValueSet/CountryInformationsource"
-        },
-        "name": "Country Information source",
-        "description": "The source of data for country of birth data",
-        "exampleBoolean": false
-      },
-      {
-        "reference": {
-          "reference": "ValueSet/DHB"
-        },
-        "name": "dhb",
-        "description": "New Zealand DHBs",
-        "exampleBoolean": false
-      },
-      {
-        "reference": {
-          "reference": "ValueSet/DeathDateInformationsource"
-        },
-        "name": "DeathDate Information source",
-        "description": "The source of data for the date of death",
-        "exampleBoolean": false
-      },
-      {
-        "reference": {
-          "reference": "ValueSet/Domicilecode"
-        },
-        "name": "Domicilecode",
-        "description": "New Zealand Domicile codes",
-        "exampleBoolean": false
-      },
-      {
-        "reference": {
-          "reference": "ValueSet/ethnicity"
-        },
-        "name": "Patient ethnicity",
-        "description": "Level 4 ethnicity codes",
-        "exampleBoolean": false
-      },
-      {
-        "reference": {
-          "reference": "ValueSet/Informationsource"
-        },
-        "name": "Information source",
-        "description": "The source of this data",
-        "exampleBoolean": false
-      },
-      {
-        "reference": {
-          "reference": "ValueSet/NameInformationsource"
-        },
-        "name": "Name Information source",
-        "description": "The source of data for name",
-        "exampleBoolean": false
-      },
-      {
-        "reference": {
-          "reference": "ValueSet/Patient-citizenship-status"
-        },
-        "name": "Patient citizenship status",
-        "description": "Status of citizenship in NZ",
-        "exampleBoolean": false
-      },
       {
         "reference": {
           "reference": "CodeSystem/AddressNotValidated"
@@ -202,46 +114,6 @@
         "description": "The reason why the address was not validated",
         "exampleBoolean": false
       },
-      {
-        "reference": {
-          "reference": "CodeSystem/DHB"
-        },
-        "name": "dhb",
-        "description": "New Zealand DHBs",
-        "exampleBoolean": false
-      },
-      {
-        "reference": {
-          "reference": "CodeSystem/Domicilecode"
-        },
-        "name": "Domicilecode",
-        "description": "New Zealand Domicile codes",
-        "exampleBoolean": false
-      },
-      {
-        "reference": {
-          "reference": "CodeSystem/EthnicityL4"
-        },
-        "name": "Level 4 ethnicity codes",
-        "description": "Level 4 ethnicity codes",
-        "exampleBoolean": false
-      },
-      {
-        "reference": {
-          "reference": "CodeSystem/Informationsource"
-        },
-        "name": "Information source",
-        "description": "The codesystem used to indivate where data has been soruced from. The ValueSets for recording source of Name, birthDate, date of death and country of birth all use this codesystem",
-        "exampleBoolean": false
-      },
-      {
-        "reference": {
-          "reference": "CodeSystem/Patient-citizenship-status"
-        },
-        "name": "Patient citizenship status",
-        "description": "Status of citizenship in NZ",
-        "exampleBoolean": false
-      },
       {
         "reference": {
           "reference": "CapabilityStatement/NhiCapabilityStatement"

diff --git a/input/extensions/StructureDefinition-informationsource.json b/input/extensions/StructureDefinition-informationsource.json
diff --git a/input/profiles/StructureDefinition-NhiPatient.json b/input/profiles/StructureDefinition-NhiPatient.json
@@ -81,7 +81,7 @@
         "path": "Patient.name.extension.valueCodeableConcept",
         "binding": {
           "strength": "required",
-          "valueSet": "https://standards.digital.health.nz/fhir/ValueSet/name-informationsource"
+          "valueSet": "http:/hl7.org.nz/fhir/ValueSet/infosource"
         }
       },
       {
@@ -171,7 +171,7 @@
         "path": "Patient.birthDate.extension.valueCodeableConcept",
         "binding": {
           "strength": "required",
-          "valueSet": "https://standards.digital.health.nz/fhir/ValueSet/birthdate-informationsource"
+          "valueSet": "http:/hl7.org.nz/fhir/ValueSet/infosource"
         }
       },
       {
@@ -233,7 +233,7 @@
         "path": "Patient.deceasedDateTime.extension.valueCodeableConcept",
         "binding": {
           "strength": "required",
-          "valueSet": "https://standards.digital.health.nz/fhir/ValueSet/deathdate-informationsource"
+          "valueSet": "http:/hl7.org.nz/fhir/ValueSet/infosource"
         }
       },
       {