roqua-healthy 1.5.9 → 1.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: dd1dc3e8ce6e055eaa889059f77e2d31c85cdb304610f897488fe5b62aaad19c
-  data.tar.gz: 7c51e0e0f982adc0085d05a5cb71234fa71a039b9244e060446e73c3d30e3437
+SHA1:
+  metadata.gz: fe41526687263d414b6fbb4a14e77d0538d14cfc
+  data.tar.gz: d9222496cb31cd289ac4050f89a0bd77dea11d71
 SHA512:
-  metadata.gz: 46c3a927a35d6ebd92be5a3342774dd9cfc421e4fee5d2200998c36b886b6795bc9cd31f3ba106d21361ac947ad97f29a65d731397f04fb6cc6a1ab93ce1e163
-  data.tar.gz: af5d642130dff9324205ee27c33591fbc21fd2fbf8963127f13fbb4abbed39f572530cb3c8442d82c691bf679bf6b6e3881b4821456d5201186e0b2efeb6e624
+  metadata.gz: f408d157c74b9d00f250921b041e35faa9cfa116f931ec8e3d38127ab484565c195915fc583aa73d9a23f7d004719e9ce675d1993e026c06ab7ebc9d5739eb13
+  data.tar.gz: b16066084c03e52ea5f81f857cf6c994c72164696eb36e853f9f52bbe1bac0b0ba5a3b47cab969c02be495a8b4bbc891917dd64247b353d72867e1c37968eae3

data/ChangeLog.md

@@ -1,3 +1,7 @@
+### 1.5.10
+
+* Support for house number suffices in PID 11.2
+
 ### 1.5.9
 
 * Ruby 2.5 support

data/lib/roqua/healthy/a19/address_parser.rb

@@ -16,7 +16,15 @@ module Roqua
 
         def street
           return nil if record.blank? || record.fetch('PID.11.1').blank?
-          record.fetch('PID.11.1').fetch('PID.11.1.1')
+
+          street = record.fetch('PID.11.1').fetch('PID.11.1.1')
+          suffix = record.fetch('PID.11.2', nil)
+
+          if suffix.present? && !street.end_with?(suffix)
+            street + suffix
+          else
+            street
+          end
         end
 
         def city

data/lib/roqua/healthy/version.rb

@@ -2,6 +2,6 @@
 module Roqua
   module Healthy
     # healthy version
-    VERSION = "1.5.9"
+    VERSION = "1.5.10"
   end
 end

data/spec/fixtures/xmcare_house_number_addendum.xml

@@ -0,0 +1,335 @@
+<HL7Message>
+  <MSH>
+    <MSH.1>|</MSH.1>
+    <MSH.2>^~\&amp;</MSH.2>
+    <MSH.3>
+      <MSH.3.1>XMCARE</MSH.3.1>
+    </MSH.3>
+    <MSH.4>
+      <MSH.4.1>ZIS</MSH.4.1>
+    </MSH.4>
+    <MSH.5>
+      <MSH.5.1>ROQUA</MSH.5.1>
+    </MSH.5>
+    <MSH.6>
+      <MSH.6.1>RGOC</MSH.6.1>
+    </MSH.6>
+    <MSH.7>
+      <MSH.7.1>20190620121912</MSH.7.1>
+    </MSH.7>
+    <MSH.8/>
+    <MSH.9>
+      <MSH.9.1>ADR</MSH.9.1>
+      <MSH.9.2>A19</MSH.9.2>
+      <MSH.9.3>ADR_A19</MSH.9.3>
+    </MSH.9>
+    <MSH.10>
+      <MSH.10.1>10883208</MSH.10.1>
+    </MSH.10>
+    <MSH.11>
+      <MSH.11.1>P</MSH.11.1>
+    </MSH.11>
+    <MSH.12>
+      <MSH.12.1>2.4</MSH.12.1>
+    </MSH.12>
+    <MSH.13/>
+    <MSH.14/>
+    <MSH.15>
+      <MSH.15.1>NE</MSH.15.1>
+    </MSH.15>
+    <MSH.16>
+      <MSH.16.1>NE</MSH.16.1>
+    </MSH.16>
+  </MSH>
+  <MSA>
+    <MSA.1>
+      <MSA.1.1>CA</MSA.1.1>
+    </MSA.1>
+    <MSA.2>
+      <MSA.2.1>20190620121912766</MSA.2.1>
+    </MSA.2>
+  </MSA>
+  <QRD>
+    <QRD.1>
+      <QRD.1.1>20190620121912</QRD.1.1>
+    </QRD.1>
+    <QRD.2>
+      <QRD.2.1>R</QRD.2.1>
+    </QRD.2>
+    <QRD.3>
+      <QRD.3.1>I</QRD.3.1>
+    </QRD.3>
+    <QRD.4>
+      <QRD.4.1>766</QRD.4.1>
+    </QRD.4>
+    <QRD.5/>
+    <QRD.6/>
+    <QRD.7>
+      <QRD.7.1>1</QRD.7.1>
+      <QRD.7.2>RD</QRD.7.2>
+    </QRD.7>
+    <QRD.8>
+      <QRD.8.1>1234567890</QRD.8.1>
+    </QRD.8>
+    <QRD.9>
+      <QRD.9.1>DEM</QRD.9.1>
+    </QRD.9>
+  </QRD>
+  <PID>
+    <PID.1>
+      <PID.1.1>1</PID.1.1>
+    </PID.1>
+    <PID.2/>
+    <PID.3>
+      <PID.3.1>1234567890</PID.3.1>
+      <PID.3.2/>
+      <PID.3.3/>
+      <PID.3.4>XMCARE</PID.3.4>
+      <PID.3.5>PI</PID.3.5>
+    </PID.3>
+    <PID.3>
+      <PID.3.1>999991234</PID.3.1>
+      <PID.3.2/>
+      <PID.3.3/>
+      <PID.3.4>NLMINBIZA</PID.3.4>
+      <PID.3.5>NNNLD</PID.3.5>
+      <PID.3.6/>
+      <PID.3.7>20190123</PID.3.7>
+    </PID.3>
+    <PID.3>
+      <PID.3.1>""</PID.3.1>
+      <PID.3.2/>
+      <PID.3.3/>
+      <PID.3.4/>
+      <PID.3.5>IBAN</PID.3.5>
+    </PID.3>
+    <PID.3>
+      <PID.3.1>""</PID.3.1>
+      <PID.3.2/>
+      <PID.3.3/>
+      <PID.3.4>GIRO</PID.3.4>
+      <PID.3.5>BA</PID.3.5>
+    </PID.3>
+    <PID.3>
+      <PID.3.1>""</PID.3.1>
+      <PID.3.2/>
+      <PID.3.3/>
+      <PID.3.4>BANK</PID.3.4>
+      <PID.3.5>BA</PID.3.5>
+    </PID.3>
+    <PID.4/>
+    <PID.5>
+      <PID.5.1>
+        <PID.5.1.1>Anton</PID.5.1.1>
+        <PID.5.1.2>""</PID.5.1.2>
+        <PID.5.1.3>Anton</PID.5.1.3>
+        <PID.5.1.4>""</PID.5.1.4>
+        <PID.5.1.5>""</PID.5.1.5>
+      </PID.5.1>
+      <PID.5.2>B</PID.5.2>
+      <PID.5.3>C</PID.5.3>
+      <PID.5.4/>
+      <PID.5.5/>
+      <PID.5.6/>
+      <PID.5.7>L</PID.5.7>
+    </PID.5>
+    <PID.5>
+      <PID.5.1>Anton</PID.5.1>
+      <PID.5.2/>
+      <PID.5.3/>
+      <PID.5.4/>
+      <PID.5.5/>
+      <PID.5.6/>
+      <PID.5.7>D</PID.5.7>
+    </PID.5>
+    <PID.5>
+      <PID.5.1/>
+      <PID.5.2>Tirol</PID.5.2>
+      <PID.5.3/>
+      <PID.5.4/>
+      <PID.5.5/>
+      <PID.5.6/>
+      <PID.5.7>N</PID.5.7>
+    </PID.5>
+    <PID.6/>
+    <PID.7>
+      <PID.7.1>19991212</PID.7.1>
+    </PID.7>
+    <PID.8>
+      <PID.8.1>M</PID.8.1>
+    </PID.8>
+    <PID.9/>
+    <PID.10/>
+    <PID.11/>
+    <PID.11>
+      <PID.11.1>
+        <PID.11.1.1>Straatnaam 123</PID.11.1.1>
+        <PID.11.1.2>Straatnaam</PID.11.1.2>
+        <PID.11.1.3>123</PID.11.1.3>
+      </PID.11.1>
+      <PID.11.2>ab</PID.11.2>
+      <PID.11.3>DEURNE</PID.11.3>
+      <PID.11.4/>
+      <PID.11.5>1234AB</PID.11.5>
+      <PID.11.6>NL</PID.11.6>
+      <PID.11.7>H</PID.11.7>
+    </PID.11>
+    <PID.11>
+      <PID.11.1>
+        <PID.11.1.1/>
+        <PID.11.1.2>""</PID.11.1.2>
+        <PID.11.1.3>""</PID.11.1.3>
+      </PID.11.1>
+      <PID.11.2>""</PID.11.2>
+      <PID.11.3>'S-GRAVENHAGE</PID.11.3>
+      <PID.11.4/>
+      <PID.11.5>""</PID.11.5>
+      <PID.11.6>NL</PID.11.6>
+      <PID.11.7>N</PID.11.7>
+    </PID.11>
+    <PID.11>
+      <PID.11.1>
+        <PID.11.1.1/>
+        <PID.11.1.2>""</PID.11.1.2>
+        <PID.11.1.3>""</PID.11.1.3>
+      </PID.11.1>
+      <PID.11.2>""</PID.11.2>
+      <PID.11.3>""</PID.11.3>
+      <PID.11.4/>
+      <PID.11.5>""</PID.11.5>
+      <PID.11.6>""</PID.11.6>
+      <PID.11.7>C</PID.11.7>
+    </PID.11>
+    <PID.12/>
+    <PID.13>
+      <PID.13.1>0123-444444</PID.13.1>
+      <PID.13.2>PRN</PID.13.2>
+      <PID.13.3>PH</PID.13.3>
+    </PID.13>
+    <PID.13>
+      <PID.13.1>0031612345678</PID.13.1>
+      <PID.13.2>ORN</PID.13.2>
+      <PID.13.3>PH</PID.13.3>
+    </PID.13>
+    <PID.13>
+      <PID.13.1>""</PID.13.1>
+      <PID.13.2>ORN</PID.13.2>
+      <PID.13.3>FX</PID.13.3>
+    </PID.13>
+    <PID.13>
+      <PID.13.1/>
+      <PID.13.2>NET</PID.13.2>
+      <PID.13.3>Internet</PID.13.3>
+      <PID.13.4>voornaam+test@example.org</PID.13.4>
+    </PID.13>
+    <PID.14/>
+    <PID.15/>
+    <PID.16/>
+    <PID.17/>
+    <PID.18/>
+    <PID.19/>
+    <PID.20/>
+    <PID.21/>
+    <PID.22/>
+    <PID.23/>
+    <PID.24/>
+    <PID.25/>
+    <PID.26>
+      <PID.26.1>""</PID.26.1>
+    </PID.26>
+    <PID.27/>
+    <PID.28/>
+    <PID.29>
+      <PID.29.1>""</PID.29.1>
+    </PID.29>
+    <PID.30>
+      <PID.30.1>N</PID.30.1>
+    </PID.30>
+    <PID.31>
+      <PID.31.1>N</PID.31.1>
+    </PID.31>
+  </PID>
+  <ROL>
+    <ROL.1/>
+    <ROL.2>
+      <ROL.2.1>UP</ROL.2.1>
+    </ROL.2>
+    <ROL.3>
+      <ROL.3.1>PP</ROL.3.1>
+    </ROL.3>
+    <ROL.4>
+      <ROL.4.1>BENU-DEUR</ROL.4.1>
+      <ROL.4.2>
+        <ROL.4.2.1/>
+        <ROL.4.2.2/>
+        <ROL.4.2.3>Benu Apotheek</ROL.4.2.3>
+      </ROL.4.2>
+      <ROL.4.3/>
+      <ROL.4.4/>
+      <ROL.4.5/>
+      <ROL.4.6/>
+      <ROL.4.7/>
+      <ROL.4.8>P</ROL.4.8>
+      <ROL.4.9>LOCAL</ROL.4.9>
+    </ROL.4>
+    <ROL.4>
+      <ROL.4.1>01239000</ROL.4.1>
+      <ROL.4.2/>
+      <ROL.4.3/>
+      <ROL.4.4/>
+      <ROL.4.5/>
+      <ROL.4.6/>
+      <ROL.4.7/>
+      <ROL.4.8>02</ROL.4.8>
+      <ROL.4.9>VEKTIS</ROL.4.9>
+    </ROL.4>
+    <ROL.5/>
+    <ROL.6/>
+    <ROL.7/>
+    <ROL.8/>
+    <ROL.9>
+      <ROL.9.1>02</ROL.9.1>
+      <ROL.9.2/>
+      <ROL.9.3>VEKTIS</ROL.9.3>
+    </ROL.9>
+  </ROL>
+  <ROL>
+    <ROL.1/>
+    <ROL.2>
+      <ROL.2.1>UP</ROL.2.1>
+    </ROL.2>
+    <ROL.3>
+      <ROL.3.1>PP</ROL.3.1>
+    </ROL.3>
+    <ROL.4>
+      <ROL.4.1>OPEN-DEUR</ROL.4.1>
+      <ROL.4.2>
+        <ROL.4.2.1/>
+        <ROL.4.2.2>de</ROL.4.2.2>
+        <ROL.4.2.3>Open</ROL.4.2.3>
+      </ROL.4.2>
+      <ROL.4.3>M</ROL.4.3>
+      <ROL.4.4>P</ROL.4.4>
+      <ROL.4.5/>
+      <ROL.4.6/>
+      <ROL.4.7/>
+      <ROL.4.8>H</ROL.4.8>
+      <ROL.4.9>LOCAL</ROL.4.9>
+    </ROL.4>
+    <ROL.5/>
+    <ROL.6/>
+    <ROL.7/>
+    <ROL.8/>
+    <ROL.9>
+      <ROL.9.1>01</ROL.9.1>
+      <ROL.9.2/>
+      <ROL.9.3>VEKTIS</ROL.9.3>
+    </ROL.9>
+  </ROL>
+  <PV1>
+    <PV1.1/>
+    <PV1.2>
+      <PV1.2.1>O</PV1.2.1>
+    </PV1.2>
+  </PV1>
+</HL7Message>

data/spec/integration/xmcare_spec.rb

@@ -207,6 +207,14 @@ describe 'Fetching A19 from XMcare' do
     end
   end
 
+  describe 'a patient with an address suffix' do
+    before { load_fixture 'xmcare_house_number_addendum', '1234567890' }
+    subject { Roqua::Healthy::A19.fetch("1234567890") }
+
+    it 'returns the street with suffix appended' do
+      expect(subject[:street]).to eq("Straatnaam 123ab")
+    end
+  end
   describe 'a patient that does not exist' do
     before { load_fixture 'xmcare_patient_not_found', '12345678901' }
 

data/spec/unit/a19/address_parser_spec.rb

@@ -8,6 +8,7 @@ describe Roqua::Healthy::A19::AddressParser do
     if types.include?('M')
       addresses << {'PID.11.7' => 'M',
                     'PID.11.1' => {'PID.11.1.1' => 'Mailstreet 1'},
+                    'PID.11.2' => '',
                     'PID.11.3' => 'Mailcity',
                     'PID.11.5' => 'Mailzipcode',
                     'PID.11.6' => 'Mailcountry'}
@@ -73,6 +74,30 @@ describe Roqua::Healthy::A19::AddressParser do
       parser  = described_class.new(message)
       expect(parser.street).to be_nil
     end
+
+    it 'appends house number suffix' do
+      addresses = [{'PID.11.7' => 'M',
+                    'PID.11.1' => {'PID.11.1.1' => 'Homestreet 1'},
+                    'PID.11.2' => "ab",
+                    'PID.11.3' => 'Homecity',
+                    'PID.11.5' => 'Homezipcode',
+                    'PID.11.6' => 'Homecountry'}]
+      message = {'PID' => {'PID.11' => addresses}}
+      parser  = described_class.new(message)
+      expect(parser.street).to eq("Homestreet 1ab")
+    end
+
+    it 'does not append house number suffix if full field already ends in it' do
+      addresses = [{'PID.11.7' => 'M',
+                    'PID.11.1' => {'PID.11.1.1' => 'Homestreet 1ab'},
+                    'PID.11.2' => "ab",
+                    'PID.11.3' => 'Homecity',
+                    'PID.11.5' => 'Homezipcode',
+                    'PID.11.6' => 'Homecountry'}]
+      message = {'PID' => {'PID.11' => addresses}}
+      parser  = described_class.new(message)
+      expect(parser.street).to eq("Homestreet 1ab")
+    end
   end
 
   describe '#city' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roqua-healthy
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.5.10
 platform: ruby
 authors:
 - Marten Veldthuis
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2019-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -356,6 +356,7 @@ files:
 - spec/fixtures/user_patient_not_found.xml
 - spec/fixtures/user_patient_with_gsm_and_email.xml
 - spec/fixtures/user_patient_with_maiden_name.xml
+- spec/fixtures/xmcare_house_number_addendum.xml
 - spec/fixtures/xmcare_impersonating_cdis.xml
 - spec/fixtures/xmcare_patient.xml
 - spec/fixtures/xmcare_patient_email_in_field_number_four.xml
@@ -407,7 +408,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: Arranges communication between Mirth and RoQua
@@ -431,6 +433,7 @@ test_files:
 - spec/fixtures/user_patient_not_found.xml
 - spec/fixtures/user_patient_with_gsm_and_email.xml
 - spec/fixtures/user_patient_with_maiden_name.xml
+- spec/fixtures/xmcare_house_number_addendum.xml
 - spec/fixtures/xmcare_impersonating_cdis.xml
 - spec/fixtures/xmcare_patient.xml
 - spec/fixtures/xmcare_patient_email_in_field_number_four.xml