renalware-core 2.0.120 → 2.0.121

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f770b5732c50a59986a8f3578ede55d2d537df63280d181cfab33057ebdf92f
-  data.tar.gz: f962a48b76616f1fdc9a578a1d1c2da7fe899b72ea48f78b6c503e074a72a343
+  metadata.gz: 9b93f9d4c837438e01bbb281d1a8a81046ae012697e1f6906cb008e401162cb0
+  data.tar.gz: 474cf5ccd494cbcf535ca7d11dee7e96bb1675f023dda2327b8fbe8a74d80fa2
 SHA512:
-  metadata.gz: 30f1a2a55139d8bb6149c1c81afa23ac26a93003fd4e4774e6f2d5314c6a6cb0240ae2813d2f68faf3dbfe88169be878779f8079d9963d03e7c774bfb8b516a9
-  data.tar.gz: 73bff07bf3e82eeaae125ef6b470d8a01eba01a5da5f3c0106d9e405339c2fae1a9e0ba9d7dca0d07fa899c622447a703ba68c94a27c2aebe971ee4287942f38
+  metadata.gz: a6d2790007b3bcf1f1173c421f8b0060c0b40345bb0323e5893dc83e3d39164e4c1e5653d9acf15d0b3ac163664fcc9f8a68e4b4a4df416e05c5d8a8c73d5240
+  data.tar.gz: b82938bbc38a637773a7999da0f416b98050a7efa56848f18e2741fb084b167e91900b836b99a50db736b7e07b3af75f666d5d51041d2f32ded7fae957289914

data/app/models/renalware/feeds/hl7_message.rb

@@ -129,6 +129,8 @@ module Renalware
         alias_attribute :died_at, :death_date
 
         def internal_id
+          return unless defined?(patient_id_list)
+
           patient_id_list.split("^").first
         end
 
@@ -156,17 +158,26 @@ module Renalware
           super.split("^")
         end
 
-        # Try to read sex_admin, but be aware it raises an error if it is not in F|M|O|U|A|N|C
-        # in which case append the actual value so we know what is causing the failure.
+        # We don't use the HL7::Message#sex_admin method (from the ruby hl7 gem) because it
+        # raises an error during reading if the sex value in the PID is not in (F|M|O|U|A|N|C).
+        # I think that behaviour is a not quite right as a hospital might not use those values in
+        # their HL7 PID implementation, especially in the UK. KCH does not for instance.
+        # So instead we read the PID array directly, and map whatever is in there to its Renalware
+        # equivalent, then overwrite the existing #admin_sex method so the HL7::Message version
+        # cannot be called. If we can't map it we just return whatever is in there and its up to
+        # calling code to handle any coercion issues. The hl7_pid_sex_map hash can be configured
+        # by the host app to support whatever sex values it uses intenrally.
+        # I think some work needs to be done on Renalware sex and gender (which are slightly
+        # conflated in Renalware). For example:
+        # - the LOINC names for administrative sex: Male Female Unknown (https://loinc.org/72143-1/)
+        # - the LOINC names for sex at birth: Male Female Unknown (https://loinc.org/LL3324-2/)
+        # - HL7's definitions: F Female, M Male, O Other, U Unknown, A Ambiguous, N Not applicable
+        # - gender: 7 options https://loinc.org/76691-5/
         def sex
-          self[8] = self[8]&.upcase # Sex eg F should always be uppercase so no harm in doing this
-          self[8] = "M" if self[8] == "MALE"
-          self[8] = "F" if self[8] == "FEMALE"
-          self[8] = "O" if self[8] == "OTHER"
-          admin_sex
-        rescue HL7::InvalidDataError => e
-          raise e, "#{e} value is '#{self[8]}'", e.backtrace
+          pid_sex = self[8]&.upcase
+          Renalware.config.hl7_pid_sex_map.fetch(pid_sex, pid_sex)
         end
+        alias admin_sex sex
 
         private
 

data/lib/renalware/configuration.rb

@@ -105,6 +105,24 @@ module Renalware
         )
       }
     }
+
+    # This the default mapping from possible HL7 PID 'administrative sex' values that we
+    # might see in a message, to their Renalware equivalent. A hospital can override this
+    # mapping if they have different values in their HL7 messages.
+    # Note that the standard HL7 PID admin sex values are not adhered to here. For reference
+    # they are:
+    # F Female, M Male, O Other, U Unknown, A Ambiguous, N Not applicable
+    config_accessor(:hl7_pid_sex_map) do
+      {
+        "MALE" => "M",
+        "FEMALE" => "F",
+        "OTHER" => "NS",
+        "UNKNOWN" => "NK",
+        "NOTKNOWN" => "NK",
+        "AMBIGUOUS" => "NS",
+        "NOT APPLICABLE" => "NS"
+      }.freeze
+    end
   end
 
   def self.config

data/lib/renalware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renalware
-  VERSION = "2.0.120"
+  VERSION = "2.0.121"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.120
+  version: 2.0.121
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2019-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview-component