his_emr_api_radiology 0.0.3 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a735c1b85659230dc78dabe513a515c3d8e6414e5b07aaf52520fbb5e220ee0
-  data.tar.gz: d41d73146551ff5b755a63c5990e916342302c95f39bd842e0f4d640b77f2e50
+  metadata.gz: ab64d31ea8b7ec7e8829c80a82e4a62840f300ee3ed9e8b385c9e6d73b9dbd94
+  data.tar.gz: 2189afd1dc6fb546fb709195a172ecaf2dd90087e62b5ee32264e788731eac60
 SHA512:
-  metadata.gz: 66c2dab2f6776d6f1662d1cf1a6cf06b6f5390f6e4aba9442d60d5644bee3f7ba25bc73fd62d166d291b9e9472843480a519ee2a87a19460d7d63091781a91b0
-  data.tar.gz: 5e1c592d2a6238ba937becd1edde5ecdde0a293799792fff45f1552ef4a88e5afde73c119f4a552702d3c0ff562179da5ad31e6d18cdc79b5c43e7602674b6b5
+  metadata.gz: 9ff060fddcaa5f0f523e70a7b7d175813a94cbdfa00f94b284cd25a49fedf657e1f275ea9efb153f89b846036fdfbc0a8723a581f9ca280437b9c915f09d8a99
+  data.tar.gz: '0794b58ba818afaad4a5564b3c04f35d0cf0a82396b81f2c64cf37e7c97998f141987b6a7be373f353a3825a06de4f99767d2017a1b376da60a4431241ab1fe9'

data/app/controllers/radiology/radiology_controller.rb

@@ -1,12 +1,20 @@
 # frozen_string_literal: true
 require 'zebra_printer/init'
-class Radiology::RadiologyOrdersController < ::ApplicationController
+class Radiology::RadiologyController < ::ApplicationController
   before_action :authenticate, except: %i[print_order_label ]
   def create
     patient_details, physician_details, radiology_orders = params.require %i[patient_details physician_details radiology_orders]
     radiology_orders = service.generate_msi(patient_details,physician_details, radiology_orders)
     render json: radiology_orders, status: :created
   end
+  def show
+    render json: service.get_radiology_orders(params[:id])
+  end
+
+  def index
+    render json: service.get_previous_orders(params[:patient_id])
+  end
+
   def print_order_label
     label = service.print_radiology_barcode(params[:accession_number],params[:patient_national_id], params[:patient_name], params[:radio_order], params[:date_created])
     send_data(label, type: 'application/label; charset=utf-8',

data/app/services/radiology/radiology_service.rb

@@ -15,7 +15,7 @@ module Radiology
         end
   
   
-        sample_file_path = "/var/www/BHT-EMR-API/config/sample.msi"
+        sample_file_path = "#{Rails.root}/config/sample.msi"
         save_file_path = "/tmp/#{patient_details[:accession_number] }_#{patient_details[:patient_name].gsub(' ', '_')}_scheduled_radiology.msi"
   
         # using eval() might decrease performance, not sure if there's a better way to do this.
@@ -29,7 +29,7 @@ module Radiology
   
        # send created msi file to ftp server
       def send_scheduled_msi(file_path)
-        main_config = YAML.load_file('/var/www/BHT-EMR-API/config/application.yml')
+        main_config = YAML.load_file("#{Rails.root}/config/application.yml")
         # connect with FTP server
         # NOTE: main_config[:ftp_host], main_config[:ftp_user_name], main_config[:ftp_pw] is in application.yml file.
         Net::FTP.open(main_config['ftp_host']) do |ftp|
@@ -53,6 +53,42 @@ module Radiology
   
         label.print(1)
       end
+      
+      def get_radiology_orders(group_concept_id)
+        stats = []
+        i = 0
+    
+        groupData = get_concept_names(group_concept_id)
+        (groupData || []).each do |groupRecord|
+          stats << {
+            concept_id: groupRecord['concept_id'],
+            group: groupRecord['name'],
+            complaints: [],
+          }
+    
+          data = get_concept_names(groupRecord['concept_id'])
+          (data || []).each do |record|
+            stats[i][:complaints] << {
+              concept_id: record['concept_id'],
+              name: record['name'],
+            }
+          end
+    
+          i += 1
+        end
+    
+        stats
+      end
+    
+      def get_concept_names(concept_id)
+        ConceptName.where("s.concept_set = ?
+        ", concept_id).joins("INNER JOIN concept_set s ON
+        s.concept_id = concept_name.concept_id").group("concept_name.concept_id").order(:name)
+      end
+
+      def get_previous_orders(patient_id)
+        Observation.where("person_id = ?  AND voided =0 AND concept_id = 8426",patient_id).order('obs_datetime DESC')
+      end
     end
   end
 end

data/config/routes.rb

@@ -1,7 +1,6 @@
 Radiology::Engine.routes.draw do
-    resources :radiology, path: 'api/v1/radiology/radiology_orders'
-    resources :radiology_properties, path: 'api/v1/radiology_properties'
-      
+    resources :radiology, path: 'api/v1/radiology/radiology_orders'      
     get '/api/v1/radiology/barcode', to: 'radiology#print_order_label'
+    get '/api/v1/list_radiology_orders', to: 'radiology#show'
     
 end

data/lib/radiology/version.rb

@@ -1,3 +1,3 @@
 module Radiology
-  VERSION = '0.0.3'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_radiology
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.8
 platform: ruby
 authors:
 - petros
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-11-20 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -218,7 +198,6 @@ files:
 - Rakefile
 - app/controllers/radiology/application_controller.rb
 - app/controllers/radiology/radiology_controller.rb
-- app/controllers/radiology/radiology_properties_controller.rb
 - app/helpers/radiology/application_helper.rb
 - app/jobs/radiology/application_job.rb
 - app/mailers/radiology/application_mailer.rb
@@ -249,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Radiology extension for the HIS-EMR-API

data/app/controllers/radiology/radiology_properties_controller.rb

@@ -1,20 +0,0 @@
-require 'json'
-class Radiology::RadiologyPropertiesController < ::ApplicationController
-  def create(success_response_status: :created)
-    path, value = params.require %i[path property_value]
-    
-      file = File.read path
-      hash = JSON.parse file
-      if value == 'true'
-        hash['encounters']['radiology orders']['available'] = true
-        hash['encounters']['view radiology results']['available'] = true
-      else
-        hash['encounters']['radiology orders']['available'] = false
-        hash['encounters']['view radiology results']['available'] = false
-      end
-      File.open path , "w" do |f|
-        f.puts JSON.pretty_generate hash
-      end
-      render json: value, status: success_response_status
-  end
-end