ruby_astm 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f211891d302b07536fa0edbadcd5da4395f17627
-  data.tar.gz: d803f0319f91c825ab9fa560c7dfe3ae7e08f9a7
+  metadata.gz: c048fb081850c73e0920aea67af6ba42022e3453
+  data.tar.gz: 447df9ea7aa6eaea6708b120d248af10664f78ae
 SHA512:
-  metadata.gz: 6db8e7f19a9d7b4014c3e9f8ce18f4a7b89509d11a5121ca6935366cc671a4d88b03d2d2a37f4c83d1f5de4803f8ec27ee00ecc046fd22e54213252430c2f785
-  data.tar.gz: 0dfbc2aad3bfac163e3121a0d501895775c1eec7f4c5d8f72b19df4fd8922e225bc01bd2f9b9a87af1560ed98972dbcbbad3d209feefcc2aacba475dad6f7951
+  metadata.gz: 5003ceacee31b6fd72a3e85cb2042bd312bb774ab158215c92fb11e0efcb894a0ab8e446035412fc4c43b193f5ece52140125955fd7f6b2f02880ee957aa63f2
+  data.tar.gz: e944a019d055a5fd14e64660a290ae07806a96793111b1b13a2a9563ed6db97051a9528c6a787a4e0f6741ffd6f887b4315031c26a4b650ba9feb5f1f019f5b6

data/lib/publisher/poller.rb

@@ -204,8 +204,9 @@ class Poller
 	        		#puts "inverted mappings"
 	        		#puts $inverted_mappings
 	        		component_machine_code = $inverted_mappings[component]
-	        		#puts "component machine code: #{component_machine_code}"
-
+	        		if component == "UCRE"
+	        			puts "component machine code: #{component_machine_code}"
+	        		end
 	        		## for eg plasma tube can do all the tests
 	        		## so can serum
 	        		## but we use the plasma tube only for some.

data/lib/ruby_astm/lab_interface.rb

@@ -381,7 +381,7 @@ module LabInterface
         self.headers[-1].patients << hl7_patient
       when "Hl7_Order"
         unless self.headers[-1].patients.blank?
-          hl7_order = Hl7Order.new({:line => line, :patient_id => self.headers[-1].patients[-1].patient_id}, :machine_name => self.headers[-1].machine_name)
+          hl7_order = Hl7Order.new({:line => line, :patient_id => self.headers[-1].patients[-1].patient_id, :machine_name => self.headers[-1].machine_name})
           self.headers[-1].patients[-1].orders << hl7_order
         end
       when "Header"

data/lib/ruby_astm/usb_module.rb

@@ -50,10 +50,13 @@ module UsbModule
 	## like key -> value, score
 	## key(barcode) -> value(time) -> score(count)
 	## so we can zincrby, each time.
-	def add_result?(barcode,result)
+	## @param[String] barcode : the barcode of the result
+	## @param[String] 
+	def add_result?(barcode,result,existing_barcodes)
 		begin
 			Integer(result)
 			#puts "result is: #{result}"
+			return false if existing_barcodes.include? barcode
 			return false if result.to_i == 0
 			#puts "the result is not zero"
 			existing_result = $redis.hget(ESR_RESULTS_HASH,barcode)
@@ -62,9 +65,8 @@ module UsbModule
 				true
 			else
 				if existing_result != result
-				current_count = $redis.zincrby(ESR_SORTED_SET,1,barcode)
-				current_count <= MAX_REPEAT_RESULT_COUNT
-			end
+					true
+				end
 			end 
 		rescue => e
 			puts e.to_s
@@ -81,7 +83,11 @@ module UsbModule
 		#puts self.usb_response_bytes.to_s
 		if interpret?
 			#puts "interpret"
+			barcodes = []
 			if kk = self.usb_response_bytes[13..-4]
+				## its going fresh -> old
+				## so if the barcode has already come
+				## we do not push it.
 				kk.each_slice(32) do |patient_record|
 					unless patient_record.blank?
 						unless patient_record.size < 24
@@ -104,10 +110,11 @@ module UsbModule
 								order.results << result
 								#puts "barcode: #{bar_code}, result : #{result.value}"
 								patient.orders << order
-								if add_result?(bar_code,result.value)
+								if add_result?(bar_code,result.value,existing_barcodes)
 									#puts patient.to_json
 									$redis.lpush("patients",patient.to_json)
 									$redis.hset(ESR_RESULTS_HASH,bar_code,result.value.to_i)
+									existing_barcodes << bar_code
 								end
 							end
 						end 

metadata

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