Merge pull request #3076 from HL7/jct-oo

HL7 · May 8, 2024 · 8542e5f · 8542e5f
2 parents c43edc1 + 3665eb2
commit 8542e5f
Show file tree

Hide file tree

Showing 19 changed files with 215 additions and 168 deletions.
diff --git a/source/device/bundle-Device-search-params.xml b/source/device/bundle-Device-search-params.xml
@@ -373,16 +373,16 @@
   <entry>
     <resource>
       <SearchParameter>
-        <id value="Device-udi-carrier"/>
+        <id value="Device-udi-carrier-hrf"/>
         <extension url="http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status">
           <valueCode value="trial-use"/>
         </extension>
         <extension url="http://hl7.org/fhir/build/StructureDefinition/path">
-          <valueString value="Device.udiCarrier"/>
+          <valueString value="Device.udiCarrier.carrierHRF"/>
         </extension>
-        <url value="http://hl7.org/fhir/build/SearchParameter/Device-udi-carrier"/>
+        <url value="http://hl7.org/fhir/build/SearchParameter/Device-udi-carrier-hrf"/>
         <description value="UDI Barcode (RFID or other technology) string in *HRF* format."/>
-        <code value="udi-carrier"/>
+        <code value="udi-carrier-hrf"/>
         <type value="string"/>
         <expression value="Device.udiCarrier.carrierHRF"/>
         <processingMode value="normal"/>
@@ -435,13 +435,13 @@
           <valueCode value="trial-use"/>
         </extension>
         <extension url="http://hl7.org/fhir/build/StructureDefinition/path">
-          <valueString value="Device.version.value"/>
+          <valueString value="Device.deviceVersion.value"/>
         </extension>
         <url value="http://hl7.org/fhir/build/SearchParameter/Device-version"/>
         <description value="The specific version of the device"/> 
         <code value="version"/>
         <type value="string"/>
-        <expression value="Device.version.value"/>
+        <expression value="Device.deviceVersion.value"/>
         <processingMode value="normal"/>
       </SearchParameter>
     </resource>
@@ -489,5 +489,28 @@
       </SearchParameter>
     </resource>
   </entry>  
-
+   <entry>
+    <resource>
+      <SearchParameter>
+        <id value="Device-version-type"/>
+        <extension url="http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status">
+          <valueCode value="trial-use"/>
+        </extension>
+        <url value="http://hl7.org/fhir/build/SearchParameter/Device-type-version"/>
+        <description value="Value and type of version"/>
+        <code value="version-type"/>
+        <type value="composite"/>
+        <expression value="Device.deviceVersion"/>
+        <processingMode value="normal"/>
+        <component>
+          <definition value="type"/>
+          <expression value="type"/>
+        </component>
+        <component>
+          <definition value="value"/>
+          <expression value="value"/>
+        </component>
+      </SearchParameter>
+    </resource>
+  </entry>
 </Bundle>
diff --git a/source/device/device-example-AND20601BPMonitor.xml b/source/device/device-example-AND20601BPMonitor.xml
@@ -45,7 +45,7 @@
     </coding>
     <text value="MDC_MOC_VMS_MDS_SIMP: Personal Health Device"/>
   </type>
-  <version>
+  <deviceVersion>
     <type>
       <coding>
         <system value="urn:iso:std:iso:11073:10101" />
@@ -54,7 +54,7 @@
       <text value="MDC_REG_CERT_DATA_CONTINUA_VERSION: Continua version" />
     </type>
     <value value="1.0" />
-  </version>
+  </deviceVersion>
   <conformsTo>
     <specification>
       <coding>

diff --git a/source/device/device-example-ANDThermometer.xml b/source/device/device-example-ANDThermometer.xml
@@ -45,7 +45,7 @@
     </coding>
     <text value="MDC_MOC_VMS_MDS_SIMP: Personal Health Device" />
   </type>
-  <version>
+  <deviceVersion>
     <type>
       <coding>
         <system value="urn:iso:std:iso:11073:10101"/>
@@ -54,8 +54,8 @@
       <text value="MDC_ID_PROD_SPEC_FW: Firmware revision"/>
     </type>
     <value value="HTP009_137"/>
-  </version>
-  <version>
+  </deviceVersion>
+  <deviceVersion>
     <type>
       <coding>
         <system value="urn:iso:std:iso:11073:10101"/>
@@ -64,8 +64,8 @@
       <text value="MDC_ID_PROD_SPEC_SW: Software revision"/>
     </type>
     <value value="0.00"/>
-  </version>
-  <version>
+  </deviceVersion>
+  <deviceVersion>
     <type>
       <coding>
         <system value="urn:iso:std:iso:11073:10101"/>
@@ -74,8 +74,8 @@
       <text value="MDC_ID_PROD_SPEC_HW: Hardware revision" />
     </type>
     <value value="0.00"/>
-  </version>
-  <version>
+  </deviceVersion>
+  <deviceVersion>
     <type>
       <coding>
         <system value="urn:iso:std:iso:11073:10101"/>
@@ -84,7 +84,7 @@
       <text value="MDC_REG_CERT_DATA_CONTINUA_VERSION: Continua version"/>
     </type>
     <value value="4.1"/>
-  </version>
+  </deviceVersion>
   <conformsTo>
     <specification>
       <coding>

diff --git a/source/device/device-example-AndroidGatewayPHG.xml b/source/device/device-example-AndroidGatewayPHG.xml
@@ -20,7 +20,7 @@
     </coding>
     <text value="MDC_MOC_VMS_MDS_AHD: Continua compliant Gateway" />
   </type>
-  <version>
+  <deviceVersion>
     <type>
       <coding>
         <system value="urn:iso:std:iso:11073:10101"/>
@@ -29,7 +29,7 @@
       <text value="MDC_REG_CERT_DATA_CONTINUA_VERSION: Continua version"/>
     </type>
     <value value="6.0" />
-  </version>
+  </deviceVersion>
   <property>
     <type>
       <coding>

diff --git a/source/device/device-example-Bodimetrics.xml b/source/device/device-example-Bodimetrics.xml
@@ -45,7 +45,7 @@
     </coding>
     <text value="MDC_MOC_VMS_MDS_SIMP: Personal Health Device"/>
   </type>
-  <version>
+  <deviceVersion>
     <type>
       <coding>
         <system value="urn:iso:std:iso:11073:10101"/>
@@ -54,8 +54,8 @@
       <text value="MDC_ID_PROD_SPEC_SW: Software revision"/>
     </type>
     <value value="020008"/>
-  </version>
-  <version>
+  </deviceVersion>
+  <deviceVersion>
     <type>
       <coding>
         <system value="urn:iso:std:iso:11073:10101"/>
@@ -64,7 +64,7 @@
       <text value="MDC_ID_PROD_SPEC_HW: Hardware revision"/>
     </type>
     <value value="CC"/>
-  </version>
+  </deviceVersion>
   <conformsTo>
     <specification>
       <coding>

diff --git a/source/device/device-example-KinsaThermometer.xml b/source/device/device-example-KinsaThermometer.xml
@@ -45,7 +45,7 @@
     </coding>
     <text value="MDC_MOC_VMS_MDS_SIMP: Personal Health Device"/>
   </type>
-  <version>
+  <deviceVersion>
     <type>
       <coding>
         <system value="urn:iso:std:iso:11073:10101"/>
@@ -54,8 +54,8 @@
       <text value="MDC_ID_PROD_SPEC_FW: Firmware revision"/>
     </type>
     <value value="1.00"/>
-  </version>
-  <version>
+  </deviceVersion>
+  <deviceVersion>
     <type>
       <coding>
         <system value="urn:iso:std:iso:11073:10101"/>
@@ -64,8 +64,8 @@
       <text value="MDC_ID_PROD_SPEC_SW: Software revision"/>
     </type>
     <value value="V2.19"/>
-  </version>
-  <version>
+  </deviceVersion>
+  <deviceVersion>
     <type>
       <coding>
         <system value="urn:iso:std:iso:11073:10101"/>
@@ -74,7 +74,7 @@
       <text value="MDC_ID_PROD_SPEC_SW: Hardware revision"/>
     </type>
     <value value="1.00"/>
-  </version>
+  </deviceVersion>
   <conformsTo>
     <specification>
       <coding>

diff --git a/source/device/device-example-Nonin20601PulseOx.xml b/source/device/device-example-Nonin20601PulseOx.xml
@@ -45,7 +45,7 @@
     </coding>
     <text value="MDC_MOC_VMS_MDS_SIMP: Personal Health Device"/>
   </type>
-  <version>
+  <deviceVersion>
     <type>
       <coding>
         <system value="urn:iso:std:iso:11073:10101"/>
@@ -54,8 +54,8 @@
       <text value="MDC_ID_PROD_SPEC_FW: Firmware revision"/>
     </type>
     <value value="0.9C"/>
-  </version>
-  <version>
+  </deviceVersion>
+  <deviceVersion>
     <type>
       <coding>
         <system value="urn:iso:std:iso:11073:10101"/>
@@ -64,7 +64,7 @@
       <text value="MDC_REG_CERT_DATA_CONTINUA_VERSION: Continua version"/>
     </type>
     <value value="1.0"/>
-  </version>
+  </deviceVersion>
   <conformsTo>
     <specification>
       <coding>

diff --git a/source/device/device-example-NoninBlePulseOx.xml b/source/device/device-example-NoninBlePulseOx.xml
@@ -45,7 +45,7 @@
     </coding>
     <text value="MDC_MOC_VMS_MDS_SIMP: Personal Health Device"/>
   </type>
-  <version>
+  <deviceVersion>
     <type>
       <coding>
         <system value="urn:iso:std:iso:11073:10101"/>
@@ -54,8 +54,8 @@
       <text value="MDC_ID_PROD_SPEC_FW: Firmware revision"/>
     </type>
     <value value="r2.1"/>
-  </version>
-  <version>
+  </deviceVersion>
+  <deviceVersion>
     <type>
       <coding>
         <system value="urn:iso:std:iso:11073:10101"/>
@@ -64,8 +64,8 @@
       <text value="MDC_ID_PROD_SPEC_SW: Software revision"/>
     </type>
     <value value="r1.5 9.7"/>
-  </version>
-  <version>
+  </deviceVersion>
+  <deviceVersion>
     <type>
       <coding>
         <system value="urn:iso:std:iso:11073:10101"/>
@@ -74,8 +74,8 @@
       <text value="MDC_ID_PROD_SPEC_HW: Hardware revision"/>
     </type>
     <value value="r1.0"/>
-  </version>
-  <version>
+  </deviceVersion>
+  <deviceVersion>
     <type>
       <coding>
         <system value="urn:iso:std:iso:11073:10101"/>
@@ -84,7 +84,7 @@
       <text value="MDC_REG_CERT_DATA_CONTINUA_VERSION: Continua version"/>
     </type>
     <value value="6.0"/>
-  </version>
+  </deviceVersion>
   <conformsTo>
     <specification>
       <coding>

diff --git a/source/device/device-example-PhilipsThermometer.xml b/source/device/device-example-PhilipsThermometer.xml
@@ -45,7 +45,7 @@
     </coding>
     <text value="MDC_MOC_VMS_MDS_SIMP: Personal Health Device"/>
   </type>
-  <version>
+  <deviceVersion>
     <type>
       <coding>
         <system value="urn:iso:std:iso:11073:10101"/>
@@ -54,8 +54,8 @@
       <text value="MDC_ID_PROD_SPEC_FW: Firmware revision"/>
     </type>
     <value value="1.60"/>
-  </version>
-  <version>
+  </deviceVersion>
+  <deviceVersion>
     <type>
       <coding>
         <system value="urn:iso:std:iso:11073:10101"/>
@@ -64,8 +64,8 @@
       <text value="MDC_ID_PROD_SPEC_SW: Software revision"/>
     </type>
     <value value="1.50"/>
-  </version>
-  <version>
+  </deviceVersion>
+  <deviceVersion>
     <type>
       <coding>
         <system value="urn:iso:std:iso:11073:10101"/>
@@ -74,8 +74,8 @@
       <text value="MDC_ID_PROD_SPEC_SW: Hardware revision"/>
     </type>
     <value value="1.40"/>
-  </version>
-  <version>
+  </deviceVersion>
+  <deviceVersion>
     <type>
       <coding>
         <system value="urn:iso:std:iso:11073:10101"/>
@@ -84,7 +84,7 @@
       <text value="MDC_REG_CERT_DATA_CONTINUA_VERSION: Continua version"/>
     </type>
     <value value="5.1"/>
-  </version>
+  </deviceVersion>
   <conformsTo>
     <specification>
       <coding>

diff --git a/source/device/device-example-RocheGlucoseMonitor.xml b/source/device/device-example-RocheGlucoseMonitor.xml
@@ -45,7 +45,7 @@
     </coding>
     <text value="MDC_MOC_VMS_MDS_SIMP: Personal Health Device"/>
   </type>
-  <version>
+  <deviceVersion>
     <type>
       <coding>
         <system value="urn:iso:std:iso:11073:10101"/>
@@ -54,7 +54,7 @@
       <text value="MDC_ID_PROD_SPEC_FW: Firmware revision"/>
     </type>
     <value value="v1.8.3"/>
-  </version>
+  </deviceVersion>
   <conformsTo>
     <specification>
       <coding>

diff --git a/source/device/device-example-software.xml b/source/device/device-example-software.xml
@@ -8,9 +8,9 @@
 	<type>
 		<text value="EHR"/>
 	</type>
-	<version>
+	<deviceVersion>
 	  <value value="10.23-23423"/>
-	</version> 
+	</deviceVersion> 
 	<contact>
 		<system value="url"/>
 		<value value="http://acme.com"/>