ruby_astm 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c86edc30a8aa2f89b804e0dbb28d2727d63b15cc5dd0e113bf04df2f9fcc769
-  data.tar.gz: 8ce45624e70cf7b8c1338f8b21eadbef19ac44781f16f46dabb0f27dc7960901
+  metadata.gz: 4f3ba60a24419e04369920eb8f6ee0a465c9962b989bd6e17ae19eef14541d2d
+  data.tar.gz: 8d27244ac7b92f552733aad743ebb9777eea930f0c0f0b44dc08ba2b4aa7d9de
 SHA512:
-  metadata.gz: 7c35e684f3affb40bbe3d2178f6585d1a199b7d7325bebffbe3c5af4087fab9ec86bd694658fe7aed242fbb39d97334efa1a482cae7b3ac06ae2804e7520b835
-  data.tar.gz: f163dd00c01a3dd5b793ec1625b6f3ce323e27b52c7a08efb9c9d9ce50c07e7508249603791be5906da3cac43b023bf47561f1507f2f55f12aaf203d3dc3ae14
+  metadata.gz: 843087dedee93ba8361371dcfbdca936c8f8b3de4085cca8f438330c4d7e903430895abd8f414daee1fef053ac3c6c690119740dfd09b4421799d8e019b541a2
+  data.tar.gz: 4a24373742aed3f8df00ec5c68c7eb8298bf4b76fa88eacb895cd3a355998d85cbcb995c9e1fbd30b9efaee2031048ee9d2c79ea16f5eabf6c42ff11740f2dcf

data/lib/mappings.json

@@ -1,5 +1,9 @@
 {
 	"_comment" : "key -> code sent by analyzer, eg sysmex sends WBC count under the code 'WBC'. value -> object. Object structure: 'LIS_CODE': in the google lab interface, this code is present in two places on google drive. one) in the name of the file, two) inside the file, where the test result value should be added. For eg in the hemogram report, TLCparam, is present in the name of the file, as well as inside the file, so the google script will update it with the relevant value. 'TUBE' stands for the type of tube in which this test has to be performed. This should match the constants in the Google Lab Interface.rb file. Now there is another problem that we have to deal with here. When going bidirectional, in some machines like Roche Cobas e411, the test codes come in as numbers, and not letters, so the keys here in this file are numbers, for those tests. Because Roche is a bitch basically.",
+	"A1c" : {
+        "LIS_CODE" : "HBA1C",
+        "REPORT_NAME" : "Glycosylated Hemoglobin"
+    },
 	"WBC" : 
 	{
 		"LIS_CODE" : "TLCparam",
@@ -176,6 +180,11 @@
 		"TUBE" : "SERUM",
 		"REPORT_NAME" : "Total Bilirubin"
 	},
+	"INBIL" : {
+		"LIS_CODE" : "BII",
+		"TUBE" : "SERUM",
+		"REPORT_NAME" : "Indirect Bilirubin"
+	},
 	"ALPU" : {
 		"LIS_CODE" : "ALPU",
 		"TUBE" : "SERUM",

data/lib/ruby_astm/astm_server.rb

@@ -52,4 +52,6 @@ class AstmServer
 		}
 	end	
 
-end
+end
+
+#sudham61@gmail.com

data/lib/ruby_astm/lab_interface.rb

@@ -83,7 +83,7 @@ module LabInterface
 
 	def receive_data(data)
       
-    begin
+    #begin
 
       self.data_buffer ||= ''
 
@@ -158,8 +158,12 @@ module LabInterface
         else
           puts "NO HEADERS PRESENT --- "
         end
+      elsif data.bytes.to_a[0] == 255
+        puts  " ----------- got 255 data -----------, not sending anything back. "
       else
-        puts self.data_buffer.gsub(/\r/,'\n').to_s
+        unless self.data_buffer.blank?
+          puts self.data_buffer.gsub(/\r/,'\n').to_s
+        end
         ## send the header 
         #puts "--------- SENT ACK -----------"
         if self.data_buffer =~ /MSH\|/
@@ -175,11 +179,11 @@ module LabInterface
           send_data(ACK)
         end
       end
-    rescue => e
-      self.headers = []
-      AstmServer.log("data was: " + self.data_buffer + "error is:" + e.backtrace.to_s)
-      send_data(EOT)
-    end
+    #rescue => e
+    #  self.headers = []
+    #  AstmServer.log("data was: " + self.data_buffer + "error is:" + e.backtrace.to_s)
+    #  send_data(EOT)
+    #end
   end
 
   def send_enq
@@ -202,14 +206,20 @@ module LabInterface
         self.headers ||= []
         self.headers << hl7_header
       when "Hl7_Observation"
-        hl7_observation = Hl7Observation.new({:line => line})
-        self.headers[-1].patients[-1].orders[-1].results[hl7_observation.name] = hl7_observation
+        unless self.headers[-1].patients.blank?
+          unless self.headers[-1].patients[-1].orders[-1].blank?
+            hl7_observation = Hl7Observation.new({:line => line})
+            self.headers[-1].patients[-1].orders[-1].results[hl7_observation.name] ||= hl7_observation
+          end
+        end
       when "Hl7_Patient"
         hl7_patient = Hl7Patient.new({:line => line})
         self.headers[-1].patients << hl7_patient
       when "Hl7_Order"
-        hl7_order = Hl7Order.new({:line => line, :patient_id => self.headers[-1].patients[-1].patient_id})
-        self.headers[-1].patients[-1].orders << hl7_order
+        unless self.headers[-1].patients.blank?
+          hl7_order = Hl7Order.new({:line => line, :patient_id => self.headers[-1].patients[-1].patient_id})
+          self.headers[-1].patients[-1].orders << hl7_order
+        end
       when "Header"
         puts "got header"
         header = Header.new({:line => line})
@@ -228,7 +238,7 @@ module LabInterface
         self.headers[-1].patients[-1].orders << order
       when "Result"
         result = Result.new({:line => line})
-        self.headers[-1].patients[-1].orders[-1].results[result.name] = result
+        self.headers[-1].patients[-1].orders[-1].results[result.name] ||= result
       when "Terminator"
         ## it didn't terminate so there was no commit being called.
         puts "got terminator."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_astm
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Bhargav Raut