renalware-core 2.0.84 → 2.0.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f61c5bd90607cab06899b310da72383a3aa1ca3aff93486b8380bef054c53a22
-  data.tar.gz: b259dbd924ce1ec71afc4285ab6a7dfb3925e277abe45940eaa5c48e3b82984a
+  metadata.gz: 93c145615b9102af8ff6b2ee37f850eded28cac83f10a695345510efbac334b2
+  data.tar.gz: 0ed44c704305710b1a4dd9b8d60160ea1d25005df3a4be52cce462434ea9b3a0
 SHA512:
-  metadata.gz: ea7b8e06397195ebd8b2323e049c300ed8b331a2a116f54192b02719be35a500e254eeb97972a8521aeeefdca2c4cb566237a21f8865a7f9a7927e60e493d4df
-  data.tar.gz: dd8a0a12995f7903d4bc72daae8fa7812ed67473e95db75f4f7f7fdfe86acf79cffd546329242df09058d37accd2ed212a2d7022dbd59626c08d05b16067b2c0
+  metadata.gz: fd753c5b94ade20136d625fe0d216fe67f863737b777e167f9d2f259c0a133649e4f03c0ff1c30a57d5bcefa1f9d6cf4641f61cc8be49270b4a748e673f37931
+  data.tar.gz: de03a58b236ff0f78ff0ab0dd596d6d626afa61920f630cbf22dc53dfd327900afa5f064bb1725b306feca76b43a4581aaceaff3058191e175712d3e3dff7724

data/app/documents/renalware/transplants/recipient_operation_document.rb

@@ -21,6 +21,7 @@ module Renalware
         attribute :ukt_donor_number
         attribute :ukt_notified_at, DateTime
         attribute :type, Document::Enum
+        attribute :relationship, Document::Enum
         attribute :gender, Document::Enum, enums: %i(male female)
         attribute :ethnic_category, Document::Enum
         attribute :age, Age

data/app/presenters/renalware/hd/session_presenter.rb

@@ -135,6 +135,14 @@ module Renalware
         RR40_ACCESS_SIDE_MAP[access_side] || RR40_ACCESS_SIDE_MAP["unknown"]
       end
 
+      # We only store the abbreviated access (rr02 + " " + rr41) so just take the first word
+      # which will be the rr02 code
+      def access_rr02_code
+        return if access_type_abbreviation.blank?
+
+        access_type_abbreviation.split(" ").first
+      end
+
       protected
 
       attr_reader :session, :view_context

data/app/presenters/renalware/ukrdc/patient_presenter.rb

@@ -53,6 +53,8 @@ module Renalware
       end
 
       def letters
+        return Letters::Letter.none if send_to_rpv == false
+
         CollectionPresenter.new(
           letters_patient
             .letters
@@ -161,6 +163,10 @@ module Renalware
         profile.esrf_on.to_time.iso8601
       end
 
+      def transplant_operations
+        Transplants::RecipientOperation.for_patient(id).order(performed_on: :asc)
+      end
+
       private
 
       def comorbidity_date_time_from_year(year)

data/app/presenters/renalware/ukrdc/transplant_operation_presenter.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/transplants"
+require "attr_extras"
+
+module Renalware
+  module UKRDC
+    class TransplantOperationPresenter
+      SNOMED_KIDNEY = { code: "70536003​", name: "Kidney Transplant" }.freeze
+      SNOMED_PANCREAS = { code: "62438007​", name: "Pancreas Transplant" }.freeze
+      SNOMED_KIDNEY_PANCREAS = { code: "6471000179103​", name: "Kidney Transplant" }.freeze
+
+      PROCEDURE_SNOMED_MAP = {
+        kidney: SNOMED_KIDNEY,
+        kidney_dual: SNOMED_KIDNEY,
+        kidney_pancreas: SNOMED_KIDNEY_PANCREAS,
+        pancreas: SNOMED_PANCREAS,
+        kidney_liver: SNOMED_KIDNEY,
+        liver: SNOMED_KIDNEY
+      }.freeze
+
+      TRA76_TYPE_LIVE_RELATED_MAP = {
+        sibling: { code: 21, description: "Transplant; Live related - sibling" },
+        father: { code: 74, description: "Transplant;  Live related - father" },
+        mother: { code: 75, description: "Transplant; Live related - mother" },
+        child: { code: 77, description: "Transplant; Live related - child " },
+        other: { code: 23, description: "Transplant; Live related - other" }
+      }.freeze
+
+      TRA76_TYPE_OTHER_MAP = {
+        cadaver: { code: 20, description: "Transplant; Cadaver donor" },
+        live_unrelated: { code: 24, description: "Transplant; Live genetically unrelated" },
+        non_heart_beating: { code: 28, description: "Transplant; non-heart-beating donor" },
+        unknown: { code: 29, description: "Transplant; type unknown" }
+      }.freeze
+
+      NHSBT_TYPE_MAP = {
+        cadaver: "DBD",
+        live_unrelated: "Live",
+        live_related: "Live",
+        non_heart_beating: "DCD"
+      }.freeze
+
+      pattr_initialize :operation
+      delegate_missing_to :operation
+      delegate :document, to: :operation
+      delegate :code, :name, to: :hospital_centre, prefix: true, allow_nil: true
+
+      def procedure_type_snomed_code
+        PROCEDURE_SNOMED_MAP.fetch(operation_type.to_sym)[:code]
+      end
+
+      def procedure_type_name
+        PROCEDURE_SNOMED_MAP.fetch(operation_type.to_sym)[:name]
+      end
+
+      def nhsbt_type
+        NHSBT_TYPE_MAP[document.donor.type&.to_sym]
+      end
+
+      # TRA76 is the type of donor. For us it is a combination of donor type and donor relationship
+      # (if live related).
+      # Unhandled options:
+      # 25 "Transplant; Cadaver donor + transp other organ"
+      # 26 "Transplant; Live donor + transplant other organ"
+      # 27 "Transplant; Live donor non-UK transplant"
+      def rr_tra76_options
+        @rr_tra76_options ||= begin
+          return if document.donor.type.blank?
+
+          donor_type = document.donor.type.to_sym
+          if donor_type == :live_related
+            rr_tra76_live_related
+          else
+            rr_tra76_other(donor_type)
+          end
+        end
+      end
+
+      private
+
+      def rr_tra76_live_related
+        donor_relationship = document.donor.relationship&.to_sym
+        TRA76_TYPE_LIVE_RELATED_MAP[donor_relationship] || TRA76_TYPE_LIVE_RELATED_MAP[:other]
+      end
+
+      def rr_tra76_other(donor_type)
+        TRA76_TYPE_OTHER_MAP[donor_type] || TRA76_TYPE_OTHER_MAP[:unknown]
+      end
+    end
+  end
+end

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

@@ -3,35 +3,19 @@
 xml = builder
 
 xml.Procedures do
+  # HD Session procedures
   patient.finished_hd_sessions.each do |session|
     render "renalware/api/ukrdc/patients/procedures/dialysis_session",
            builder: xml,
            patient: patient,
            session: Renalware::HD::SessionPresenter.new(session)
   end
-  # patient.prescriptions.each do |prescription|
-  #   xml.Medication do
-  #     xml.FromTime prescription.prescribed_on.to_datetime
-  #     if prescription.terminated_or_marked_for_termination?
-  #       xml.ToTime prescription.terminated_on&.to_datetime
-  #     end
-  #     xml.Route do
-  #       xml.CodingStandard "RR22"
-  #       xml.Code prescription.medication_route&.rr_code
-  #       xml.Description prescription.medication_route&.name
-  #     end
-  #     xml.DrugProduct do
-  #       xml.Generic prescription.drug
-  #       # xml.Id do
-  #       #   xml.CodingStandard "DM+D"
-  #       #   xml.Code "dm + d code for the drug - coming soon"
-  #       #   xml.Description prescription.drug
-  #       # end
-  #     end
-  #     xml.Frequency prescription.frequency
-  #     xml.Comments prescription.notes
-  #     # xml.DoseUoM
-  #     # xml.Indication
-  #   end
-  # end
+
+  # Transplant operation procedures
+  patient.transplant_operations.each do |operation|
+    render "renalware/api/ukrdc/patients/procedures/transplant_operation",
+           builder: xml,
+           patient: patient,
+           operation: Renalware::UKRDC::TransplantOperationPresenter.new(operation)
+  end
 end

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

@@ -2,12 +2,15 @@
 
 xml = builder
 
-# A temporary output ot the treatment timeline using just this modality descriptions with a
-# crude renal reg modality code assigned to them - HD PD Transplant vCKD - all other modalities
+# A temporary output of the treatment timeline using just modality descriptions with a
+# crude renal reg modality code assigned to them - HD, PD, Transplant, vCKD - all other modalities
 # fall through the gaps at this stage until we implement this properly. Also sub RR modal codes
 # like CAPD and HDF are not yet implemented, just the top level modality.
 patient.modalities.each do |modality|
-  next if modality.description.ukrdc_modality_code_id.blank?
+  ukrdc_modality_code_id = modality.description.ukrdc_modality_code_id
+  next if ukrdc_modality_code_id.blank?
+
+  ukrdc_modality_code = Renalware::UKRDC::ModalityCode.find(ukrdc_modality_code_id)
 
   xml.Treatment do
     xml.EncounterNumber modality.id
@@ -22,7 +25,27 @@ patient.modalities.each do |modality|
 
     xml.AdmitReason do
       xml.CodingStandard "CF_RR7_TREATMENT"
-      xml.Code Renalware::UKRDC::ModalityCode.find(modality.description.ukrdc_modality_code_id).txt_code
+      xml.Code ukrdc_modality_code.txt_code
     end
+
+    # # This is a bit of hack to get the HD Profile location for the current modality
+    # if [1, 2, 3, 4, 5, 9].include?(ukrdc_modality_code.txt_code.to_i) # HD
+    #   profile = Renalware::HD::Profile
+    #     .for_patient(patient)
+    #     .where(<<-SQL).first
+    #     created_at::date <= '#{modality.started_on}'
+    #     and (
+    #       deactivated_at is NULL or
+    #       (
+    #         deactivated_at >= '#{modality.started_on}'
+    #       )
+    #     )
+    #     SQL
+    #   if profile&.hospital_unit.present?
+    #     xml.Attributes do
+    #       xml.QBL05 profile.hospital_unit.unit_type # eg home
+    #     end
+    #   end
+    # end
   end
 end

data/app/views/renalware/api/ukrdc/patients/procedures/_dialysis_session.xml.builder

@@ -31,7 +31,7 @@ xml.DialysisSession(
   xml.ExternalId session.uuid
   xml.Attributes do
     xml.QHD19 session.had_intradialytic_hypotension?
-    xml.QHD20 session.access_type_abbreviation
+    xml.QHD20 session.access_rr02_code
     xml.QHD21 session.access_side_rr40_code
     xml.QHD22 "N" # Access in two sites simultaneously
     xml.QHD30 session.blood_flow

data/app/views/renalware/api/ukrdc/patients/procedures/_transplant_operation.xml.builder

@@ -0,0 +1,35 @@
+xml = builder
+
+xml.Transplant do
+  if operation.operation_type.present?
+    xml.ProcedureType do
+      xml.CodingStandard "SNOMED"
+      xml.Code operation.procedure_type_snomed_code
+      xml.Description operation.procedure_type_name
+    end
+  end
+
+  xml.ProcedureTime operation.performed_on&.to_time&.iso8601
+
+  if operation.hospital_centre_code.present?
+    xml.EnteredAt do
+      xml.CodingStandard "ODS"
+      xml.Code operation.hospital_centre_code
+      xml.Description operation.hospital_centre_name
+    end
+  end
+
+  xml.Attributes do
+    if operation.nhsbt_type.present?
+      xml.TRA77 operation.nhsbt_type
+    end
+    # Note sending TRA76 yet as defined as datetime in XSD and needs changeing there.
+    # if operation.rr_tra76_options.present?
+    #   xml.TRA76 do
+    #     xml.CodingStandard "CF_RR7_TREATMENT"
+    #     xml.Code operation.rr_tra76_options[:code]
+    #     xml.Description operation.rr_tra76_options[:description]
+    #   end
+    # end
+  end
+end

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

@@ -18,7 +18,7 @@ xml.ukrdc(:PatientRecord, namespace_and_schema) do
   render "social_histories", builder: xml, patient: patient
   render "family_histories", builder: xml, patient: patient
   render "observations", builder: xml, patient: patient
-  render "allergies", builder: xml, patient: patient
+  # render "allergies", builder: xml, patient: patient
   render "diagnoses", builder: xml, patient: patient
   render "medications", builder: xml, patient: patient
   render "procedures", builder: xml, patient: patient

data/app/views/renalware/transplants/recipient_operations/_form.html.slim

@@ -41,6 +41,7 @@ ruby:
              locals: { legend: "Donor", name: "donor" } do
       = fd.simple_fields_for :donor, fd.object.donor do |fcm|
         = fcm.input :type, wrapper: :horizontal_small
+        = fcm.input :relationship, wrapper: :horizontal_small
         = fcm.input :ukt_donor_number, wrapper: :horizontal_small
         = fcm.input :ukt_notified_at, as: :datetime_picker, wrapper: :horizontal_datepicker
         = fcm.input :gender, wrapper: :horizontal_small

data/config/locales/renalware/transplants/recipient_operation.yml

@@ -72,6 +72,12 @@ en:
         cadaver: Cadaver
         non_heart_beating: NHB
         live_unrelated: Live unrelated
+      relationship:
+        sibling: Sibling
+        father: Father
+        mother: Mother
+        child: Child
+        other: Other
       ethnic_category:
         white: "White"
         black_caribbean: "Black Caribbean"

data/lib/renalware/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.84
+  version: 2.0.85
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-18 00:00:00.000000000 Z
+date: 2019-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type
@@ -2022,6 +2022,7 @@ files:
 - app/presenters/renalware/ukrdc/pathology_observation_presenter.rb
 - app/presenters/renalware/ukrdc/pathology_observation_request_presenter.rb
 - app/presenters/renalware/ukrdc/patient_presenter.rb
+- app/presenters/renalware/ukrdc/transplant_operation_presenter.rb
 - app/presenters/renalware/virology/dashboard_presenter.rb
 - app/presenters/string_presenter.rb
 - app/presenters/time_presenter.rb
@@ -2144,6 +2145,7 @@ files:
 - app/views/renalware/api/ukrdc/patients/observations/_standing_blood_pressure.xml.builder
 - app/views/renalware/api/ukrdc/patients/observations/_weight.xml.builder
 - app/views/renalware/api/ukrdc/patients/procedures/_dialysis_session.xml.builder
+- app/views/renalware/api/ukrdc/patients/procedures/_transplant_operation.xml.builder
 - app/views/renalware/api/ukrdc/patients/show.xml.builder
 - app/views/renalware/api/v1/medications/prescriptions/index.json.jbuilder
 - app/views/renalware/api/v1/patients/patients/index.json.jbuilder