his_emr_api_lab 0.0.5.pre.p1 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa64a790eb8ca474b8505b496671e5462c055ab42cc646a2e5788579f5fe0d79
-  data.tar.gz: c1b23bc070e065aafb50b4b36e68c125c96c02499648c55135f811ad378fc829
+  metadata.gz: 1820c47a6689d070b7e2d7c15e2fbcea3d66468141865a4aba4f52cc394a5146
+  data.tar.gz: 49d92b0a38610d40274555b8fc130834137c2bfd8a278697ceada745cecf8fc2
 SHA512:
-  metadata.gz: 9b988f69ecc23eddd265e0f67a40f2014ed630aeca9346eef44ebbb7a7faea1e27c58dae0cfd2c45bd38a8e53dee8fcf30315c3dfd98bf9f5c75787357071db6
-  data.tar.gz: cef9504aaebd53c1f96e9a67d518edafa6226bc07c487b1653ffc97ccc95bb9621080257f8d81f00e8375860703ce482e713466d2aa941a40b752a4e3399bb54
+  metadata.gz: f7ba1de5785aaa82cb6471639b7edb8ab59a4972cd289bf9886a1f89c460e17d202479b92460377a66fb55998d45a2ad50f4cc5c48d5fafb04e972bf66802bf5
+  data.tar.gz: 932735ff44518d81045456b6c80fde5e488e6971e4bee9180e7943012bd0db5d809d2af38b30da736d858aebf09b3dd8a926c82d23d93224d3451a528e7b2740

data/app/services/lab/labelling_service/order_label.rb

@@ -27,7 +27,7 @@ module Lab
                                '',
                                drawer,
                                '',
-                               specimen,
+                               tests,
                                reason_for_test,
                                order.accession_number,
                                order.accession_number)
@@ -36,7 +36,7 @@ module Lab
       def reason_for_test
         return 'Unknown' unless order.reason_for_test
 
-        ConceptName.find_by_concept_id(order.reason_for_test.value_coded)&.name || 'Unknown'
+        short_concept_name(order.reason_for_test.value_coded) || 'Unknown'
       end
 
       def patient
@@ -73,6 +73,24 @@ module Lab
         ConceptName.find_by_concept_id(order.concept_id)&.name || 'Unknown'
       end
 
+      def tests
+        tests = order.tests.map do |test|
+          name = short_concept_name(test.value_coded) || 'Unknown'
+
+          next 'VL' if name.match?(/Viral load/i)
+
+          name.size > 7 ? name[0..6] : name
+        end
+
+        tests.join(', ')
+      end
+
+      def short_concept_name(concept_id)
+        ConceptName.where(concept_id: concept_id)
+                   .min_by { |concept| concept.name.size }
+                   &.name
+      end
+
       def unknown_concept
         ConceptName.find_by_name('Unknown')
       end

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

@@ -142,9 +142,10 @@ module Lab
       MIGRATION_REJECTIONS_CSV_PATH = LIMS_LOG_PATH.join('migration-rejections.csv')
 
       def self.export_rejections(rejections)
-        headers = ['Accession number', 'NHID', 'First name', 'Last name', 'Reason']
+        headers = ['doc_id', 'Accession number', 'NHID', 'First name', 'Last name', 'Reason']
         rows = (rejections || []).map do |rejection|
           [
+            rejection.order[:_id],
             rejection.order[:tracking_number],
             rejection.order[:patient][:id],
             rejection.order[:patient][:first_name],
@@ -159,9 +160,10 @@ module Lab
       MIGRATION_FAILURES_CSV_PATH = LIMS_LOG_PATH.join('migration-failures.csv')
 
       def self.export_failures
-        headers = ['Accession number', 'NHID', 'Reason', 'Difference']
+        headers = ['doc_id', 'Accession number', 'NHID', 'Reason', 'Difference']
         rows = Lab::LimsFailedImport.all.map do |failure|
           [
+            failure.lims_id,
             failure.tracking_number,
             failure.patient_nhid,
             failure.reason,

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

@@ -30,9 +30,9 @@ module Lab
 
       # Translates a LIMS specimen name to an OpenMRS concept_id
       def specimen_type_id
-        lims_specimen_name = self['sample_type']
+        lims_specimen_name = self['sample_type']&.strip&.downcase
 
-        if %w[specimen_not_collected not_assigned].include?(lims_specimen_name)
+        if %w[specimen_not_collected not_assigned not_specified].include?(lims_specimen_name)
           return ConceptName.select(:concept_id).find_by_name!('Unknown').concept_id
         end
 
@@ -53,6 +53,8 @@ module Lab
 
       # Extract requesting clinician name from LIMS
       def requesting_clinician
+        return 'Unknown' unless self['who_order_test']
+
         # TODO: Extend requesting clinician to an obs tree having extra parameters
         # like phone number and ID to closely match the lims user.
         first_name = self['who_order_test']['first_name'] || ''
@@ -67,6 +69,10 @@ module Lab
       end
 
       def start_date
+        if self['date_created'].blank?
+          raise LimsException, 'Order missing created date'
+        end
+
         Utils.parse_date(self['date_created'])
       end
 

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

@@ -66,6 +66,8 @@ module Lab
           Date.strptime(str_date, '%d-%m-%Y').strftime('%Y-%m-%d')
         elsif str_date.match?(/(\d{4}\d{2}\d{2})\d+/)
           Date.strptime(str_date, '%Y%m%d').strftime('%Y-%m-%d')
+        elsif str_date.match?(%r{\d{2}/\d{2}/\d{4}})
+          str_date.to_date.to_s
         else
           Rails.logger.warn("Invalid date: #{str_date}")
           parse_date(fallback_date)

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

@@ -28,7 +28,9 @@ module Lab
           fout.write("Worker ##{Process.pid} started at #{Time.now}")
           worker = new(Api.new)
           worker.pull_orders
-          worker.push_orders
+          # TODO: Verify that names being pushed to LIMS are of the correct format (ie matching
+          # LIMS naming conventions). Enable pushing when that is done
+          # worker.push_orders
         end
       end
 

data/app/services/lab/orders_search_service.rb

@@ -5,44 +5,54 @@ module Lab
   module OrdersSearchService
     class << self
       def find_orders(filters)
-        date = filters.delete(:date)
-        status = filters.delete(:status)
+        extra_filters = pop_filters(filters, :date, :end_date, :status)
 
         orders = Lab::LabOrder.prefetch_relationships
                               .where(filters)
                               .order(start_date: :desc)
 
-        orders = filter_orders_by_date(orders, date) if date
-        orders = filter_orders_by_status(orders, status) if status
+        orders = filter_orders_by_status(orders, pop_filters(extra_filters, :status))
+        orders = filter_orders_by_date(orders, extra_filters)
 
         orders.map { |order| Lab::LabOrderSerializer.serialize_order(order) }
       end
 
-      def filter_orders_by_date(orders, date)
-        orders.where('start_date < DATE(?)', date.to_date + 1.day)
-      end
+      def filter_orders_by_date(orders, date: nil, end_date: nil)
+        date = date&.to_date
+        end_date = end_date&.to_date
 
-      def filter_orders_by_status(orders, status)
-        case status.downcase
-        when 'ordered' then orders.where(concept_id: unknown_concept_id)
-        when 'drawn' then orders.where.not(concept_id: unknown_concept_id)
+        if date && end_date
+          return orders.where('start_date BETWEEN ? AND ?', date, end_date + 1.day)
         end
-      end
 
-      def unknown_concept_id
-        ConceptName.find_by_name!('Unknown').concept_id
+        if date
+          return orders.where('start_date BETWEEN ? AND ?', date, date + 1.day)
+        end
+
+        return orders.where('start_date < ?', end_date + 1.day) if end_date
+
+        orders
       end
 
-      def filter_orders_by_status(orders, status)
-        case status.downcase
+      def filter_orders_by_status(orders, status: nil)
+        case status&.downcase
         when 'ordered' then orders.where(concept_id: unknown_concept_id)
         when 'drawn' then orders.where.not(concept_id: unknown_concept_id)
+        else orders
         end
       end
 
       def unknown_concept_id
         ConceptName.find_by_name!('Unknown').concept_id
       end
+
+      def pop_filters(params, *filters)
+        filters.each_with_object({}) do |filter, popped_params|
+          next unless params.key?(filter)
+
+          popped_params[filter.to_sym] = params.delete(filter)
+        end
+      end
     end
   end
 end

data/lib/generators/lab/install/templates/swagger.yaml

@@ -175,6 +175,12 @@ paths:
         description: 'Filter by sample status: ordered, drawn'
         schema:
           type: string
+      - name: end_date
+        in: query
+        required: false
+        description: Select all results before this date
+        schema:
+          type: date
       responses:
         '200':
           description: Success
@@ -396,6 +402,32 @@ paths:
       responses:
         '204':
           description: No Content
+  "/api/v1/lab/reasons_for_test":
+    get:
+      summary: Reasons for test
+      description: Retrieve default reasons for test concept set
+      tags:
+      - Concepts
+      security:
+      - api_key: []
+      responses:
+        '200':
+          description: Success
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    concept_id:
+                      type: integer
+                    name:
+                      type: string
+                      example: Routine
+                  required:
+                  - concept_id
+                  - name
   "/api/v1/lab/tests/{test_id}/results":
     post:
       summary: Add results to order

data/lib/lab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lab
-  VERSION = '0.0.5-p1'
+  VERSION = '0.0.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 0.0.5.pre.p1
+  version: 0.0.10
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -304,9 +304,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.8
 signing_key: