renalware-core 2.0.104 → 2.0.105

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4759c82f676bcb96352e1244449b55ee7e69f1b3f9921c7d2af5575ac740e20f
-  data.tar.gz: f64720e8f4c26663b2a532454112eef362783b2a64be5c0fda4dbabb6e5bcbe3
+  metadata.gz: 3b9b42c69084c04d467667d66060481ae92e81db155c9324f76b23b952314c9d
+  data.tar.gz: 45fc5ad4564fd35587d7b87a2fd0f578ddd8849b07a84e8818da7d2234ece38f
 SHA512:
-  metadata.gz: ddfceb2f396292b11d4f9a74c98484fa8cbc93a3565518227e29d93d4c9ac6de8557c114c5dc26978f6e03f5c0eafd5630de1fbce46dd2635c68847873e8cb16
-  data.tar.gz: adc5f560e7975ffc33539ec17b66123635e632330137877c05b364d9f00df916b478e1b25ea471cd5b30c948bddb6360d5a0b18edd328b22c09550433fff4cb9
+  metadata.gz: dda5b2284b0a3fc51cd33c5df151d1949f4ac40671ef086b55fc25672259ea52f280dd59fcca51aa213b98df726306ed0fbde98560797014f2f3ca5215a82b61
+  data.tar.gz: e093eb880bb2c8b5e0c36ead99dac1736a33bdc6fa9e0e26098317714fdd55d18abf3bc25e8eb5d91c1a8879327a6b1ccb05cd32e4bfece83c8d0c1fb904c9aa

data/app/views/renalware/api/ukrdc/patients/_hd_session_observations.xml.builder

@@ -21,7 +21,7 @@ observation_times = {
     xml.Observation do
       xml.ObservationTime observation_times[pre_post].iso8601
       xml.ObservationCode do
-        xml.CodingStandard "PV"
+        xml.CodingStandard "UKRR"
         xml.Code I18n.t("loinc.#{i18n_key}.code")
         xml.Description I18n.t("loinc.#{i18n_key}.description")
       end

data/app/views/renalware/api/ukrdc/patients/_lab_orders.xml.builder

@@ -7,8 +7,42 @@ xml.LabOrders(
   start: patient.changes_since.to_date.iso8601,
   stop: patient.changes_up_until.to_date.iso8601
 ) do
-  render partial: "renalware/api/ukrdc/patients/lab_orders/lab_order",
-         collection: patient.observation_requests,
-         as: :request,
-         locals: { builder: builder, patient: patient }
+  patient.observation_requests.each do |request|
+    xml.LabOrder do
+      xml.PlacerId request.placer_id
+      xml.OrderCategory do
+        xml.Code request.description.code
+      end
+      xml.SpecimenCollectedTime request.requested_at&.iso8601
+      xml.SpecimenSource request.description.bottle_type
+      xml.ResultItems do
+        request.observations.each do |observation|
+          observation = Renalware::Pathology::ObservationPresenter.new(observation)
+          observation = Renalware::UKRDC::PathologyObservationPresenter.new(observation)
+
+          xml.ResultItem do
+            xml.EnteredOn observation.updated_at&.iso8601
+            xml.PrePost observation.pre_post(patient_is_on_hd: patient.current_modality_hd?)
+            xml.ServiceId do
+              xml.CodingStandard observation.coding_standard
+              xml.Code observation.code
+              xml.Description observation.description_name
+            end
+
+            # If the rrr_type of the observation_descriptions is interpretation (ie an interpretted result
+            # like POS NEG)
+            if observation.rr_type_interpretation?
+              xml.InterpretationCodes observation.interpretation_code
+            else
+              xml.ResultValue observation.result
+              xml.ResultValueUnits observation.measurement_unit_name
+            end
+
+            xml.ObservationTime observation.observed_at&.iso8601
+          end
+        end
+      end
+      xml.EnteredOn request.requested_at.iso8601
+    end
+  end
 end

data/app/views/renalware/api/ukrdc/patients/lab_orders/_lab_order.xml.builder.dead

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+# See HL7 spec http://pacs.hk/Doc/HL7/Hl7V231.pdf
+
+xml = builder
+
+xml.LabOrder do
+  xml.PlacerId request.placer_id
+  xml.OrderCategory do
+    xml.Code request.description.code
+  end
+  xml.SpecimenCollectedTime request.requested_at&.iso8601
+  xml.SpecimenSource request.description.bottle_type
+  xml.ResultItems do
+    request.observations.each do |observation|
+      observation = Renalware::Pathology::ObservationPresenter.new(observation)
+      observation = Renalware::UKRDC::PathologyObservationPresenter.new(observation)
+
+      xml.ResultItem do
+        xml.EnteredOn observation.updated_at&.iso8601
+        xml.PrePost observation.pre_post(patient_is_on_hd: patient.current_modality_hd?)
+        xml.ServiceId do
+          xml.CodingStandard observation.coding_standard
+          xml.Code observation.code
+          xml.Description observation.description_name
+        end
+
+        # If the rrr_type of the observation_descriptions is interpretation (ie an interpretted result
+        # like POS NEG)
+        if observation.rr_type_interpretation?
+          xml.InterpretationCodes observation.interpretation_code
+        else
+          xml.ResultValue observation.result
+          xml.ResultValueUnits observation.measurement_unit_name
+        end
+
+        xml.ObservationTime observation.observed_at&.iso8601
+      end
+    end
+  end
+  xml.EnteredOn request.requested_at.iso8601
+end

data/config/locales/loinc_codes.yml

@@ -3,32 +3,20 @@ en:
     blood_pressure:
       systolic:
         # code: 76538-8
-        code: bpsys
+        code: QBLG3
         description: Blood pressure device Cuff pressure.systolic
         units: "mmHg"
       diastolic:
         # code: 76539-6
-        code: bpdia
+        code: QBLG4
         description: Blood pressure device Cuff pressure.diastolic
         units: "mmHg"
     weight:
       # code: 3141-9
-      code: weight
+      code: QBLG1
       description: Body weight Measured
       units: "Kg"
     height:
-      code: height
+      code: QBLGB
       description: Height Measured
       units: "cm"
-    temperature:
-      code: temperature
-      description: Temperature
-      units: "C"
-    bm_stix:
-      code: bm_stix
-      description: bm_stix
-      units: "?"
-    respiratory_rate:
-      code: respiratory_rate
-      description: respiratory_rate
-      units: "?"

data/db/migrate/20190909084425_add_columns_to_support_data_migration.rb

@@ -0,0 +1,15 @@
+class AddColumnsToSupportDataMigration < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      add_column :admission_admissions, :feed_id, :string, index: true
+      add_column :clinic_appointments, :feed_id, :string, index: true
+      add_reference(
+        :clinic_appointments,
+        :consultant,
+        index: true,
+        foreign_key: { to_table: :renal_consultants }
+      )
+      add_column :clinic_appointments, :clinic_description, :text
+    end
+  end
+end

data/lib/renalware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renalware
-  VERSION = "2.0.104"
+  VERSION = "2.0.105"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.104
+  version: 2.0.105
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-06 00:00:00.000000000 Z
+date: 2019-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type
@@ -2163,8 +2163,8 @@ files:
 - app/views/renalware/api/ukrdc/patients/_surveys.xml.builder
 - app/views/renalware/api/ukrdc/patients/_treatments.xml.builder
 - app/views/renalware/api/ukrdc/patients/diagnoses/_cause_of_death.xml.builder
-- app/views/renalware/api/ukrdc/patients/lab_orders/_lab_order.xml.builder
-- app/views/renalware/api/ukrdc/patients/lab_orders/_result_item.xml.builder
+- app/views/renalware/api/ukrdc/patients/lab_orders/_lab_order.xml.builder.dead
+- app/views/renalware/api/ukrdc/patients/lab_orders/_result_item.xml.builder.dead
 - app/views/renalware/api/ukrdc/patients/observations/_blood_pressure.xml.builder
 - app/views/renalware/api/ukrdc/patients/observations/_standing_blood_pressure.xml.builder
 - app/views/renalware/api/ukrdc/patients/observations/_weight.xml.builder
@@ -3547,6 +3547,7 @@ files:
 - db/migrate/20190823051014_add_hidden_colum_to_event_types.rb
 - db/migrate/20190823105642_add_asked_for_write_access_to_users.rb
 - db/migrate/20190830082736_add_pd_regime_columns_for_blt.rb
+- db/migrate/20190909084425_add_columns_to_support_data_migration.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb

data/app/views/renalware/api/ukrdc/patients/lab_orders/_lab_order.xml.builder

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-# See HL7 spec http://pacs.hk/Doc/HL7/Hl7V231.pdf
-
-xml = builder
-
-xml.LabOrder do
-  # xml.ReceivingLocation do
-  #   xml.Code ""
-  #   xml.Description # request.pathology_lab.name
-  # end
-  xml.PlacerId request.placer_id
-  # xml.FillerId "??ORC:3 Labs Order Id"
-  # xml.OrderedBy do
-  #   xml.Code "unknown"
-  #   xml.Description request.requestor_name
-  # end
-  # xml.OrderItem do
-  #   xml.comment! "Code TODO: LOIN code for request E.g. MB from 'OBR|1|^PCS|09B0099478^LA|FBC^FULL BLOOD COUNT^MB|..'"
-  #   xml.Code
-  # end
-  xml.OrderCategory do
-    xml.Code request.description.code
-    # xml.CodingStandard "LOCAL"
-    # xml.Description "Standard Renal Tests"
-  end
-  xml.SpecimenCollectedTime request.requested_at&.iso8601
-  # xml.SpecimenReceivedTime "TODO"
-  xml.SpecimenSource request.description.bottle_type
-  # xml.Duration "OBR:27.3 but no available in the example messages I have"
-
-  xml.ResultItems do
-    render partial: "renalware/api/ukrdc/patients/lab_orders/result_item",
-           collection: request.observations,
-           as: :observation,
-           locals: { builder: builder, patient: patient }
-  end
-
-  # xml.PatientClass do
-  #   xml.CodingStandard "HL7_0004"
-  #   xml.Code "e.g. I for Inpatient"
-  #   xml.Description "e.g. Inpatient"
-  # end
-  xml.EnteredOn request.requested_at.iso8601
-  # xml.EnteredAt do
-  #   xml.code "location code here"
-  # end
-end