HL7, support for v2.5

Author: amazy

Diff for: orthanc_tools/hl7Lib/hl7_worklist_parser.py

@@ -37,6 +37,7 @@ def __init__(self, specific_fields: dict = None, patient_name_components_count:
             #'ScheduledProcedureStepStartDateTime': 'OBR.F27.R1.C4',
             '_scheduledProcedureStepStartDateTime': 'OBR.F27.R1.C4',
             '__scheduledProcedureStepStartDateTime': 'OBR.F20', # By default, this is the segment used by assistovet it seems not to be in use in other cases
+            '___scheduledProcedureStepStartDateTime': 'OBR.F36',  # for HL7 v2.5
 
             # --- PV1 segment
             '_ambulatoryStatus': 'PV1.F15',
@@ -123,6 +124,11 @@ def parse(self, hl7_message: str) -> typing.Dict:
             values['ScheduledProcedureStepStartDate'] = datetimeString[
                                                         :8]  # date is made of the 8 first chars of the string
             values['ScheduledProcedureStepStartTime'] = datetimeString[8:14]
+        elif values.get('___scheduledProcedureStepStartDateTime') is not None: # HL7 2.5
+            datetimeString = values.get('___scheduledProcedureStepStartDateTime')
+            values['ScheduledProcedureStepStartDate'] = datetimeString[
+                                                        :8]  # date is made of the 8 first chars of the string
+            values['ScheduledProcedureStepStartTime'] = datetimeString[8:14]
 
 
 

Diff for: orthanc_tools/hl7Lib/tests/test_hl7_worklist_parser.py

@@ -47,6 +47,33 @@ def test_message_from_avignon_with_accent(self):
 
         self.assertEqual('ÉCHOGRAPHIE DE L\'ABDOMEN ET DU PETIT BASSIN (PELVIS)', values.get('RequestedProcedureDescription'))
 
+    new_message_from_avignon = (
+        "\x0bMSH|^~\&|Institut Ste Catherine|Institut Ste Catherine|||20250130152802||ORM^O01^ORM_O01|20250130152802966|P|2.5|||AL||FR||FR\r"
+        "PID|||202303295^^^icap84.org^PI~139061305567914^^^ASIP-SANTE-INS-NIR&1.2.250.1.213.1.4.8&ISO^INS||TEST^LUCIEN^^^^^D~TEST^LUCIEN^^^^^L||19491230|M|||8 IMPASSE VIVALDI ^^VILLE^^84999||0780808008^PRN^PH~0123456789^PRN^[email protected]^NET^Internet||||||||||13055\r"
+        "ORC|NW|999001714293|1714293||SC|||||||DOYE^DOYER^MICHEL\r"
+        "OBR||1714293|1714293|DPAC^Depose de PAC^LOCAL|||20250130163000|20250130173000||||||||DOE^DOYER^MICHEL^^^DR^RAD||1714293||||||DX||||||||^^^SGT||||20250130163000\r"
+        "\x1c\x0d"
+    )
+    def test_new_message_from_avignon(self):
+        worklist_parser = Hl7WorklistParser()
+        values = worklist_parser.parse(self.new_message_from_avignon)
+
+        self.assertEqual('M', values.get('PatientSex'))
+        self.assertEqual('19491230', values.get('PatientBirthDate'))
+        self.assertEqual('202303295', values.get('PatientID'))
+        self.assertEqual('TEST^LUCIEN^^^', values.get('PatientName'))
+        self.assertEqual('icap84.org', values.get('IssuerOfPatientID'))
+        self.assertEqual('999001714293', values.get('OrderPlacerIdentifierSequence'))
+        self.assertEqual('1714293', values.get('OrderFillerIdentifierSequence'))
+        self.assertEqual('1714293', values.get('AccessionNumber'))
+        self.assertEqual('DX', values.get('Modality'))
+        self.assertEqual('Depose de PAC', values.get('RequestedProcedureDescription'))
+        self.assertEqual('20250130', values.get('ScheduledProcedureStepStartDate'))
+        self.assertEqual('163000', values.get('ScheduledProcedureStepStartTime'))
+
+
+
+
 
     message2 = (
         "\x0bMSH|^~\&|MPA|SYSTEMA|IMPAX|MDRADAMB|200802210826||ORM^O01|MSG242081|P|2.3|\r"

Diff for: release-notes.md

@@ -1,3 +1,7 @@
+v 0.15.2
+========
+- `Hl7WorklistParser`: support for HL7 v2.5. 
+
 v 0.15.1
 ========
 - `OrthancTestDbPopulator`: `instances_count` is now applied to every generated series

Diff for: setup.py

@@ -28,7 +28,7 @@
     # For a discussion on single-sourcing the version across setup.py and the
     # project code, see
     # https://packaging.python.org/guides/single-sourcing-package-version/
-    version='0.15.1',  # Required
+    version='0.15.2',  # Required
 
     # This is a one-line description or tagline of what your project does. This
     # corresponds to the "Summary" metadata field: