diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cb066f0..652561b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,23 +29,21 @@ jobs: # Java and .NET are already installed on ubuntu-latest - name: Firely.Terminal (GitHub Actions) - uses: FirelyTeam/firely-terminal-pipeline@v0.4.1 + uses: FirelyTeam/firely-terminal-pipeline@v0.5.0 with: PATH_TO_CONFORMANCE_RESOURCES: Resources/fsh-generated/resources/ #PATH_TO_EXAMPLES: Examples PATH_TO_QUALITY_CONTROL_RULES: qc/custom DOTNET_VALIDATION_ENABLED: true JAVA_VALIDATION_ENABLED: true - OUTPUT_FORMAT: RAW - JAVA_VALIDATION_OPTIONS: -allow-example-urls true + JAVA_VALIDATION_OPTIONS: -allow-example-urls true -output-style compact SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }} SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }} SUSHI_ENABLED: true - SUSHI_VERSION: 3.5.0 SUSHI_OPTIONS: Resources/ EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA - # - name: Add & Commit + #- name: Add & Commit # uses: EndBug/add-and-commit@v7 # with: # add: 'Resources/fsh-generated/resources/' diff --git a/Resources/fsh-generated/resources/StructureDefinition-ExamplePatient.json b/Resources/fsh-generated/resources/StructureDefinition-ExamplePatient.json index 48aa964..7ce2f2a 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ExamplePatient.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ExamplePatient.json @@ -10,31 +10,6 @@ "description": "Dieses Profil beschreibt die Nutzung von administrativen Patientendaten in YourNameHere-Szenarien.", "fhirVersion": "4.0.1", "mapping": [ - { - "identity": "rim", - "uri": "http://hl7.org/v3", - "name": "RIM Mapping" - }, - { - "identity": "cda", - "uri": "http://hl7.org/v3/cda", - "name": "CDA (R2)" - }, - { - "identity": "w5", - "uri": "http://hl7.org/fhir/fivews", - "name": "FiveWs Pattern Mapping" - }, - { - "identity": "v2", - "uri": "http://hl7.org/v2", - "name": "HL7 v2 Mapping" - }, - { - "identity": "loinc", - "uri": "http://loinc.org", - "name": "LOINC code for the element" - }, { "identity": "CompositionDocumentReferenceMapping", "name": "Metadaten eines strukturieren Dokumentes (Document-Bundle)", @@ -318,7 +293,6 @@ "id": "Patient.name:Name.prefix.extension:prefix-qualifier", "path": "Patient.name.prefix.extension", "sliceName": "prefix-qualifier", - "max": "1", "mustSupport": true }, { @@ -401,6 +375,20 @@ "min": 1, "mustSupport": true }, + { + "id": "Patient.gender.extension", + "path": "Patient.gender.extension", + "slicing": { + "discriminator": [ + { + "type": "value", + "path": "url" + } + ], + "ordered": false, + "rules": "open" + } + }, { "id": "Patient.gender.extension:Geschlecht-Administrativ", "path": "Patient.gender.extension", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ExampleValueSet.json b/Resources/fsh-generated/resources/StructureDefinition-ExampleValueSet.json index 2e42ba7..57e1f94 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ExampleValueSet.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ExampleValueSet.json @@ -9,28 +9,6 @@ "publisher": "gematik GmbH", "description": "Dieses Profil beschreibt die maschinenlesbare Auswahl von Codes für die Kodierung spezifischer FHIR-Elemente in YourNameHere-Szenarien", "fhirVersion": "4.0.1", - "mapping": [ - { - "identity": "rim", - "uri": "http://hl7.org/v3", - "name": "RIM Mapping" - }, - { - "identity": "workflow", - "uri": "http://hl7.org/fhir/workflow", - "name": "Workflow Pattern" - }, - { - "identity": "w5", - "uri": "http://hl7.org/fhir/fivews", - "name": "FiveWs Pattern Mapping" - }, - { - "identity": "objimpl", - "uri": "http://hl7.org/fhir/object-implementation", - "name": "Object Implementation Information" - } - ], "kind": "resource", "abstract": false, "type": "ValueSet", diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml index 48cd09c..b41a6b7 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -11,5 +11,5 @@ publisher: url: https://www.gematik.de/ email: info@gematik.de dependencies: - de.basisprofil.r4: 1.4.0 - hl7.fhir.r4.core: 4.0.1 \ No newline at end of file + de.basisprofil.r4: 1.5.0 + hl7.fhir.r4.core: 4.0.1 diff --git a/package.json b/package.json index 084d444..2ba0a72 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,7 @@ "4.0.1" ], "dependencies": { - "de.basisprofil.r4": " 1.4.0", - "de.gematik.isik-basismodul": "2.0.0", - "hl7.fhir.r4.core": " 4.0.1" + "de.basisprofil.r4": "1.5.0", + "hl7.fhir.r4.core": "4.0.1" } }