renalware-core 2.0.102 → 2.0.103

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e133555ef2e268c6afe1886268f93c58e83e894946580483a919e39d93f1b077
-  data.tar.gz: 6f95064fe71e9d753935ce21c44cd46486e973f940777ff065be97fe502fa7bb
+  metadata.gz: b3fcf667f61a34da31971a76359ec16409ac8da3f4f118b9b42de1de51249623
+  data.tar.gz: '0109e1864753ae09f154ab1f3e1f764f116475a1835d627955d4ade5294bf26f'
 SHA512:
-  metadata.gz: c3e4ce78a878dd8933d791d30c7692056997b4194468c53924d2620f126192296e117c5b1d7db72b74e6fdd7a69ec63e3d95913497e43291038409ce1fcfa917
-  data.tar.gz: 3a377a342f2585c1341860e233dc7af417cd66d9cc43306bb3648fd9ca8f572cd01938134494a5b96b7d5734a032c00944e109dde7dfe08211f1f6ce57f1ec2d
+  metadata.gz: 1b555f9e3be2c7c52b3864c69cb346d99a1ea75465e9556bff4d2c735a9c12237492bbfdf7ecc0304447a1362f53d8f0a14941f2278eaf5cd6ec2bf016fc8851
+  data.tar.gz: a0ca258b95dcfcbefce04d1f3c2832592154f1e9fb2ccb56b8f9da0350f066bdbabe7b6412ebdf9342f2a5309c9b34dbd28dd4b07e8dba3cbd14ec2fe771f41f

data/app/documents/renalware/smoking_status.rb

@@ -4,8 +4,22 @@ require "document/enum"
 
 module Renalware
   class SmokingStatus < NestedAttribute
+    SMOKING_SNOMED_MAP = {
+      current: { code: 77176002, description: "Current" },
+      non_smoker: { code: 8392000, description: "Non" },
+      ex_smoker: { code: 8517006, description: "Ex" }
+    }.freeze
+
     attribute :value,
               Document::Enum,
               enums: %i(non_smoker ex_smoker current)
+
+    def snomed_code
+      SMOKING_SNOMED_MAP.dig(value&.to_sym, :code)
+    end
+
+    def snomed_description
+      SMOKING_SNOMED_MAP.dig(value&.to_sym, :description)
+    end
   end
 end

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

@@ -38,13 +38,6 @@ module Renalware
         super
       end
 
-      # def modalities
-      #   __getobj__
-      #     .modalities
-      #     .includes(:description)
-      #     .order(started_on: :asc, created_at: :asc)
-      # end
-
       def dead?
         current_modality_death?
       end
@@ -158,15 +151,19 @@ module Renalware
       end
 
       def clinical_history
-        @clinical_history ||= document&.history || NullObject.new
+        @clinical_history ||= document&.history || NullObject.instance
       end
 
       def smoking_history?
         clinical_history.smoking.present?
       end
 
+      def smoking_cormbidity
+        comorbidity_attributes[:smoking]
+      end
+
       def profile
-        renal_patient.profile || NullObject.instance
+        renal_patient.profile || Renalware::Renal::Profile.new
       end
 
       def first_seen_on
@@ -192,11 +189,11 @@ module Renalware
       end
 
       def comorbidity_attributes
-        profile&.document&.comorbidities&.attributes || {}
+        profile.document&.comorbidities&.attributes || {}
       end
 
       def comorbidities
-        @comorbidities ||= profile&.document&.comorbidities
+        @comorbidities ||= profile.document&.comorbidities
       end
 
       def clinical_patient

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

@@ -22,12 +22,12 @@ xml.Diagnoses do
     end
   end
 
-  if patient.smoking_history?
+  if patient.smoking_cormbidity&.value.present?
     xml.Diagnosis do
       xml.Diagnosis do
         xml.CodingStandard "SNOMED"
-        xml.Code patient.snomed_smoking_history.code
-        xml.Description "Smoking history: #{patient.snomed_smoking_history.description}"
+        xml.Code patient.smoking_cormbidity.snomed_code
+        xml.Description "Smoking history: #{patient.smoking_cormbidity.snomed_description}"
       end
       # We don't store a smoking date (it doesn't make much sense to) but UKRDC
       # would like a date so send th ESRF date. See email from GS to TC 23/5/18.

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

@@ -17,14 +17,6 @@ observation_times = {
     "weight" => observations.weight
   }
 
-  if observations.temperature_measured == :yes
-    measurements["temperature"] = observations.temperature
-  end
-
-  if observations.respiratory_rate_measured == :yes
-    measurements["respiratory_rate"] = observations.respiratory_rate
-  end
-
   measurements.each do |i18n_key, value|
     xml.Observation do
       xml.ObservationTime observation_times[pre_post].iso8601

data/app/views/renalware/api/ukrdc/patients/diagnoses/_cause_of_death.xml.builder

@@ -9,7 +9,7 @@ cause_code = 99 if cause_code == 34
 xml.CauseOfDeath do
   xml.DiagnosisType "final"
   xml.Diagnosis do
-    xml.CodingStandard "EDTA"
+    xml.CodingStandard "EDTA_COD"
     xml.Code cause_code
   end
   xml.EnteredOn cause.created_at.to_datetime

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

@@ -15,7 +15,7 @@ xml.ukrdc(:PatientRecord, namespace_and_schema) do
   render "sending_facility", builder: xml, patient: patient
   render "patient", builder: xml, patient: patient
   render "lab_orders", builder: xml, patient: patient
-  render "social_histories", builder: xml, patient: patient
+  # 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

data/lib/renalware/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.102
+  version: 2.0.103
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-03 00:00:00.000000000 Z
+date: 2019-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type