diff --git a/input/fsh/aliases.fsh b/input/fsh/aliases.fsh index 3be7816..bcbff7c 100644 --- a/input/fsh/aliases.fsh +++ b/input/fsh/aliases.fsh @@ -5,6 +5,7 @@ Alias: $v2-0203 = http://terminology.hl7.org/CodeSystem/v2-0203 Alias: $coverageselfpay = http://terminology.hl7.org/CodeSystem/coverage-selfpay Alias: $v3-actcode = http://terminology.hl7.org/CodeSystem/v3-ActCode Alias: $requeststatus = http://hl7.org/fhir/request-status +Alias: $oid = urn:ietf:rfc:3986 // AU Core profiles Alias: $AUCorePatient = http://hl7.org.au/fhir/core/StructureDefinition/au-core-patient diff --git a/input/fsh/au-erequesting-coverage.fsh b/input/fsh/au-erequesting-coverage.fsh index 21702f9..655f33b 100644 --- a/input/fsh/au-erequesting-coverage.fsh +++ b/input/fsh/au-erequesting-coverage.fsh @@ -8,7 +8,7 @@ Description: "This profile sets minimum expectations for a Coverage resource tha * ^extension[http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm].valueInteger = 0 -* type from http://hl7.org/fhir/ValueSet/coverage-type (preferred) +* type from http://terminology.hl7.org.au/ValueSet/au-erequesting-coverage-type (preferred) * type ^binding.extension[http://hl7.org/fhir/tools/StructureDefinition/additional-binding][0].extension[purpose].valueCode = #minimum -* type ^binding.extension[http://hl7.org/fhir/tools/StructureDefinition/additional-binding][0].extension[valueSet].valueCanonical = "http://hl7.org.au/fhir/ereq/ValueSet/au-erequesting-coverage-type" +* type ^binding.extension[http://hl7.org/fhir/tools/StructureDefinition/additional-binding][0].extension[valueSet].valueCanonical = "http://terminology.hl7.org.au/ValueSet/au-erequesting-coverage-type" * type ^binding.extension[http://hl7.org/fhir/tools/StructureDefinition/additional-binding][0].extension[documentation].valueMarkdown = "The minimum set of codes that any conformant system SHALL support." diff --git a/input/fsh/au-erequesting-diagnosticrequest.fsh b/input/fsh/au-erequesting-diagnosticrequest.fsh index 3dd230b..6df5369 100644 --- a/input/fsh/au-erequesting-diagnosticrequest.fsh +++ b/input/fsh/au-erequesting-diagnosticrequest.fsh @@ -37,7 +37,7 @@ Description: "This profile sets minimum expectations for a ServiceRequest resour * status 1..1 MS -* status from http://hl7.org.au/fhir/ereq/ValueSet/au-erequesting-request-status (required) +* status from http://terminology.hl7.org.au/ValueSet/au-erequesting-request-status (required) * status ^extension[http://hl7.org/fhir/StructureDefinition/obligation][0].extension[code].valueCode = #SHALL:populate * status ^extension[http://hl7.org/fhir/StructureDefinition/obligation][0].extension[actor][0].valueCanonical = "http://hl7.org.au/fhir/ereq/ActorDefinition/au-erequesting-actor-placer" * status ^extension[http://hl7.org/fhir/StructureDefinition/obligation][1].extension[code].valueCode = #SHALL:handle diff --git a/input/fsh/au-erequesting-task.fsh b/input/fsh/au-erequesting-task.fsh index c437992..c21ad67 100644 --- a/input/fsh/au-erequesting-task.fsh +++ b/input/fsh/au-erequesting-task.fsh @@ -15,7 +15,7 @@ Description: "This profile sets minimum expectations for a Task resource that is * status MS -* status from http://hl7.org.au/fhir/ereq/ValueSet/au-erequesting-task-status (required) +* status from http://terminology.hl7.org.au/ValueSet/au-erequesting-task-status (required) * statusReason MS diff --git a/input/fsh/valuesets/au-erequesting-coverage-self-pay.fsh b/input/fsh/valuesets/au-erequesting-coverage-self-pay.fsh index b224542..8a8ddb0 100644 --- a/input/fsh/valuesets/au-erequesting-coverage-self-pay.fsh +++ b/input/fsh/valuesets/au-erequesting-coverage-self-pay.fsh @@ -2,8 +2,11 @@ ValueSet: AUeRequestingCoverageTypeAndSelf-PayCodes Id: au-erequesting-coverage-type Title: "AU eRequesting Coverage Type and Self-Pay Codes" Description: "Coverage type and self-pay codes typically used in the Australian eRequesting context." -* ^meta.profile[+] = "http://hl7.org/fhir/StructureDefinition/shareablevalueset" +* ^meta.profile[+] = "https://healthterminologies.gov.au/fhir/StructureDefinition/composed-value-set-4" +* ^url = "http://terminology.hl7.org.au/ValueSet/au-erequesting-coverage-type" * ^version = "1.0.0" +* ^identifier.value = "urn:oid:2.16.840.1.113883.2.3.4.2.4.35" +* ^identifier.system = $oid * ^extension[http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm].valueInteger = 0 * ^status = #draft * ^experimental = false diff --git a/input/fsh/valuesets/au-erequesting-ranzcr-radiology-procedures.fsh b/input/fsh/valuesets/au-erequesting-ranzcr-radiology-procedures.fsh index 52a39c3..ea6ea6f 100644 --- a/input/fsh/valuesets/au-erequesting-ranzcr-radiology-procedures.fsh +++ b/input/fsh/valuesets/au-erequesting-ranzcr-radiology-procedures.fsh @@ -2,9 +2,11 @@ ValueSet: RANZCRRadiologyReferral Id: ranzcr-radiology-referral Title: "RANZCR Radiology Referral" Description: "Standard codes for use in requesting radiology tests in Australia, derived from the RANZCR Radiology Referral Set (RRS)." -* ^meta.profile[+] = "http://hl7.org/fhir/StructureDefinition/shareablevalueset" +* ^meta.profile[+] = "https://healthterminologies.gov.au/fhir/StructureDefinition/composed-value-set-4" * ^url = "https://ranzcr.com/fhir/ValueSet/radiology-referral" * ^version = "1.0.0" +* ^identifier.value = "urn:oid:1.2.36.1.2001.1004.300.100.1014" +* ^identifier.system = $oid * ^extension[http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm].valueInteger = 0 * ^status = #draft * ^experimental = false diff --git a/input/fsh/valuesets/au-erequesting-request-status.fsh b/input/fsh/valuesets/au-erequesting-request-status.fsh index 4d09ddc..80f07d4 100644 --- a/input/fsh/valuesets/au-erequesting-request-status.fsh +++ b/input/fsh/valuesets/au-erequesting-request-status.fsh @@ -2,8 +2,11 @@ ValueSet: AUeRequestingRequestStatus Id: au-erequesting-request-status Title: "AU eRequesting RequestStatus" Description: "ServiceRequest status values used in the Australian eRequesting context." -* ^meta.profile[+] = "http://hl7.org/fhir/StructureDefinition/shareablevalueset" +* ^meta.profile[+] = "https://healthterminologies.gov.au/fhir/StructureDefinition/composed-value-set-4" +* ^url = "http://terminology.hl7.org.au/ValueSet/au-erequesting-request-status" * ^version = "1.0.0" +* ^identifier.value = "urn:oid:2.16.840.1.113883.2.3.4.2.4.36" +* ^identifier.system = $oid * ^extension[http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm].valueInteger = 0 * ^status = #draft * ^experimental = false diff --git a/input/fsh/valuesets/au-erequesting-task-status.fsh b/input/fsh/valuesets/au-erequesting-task-status.fsh index cda93cb..e9aa713 100644 --- a/input/fsh/valuesets/au-erequesting-task-status.fsh +++ b/input/fsh/valuesets/au-erequesting-task-status.fsh @@ -2,8 +2,11 @@ ValueSet: AUeRequestingTaskStatus Id: au-erequesting-task-status Title: "AU eRequesting Task Status" Description: "Task status values used in the Australian eRequesting context." -* ^meta.profile[+] = "http://hl7.org/fhir/StructureDefinition/shareablevalueset" +* ^meta.profile[+] = "https://healthterminologies.gov.au/fhir/StructureDefinition/composed-value-set-4" +* ^url = "http://terminology.hl7.org.au/ValueSet/au-erequesting-task-status" * ^version = "1.0.0" +* ^identifier.value = "urn:oid:2.16.840.1.113883.2.3.4.2.4.37" +* ^identifier.system = $oid * ^extension[http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm].valueInteger = 0 * ^status = #draft * ^experimental = false diff --git a/input/pagecontent/changes.md b/input/pagecontent/changes.md index 8703eef..caf1348 100644 --- a/input/pagecontent/changes.md +++ b/input/pagecontent/changes.md @@ -32,3 +32,4 @@ This change log documents the significant updates and resolutions implemented fr - added identifier search parameter support for Organization, Patient, Practitioner, and PractitionerRole as SHALL [FHIR-48934](https://jira.hl7.org/browse/FHIR-48934), [FHIR-47145](https://jira.hl7.org/browse/FHIR-47145) - added _include support for PractitionerRole:practitioner and PractitionerRole:organization as SHALL for the PractitionerRole resource type [FHIR-48934](https://jira.hl7.org/browse/FHIR-48934), [FHIR-47145](https://jira.hl7.org/browse/FHIR-47145) - added the following Task search parameters as SHALL: group-identifier, owner, patient, requester, focus, status, _lastUpdated, patient+status, owner+status, requester+status, _lastUpdated+status+owner, patient.identifier, owner.identifier, requester.identifier, Task:patient, Task:requester, Task:owner and Task:focus [FHIR-48915](https://jira.hl7.org/browse/FHIR-48915) +- Updated AU eRequesting ValueSet resources to remove conformance to HL7 International ShareableValueSet and instead claim conformance to NCTS Composed ValueSet (FHIR-47149). \ No newline at end of file diff --git a/sushi-config.yaml b/sushi-config.yaml index c95d395..41322d2 100644 --- a/sushi-config.yaml +++ b/sushi-config.yaml @@ -87,7 +87,10 @@ parameters: # see https://confluence.hl7.org/display/FHIR/Implementation+Guide+ - fsh-generated/includes - input/resources special-url: - https://ranzcr.com/fhir/ValueSet/radiology-referral + - https://ranzcr.com/fhir/ValueSet/radiology-referral + - http://terminology.hl7.org.au/ValueSet/au-erequesting-coverage-type + - http://terminology.hl7.org.au/ValueSet/au-erequesting-request-status + - http://terminology.hl7.org.au/ValueSet/au-erequesting-task-status #- input/summaries # path-expansion-params: '../../input/_resources/exp-params.json' active-tables: false