ruby_astm 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f3ba60a24419e04369920eb8f6ee0a465c9962b989bd6e17ae19eef14541d2d
-  data.tar.gz: 8d27244ac7b92f552733aad743ebb9777eea930f0c0f0b44dc08ba2b4aa7d9de
+  metadata.gz: e495bbce6cc215d7c08b9747276962a59e1f43bddb206b3383d709962472d140
+  data.tar.gz: 1b076d1c574bafae7b91fa976505cf0d23ec41cf9cc00eda5f3c899ecbc0da4f
 SHA512:
-  metadata.gz: 843087dedee93ba8361371dcfbdca936c8f8b3de4085cca8f438330c4d7e903430895abd8f414daee1fef053ac3c6c690119740dfd09b4421799d8e019b541a2
-  data.tar.gz: 4a24373742aed3f8df00ec5c68c7eb8298bf4b76fa88eacb895cd3a355998d85cbcb995c9e1fbd30b9efaee2031048ee9d2c79ea16f5eabf6c42ff11740f2dcf
+  metadata.gz: 8dd76d5568de871b42efbb96c3f79d82c70d43933184bc442906e965fd18fb571a024e210bf7e2952617c959efcf47027c00f284813069e276d409387b7d2415
+  data.tar.gz: 42e1a222ebbd3e6a215d7de88164155b833565a1c418266a5735c4026352dc29f3bfbf99c127fc861ad04ccb56813b5f9f5a43489e13291da42ae83b37777c38

data/lib/mappings.json

@@ -175,6 +175,11 @@
 		"TUBE" : "SERUM",
 		"REPORT_NAME" : "Direct Bilirubin"
 	},
+	"CA" : {
+		"LIS_CODE" : "CA",
+		"TUBE" : "SERUM",
+		"REPORT_NAME" : "Serum Calcium"
+	},
 	"BIT" : {
 		"LIS_CODE" : "BIT",
 		"TUBE" : "SERUM",

data/lib/publisher/poller.rb

@@ -167,8 +167,13 @@ class Poller
 	        puts "tube is : #{tube}"
 	        puts "tests hash is:"
 	        puts tests_hash.to_s
-	        tube_key = tests_hash.keys.select{|c| c=~/#{tube}/ }[0] 
-	        tests_hash[tube_key] << machine_code   
+
+	        tube_key = nil
+	        unless tests_hash.keys.select{|c| c=~/#{tube}/ }.blank?
+	        	tube_key = tests_hash.keys.select{|c| c=~/#{tube}/ }[0] 
+	        	tests_hash[tube_key] << machine_code 
+	        end   
+
 	      else
 	        AstmServer.log("ERROR: Test: #{test} does not have an LIS code")
 	      end 

data/lib/ruby_astm.rb

@@ -1,3 +1,4 @@
+require "ruby_astm/usb_module"
 require "ruby_astm/query"
 require "ruby_astm/frame"
 require "ruby_astm/header"

data/lib/ruby_astm/astm_server.rb

@@ -8,6 +8,7 @@ require "redis"
 class AstmServer
 
 	include LabInterface
+	include UsbModule
 
 	def self.log(message)
 		puts "" + message
@@ -28,27 +29,40 @@ class AstmServer
 	$record_end = "[13]"
 	$frame_end = "[10]"
 
-	def initialize(server_ip=nil,server_port=nil,mpg=nil,respond_to_queries=false)
+
+	## DEFAULT SERIAL PORT : /dev/ttyS0
+	## DEFAULT USB PORT : /dev/ttyUSB0
+	def initialize(server_ip=nil,server_port=nil,mpg=nil,respond_to_queries=false,serial_port='/dev/ttyS0',usb_port='/dev/ttyUSB0',serial_baud=9600,serial_parity=8,usb_baud=19200,usb_parity=8)
 		$redis = Redis.new
 		AstmServer.log("Initializing AstmServer")
 		self.server_ip = server_ip || "127.0.0.1"
 		self.server_port = server_port || 3000
 		self.respond_to_queries = respond_to_queries
+		self.serial_port = serial_port
+		self.serial_baud = serial_baud
+		self.serial_parity = serial_parity
+		self.usb_port = usb_port
+		self.usb_baud = usb_baud
+		self.usb_parity = usb_parity
 		$mappings = JSON.parse(IO.read(mpg || AstmServer.default_mappings))
 	end
 
 	def start_server
 		EventMachine.run {
-			serial = EventMachine.open_serial('/dev/ttyS0', 9600, 8,LabInterface)
-			puts "RUNNING SERIAL ON dev/ttyS0 ------------ #{serial.to_s}"
+			serial = EventMachine.open_serial(serial_port, serial_baud, serial_parity,LabInterface)
+			puts "RUNNING SERIAL ON #{serial_port} ------------ #{serial.to_s}"
 			self.ethernet_server = EventMachine::start_server self.server_ip, self.server_port, LabInterface
 			AstmServer.log("Running ETHERNET SERVER on #{server_port}")
-			#serial = EventMachine.open_serial('/dev/ttyUSB0', 9600, 8)
-			#serial.on_data do |data|
-			#  	puts "got some data"
-			#  	puts data.to_s
-			#    serial.send_data("\X06")
-			#end
+			usb = EventMachine.open_serial(usb_port,usb_baud,usb_parity)
+			self.usb_response_bytes = []
+			EM.add_periodic_timer(5) do
+				puts "running usb on #{usb_port}"
+				puts "sending machine data request #{request_results}"
+			   usb.send_data(request_results)
+			end
+			usb.on_data do |data|
+				parse_usb_response(data)
+			end
 		}
 	end	
 

data/lib/ruby_astm/lab_interface.rb

@@ -11,11 +11,19 @@ module LabInterface
   EOT = "\x04"
 
 
-
-  mattr_accessor :headers
   mattr_accessor :ethernet_server
   mattr_accessor :server_ip
   mattr_accessor :server_port
+  mattr_accessor :serial_port
+  mattr_accessor :serial_baud
+  mattr_accessor :serial_parity
+  mattr_accessor :usb_port
+  mattr_accessor :usb_baud
+  mattr_accessor :usb_parity
+
+
+
+  mattr_accessor :headers
   mattr_accessor :mapping
   mattr_accessor :respond_to_queries
 
@@ -83,7 +91,9 @@ module LabInterface
 
 	def receive_data(data)
       
-    #begin
+
+    begin
+
 
       self.data_buffer ||= ''
 
@@ -179,11 +189,13 @@ 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

data/lib/ruby_astm/result.rb

@@ -10,46 +10,60 @@ class Result
 
 	def set_name(args)
 		if line = args[:line]
-			puts line.to_s
-			puts line.fields[2].to_s
-			line.fields[2].scan(/\^+(?<name>[A-Za-z0-9\%\#\-\_\?\/]+)\^?(?<dilution>\d+)?/) { |name,dilution|  
-				
-				self.name = lookup_mapping(name)
-				
-				self.report_name = lookup_report_name(name)
 
-			}
+			unless line.fields[2].blank?
+				line.fields[2].scan(/\^+(?<name>[A-Za-z0-9\%\#\-\_\?\/]+)\^?(?<dilution>\d+)?/) { |name,dilution|  
+					
+					self.name = lookup_mapping(name)
+					
+					self.report_name = lookup_report_name(name)
 
-			self.name.scan(/(?<test_name>\d+)\/(?<dilution>\d+)\/(?<pre_dilution>[a-zA-Z0-9]+)/) { |test_name,dilution,pre_dilution|
+				}
+			end
 
-				self.name = lookup_mapping(test_name)
+			unless self.name.blank?
+				self.name.scan(/(?<test_name>\d+)\/(?<dilution>\d+)\/(?<pre_dilution>[a-zA-Z0-9]+)/) { |test_name,dilution,pre_dilution|
 
-				self.report_name = lookup_report_name(test_name)
+					self.name = lookup_mapping(test_name)
 
-				self.dilution = dilution
+					self.report_name = lookup_report_name(test_name)
+
+					self.dilution = dilution
+
+				}
+			end
 
-			}
 
 		end
 	end
 
 	def set_value(args)
 		if line = args[:line]
-			self.value = line.fields[3].strip
-			self.value.scan(/(?<flag>\d+)\^(?<value>\d?\.?\d+)/) {|flag,value|
-				self.value = value
-			}
-			line.fields[2].scan(/\^+(?<name>[A-Za-z0-9\%\#\-\_\?\/]+)\^?(?<dilution>\d+)?/) { |name,dilution|  
-				if transform_expression = lookup_transform(name)
-					self.value = eval(transform_expression)
-				end
-			}
+
+			unless line.fields[3].blank?
+				self.value = line.fields[3].strip
+				self.value.scan(/(?<flag>\d+)\^(?<value>\d?\.?\d+)/) {|flag,value|
+					self.value = value
+				}
+			end
+			unless line.fields[2].blank?
+				line.fields[2].scan(/\^+(?<name>[A-Za-z0-9\%\#\-\_\?\/]+)\^?(?<dilution>\d+)?/) { |name,dilution|  
+					if transform_expression = lookup_transform(name)
+						self.value = eval(transform_expression)
+					end
+				}
+			end
+
 		end
 	end
 
 	def set_flags(args)
 		if line = args[:line]
-			self.flags = line.fields[6].strip
+
+			unless line.fields[6].blank?
+				self.flags = line.fields[6].strip
+			end
+
 		end 
 	end	
 
@@ -69,15 +83,23 @@ class Result
 
 	def set_reference_ranges(args)
 		if line = args[:line]
-			self.reference_ranges = line.fields[5].strip
+
+			unless line.fields[5].blank?
+				self.reference_ranges = line.fields[5].strip
+			end
+
 		end
 	end
 
 	def set_dilution(args)
 		if line = args[:line]
-			line.fields[2].scan(/\^+(?<name>[A-Za-z0-9\%\#\-\_\?\/]+)\^?(?<dilution>\d+)?/) { |name,dilution|  
-				self.dilution = dilution unless self.dilution
-			}
+
+			unless line.fields[2].blank?
+				line.fields[2].scan(/\^+(?<name>[A-Za-z0-9\%\#\-\_\?\/]+)\^?(?<dilution>\d+)?/) { |name,dilution|  
+					self.dilution = dilution unless self.dilution
+				}
+			end
+
 		end
 	end
 
@@ -114,6 +136,7 @@ class Result
 			super
 		end
 =end
+
 	end
 
 	## @return[String] the name defined in the mappings.json file, or the name that wqs passed in.

data/lib/ruby_astm/usb_module.rb

@@ -0,0 +1,75 @@
+require "active_support/all"
+
+module UsbModule
+
+	mattr_accessor :usb_response_bytes
+
+	def begin_patient_results
+		">00A00013"
+	end
+
+	def request_version
+		">00000080\r00"
+	end
+
+	def request_status
+		">00000082\r00"
+	end
+
+	## requests the last 5 tests performed.
+	## last two digits before the carriage return are 00
+	## if digits are 01 : will take the 5 penultimate tests
+	## if digits are 13 : will take the first 5 tests from memory.
+	def request_results
+		">0002009300\r00"
+	end
+
+	def interpret?
+		## if the third last is a carriage return, then interpret.l
+
+		self.usb_response_bytes[-3] == 13
+	end	
+
+	def parse_usb_response(string_data)
+		string_data.bytes.to_a.each do |byte|
+			self.usb_response_bytes.push(byte)
+		end
+		#puts "self usb response bytes:"
+		#puts self.usb_response_bytes.to_s
+		if interpret?
+			#puts "interpret"
+			self.usb_response_bytes[13..-4].each_slice(32) do |patient_record|
+				bar_code = nil
+				bar_code = patient_record[11..23].pack('c*').gsub(/\./,'')
+				#puts "bar code: #{bar_code}"
+				unless bar_code.strip.blank?
+					esr = patient_record[26]
+					patient = Patient.new(:orders => [Order.new(:results => [Result.new(:value => esr, :name => "ESR", :report_name => "ESR")])])
+					patient = Patient.new({})
+					patient.patient_id = bar_code
+					patient.orders = []
+					order = Order.new({})
+					result = Result.new({})
+					result.value = esr.to_s
+					result.name = "ESR"
+					result.report_name = "ESR"
+					order.id = bar_code
+					order.results = []
+					order.results << result
+					patient.orders << order
+					#puts patient.orders.size
+					#puts patient.orders.first.results.size
+					#puts patient.orders.first.results.first.to_s
+					#puts "patient to json is:"
+					puts patient.to_json
+					$redis.lpush("patients",patient.to_json)
+				end 
+			end
+			self.usb_response_bytes = []	
+		else
+			#puts "dont interpret"		
+		end
+
+	end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_astm
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Bhargav Raut
@@ -133,6 +133,7 @@ files:
 - lib/ruby_astm/patient.rb
 - lib/ruby_astm/query.rb
 - lib/ruby_astm/result.rb
+- lib/ruby_astm/usb_module.rb
 homepage: https://www.github/com/wordjelly/ruby_astm
 licenses:
 - MIT