ruby-hl7-extensions 0.0.59 → 0.0.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8172ad8eba6d86658a5b5b0038a36d1214d9d2e0
-  data.tar.gz: 3c084a94d17bc158167e6b895a53b7780bc28e7d
+  metadata.gz: b91e92c7db8ae5a0a365bf7ed7a99d808dc856e9
+  data.tar.gz: b2ed8813fbcb261897b15d73eafb58c7c75c8178
 SHA512:
-  metadata.gz: 63bc73abd4cefef0dd37a59e38eeb4a772d43a8ed7e4e6efa0e6985dc4427f0fa9e8247d29c8f2fb912a42f1e60dc72f34e581760c043f54308776288d8eca66
-  data.tar.gz: 1b4732e229729fd2f0fbc55c714020c5331a42307a39d78b9b79d09c9657829e1ab40105ae06f50d0e9800f85b2b7607a1b0d3c5183ee23a517e359e769e3924
+  metadata.gz: 2b88bd45f6708fcd25b0133ed93163485ba68b8b9591822c83ced77ed2d2f3f68a5487e8b270c4c4dd86755cf2535f2b3899cbb759bf93c707913c804ccb6507
+  data.tar.gz: 77d07bf000dede8518feea10223cc8689ef99efcdefc6e1fc9ce5baf768e8483e20e5fe6f3de6c91aed5aeeec20a09fc73018b9335530a29b859a7dae1a0fbe5

data/VERSION

@@ -1 +1 @@
-0.0.59
+0.0.60

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 59
+:patch: 60

data/lib/core_ext/message.rb

@@ -11,6 +11,14 @@ module Extensions
       module InstanceMethods
         def providers
           providers = []
+
+          if self[:ORC]
+            orcs = self[:ORC].is_a?(Array) ? self[:ORC] : [self[:ORC]]
+            orcs.each do |orc|
+              providers << {hash: orc.ordering_provider_hash, segment: orc}
+            end
+          end
+
         
           if self[:OBR]
             obrs = self[:OBR].is_a?(Array) ? self[:OBR] : [self[:OBR]]
@@ -21,12 +29,20 @@ module Extensions
         
           if self[:PV1]
             pv1 = self[:PV1]
-            providers << {hash: pv1.admitting_provider_hash, segment: self[:PV1]}
-            providers << {hash: pv1.attending_provider_hash, segment: self[:PV1]}
-            providers << {hash: pv1.consulting_provider_hash, segment: self[:PV1]}
-            providers << {hash: pv1.referring_provider_hash, segment: self[:PV1]}
+            providers << {hash: pv1.provider_hash("admitting","AD"), segment: self[:PV1]}
+            providers << {hash: pv1.provider_hash("attending","AT"), segment: self[:PV1]}
+            providers << {hash: pv1.provider_hash("consulting","CP"), segment: self[:PV1]}
+            providers << {hash: pv1.provider_hash("referring","RP"), segment: self[:PV1]}
           end
         
+          if self[:ROL]
+            roles = self[:ROL]
+            roles = [self[:ROL]] unless self[:ROL].is_a?Array
+            roles.each do |rol| 
+              providers << {hash: rol.person_hash, segment: rol}
+            end
+          end 
+            
           providers
         end
         
@@ -52,7 +68,7 @@ module Extensions
         end
 
         def patient_dob
-          Date.parse(hash["message"]["content"]["PID"]["dateTimeBirth"]).strftime("%B %d, %Y")
+          Date.parse(hash["message"]["content"]["PID"]["patientDob"]).strftime("%B %d, %Y")
         end
 
         def patient_mrn
@@ -89,6 +105,10 @@ module Extensions
           to_hash
         end
         
+        def segments_for(key)
+          self.select {|segment| segment.segment_name == key}
+        end
+        
         def to_hash
           begin
             return @hash unless @hash.blank?

data/lib/core_ext/segment.rb

@@ -32,9 +32,28 @@ module Extensions
         def handle_element(key)
           self.send(key)
         end
+        
+        def value_for_field(key)
+          index = key.split(".").first.to_i
+          index, subindex = key.split(".").collect {|i|i.to_i}
+          field = self.class.field(index)
+          if field
+            if subindex.blank?
+              return self.send(field[0].to_s)
+            else
+              return self.send(field[0].to_s).split(self.item_delim)[subindex-1]
+            end
+          end
+        end
       end
       
       module ClassMethods
+        def field(index)
+          fields.each do |field|
+            return field if field[1][:idx] == index
+          end
+        end
+        
         def from_hash(type, hash)
           clazz = eval("::HL7::Message::Segment::#{type}")
           instance = clazz.new

data/lib/core_ext/segments/orc.rb

@@ -9,6 +9,10 @@ module Extensions
         end
 
         module InstanceMethods
+          def ordering_provider_hash
+            to_hash["orderingProvider"]
+          end
+          
           def obr_list
             a = to_hash["OBR"]["array"].collect {|obr| ::HL7::Message::Segment.from_hash("OBR", obr)}
             a.to_enum(:each)            

data/lib/core_ext/segments/pid.rb

@@ -25,37 +25,20 @@ module Extensions
             patientAccountNumber = self.account_number.split("^") rescue Array.new(10) {|i| "" }
             internalId = self.patient_id_list.split("^") rescue Array.new(10) {|i| "" }
 
-            @hash = {"setId" => self.set_id,
-                     "externalId" => self.patient_id, 
-                     "internalId" => {"id" => internalId[0], "check_digit" => internalId[1], "check_digit_scheme" => internalId[2], 
-                                      "assigning_authority" => internalId[3], "type" => internalId[4], "assigning_facility" => internalId[5]}, 
-                     "alternateId" => self.alt_patient_id, 
-                     "patientName" => {"lastName" => patient_name[0], "firstName" => patient_name[1], "middleInitOrName"=> patient_name[2]}, 
-                     "mothersMaidenName" => self.mother_maiden_name, 
-                     "dateTimeBirth" => self.patient_dob, 
-                     "sex" => self.admin_sex, 
-                     "alias" => self.patient_alias, 
-                     "race" => self.race, 
-                     "address"=>{"streetAddress"=>address[0], "otherDesignation"=>address[1], "city"=>address[2], "state"=>address[3], "postalCode"=>address[4], "country"=>address[5], "addressType"=>address[6]}, 
-                     "countyCode"=> self.country_code, 
-                     "phoneNumbers"=>{"home"=>self.phone_home, "business"=>self.phone_business}, 
-                     "homePhone"=>{"number" => "","useCode" => "", "equipmentType" => "", "email" => "", "countryCode" => "", "areaCode" => "", "phoneNumber" => ""},
-                     "primaryLanguage"=>self.primary_language, 
-                     "maritalStatus"=>self.marital_status, 
-                     "religion"=>self.religion, 
-                     "patientAccountNumber"=>{"id"=>patientAccountNumber[0], "checkDigit"=>patientAccountNumber[1], "codeIdCheck"=>patientAccountNumber[2], "assigningAuth"=>patientAccountNumber[3], "idTypeCode"=>patientAccountNumber[4], "assigningFacility"=>patientAccountNumber[5]},
-                     "ssn"=>self.social_security_num, 
-                     "driversLicenseNumber"=>self.driver_license_num, 
-                     "mothersId"=>self.mothers_id, 
-                     "ethnicGroup"=>self.ethnic_group, 
-                     "birthPlace"=>self.birthplace, 
-                     "multipleBirthIndicator"=>self.multi_birth, 
-                     "birthOrder"=>self.birth_order, 
-                     "citizenship"=>self.citizenship, 
-                     "veteranStatus"=>self.vet_status, 
-                     "nationality"=>self.nationality, 
-                     "deathDateTime"=>self.death_date, 
-                     "deathIndicator"=>self.death_indicator}
+            @hash = super.to_hash
+
+            @hash["internalId"] = {"id" => internalId[0], "check_digit" => internalId[1], "check_digit_scheme" => internalId[2],
+                                   "assigning_authority" => internalId[3], "type" => internalId[4], "assigning_facility" => internalId[5]}
+
+            @hash["patientName"] = {"lastName" => patient_name[0], "firstName" => patient_name[1], "middleInitOrName"=> patient_name[2]}
+
+            @hash["address"] = {"streetAddress"=>address[0], "otherDesignation"=>address[1], "city"=>address[2], "state"=>address[3], "postalCode"=>address[4], "country"=>address[5], "addressType"=>address[6]}
+
+            @hash["phoneNumbers"] = {"home"=>self.phone_home, "business"=>self.phone_business}
+
+            @hash["patientAccountNumber"] = {"id"=>patientAccountNumber[0], "checkDigit"=>patientAccountNumber[1], "codeIdCheck"=>patientAccountNumber[2], "assigningAuth"=>patientAccountNumber[3], "idTypeCode"=>patientAccountNumber[4], "assigningFacility"=>patientAccountNumber[5]}
+
+            @hash
           end
         end
         

data/lib/core_ext/segments/pv1.rb

@@ -14,20 +14,12 @@ module Extensions
             to_hash["visit"]["id"]
           end
           
-          def admitting_provider_hash
-            to_hash["admittingProvider"].merge("providerType" => "AD")
-          end
-          
-          def attending_provider_hash
-            to_hash["attendingProvider"].merge("providerType" => "AT")
-          end
-          
-          def consulting_provider_hash
-            {"id" => to_hash["consultingDoctor"], "providerType" => "CP"}
-          end
-          
-          def referring_provider_hash
-            {"id" => to_hash["referringDoctor"], "providerType" => "RP"}
+          def provider_hash(provider_type, provider_code)
+            if to_hash["#{provider_type}Provider"]
+              to_hash["#{provider_type}Provider"].merge("providerType" => provider_code)
+            else
+              {}
+            end
           end
           
           def to_hash
@@ -85,6 +77,45 @@ module Extensions
                                            "assigningFacility" => admittingProvider[13]}
             end
             
+            if self.hash["referringDoctor"].blank?
+              hash["referringProvider"] = {}
+            else
+              referringProvider = self.hash["referringDoctor"].split("^") rescue Array.new(20) {|i|""}
+              hash["referringProvider"] = {"id" => referringProvider[0],
+                                           "lastName" => referringProvider[1],
+                                           "firstName" => referringProvider[2],
+                                           "middleInitOrName" => referringProvider[3],
+                                           "suffix" => referringProvider[4],
+                                           "prefix" => referringProvider[5],
+                                           "degree" => referringProvider[6],
+                                           "sourceTable" => referringProvider[7],
+                                           "assigningAuthority" => referringProvider[8],
+                                           "nameTypeCode" => referringProvider[9],
+                                           "identifierCheckDigit" => referringProvider[10],
+                                           "codeIdCheck" => referringProvider[11],
+                                           "identifierTypeCode" => referringProvider[12],
+                                           "assigningFacility" => referringProvider[13]}
+            end
+            
+            if self.hash["consultingDoctor"].blank?
+              hash["consultingProvider"] = {}
+            else
+              consultingProvider = self.hash["consultingDoctor"].split("^") rescue Array.new(20) {|i|""}
+              hash["consultingProvider"] = {"id" => consultingProvider[0],
+                                           "lastName" => consultingProvider[1],
+                                           "firstName" => consultingProvider[2],
+                                           "middleInitOrName" => consultingProvider[3],
+                                           "suffix" => consultingProvider[4],
+                                           "prefix" => consultingProvider[5],
+                                           "degree" => consultingProvider[6],
+                                           "sourceTable" => consultingProvider[7],
+                                           "assigningAuthority" => consultingProvider[8],
+                                           "nameTypeCode" => consultingProvider[9],
+                                           "identifierCheckDigit" => consultingProvider[10],
+                                           "codeIdCheck" => consultingProvider[11],
+                                           "identifierTypeCode" => consultingProvider[12],
+                                           "assigningFacility" => consultingProvider[13]}
+            end
             visitNumber = self.hash["visitNumber"].split("^") rescue Array.new(20) {|i|""}
             hash["visit"] = {"id" => visitNumber[0],
                              "checkDigit" => visitNumber[1],
@@ -92,8 +123,7 @@ module Extensions
                              "assigningAuthority" => visitNumber[3],
                              "idTypeCode" => visitNumber[4]}
 
-            
-            hash
+            @hash = hash
           end
         end
         

data/lib/core_ext/segments/rol.rb

@@ -0,0 +1,41 @@
+require 'ruby-hl7'
+class HL7::Message::Segment::ROL < HL7::Message::Segment
+  weight 4
+  add_field :role_instance_id
+  add_field :action_code
+  add_field :role
+  add_field :role_person
+  add_field :role_begin_date do |value|
+    convert_to_ts(value)
+  end
+  add_field :role_end_date do |value|
+    convert_to_ts(value)
+  end
+  add_field :role_duration
+  add_field :role_action_reason
+  add_field :provider_type
+  add_field :organization_unit_type
+  add_field :provider_info
+  add_field :phone
+  
+  def person_hash
+    person = self.role_person.split(self.item_delim) rescue Array.new(20) {|i|""}
+    
+    {"id" => person[0],
+     "lastName" => person[1],
+     "firstName" => person[2],
+     "middleInitOrName" => person[3],
+     "suffix" => person[4],
+     "prefix" => person[5],
+     "degree" => person[6],
+     "sourceTable" => person[7],
+     "assigningAuthority" => person[8],
+     "nameTypeCode" => person[9],
+     "identifierCheckDigit" => person[10],
+     "codeIdCheck" => person[11],
+     "identifierTypeCode" => person[12],
+     "assigningFacility" => person[13],
+     "providerType" => self.role}
+  end
+  
+end

data/lib/core_ext/segments/segments.rb

@@ -15,3 +15,5 @@ segments.each do |segment_name|
   end")
 
 end
+
+require 'core_ext/segments/rol'

data/ruby-hl7-extensions.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-hl7-extensions"
-  s.version = "0.0.59"
+  s.version = "0.0.60"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.email = "ruby-hl7-json@googlegroups.com"
   s.extra_rdoc_files = ["LICENSE", "README.md"]
   s.files = [".gitignore", "Gemfile", "Gemfile.lock", "LICENSE", "README.md", "Rakefile", "VERSION", "VERSION.yml", 
-             "lib/core_ext/values/msh.rb",
+             "lib/core_ext/values/msh.rb","lib/core_ext/segments/rol.rb",
              "lib/core_ext/message.rb", "lib/core_ext/segment.rb", 
              "lib/core_ext/segments/msh.rb", "lib/core_ext/segments/nk1.rb", "lib/core_ext/segments/orc.rb", "lib/core_ext/segments/nte.rb", "lib/core_ext/segments/obr.rb", "lib/core_ext/segments/obx.rb", "lib/core_ext/segments/pid.rb", "lib/core_ext/segments/pv1.rb", "lib/core_ext/segments/segments.rb",
              "lib/ruby-hl7-extensions.rb", "ruby-hl7-extensions.gemspec"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-hl7-extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.59
+  version: 0.0.60
 platform: ruby
 authors:
 - Nick Lega
@@ -64,6 +64,7 @@ files:
 - lib/core_ext/segments/orc.rb
 - lib/core_ext/segments/pid.rb
 - lib/core_ext/segments/pv1.rb
+- lib/core_ext/segments/rol.rb
 - lib/core_ext/segments/segments.rb
 - lib/core_ext/values/msh.rb
 - lib/ruby-hl7-extensions.rb
@@ -93,3 +94,4 @@ signing_key:
 specification_version: 3
 summary: Ruby HL7 Library w/Extensions
 test_files: []
+has_rdoc: