his_emr_api_lab 1.0.0 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e6be868d3a1113b834bf4e6644734eead3e01d7b51f90e310e3020eb8125b6c
-  data.tar.gz: bd7ca74bdf0af442d3a4c6f9a1f9e0a73d4d61571f1e39ae6ce5352246cd801d
+  metadata.gz: cecc609c02db9bc3bfef3b86458006055944bf3bc7729446490c5375c9ceabd4
+  data.tar.gz: 9992f6d05a17f52c725dc014876a29faadc1b96ba2711f26851e73c917e44e61
 SHA512:
-  metadata.gz: 7c122f5fbc967d7e470aac9eb455f77d9471a40caa582a9306d4558a25094d8efba17a9aca25ea312609ac9c7571cf154f463a0c65a55387bb8a030dcf48b7c6
-  data.tar.gz: 9c68ca05bb1accaac6942c37f2399ae5ef5f94bde87cbd30811f35e394a9b2a43e2671f266173839156b980c3030051fc5e9fc4103c3b8f41a7dcd84e5324e35
+  metadata.gz: 4d37c96cfad06c9d7c8a62dab06ab9c4a2ecbb7ffed973287d09abfe5f7f3fb9d721ae5f473edc1aab7ba100cf4f525af329f8797e319cfb534f7141e96d12c3
+  data.tar.gz: 2e88ceb111fa7a74be37c78d8b7df7a6b179f28c38ee9824d829097e8568c058ea9996afd2105fff44d61e51aa37184d495f77fd6ed6ee84e3ffd86419cc8e9f

data/app/services/lab/lims/failed_imports.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative './api'
 require_relative './order_dto'
 
 module Lab

data/app/services/lab/lims/order_dto.rb

@@ -83,9 +83,9 @@ module Lab
 
       # Translates a LIMS sample priority to a concept_id
       def reason_for_test
-        return unknown_concept.concept_id unless self['sample_priority']
+        return unknown_concept.concept_id unless self['priority']
 
-        ConceptName.find_by_name!(self['sample_priority']).concept_id
+        ConceptName.find_by_name!(self['priority']).concept_id
       end
 
       def lab_program

data/app/services/lab/lims/order_serializer.rb

@@ -18,7 +18,7 @@ module Lab
             tracking_number: serialized_order.accession_number,
             sending_facility: current_facility_name,
             receiving_facility: serialized_order.target_lab,
-            tests: serialized_order.tests.collect(&:name),
+            tests: serialized_order.tests.map { |test| format_test_name(test.name) },
             patient: format_patient(serialized_order.patient_id),
             order_location: format_order_location(serialized_order.encounter_id),
             sample_type: format_sample_type(serialized_order.specimen.name),
@@ -27,7 +27,7 @@ module Lab
             test_statuses: format_test_status_trail(order),
             who_order_test: format_orderer(order),
             districy: current_district, # yes districy [sic]...
-            priority: serialized_order.reason_for_test.name,
+            priority: format_sample_priority(serialized_order.reason_for_test.name),
             date_created: serialized_order.order_date,
             test_results: format_test_results(serialized_order),
             type: 'Order'
@@ -69,7 +69,7 @@ module Lab
         end
 
         def format_sample_type(name)
-          name.casecmp?('Unknown') ? 'not_specified' : name
+          name.casecmp?('Unknown') ? 'not_specified' : name.titleize
         end
 
         def format_sample_status(name)
@@ -98,8 +98,7 @@ module Lab
 
         def format_test_status_trail(order)
           order.tests.each_with_object({}) do |test, trail|
-            test_name = ConceptName.find_by_concept_id!(test.value_coded).name
-            test_name = 'Viral load' if test_name.casecmp?('HIV Viral Load')
+            test_name = format_test_name(ConceptName.find_by_concept_id!(test.value_coded).name)
 
             current_test_trail = trail[test_name] = {}
 
@@ -125,9 +124,11 @@ module Lab
           order.tests&.each_with_object({}) do |test, results|
             next unless test.result
 
-            results[test.name] = {
+            results[format_test_name(test.name)] = {
               results: test.result.each_with_object({}) do |measure, measures|
-                measures[measure.indicator.name] = { result_value: "#{measure.value_modifier}#{measure.value}" }
+                measures[format_test_name(measure.indicator.name)] = {
+                  result_value: "#{measure.value_modifier}#{measure.value}"
+                }
               end,
               result_date: test.result.first&.date,
               result_entered_by: {}
@@ -135,6 +136,20 @@ module Lab
           end
         end
 
+        def format_test_name(test_name)
+          return 'Viral Load' if test_name.casecmp?('HIV Viral load')
+
+          return 'TB' if test_name.casecmp?('TB Program')
+
+          test_name.titleize
+        end
+
+        def format_sample_priority(priority)
+          return 'Routine' if priority&.casecmp?('Medical examination, routine')
+
+          priority&.titleize
+        end
+
         def current_health_center
           health_center = Location.current_health_center
           raise 'Current health center not set' unless health_center

data/app/services/lab/lims/worker.rb

@@ -209,7 +209,7 @@ module Lab
         raise MissingAccessionNumber if order_dto[:tracking_number].blank?
 
         logger.info("Importing LIMS order ##{order_dto[:tracking_number]}")
-        mapping = LimsOrderMapping.find_by(lims_id: order_dto[:_id])
+        mapping = find_order_mapping_by_lims_id(order_dto[:_id])
 
         ActiveRecord::Base.transaction do
           if mapping
@@ -221,7 +221,6 @@ module Lab
                                               order_id: order['id'],
                                               pulled_at: Time.now,
                                               revision: order_dto['_rev'])
-            byebug unless mapping.errors.empty?
           end
 
           order
@@ -313,7 +312,7 @@ module Lab
       end
 
       def guess_result_datatype(result)
-        return 'numeric' if result.strip.match?(/^[+-]?(\d+(\.\d+)|\.\d+)?$/)
+        return 'numeric' if result.strip.match?(/^[+-]?((\d+(\.\d+)?)|\.\d+)$/)
 
         'text'
       end
@@ -339,6 +338,16 @@ module Lab
       def last_seq_path
         LIMS_LOG_PATH.join('last_seq.dat')
       end
+
+      def find_order_mapping_by_lims_id(lims_id)
+        mapping = Lab::LimsOrderMapping.find_by(lims_id: lims_id)
+        return nil unless mapping
+
+        return mapping if Lab::LabOrder.where(order_id: mapping.order_id).exists?
+
+        mapping.destroy
+        nil
+      end
     end
   end
 end

data/db/migrate/20210610095024_fix_numeric_results_value_type.rb

@@ -0,0 +1,20 @@
+class FixNumericResultsValueType < ActiveRecord::Migration[5.2]
+  def up
+    results = Lab::LabResult.all.includes(:children)
+
+    ActiveRecord::Base.connection.transaction do
+      results.each do |result|
+        result.children.each do |measure|
+          next unless measure.value_text&.match?(/^[+-]?((\d+(\.\d+)?)|\.\d+)$/)
+
+          puts "Updating result value type for result measure ##{measure.obs_id}"
+          measure.value_numeric = measure.value_text
+          measure.value_text = nil
+          measure.save!
+        end
+      end
+    end
+  end
+
+  def down; end
+end

data/lib/lab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lab
-  VERSION = '1.0.0'
+  VERSION = '1.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.5
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-04 00:00:00.000000000 Z
+date: 2021-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -270,6 +270,7 @@ files:
 - db/migrate/20210323080140_change_lims_id_to_string_in_lims_order_mapping.rb
 - db/migrate/20210326195504_add_order_revision_to_lims_order_mapping.rb
 - db/migrate/20210407071728_create_lab_lims_failed_imports.rb
+- db/migrate/20210610095024_fix_numeric_results_value_type.rb
 - lib/auto12epl.rb
 - lib/couch_bum/couch_bum.rb
 - lib/generators/lab/install/USAGE