ruby_astm 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 844c22badb98d4a33e8ee9397925921f10749c164889671d7e9015ef12080425
-  data.tar.gz: 25ad8a5f3235eaa4a4c02266424bb35674a1f773f574c32c539f4abb41b6c0bc
+  metadata.gz: 0317b5cc1b25b47af7d15db62ee7f7f6ccf6e40587ffb16643da7c9845a75d85
+  data.tar.gz: d5214042d72a4f3c498bca1d4565f40488374568e2fd1da917f837e51c08c5c6
 SHA512:
-  metadata.gz: 2a20199e04e200252ba7f56e82981dce7b6b93576146cc7d582bbc4f42a14ed6fe9e1c4311feca8b428c0ecb46fb9916f7f081184626e1959ad651b1be51d27d
-  data.tar.gz: facd490b2c2de348e6e0a8ea72d9b08e4713deda5107ccb391e311f64cfdc94077a44d67e96a5a982875524d40c11631c8a252b847b5d029a5d356dda33f0641
+  metadata.gz: 32b5da6d8f483aa2b4402d6c0b3a03b7f3a4b54c4006f0352bfc98fdc794e82cf5f45523a1178a63d6226a20d25e80e2d979176f1d65f34217486356a2b6bc4e
+  data.tar.gz: b75c3fcc0aa7b46c504d1e9b27eb40813d711ce4c85b7623e0f5aaa5b83e9f3712deaecf19c62b403af1aa0adf692740059aaef501eb86fefe133a6977b82c77

data/lib/mappings.json

@@ -141,7 +141,7 @@
 		"TUBE" : "SERUM",
 		"REPORT_NAME" : "VLDL"
 	},
-	"CRE" : {
+	"CREAT" : {
 		"LIS_CODE" : "CRE",
 		"TUBE" : "SERUM",
 		"REPORT_NAME" : "Creatinine"
@@ -181,12 +181,12 @@
 		"TUBE" : "SERUM",
 		"REPORT_NAME" : "Alkaline Phosphatase"
 	},
-	"GOTHL" : {
+	"GOT" : {
 		"LIS_CODE" : "GOTHL",
 		"TUBE" : "SERUM",
 		"REPORT_NAME" : "SGOT"
 	},
-	"GPTHL" : {
+	"GPT" : {
 		"LIS_CODE" : "GPTHL",
 		"TUBE" : "SERUM",
 		"REPORT_NAME" : "SGPT"

data/lib/ruby_astm/HL7/hl7_observation.rb

@@ -4,6 +4,7 @@ class Hl7Observation < Result
 	def set_name(args)
 		if line = args[:line]
 			self.name = lookup_mapping(line.fields[3].strip)
+			self.report_name = lookup_report_name(line.fields[3].strip)
 		end
 	end
 

data/lib/ruby_astm/order.rb

@@ -118,18 +118,31 @@ class Order
 		end
 
 		if (options[:machine_name] && (options[:machine_name] == "cobas-e411"))
+			
+
+			## remove all the non number tests, as these are not to be run on the roche system, and cause the roche machine to clam up totally if non recognized/alphabetic tests are sent to it in the response.
+
+
+			self.tests = self.tests.select{|c| c =~ /[0-9]+/}
+
 			self.tests = self.tests.map{|c| c = "^^^" + c + "^1"}
 			# ^^0000000387^587^0^2^^S1^SC
 			id_string = options[:sequence_number] + "^" + options[:carrier_number] + "^" + options[:position_number] + "^^" + options[:sample_type] + "^" + options[:container_type]
 
-			"O|1|#{self.id.to_s}|#{id_string}|#{self.tests.join('\\')}|#{self.priority}||#{Time.now.strftime("%Y%m%d%H%M%S")}||||A||||1||||||||||O\r"
+			
+			"O|1|#{self.id.to_s}|#{id_string}|#{tests.join('\\')}|#{self.priority}||#{Time.now.strftime("%Y%m%d%H%M%S")}||||A||||1||||||||||O\r"
 
 		else
 
-			"O|#{self.sequence_number}|#{self.id}|#{Time.now.to_i.to_s}|^^^#{self.tests.join('`^^^')}|#{self.priority}||#{Time.now.strftime("%Y%m%d%H%M%S")}||||N||||#{self.specimen_type || 'SERUM'}\r"
+			tests = self.tests.select{|c| c =~ /[A-Z]+/}
+
+			"O|#{self.sequence_number}|#{self.id}|#{Time.now.to_i.to_s}|^^^#{tests.join('`^^^')}|#{self.priority}||#{Time.now.strftime("%Y%m%d%H%M%S")}||||N||||#{self.specimen_type || 'SERUM'}\r"
 	
 		end
 
+		## for urine it does not get the report name.
+		## so let me do one entry for urine and hemogram.
+
 	end	
 
 end

data/lib/ruby_astm/result.rb

@@ -12,6 +12,7 @@ class Result
 		if line = args[:line]
 			
 			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)

metadata

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