Merge pull request #245 from hl7ch/develop

Develop

input/fsh/ALIASES.fsh

@@ -6,28 +6,32 @@ Alias:  $v2-0371                       = http://terminology.hl7.org/CodeSystem/v
 Alias:  $v2-0373                       = http://terminology.hl7.org/CodeSystem/v2-0373
 Alias:  $v2-0487                       = http://terminology.hl7.org/CodeSystem/v2-0487
 Alias:  $v2-0916                       = http://terminology.hl7.org/CodeSystem/v2-0916
-Alias:  $v3ActCode                     = http://terminology.hl7.org/CodeSystem/v3-ActCode
+Alias:  $v3-ActCode                    = http://terminology.hl7.org/CodeSystem/v3-ActCode
 Alias:  $handling-condition            = http://terminology.hl7.org/CodeSystem/handling-condition
 Alias:  $container-cap                 = http://terminology.hl7.org/CodeSystem/container-cap
 Alias:  $rejection-criteria            = http://terminology.hl7.org/CodeSystem/rejection-criteria
+Alias:  $condition-category            = http://terminology.hl7.org/CodeSystem/condition-category
 Alias:  $report-codes                  = http://hl7.org/fhir/ValueSet/report-codes
+Alias:  $launchContext                 = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext
 Alias:  $microbiol-procedures          = http://fhir.ch/ig/ch-lab-order/ValueSet/MicrobiolProcedures
-// Alias:  $processing-procedure          = http://fhir.ch/ig/ch-lab-order/CodeSystem/Specimen.processing.procedure, replaced by $handling-condition
 Alias:  $shareablevalueset             = http://hl7.org/fhir/StructureDefinition/shareablevalueset
 // Alias:  $L-Forms                       = http://terminology.hl7.org/3.1.0/CodeSystem/forms-codes
 
-// Patient 
-Alias:  $administrativeGender          = http://fhir.ch/ig/ch-core/StructureDefinition/ch-core-patient#Patient.gender
-Alias:  $echMaritalStatus              = http://fhir.ch/ig/ch-core/CodeSystem/ech-11-maritalstatus
+// ---- Patient
+Alias:  $ech-11-maritalstatus          = http://fhir.ch/ig/ch-core/CodeSystem/ech-11-maritalstatus
+Alias:  $administrative-gender         = http://hl7.org/fhir/administrative-gender
 Alias:  $religiousAffiliation          = http://terminology.hl7.org/CodeSystem/v3-ReligiousAffiliation
+Alias:  $ch-orf-cs-consentstatus       = http://fhir.ch/ig/ch-orf/CodeSystem/ch-orf-cs-consentstatus
+Alias:  $document-entry-language-code  = http://fhir.ch/ig/ch-epr-term/ValueSet/DocumentEntry.languageCode
 
 // Order
-Alias:  $requestPriority               = http://hl7.org/fhir/request-priority
+Alias:  $request-priority              = http://hl7.org/fhir/request-priority
 Alias:  $servicerequest-categories     = http://fhir.ch/ig/ch-lab-order/CodeSystem/ch-lab-order-servicerequest-categories
 Alias:  $shareableValueSet             = http://hl7.org/fhir/StructureDefinition/shareablevalueset
 Alias:  $documentEntryClassCode        = http://fhir.ch/ig/ch-epr-term/ValueSet/DocumentEntry.classCode
 Alias:  $documentEntryTypeCode         = http://fhir.ch/ig/ch-epr-term/ValueSet/DocumentEntry.typeCode
 
 // Encounter, appointment
 Alias:  $ChCoreCSEncounterType         = http://fhir.ch/ig/ch-core/CodeSystem/bfs-medstats-21-encountertype
-Alias:  $appointmentStatus             = http://hl7.org/fhir/appointmentstatus
+Alias:  $appointmentstatus             = http://hl7.org/fhir/appointmentstatus
+Alias:  $bfs-medstats-21-encountertype = http://fhir.ch/ig/ch-core/CodeSystem/bfs-medstats-21-encountertype

input/fsh/instances/HealthInsuranceCard.fsh

@@ -6,7 +6,7 @@ Usage: #example
 * identifier.system = "http://ehic.com/insurer/123456789/member"
 * identifier.value = "A123456780"
 * status = #active
-* type = $v3ActCode#EHCPOL "extended healthcare"
+* type = $v3-ActCode#EHCPOL "extended healthcare"
 * subscriber = Reference(Patient/FranzMuster)
 * beneficiary = Reference(Patient/FranzMuster)
 * period.end = "2012-03-17"

input/fsh/instances/LabOrderQuestionnaireResponse.fsh

@@ -1,7 +1,7 @@
 Instance: LabOrder-QuestionnaireResponse
 InstanceOf: ChOrfQuestionnaireResponse
 Title: "questionnaire response LabOrder"
-Description: "Example for Laboratory Order Questionnaire Response due to suspected deep vein thrombosis"
+Description: "Example for Laboratory Order Questionnaire Response"
 Usage: #example
 * id = "LabOrder-qr"
 * meta.versionId = "1"
@@ -63,7 +63,7 @@ Usage: #example
 * item[=].item[=].item.item[=].answer.valueString = "[email protected]"
 * item[=].item[+].linkId = "order.priority"
 * item[=].item[=].text = "Auftragspriorität"
-* item[=].item[=].answer.valueCoding = $requestPriority#routine
+* item[=].item[=].answer.valueCoding = $request-priority#routine
 * item[+].linkId = "receiver"
 * item[=].text = "Empfänger"
 * item[=].item[0].linkId = "receiver.practitioner"
@@ -123,13 +123,13 @@ Usage: #example
 * item[=].item[=].answer.valueDate = "1981-01-01"
 * item[=].item[+].linkId = "patient.gender"
 * item[=].item[=].text = "Geschlecht"
-* item[=].item[=].answer.valueCoding = AdministrativeGender#male
+* item[=].item[=].answer.valueCoding = $administrative-gender#male
 
 // patient.maritalStatus
 
 * item[=].item[+].linkId = "patient.maritalStatus"
 * item[=].item[=].text = "Zivilstand"
-* item[=].item[=].answer.valueCoding = $echMaritalStatus#5 "unverheiratet"
+* item[=].item[=].answer.valueCoding = $ech-11-maritalstatus#5 "unverheiratet"
 
 * item[=].item[+].linkId = "patient.phone"
 * item[=].item[=].text = "Telefon"