From 529fc3014c65e6bc255300a3bf0433be70f298a0 Mon Sep 17 00:00:00 2001
From: Alberto Fuentes <afuentes@ES-MBP-AFUENTES.local>
Date: Tue, 21 Apr 2020 13:07:47 +0200
Subject: [PATCH] hl7 to xml escape empty field

---
 src/ITB/HL7/Format/HL7XMLv2.cls         | 1 +
 unittest/hl7/2.5_ORM-EmptyField.hl7     | 7 +++++++
 unittest/hl7/2.5_ORM-EmptyField.hl7.xml | 1 +
 3 files changed, 9 insertions(+)
 create mode 100644 unittest/hl7/2.5_ORM-EmptyField.hl7
 create mode 100755 unittest/hl7/2.5_ORM-EmptyField.hl7.xml

diff --git a/src/ITB/HL7/Format/HL7XMLv2.cls b/src/ITB/HL7/Format/HL7XMLv2.cls
index dded95b..e2cb9cf 100644
--- a/src/ITB/HL7/Format/HL7XMLv2.cls
+++ b/src/ITB/HL7/Format/HL7XMLv2.cls
@@ -681,6 +681,7 @@ ClassMethod UnescapeXML(pData, pSeparators, pEscapeChar)
 	Set replace(tEscape_"S"_tEscape)=$$$CSSEP(pSeparators)
 	Set replace(tEscape_"T"_tEscape)=$$$SSSEP(pSeparators)
 	Set replace(tEscape_"E"_tEscape)=$$$ESCSEP(pSeparators)
+	set replace(tEscape_"X00"_tEscape)=""
 	Quit $$replaceArrayLeftToRight^EnsUtil(pData,.replace,5,.pLastPos)
 }
 
diff --git a/unittest/hl7/2.5_ORM-EmptyField.hl7 b/unittest/hl7/2.5_ORM-EmptyField.hl7
new file mode 100644
index 0000000..c2784dd
--- /dev/null
+++ b/unittest/hl7/2.5_ORM-EmptyField.hl7
@@ -0,0 +1,7 @@
+MSH|^~\&|hphis|192.168.2.203|EPIC||20131011093851||ORM^O01|ITM14AAACVDD|P|2.5|||AL|NE
+PID||241900||MAPO0370403001|TEST^TEST^TEST||19740602|M|||BARCELONA^^BARCELONA^8^08620^724^^1||123456789|123456789|||||08/03072889-52|52912868B||||||||724||no
+PV1|1|||O|||1105^TEST^TEST^TEST~1105|1105^TEST^TEST^TEST~1105||DIGC|||||||1105^TEST^TEST^TEST~1105||302141984|||||||||||||||||||||||||20131011104000
+ORC|NW|||1760391|HD||^^^^^1||20131011093800000|||2214^TEST^LAIA|CIRC|||^REASON 1
+OBR||\X00\||1^INTERTEST||||||^S/I^S/I||||||2214^SERRANO^LAIA|||CIRC||DIGH||||||^^^^^1||||REASON 2
+NTE|||TEST NOTES
+OBX|1|ST|4|7|ABCD1234
diff --git a/unittest/hl7/2.5_ORM-EmptyField.hl7.xml b/unittest/hl7/2.5_ORM-EmptyField.hl7.xml
new file mode 100755
index 0000000..df020ea
--- /dev/null
+++ b/unittest/hl7/2.5_ORM-EmptyField.hl7.xml
@@ -0,0 +1 @@
+<ORM_O01 xmlns="urn:hl7-org:v2xml"><MSH><MSH.1>|</MSH.1><MSH.2>^~\&amp;</MSH.2><MSH.3><HD.1>hphis</HD.1></MSH.3><MSH.4><HD.1>192.168.2.203</HD.1></MSH.4><MSH.5><HD.1>EPIC</HD.1></MSH.5><MSH.7><TS.1>20131011093851</TS.1></MSH.7><MSH.9><MSG.1>ORM</MSG.1><MSG.2>O01</MSG.2></MSH.9><MSH.10>ITM14AAACVDD</MSH.10><MSH.11><PT.1>P</PT.1></MSH.11><MSH.12><VID.1>2.5</VID.1></MSH.12><MSH.15>AL</MSH.15><MSH.16>NE</MSH.16></MSH><ORM_O01.PATIENT><PID><PID.2><CX.1>241900</CX.1></PID.2><PID.4><CX.1>MAPO0370403001</CX.1></PID.4><PID.5><XPN.1><FN.1>TEST</FN.1></XPN.1><XPN.2>TEST</XPN.2><XPN.3>TEST</XPN.3></PID.5><PID.7><TS.1>19740602</TS.1></PID.7><PID.8>M</PID.8><PID.11><XAD.1><SAD.1>BARCELONA</SAD.1></XAD.1><XAD.3>BARCELONA</XAD.3><XAD.4>8</XAD.4><XAD.5>08620</XAD.5><XAD.6>724</XAD.6><XAD.8>1</XAD.8></PID.11><PID.13><XTN.1>123456789</XTN.1></PID.13><PID.14><XTN.1>123456789</XTN.1></PID.14><PID.19>08/03072889-52</PID.19><PID.20><DLN.1>52912868B</DLN.1></PID.20><PID.28><CE.1>724</CE.1></PID.28><PID.30>no</PID.30></PID><ORM_O01.PATIENT_VISIT><PV1><PV1.1>1</PV1.1><PV1.4>O</PV1.4><PV1.7><XCN.1>1105</XCN.1><XCN.2><FN.1>TEST</FN.1></XCN.2><XCN.3>TEST</XCN.3><XCN.4>TEST</XCN.4></PV1.7><PV1.7><XCN.1>1105</XCN.1></PV1.7><PV1.8><XCN.1>1105</XCN.1><XCN.2><FN.1>TEST</FN.1></XCN.2><XCN.3>TEST</XCN.3><XCN.4>TEST</XCN.4></PV1.8><PV1.8><XCN.1>1105</XCN.1></PV1.8><PV1.10>DIGC</PV1.10><PV1.17><XCN.1>1105</XCN.1><XCN.2><FN.1>TEST</FN.1></XCN.2><XCN.3>TEST</XCN.3><XCN.4>TEST</XCN.4></PV1.17><PV1.17><XCN.1>1105</XCN.1></PV1.17><PV1.19><CX.1>302141984</CX.1></PV1.19><PV1.44><TS.1>20131011104000</TS.1></PV1.44></PV1></ORM_O01.PATIENT_VISIT></ORM_O01.PATIENT><ORM_O01.ORDER><ORC><ORC.1>NW</ORC.1><ORC.4><EI.1>1760391</EI.1></ORC.4><ORC.5>HD</ORC.5><ORC.7><TQ.6>1</TQ.6></ORC.7><ORC.9><TS.1>20131011093800000</TS.1></ORC.9><ORC.12><XCN.1>2214</XCN.1><XCN.2><FN.1>TEST</FN.1></XCN.2><XCN.3>LAIA</XCN.3></ORC.12><ORC.13><PL.1>CIRC</PL.1></ORC.13><ORC.16><CE.2>REASON 1</CE.2></ORC.16></ORC><ORM_O01.ORDER_DETAIL><ORM_O01.ORDER_CHOICE><OBR><OBR.2><EI.1></EI.1></OBR.2><OBR.4><CE.1>1</CE.1><CE.2>INTERTEST</CE.2></OBR.4><OBR.10><XCN.2><FN.1>S/I</FN.1></XCN.2><XCN.3>S/I</XCN.3></OBR.10><OBR.16><XCN.1>2214</XCN.1><XCN.2><FN.1>SERRANO</FN.1></XCN.2><XCN.3>LAIA</XCN.3></OBR.16><OBR.19>CIRC</OBR.19><OBR.21>DIGH</OBR.21><OBR.27><TQ.6>1</TQ.6></OBR.27><OBR.31><CE.1>REASON 2</CE.1></OBR.31></OBR></ORM_O01.ORDER_CHOICE><NTE><NTE.3>TEST NOTES</NTE.3></NTE><ORM_O01.OBSERVATION><OBX><OBX.1>1</OBX.1><OBX.2>ST</OBX.2><OBX.3><CE.1>4</CE.1></OBX.3><OBX.4>7</OBX.4><OBX.5>ABCD1234</OBX.5></OBX></ORM_O01.OBSERVATION></ORM_O01.ORDER_DETAIL></ORM_O01.ORDER></ORM_O01>