Merge pull request #49 from medizininformatik-initiative/develop

more device stuff
medizininformatik-initiative · Oct 18, 2024 · e6bea0d · e6bea0d
2 parents 4e1fa90 + ccb7faa
commit e6bea0d
Show file tree

Hide file tree

Showing 10 changed files with 79 additions and 141 deletions.
diff --git a/fsh-generated/fsh-index.json b/fsh-generated/fsh-index.json
@@ -31,6 +31,14 @@
     "startLine": 1,
     "endLine": 16
   },
+  {
+    "outputFile": "Device-mii-exa-bildgebung-geraet.json",
+    "fshName": "mii-exa-bildgebung-geraet",
+    "fshType": "Instance",
+    "fshFile": "instances\\Example-Device.fsh",
+    "startLine": 1,
+    "endLine": 8
+  },
   {
     "outputFile": "DiagnosticReport-mii-exa-bildgebung-radiologischer-Befund.json",
     "fshName": "mii-exa-bildgebung-radiologischer-Befund",
@@ -311,22 +319,6 @@
     "startLine": 367,
     "endLine": 386
   },
-  {
-    "outputFile": "SearchParameter-mii-sp-bildgebung-imaging-study-series-manufacturer-model-name.json",
-    "fshName": "mii-sp-bildgebung-imaging-study-series-manufacturer-model-name",
-    "fshType": "Instance",
-    "fshFile": "searchparameters\\SearchParameter.fsh",
-    "startLine": 658,
-    "endLine": 675
-  },
-  {
-    "outputFile": "SearchParameter-mii-sp-bildgebung-imaging-study-series-manufacturer.json",
-    "fshName": "mii-sp-bildgebung-imaging-study-series-manufacturer",
-    "fshType": "Instance",
-    "fshFile": "searchparameters\\SearchParameter.fsh",
-    "startLine": 639,
-    "endLine": 656
-  },
   {
     "outputFile": "SearchParameter-mii-sp-bildgebung-imaging-study-series-number.json",
     "fshName": "mii-sp-bildgebung-imaging-study-series-number",

diff --git a/fsh-generated/fsh-index.txt b/fsh-generated/fsh-index.txt
@@ -3,6 +3,7 @@ BodyStructure-mii-exa-bildgebung-koerperstruktur.json
 CapabilityStatement-mii-cps-bildgebung-capabilitystatement-1x.json                     mii-cps-bildgebung-capabilitystatement-1x                         Instance   capabilitystatements\CapabilityStatement-1x.fsh       31 - 292
 CarePlan-mii-exa-bildgebung-behandlungsempfehlung.json                                 mii-exa-bildgebung-behandlungsempfehlung                          Instance   instances\Example-CarePlan.fsh                        1 - 10
 Composition-mii-exa-bildgebung-semistrukt-befundbericht.json                           mii-exa-bildgebung-semistrukt-befundbericht                       Instance   instances\Example-Composition.fsh                     1 - 16
+Device-mii-exa-bildgebung-geraet.json                                                  mii-exa-bildgebung-geraet                                         Instance   instances\Example-Device.fsh                          1 - 8
 DiagnosticReport-mii-exa-bildgebung-radiologischer-Befund.json                         mii-exa-bildgebung-radiologischer-Befund                          Instance   instances\Example-DiagnosticReport.fsh                1 - 18
 ImagingStudy-mii-exa-bildgebung-bildgebungsstudie-cr.json                              mii-exa-bildgebung-bildgebungsstudie-cr                           Instance   instances\Example-ImagingStudy-CR.fsh                 1 - 41
 ImagingStudy-mii-exa-bildgebung-bildgebungsstudie-ct.json                              mii-exa-bildgebung-bildgebungsstudie-ct                           Instance   instances\Example-ImagingStudy-CT.fsh                 1 - 50
@@ -38,8 +39,6 @@ SearchParameter-mii-sp-bildgebung-imaging-study-series-exposure.json
 SearchParameter-mii-sp-bildgebung-imaging-study-series-kvp.json                        mii-sp-bildgebung-imaging-study-series-kvp                        Instance   searchparameters\SearchParameter.fsh                  346 - 365
 SearchParameter-mii-sp-bildgebung-imaging-study-series-laterality.json                 mii-sp-bildgebung-imaging-study-series-laterality                 Instance   searchparameters\SearchParameter.fsh                  698 - 719
 SearchParameter-mii-sp-bildgebung-imaging-study-series-magnetic-field-strength.json    mii-sp-bildgebung-imaging-study-series-magnetic-field-strength    Instance   searchparameters\SearchParameter.fsh                  367 - 386
-SearchParameter-mii-sp-bildgebung-imaging-study-series-manufacturer-model-name.json    mii-sp-bildgebung-imaging-study-series-manufacturer-model-name    Instance   searchparameters\SearchParameter.fsh                  658 - 675
-SearchParameter-mii-sp-bildgebung-imaging-study-series-manufacturer.json               mii-sp-bildgebung-imaging-study-series-manufacturer               Instance   searchparameters\SearchParameter.fsh                  639 - 656
 SearchParameter-mii-sp-bildgebung-imaging-study-series-number.json                     mii-sp-bildgebung-imaging-study-series-number                     Instance   searchparameters\SearchParameter.fsh                  677 - 696
 SearchParameter-mii-sp-bildgebung-imaging-study-series-radionuclide-half-life.json     mii-sp-bildgebung-imaging-study-series-radionuclide-half-life     Instance   searchparameters\SearchParameter.fsh                  537 - 556
 SearchParameter-mii-sp-bildgebung-imaging-study-series-radionuclide-total-dose.json    mii-sp-bildgebung-imaging-study-series-radionuclide-total-dose    Instance   searchparameters\SearchParameter.fsh                  516 - 535

diff --git a/fsh-generated/includes/fsh-link-references.md b/fsh-generated/includes/fsh-link-references.md
@@ -13,6 +13,7 @@
 [mii-exa-bildgebung-koerperstruktur]: BodyStructure-mii-exa-bildgebung-koerperstruktur.html
 [mii-exa-bildgebung-behandlungsempfehlung]: CarePlan-mii-exa-bildgebung-behandlungsempfehlung.html
 [mii-exa-bildgebung-semistrukt-befundbericht]: Composition-mii-exa-bildgebung-semistrukt-befundbericht.html
+[mii-exa-bildgebung-geraet]: Device-mii-exa-bildgebung-geraet.html
 [mii-exa-bildgebung-radiologischer-Befund]: DiagnosticReport-mii-exa-bildgebung-radiologischer-Befund.html
 [mii-exa-bildgebung-bildgebungsprozedur]: Procedure-mii-exa-bildgebung-bildgebungsprozedur.html
 [mii-exa-bildgebung-bildgebungsstudie-cr]: ImagingStudy-mii-exa-bildgebung-bildgebungsstudie-cr.html
@@ -63,8 +64,6 @@
 [mii-sp-bildgebung-imaging-study-series-kvp]: SearchParameter-mii-sp-bildgebung-imaging-study-series-kvp.html
 [mii-sp-bildgebung-imaging-study-series-laterality]: SearchParameter-mii-sp-bildgebung-imaging-study-series-laterality.html
 [mii-sp-bildgebung-imaging-study-series-magnetic-field-strength]: SearchParameter-mii-sp-bildgebung-imaging-study-series-magnetic-field-strength.html
-[mii-sp-bildgebung-imaging-study-series-manufacturer]: SearchParameter-mii-sp-bildgebung-imaging-study-series-manufacturer.html
-[mii-sp-bildgebung-imaging-study-series-manufacturer-model-name]: SearchParameter-mii-sp-bildgebung-imaging-study-series-manufacturer-model-name.html
 [mii-sp-bildgebung-imaging-study-series-number]: SearchParameter-mii-sp-bildgebung-imaging-study-series-number.html
 [mii-sp-bildgebung-imaging-study-series-radionuclide]: SearchParameter-mii-sp-bildgebung-imaging-study-series-radionuclide.html
 [mii-sp-bildgebung-imaging-study-series-radionuclide-half-life]: SearchParameter-mii-sp-bildgebung-imaging-study-series-radionuclide-half-life.html

diff --git a/fsh-generated/resources/Device-mii-exa-bildgebung-geraet.json b/fsh-generated/resources/Device-mii-exa-bildgebung-geraet.json
@@ -0,0 +1,16 @@
+{
+  "resourceType": "Device",
+  "id": "mii-exa-bildgebung-geraet",
+  "meta": {
+    "profile": [
+      "https://www.medizininformatik-initiative.de/fhir/ext/modul-bildgebung/StructureDefinition/mii-pr-bildgebung-geraet"
+    ]
+  },
+  "manufacturer": "Siemens",
+  "deviceName": [
+    {
+      "name": "Magnetom Vida",
+      "type": "model-name"
+    }
+  ]
+}
diff --git a/fsh-generated/resources/ImplementationGuide-mii-ig-befunde-bildgebender-verfahren.json b/fsh-generated/resources/ImplementationGuide-mii-ig-befunde-bildgebender-verfahren.json
@@ -166,6 +166,13 @@
         "name": "MII Example Bildgebung Composition",
         "exampleCanonical": "https://www.medizininformatik-initiative.de/fhir/ext/modul-bildgebung/StructureDefinition/mii-pr-bildgebung-semistrukt-befundbericht"
       },
+      {
+        "reference": {
+          "reference": "Device/mii-exa-bildgebung-geraet"
+        },
+        "name": "MII Example Bildgebung Device",
+        "exampleCanonical": "https://www.medizininformatik-initiative.de/fhir/ext/modul-bildgebung/StructureDefinition/mii-pr-bildgebung-geraet"
+      },
       {
         "reference": {
           "reference": "DiagnosticReport/mii-exa-bildgebung-radiologischer-Befund"
@@ -560,22 +567,6 @@
         "description": "Suchparameter für ImagingStudy.series.extension.magneticFieldStrength",
         "exampleBoolean": false
       },
-      {
-        "reference": {
-          "reference": "SearchParameter/mii-sp-bildgebung-imaging-study-series-manufacturer"
-        },
-        "name": "mii-sp-bildgebung-imaging-study-series-manufacturer",
-        "description": "ImagingStudy.series.extension.manufacturer",
-        "exampleBoolean": false
-      },
-      {
-        "reference": {
-          "reference": "SearchParameter/mii-sp-bildgebung-imaging-study-series-manufacturer-model-name"
-        },
-        "name": "mii-sp-bildgebung-imaging-study-series-manufacturer-model-name",
-        "description": "ImagingStudy.series.extension.manufacturerModelName",
-        "exampleBoolean": false
-      },
       {
         "reference": {
           "reference": "SearchParameter/mii-sp-bildgebung-imaging-study-series-number"

diff --git a/...urces/SearchParameter-mii-sp-bildgebung-imaging-study-series-manufacturer-model-name.json b/...urces/SearchParameter-mii-sp-bildgebung-imaging-study-series-manufacturer-model-name.json
diff --git a/...erated/resources/SearchParameter-mii-sp-bildgebung-imaging-study-series-manufacturer.json b/...erated/resources/SearchParameter-mii-sp-bildgebung-imaging-study-series-manufacturer.json
diff --git a/...ulBefundeBildgebenderVerfahren/TechnischeImplementierung/FHIR-Profile/Device.md b/...ulBefundeBildgebenderVerfahren/TechnischeImplementierung/FHIR-Profile/Device.md
@@ -77,6 +77,5 @@ Folgende Suchparameter sind für das Modul Bildgebung relevant, auch in Kombinat
 
 Beispiel einer Device-Ressource:
 
-TODO
-
+{{json:fsh-generated/resources/Device-mii-exa-bildgebung-geraet.json}}
 ---
diff --git a/input/fsh/instances/Example-Device.fsh b/input/fsh/instances/Example-Device.fsh
@@ -0,0 +1,8 @@
+Instance: mii-exa-bildgebung-geraet
+InstanceOf: MII_PR_Bildgebung_Geraet
+Usage: #example
+Title: "MII Example Bildgebung Device"
+* meta.profile = "https://www.medizininformatik-initiative.de/fhir/ext/modul-bildgebung/StructureDefinition/mii-pr-bildgebung-geraet"
+* manufacturer = "Siemens"
+* deviceName.name = "Magnetom Vida"
+* deviceName.type = http://hl7.org/fhir/ValueSet/device-nametype#model-name "Model name"
diff --git a/input/fsh/searchparameters/SearchParameter.fsh b/input/fsh/searchparameters/SearchParameter.fsh
@@ -636,43 +636,43 @@ Usage: #definition
 * target[+] = #MedicationStatement
 * target[+] = #MedicationAdministration
 
-Instance: mii-sp-bildgebung-imaging-study-series-manufacturer
-InstanceOf: SearchParameter
-Usage: #definition
-* url = "https://www.medizininformatik-initiative.de/fhir/ext/modul-bildgebung/SearchParameter/mii-sp-bildgebung-imaging-series-study-manufacturer"
-* insert SP_Publisher
-* insert Version
-* name = "MII_SP_Bildgebung_Imaging_Study_Series_Manufacturer"
-* status = #active
-* experimental = false
-* date = "2024-08-30"
-* description = "ImagingStudy.series.extension.manufacturer"
-* code = #manufacturer
-* base = #ImagingStudy
-* type = #string
-* expression = "ImagingStudy.series.extension('https://www.medizininformatik-initiative.de/fhir/ext/modul-bildgebung/StructureDefinition/mii-ex-bildgebung-geraet-hersteller').extension('manufacturer').value"
-* modifier[+] = #contains
-* modifier[+] = #exact
-* modifier[+] = #missing
-
-Instance: mii-sp-bildgebung-imaging-study-series-manufacturer-model-name
-InstanceOf: SearchParameter
-Usage: #definition
-* url = "https://www.medizininformatik-initiative.de/fhir/ext/modul-bildgebung/SearchParameter/mii-sp-bildgebung-imaging-study-series-manufacturer-model-name"
-* insert SP_Publisher
-* insert Version
-* name = "MII_SP_Bildgebung_Imaging_Study_Series_Manufacturer_Model_Name"
-* status = #active
-* experimental = false
-* date = "2024-08-30"
-* description = "ImagingStudy.series.extension.manufacturerModelName"
-* code = #manufacturer-model-name
-* base = #ImagingStudy
-* type = #string
-* expression = "ImagingStudy.series.extension('https://www.medizininformatik-initiative.de/fhir/ext/modul-bildgebung/StructureDefinition/mii-ex-bildgebung-geraet-hersteller').extension('manufacturerModelName').value"
-* modifier[+] = #contains
-* modifier[+] = #exact
-* modifier[+] = #missing
+// Instance: mii-sp-bildgebung-imaging-study-series-manufacturer
+// InstanceOf: SearchParameter
+// Usage: #definition
+// * url = "https://www.medizininformatik-initiative.de/fhir/ext/modul-bildgebung/SearchParameter/mii-sp-bildgebung-imaging-series-study-manufacturer"
+// * insert SP_Publisher
+// * insert Version
+// * name = "MII_SP_Bildgebung_Imaging_Study_Series_Manufacturer"
+// * status = #active
+// * experimental = false
+// * date = "2024-08-30"
+// * description = "ImagingStudy.series.extension.manufacturer"
+// * code = #manufacturer
+// * base = #ImagingStudy
+// * type = #string
+// * expression = "ImagingStudy.series.extension('https://www.medizininformatik-initiative.de/fhir/ext/modul-bildgebung/StructureDefinition/mii-ex-bildgebung-geraet-hersteller').extension('manufacturer').value"
+// * modifier[+] = #contains
+// * modifier[+] = #exact
+// * modifier[+] = #missing
+
+// Instance: mii-sp-bildgebung-imaging-study-series-manufacturer-model-name
+// InstanceOf: SearchParameter
+// Usage: #definition
+// * url = "https://www.medizininformatik-initiative.de/fhir/ext/modul-bildgebung/SearchParameter/mii-sp-bildgebung-imaging-study-series-manufacturer-model-name"
+// * insert SP_Publisher
+// * insert Version
+// * name = "MII_SP_Bildgebung_Imaging_Study_Series_Manufacturer_Model_Name"
+// * status = #active
+// * experimental = false
+// * date = "2024-08-30"
+// * description = "ImagingStudy.series.extension.manufacturerModelName"
+// * code = #manufacturer-model-name
+// * base = #ImagingStudy
+// * type = #string
+// * expression = "ImagingStudy.series.extension('https://www.medizininformatik-initiative.de/fhir/ext/modul-bildgebung/StructureDefinition/mii-ex-bildgebung-geraet-hersteller').extension('manufacturerModelName').value"
+// * modifier[+] = #contains
+// * modifier[+] = #exact
+// * modifier[+] = #missing
 
 Instance: mii-sp-bildgebung-imaging-study-series-number
 InstanceOf: SearchParameter
-Original file line number
+Diff line change
@@ Expand Up @@
     Beispiel einer Device-Ressource:
-    TODO
+    {{json:fsh-generated/resources/Device-mii-exa-bildgebung-geraet.json}}
     ---