Skip to content

Commit

Permalink
feat: added Schwangerschaftsstatus, SS-ET, Raucher & Alkoholabusussta…
Browse files Browse the repository at this point in the history
…tus (#378)


* feat: added Schwangerschaftsstatus, SS-ET, Raucher & Alkoholabususstatus
* try fix for Capability Statement
* typo fixes & .category added

---------

Co-authored-by: Max Theilig <max.theilig@gematik.de>
  • Loading branch information
patrick-werner and MaxMTheilig committed Mar 5, 2024
1 parent 9902e13 commit c6a8e49
Show file tree
Hide file tree
Showing 15 changed files with 991 additions and 101 deletions.
100 changes: 98 additions & 2 deletions Resources/fsh-generated/fsh-index.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@
"startLine": 43,
"endLine": 55
},
{
"outputFile": "AllergyIntolerance-ISiKAllergieUnvertraeglichkeitBeispiel1.json",
"fshName": "ISiKAllergieUnvertraeglichkeitBeispiel1",
"fshType": "Instance",
"fshFile": "ISiKAllergieUnvertraeglichkeit.fsh",
"startLine": 107,
"endLine": 128
},
{
"outputFile": "Binary-Binary-JPEG-Example-short.json",
"fshName": "Binary-JPEG-Example-short",
Expand Down Expand Up @@ -51,9 +59,9 @@
"outputFile": "CapabilityStatement-ISiKCapabilityStatementBasisServer.json",
"fshName": "ISiKCapabilityStatementBasisServer",
"fshType": "Instance",
"fshFile": "ISiKCapabilityStatement.fsh",
"fshFile": "ISiKCapabilityStatementBasisServer.fsh",
"startLine": 1,
"endLine": 668
"endLine": 683
},
{
"outputFile": "CodeSystem-CodeSystemExample.json",
Expand Down Expand Up @@ -151,6 +159,38 @@
"startLine": 55,
"endLine": 68
},
{
"outputFile": "Observation-ISiKAlkoholAbususBeispiel.json",
"fshName": "ISiKAlkoholAbususBeispiel",
"fshType": "Instance",
"fshFile": "ISiKLebenszustandOberservations.fsh",
"startLine": 66,
"endLine": 74
},
{
"outputFile": "Observation-ISiKRaucherStatusBeispiel.json",
"fshName": "ISiKRaucherStatusBeispiel",
"fshType": "Instance",
"fshFile": "ISiKLebenszustandOberservations.fsh",
"startLine": 89,
"endLine": 97
},
{
"outputFile": "Observation-ISiKSchwangerschaftErwarteterEntbindungsterminBeispiel.json",
"fshName": "ISiKSchwangerschaftErwarteterEntbindungsterminBeispiel",
"fshType": "Instance",
"fshFile": "ISiKLebenszustandOberservations.fsh",
"startLine": 43,
"endLine": 51
},
{
"outputFile": "Observation-ISiKSchwangerschaftsstatusBeispiel.json",
"fshName": "ISiKSchwangerschaftsstatusBeispiel",
"fshType": "Instance",
"fshFile": "ISiKLebenszustandOberservations.fsh",
"startLine": 20,
"endLine": 28
},
{
"outputFile": "Patient-PatientinMusterfrau.json",
"fshName": "PatientinMusterfrau",
Expand Down Expand Up @@ -215,6 +255,22 @@
"startLine": 1,
"endLine": 29
},
{
"outputFile": "StructureDefinition-ISiKAlkoholAbusus.json",
"fshName": "ISiKAlkoholAbusus",
"fshType": "Profile",
"fshFile": "ISiKLebenszustandOberservations.fsh",
"startLine": 53,
"endLine": 64
},
{
"outputFile": "StructureDefinition-ISiKAllergieUnvertraeglichkeit.json",
"fshName": "ISiKAllergieUnvertraeglichkeit",
"fshType": "Profile",
"fshFile": "ISiKAllergieUnvertraeglichkeit.fsh",
"startLine": 1,
"endLine": 105
},
{
"outputFile": "StructureDefinition-ISiKAngehoeriger.json",
"fshName": "ISiKAngehoeriger",
Expand Down Expand Up @@ -295,6 +351,30 @@
"startLine": 1,
"endLine": 50
},
{
"outputFile": "StructureDefinition-ISiKRaucherStatus.json",
"fshName": "ISiKRaucherStatus",
"fshType": "Profile",
"fshFile": "ISiKLebenszustandOberservations.fsh",
"startLine": 76,
"endLine": 87
},
{
"outputFile": "StructureDefinition-ISiKSchwangerschaftErwarteterEntbindungstermin.json",
"fshName": "ISiKSchwangerschaftErwarteterEntbindungstermin",
"fshType": "Profile",
"fshFile": "ISiKLebenszustandOberservations.fsh",
"startLine": 30,
"endLine": 41
},
{
"outputFile": "StructureDefinition-ISiKSchwangerschaftsstatus.json",
"fshName": "ISiKSchwangerschaftsstatus",
"fshType": "Profile",
"fshFile": "ISiKLebenszustandOberservations.fsh",
"startLine": 1,
"endLine": 18
},
{
"outputFile": "StructureDefinition-ISiKValueSet.json",
"fshName": "ISiKValueSet",
Expand Down Expand Up @@ -398,5 +478,21 @@
"fshFile": "valueSets.fsh",
"startLine": 16,
"endLine": 25
},
{
"outputFile": "ValueSet-SchwangerschaftEtMethodeVS.json",
"fshName": "SchwangerschaftEtMethodeVS",
"fshType": "ValueSet",
"fshFile": "valueSets.fsh",
"startLine": 56,
"endLine": 62
},
{
"outputFile": "ValueSet-SchwangerschaftsstatusVS.json",
"fshName": "SchwangerschaftsstatusVS",
"fshType": "ValueSet",
"fshFile": "valueSets.fsh",
"startLine": 48,
"endLine": 54
}
]
114 changes: 63 additions & 51 deletions Resources/fsh-generated/fsh-index.txt

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"resourceType": "Observation",
"id": "ISiKAlkoholAbususBeispiel",
"meta": {
"profile": [
"https://gematik.de/fhir/isik/Basismodul/StructureDefinition/ISiKAlkoholAbusus"
]
},
"code": {
"coding": [
{
"code": "15167005",
"system": "http://snomed.info/sct",
"display": "Schädlicher Gebrauch von Alkohol"
}
]
},
"status": "final",
"subject": {
"reference": "Patient/PatientinMusterfrau"
},
"effectiveDateTime": "2024-01-01",
"valueBoolean": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"resourceType": "Observation",
"id": "ISiKRaucherStatusBeispiel",
"meta": {
"profile": [
"https://gematik.de/fhir/isik/Basismodul/StructureDefinition/ISiKRaucherStatus"
]
},
"code": {
"coding": [
{
"code": "77176002",
"system": "http://snomed.info/sct",
"display": "Smoker"
}
]
},
"status": "final",
"subject": {
"reference": "Patient/PatientinMusterfrau"
},
"effectiveDateTime": "2024-01-01",
"valueBoolean": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"resourceType": "Observation",
"id": "ISiKSchwangerschaftErwarteterEntbindungsterminBeispiel",
"meta": {
"profile": [
"https://gematik.de/fhir/isik/Basismodul/StructureDefinition/ISiKSchwangerschaftErwarteterEntbindungstermin"
]
},
"code": {
"coding": [
{
"code": "11779-6",
"system": "http://loinc.org",
"display": "Delivery date Estimated from last menstrual period"
}
]
},
"status": "final",
"subject": {
"reference": "Patient/PatientinMusterfrau"
},
"effectiveDateTime": "2024-01-01",
"valueDateTime": "2024-08-01"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"resourceType": "Observation",
"id": "ISiKSchwangerschaftsstatusBeispiel",
"meta": {
"profile": [
"https://gematik.de/fhir/isik/Basismodul/StructureDefinition/ISiKSchwangerschaftsstatus"
]
},
"code": {
"coding": [
{
"code": "82810-3",
"system": "http://loinc.org"
}
]
},
"status": "final",
"subject": {
"reference": "Patient/PatientinMusterfrau"
},
"effectiveDateTime": "2024-01-01",
"valueCodeableConcept": {
"coding": [
{
"code": "LA15173-0",
"system": "http://loinc.org",
"display": "Pregnant"
}
]
},
"hasMember": [
{
"reference": "Observation/ISiKSchwangerschaftErwarteterEntbindungsterminBeispiel"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
{
"resourceType": "StructureDefinition",
"id": "ISiKAlkoholAbusus",
"url": "https://gematik.de/fhir/isik/Basismodul/StructureDefinition/ISiKAlkoholAbusus",
"version": "4.0.0-rc",
"name": "ISiKAlkoholAbusus",
"title": "ISiK Alkohol Abusus",
"status": "draft",
"experimental": false,
"date": "2024-01-16",
"publisher": "gematik GmbH",
"fhirVersion": "4.0.1",
"mapping": [
{
"identity": "workflow",
"uri": "http://hl7.org/fhir/workflow",
"name": "Workflow Pattern"
},
{
"identity": "sct-concept",
"uri": "http://snomed.info/conceptdomain",
"name": "SNOMED CT Concept Domain Binding"
},
{
"identity": "v2",
"uri": "http://hl7.org/v2",
"name": "HL7 v2 Mapping"
},
{
"identity": "rim",
"uri": "http://hl7.org/v3",
"name": "RIM Mapping"
},
{
"identity": "w5",
"uri": "http://hl7.org/fhir/fivews",
"name": "FiveWs Pattern Mapping"
},
{
"identity": "sct-attr",
"uri": "http://snomed.org/attributebinding",
"name": "SNOMED CT Attribute Binding"
}
],
"kind": "resource",
"abstract": false,
"type": "Observation",
"baseDefinition": "http://hl7.org/fhir/StructureDefinition/Observation",
"derivation": "constraint",
"differential": {
"element": [
{
"id": "Observation.category",
"path": "Observation.category",
"patternCodeableConcept": {
"coding": [
{
"code": "social-history",
"system": "http://hl7.org/fhir/secondary-finding"
}
]
}
},
{
"id": "Observation.code",
"path": "Observation.code",
"patternCodeableConcept": {
"coding": [
{
"code": "15167005",
"system": "http://snomed.info/sct"
}
]
},
"mustSupport": true
},
{
"id": "Observation.subject",
"path": "Observation.subject",
"min": 1,
"mustSupport": true
},
{
"id": "Observation.subject.reference",
"path": "Observation.subject.reference",
"min": 1,
"mustSupport": true
},
{
"id": "Observation.effective[x]",
"path": "Observation.effective[x]",
"min": 1,
"mustSupport": true
},
{
"id": "Observation.value[x]",
"path": "Observation.value[x]",
"slicing": {
"discriminator": [
{
"type": "type",
"path": "$this"
}
],
"ordered": false,
"rules": "open"
},
"min": 1
},
{
"id": "Observation.value[x]:valueBoolean",
"path": "Observation.value[x]",
"sliceName": "valueBoolean",
"min": 1,
"max": "1",
"type": [
{
"code": "boolean"
}
],
"mustSupport": true
}
]
}
}

0 comments on commit c6a8e49

Please sign in to comment.