ruby_astm 1.4.7 → 1.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e92b2e6071300c63a2c9cf237c68daf4e139a8806e451382eb3ad84b5ff7143
-  data.tar.gz: '08e321353b2f109d2994ab9f6e12720f564e4cff195b95fae4a6cc4b69145f1b'
+  metadata.gz: 6abc78dc8d0ed2abe9b877e3727155c0aacfe008b40f8e68678f8953c41b3230
+  data.tar.gz: 2c477c41fb604d712da07752e0468bd6468a51ca0ca3e86c24985a99a5003b1d
 SHA512:
-  metadata.gz: 8a41a9637d497c4135adc2f846b45cfaefaa0b878259380c81440c7a32b6fcc098c7f2cfd99e0269d995cc6540f2d7760dcb66e4106af81a0690c58a5f1b382b
-  data.tar.gz: a743e98d90ed2a7c022ac75a8a64c42987f717e61e679a3ba5ed5cdaf4a70a16231544dcfdd34bb7e4a5920bfa6ab98250dabbab508577d2a34f8dc47bf1401f
+  metadata.gz: c1c5b8d38e039fb84feee8ce501a5fc648ffe7fd79aa088f4018c4dd18c60d6611ba75deac6652b3d558778adf02f827aee3a716e4000e19b762b7459a943385
+  data.tar.gz: 49e0c42b89413aabb1d40ca9a5b2e8ccdedd34ad3a3919a4de6de827f7b33237ab329d96d88679b00850be09f16b6f05be85d9059b4057bc863d431821d8ac40

data/lib/publisher/google_lab_interface.rb

@@ -59,6 +59,9 @@ class Google_Lab_Interface < Poller
     AstmServer.log("Initialized Google Lab Interface")
     $service = Google::Apis::ScriptV1::ScriptService.new
     $service.client_options.application_name = APPLICATION_NAME
+    $service.client_options.send_timeout_sec = 1200
+    $service.client_options.open_timeout_sec = 1200
+    $service.request_options.retries = 3
     $service.authorization = authorize
   end
 
@@ -74,12 +77,16 @@ class Google_Lab_Interface < Poller
       :input => JSON.generate([epoch])
     }
 
+
+
     request = Google::Apis::ScriptV1::ExecutionRequest.new(
       function: 'get_latest_test_information',
       parameters: pp
     )
 
-    begin 
+    puts "params are: #{pp}"
+
+    #begin 
       resp = $service.run_script(self.script_id, request)
       if resp.error
         AstmServer.log("Response Error polling LIS for requisitions: #{resp.error.message}: #{resp.error.code}")
@@ -87,13 +94,13 @@ class Google_Lab_Interface < Poller
         process_LIS_response(resp.response["result"])
         AstmServer.log("Successfully polled lis for requisitions: #{resp.response}")
       end
-    rescue => e
-      AstmServer.log("Rescue Error polling LIS for requisitions: #{e.to_s}")
-      AstmServer.log("Error backtrace")
-      AstmServer.log(e.backtrace.to_s)
-    ensure
+    #rescue => e
+      #AstmServer.log("Rescue Error polling LIS for requisitions: #{e.to_s}")
+      #AstmServer.log("Error backtrace")
+      #AstmServer.log(e.backtrace.to_s)
+    #ensure
       
-    end
+    #end
 
   end
 

data/lib/publisher/poller.rb

@@ -253,7 +253,24 @@ class Poller
 	def get_checkpoint
 		latest_two_entries = $redis.zrange Poller::REQUISITIONS_SORTED_SET, -2, -1, {withscores: true}
 		unless latest_two_entries.blank?
-    		latest_two_entries[-1][1].to_i
+    		last_entry = latest_two_entries[-1][1].to_i
+    		#one_year_back = Time.now - 1.year
+    		#one_year_back = one_year_back.to_i
+    		#time_now = Time.now.to_i
+    		#puts "diff is: #{time_now*1000 - one_year_back*1000}"
+    		#puts "one year back is "
+    		#puts "last entry is: #{last_entry}"
+    		#puts "last entry - Time.now is :#{Time.now.to_i*1000 - last_entry}"
+    		#puts "default checkpoint is :#{default_checkpoint}"
+    		#last_entry
+    		#default_checkpoint
+    		if (((Time.now.to_i)*1000) - last_entry) >= 86400*1000
+    			puts "diff is too great"
+    			default_checkpoint
+    		else
+    			puts "taking the last entry"
+    			last_entry
+    		end 
     	else
     		default_checkpoint
 		end

data/lib/ruby_astm/lab_interface.rb

@@ -78,6 +78,17 @@ module LabInterface
       File.dirname __dir__
   end
 
+
+  def process_byte_file(full_file_path)
+    bytes = eval(IO.read(full_file_path))
+    bytes = bytes.flatten
+    text = pre_process_bytes(bytes,"")
+    text.each_line do |line|
+      line.split('\\r').each do |txt| 
+        process_text(txt)
+      end
+    end
+  end
   ## can process a file which contains ASTM output.
   ## this method is added so that you can load previously generated ASTM output into your database
   ## it also simplifies testing.
@@ -209,76 +220,7 @@ module LabInterface
 
   end
 
-  ## @param[Array] : 
-  ## [[bytes],[bytes]....]
-  def process_electrolytes(data_bytes)
-    #puts "came to process electrolytes_plain_text"
-    byte_arr = data_bytes.flatten
-    #puts "the end part of the arr is"
-    return if byte_arr[-4..-1] != SIEMENS_ELECTROLYTE_END
-    self.data_bytes = []
-    concat = ""
-    byte_arr.each do |byte|
-        x = [byte].pack('c*').force_encoding('UTF-8')
-        if x == "\r"
-          concat+="\n"
-        elsif x == "\n"
-          #puts "new line found --- "
-          concat+=x
-          #puts "last thing in concat."
-          #puts concat[-1].to_s
-        else
-          concat+=x
-        end
-    end
-    ## nwo write concat to file
-    ## File.open("electrolytes_plain_text.txt", 'a+') { |file| file.write(concat) }
-    ## Header
-    ## Patient
-    ## Order
-    ## Result
-    ## Terminator
-
-    ## GET PO2
-    concat.scan(/pCO2\s+(?<pco>(\d+)(\.\d)*)(\^|v)?\s+mmHg/) do |k|
-      n = Regexp.last_match
-      puts n[:pco].to_s
-    end
-
-    ## GET PCO2
-    concat.scan(/pO2\s+(?<po>(\d+)(\.\d)*)(\^|v)?\s+mmHg/) do |k|
-      n = Regexp.last_match
-      puts n[:po].to_s
-    end
-
-    ## GET PH
-
-    ## GET NA+
-
-    ## GET K+
-
-    ## GET CL-
-
-    ## GET PATIENT_ID
-
-    ## GET DATE AND TIME
-
-    start_measure = false
-    
-    concat.split(/\n/).each do |line|
-      if line =~ /348\-D718/
-        header = Header.new({:line => line})
-        self.headers ||= []
-        self.headers << header
-      elsif line =~ /\-{32}/
-      elsif line =~ /Patient\s+ID/
-      elsif line =~ /Measured/
-      elsif line =~ /outside ref/
-      else
-      end
-    end
-
-  end
+  
 
 	def receive_data(data)
       
@@ -324,10 +266,10 @@ module LabInterface
       if data.bytes.to_a[-1] == 4
         puts "GOT EOT --- PROCESSING BUFFER, AND CLEARING."
         process_text(self.data_buffer)
-        #root_path = File.dirname __dir
-        #puts "root path #{root_path}"
-        #IO.write((File.join root_path,'test','resources','roche_multi_frame_bytes.txt'),self.test_data_bytes.to_s)
-        #puts self.test_data_bytes.flatten.to_s
+        root_path = File.dirname __dir__
+        puts "root path #{root_path}"
+        #IO.write((File.join root_path,'../test','resources','stago.txt'),self.test_data_bytes.to_s)
+        puts self.test_data_bytes.flatten.to_s
         self.data_buffer = ''
         unless self.headers.blank?
           if self.headers[-1].queries.blank?
@@ -467,7 +409,10 @@ module LabInterface
           end
         end
       when "Result"
+        puts "GOT RESULT------------------>"
+        puts "line is :#{line}"
         result = Result.new({:line => line})
+        puts "made new result"
         unless self.headers.blank?
           unless self.headers[-1].patients.blank?
             unless self.headers[-1].patients[-1].orders[-1].blank?

data/lib/ruby_astm/order.rb

@@ -74,6 +74,7 @@ class Order
 	end
 
 	def initialize(args={})
+		puts "------------ INITIALIZING ORDER -------------- "
 		set_id(args)
 		set_priority(args)
 		set_sequence_number(args)

data/lib/ruby_astm/result.rb

@@ -9,9 +9,12 @@ class Result
 	attr_accessor :dilution
 
 	def set_name(args)
+		puts "came to set name"
 		if line = args[:line]
-
+			puts "line fields is: #{line.fields}"
 			unless line.fields[2].blank?
+				puts "line fields 2 is:"
+				puts line.fields[2]
 				line.fields[2].scan(/^\^+(?<name>[A-Za-z0-9\%\#\-\_\?\/]+)\^?(?<dilution>\d+)?/) { |name,dilution|  
 					
 					self.name = lookup_mapping(name)
@@ -47,6 +50,9 @@ class Result
 				}
 			end
 			unless line.fields[2].blank?
+				puts "line fields 2 is:"
+				puts line.fields[2]
+				puts "----------------------------"
 				line.fields[2].scan(/\^+(?<name>[A-Za-z0-9\%\#\-\_\?\/]+)\^?(?<dilution>\d+)?/) { |name,dilution|  
 					if transform_expression = lookup_transform(name)
 						self.value = eval(transform_expression)
@@ -107,6 +113,7 @@ class Result
 
 	## here will call mappings and check the result correlation
 	def initialize(args={})
+		puts "called initialize result"
 		set_name(args)
 		set_flags(args)
 		set_value(args)

data/lib/ruby_astm/usb_module.rb

@@ -4,6 +4,8 @@ module UsbModule
 
 	mattr_accessor :usb_response_bytes
 
+	ESR_RESULTS_HASH = "ESR_RESULTS_HASH"
+
 	def begin_patient_results
 		">00A00013"
 	end
@@ -30,6 +32,24 @@ module UsbModule
 		self.usb_response_bytes[-3] == 13
 	end	
 
+	def add_result?(barcode,result)
+		begin
+			Integer(result)
+			#puts "result is: #{result}"
+			return false if result.to_i == 0
+			#puts "the result is not zero"
+			existing_result = $redis.hget(ESR_RESULTS_HASH,barcode)
+			#puts "existing result is: #{existing_result}"
+			if ((existing_result.blank?) || (existing_result != result))
+				return true
+			end 
+		rescue => e
+			puts e.to_s
+			return false
+		end
+		
+	end
+
 	def parse_usb_response(string_data)
 		string_data.bytes.to_a.each do |byte|
 			self.usb_response_bytes.push(byte)
@@ -40,31 +60,35 @@ module UsbModule
 			#puts "interpret"
 			if kk = self.usb_response_bytes[13..-4]
 				kk.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 
+					unless patient_record.blank?
+						unless patient_record.size < 24
+							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
+								#puts "barcode: #{bar_code}, result : #{result.value}"
+								patient.orders << order
+								if add_result?(bar_code,result.value)
+									#puts patient.to_json
+									$redis.lpush("test_patients",patient.to_json)
+									$redis.hset(ESR_RESULTS_HASH,bar_code,result.value.to_i)
+								end
+							end
+						end 
+					end
 				end
 			end
 			self.usb_response_bytes = []	

metadata

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