hqmf2js 1.2.1 → 1.3.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTFiZDJjMjNmZGViNTU3MGE1MzY2M2YwYzBhZDVmOTViMjRhNDk1Zg==
+  data.tar.gz: !binary |-
+    ZGRlMTYwNmRmODBlZjNkNmQwY2E1Yjg4NmY2YmMwZjIxMjNmYjNkZA==
+SHA512:
+  metadata.gz: !binary |-
+    ZWM3NDBhMzBmYzg5YjE0ODAyZmEzNDliMDgzODIyZmI0MGIxM2FlZDY3ZTBm
+    NDkwZjhhMjMyMGZkZWNjYzk1ZDI0OWFlYjdiYzFmMzU5YmU2MTM3YWMxMGQ5
+    ZDcyMmZiNTdlMTdmMGZhZWVjYmI0YWFiNmUwNzM2MzhlYzcyNjY=
+  data.tar.gz: !binary |-
+    YTg5ZDhiZjZlOTYxNzY5ZTlkNjI3NDI2NGQzM2M4YzVkZDEwMTAxZDJmYjQ5
+    ZjJkNWFkZmY3N2UyZDZhYWI1NWY5ZjJkOWU2OGMzZjA4NjhjOTM5ZGM3MjRj
+    MDYzODYwMDAyODU2ZWNhMjhmMWIzMDJjNDAxN2ZmNzNkZjcxZDQ=

data/.travis.yml

@@ -1,17 +1,14 @@
 language: ruby
-
 rvm:
   - 1.9.3
-
-script: bundle exec rake
-
+script: bundle exec rake test
 notifications:
   email:
     recipients:
       - healthcare-ci@googlegroups.com
     on_failure: change
 
-branches:
+branches: 
   only:
     - master
     - develop

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem 'rails', '3.2.9'
+gem 'rails', '3.2.14'
 
 group :assets do
   gem 'sass-rails'
@@ -8,10 +8,11 @@ group :assets do
   gem 'uglifier'
 end
 
-gemspec
+gem 'hquery-patient-api', '1.0.4'
+gem 'health-data-standards', :git => 'https://github.com/projectcypress/health-data-standards.git', :branch => 'master'
 
 gem 'nokogiri'
-gem 'sprockets', '~> 2.2.2'
+gem 'sprockets'
 gem 'coffee-script'
 gem 'uglifier'
 gem 'tilt'
@@ -19,9 +20,10 @@ gem 'rake'
 gem 'pry'
 
 group :test do
+  gem 'simplecov', :require => false
+
   gem 'minitest'
   gem 'turn', :require => false
-  gem 'cover_me', '~> 1.2.0'
   gem 'awesome_print', :require => 'ap'
   
   platforms :ruby do

data/Gemfile.lock

@@ -1,46 +1,53 @@
-PATH
-  remote: .
+GIT
+  remote: https://github.com/projectcypress/health-data-standards.git
+  revision: 7a5673f90ab59b1350e22a71aefc1de5b569d98b
+  branch: master
   specs:
-    hqmf2js (1.2.1)
-      coffee-script (~> 2.2.0)
-      health-data-standards (~> 3.1.1)
-      hquery-patient-api (~> 1.0.2)
-      nokogiri (~> 1.5.5)
-      sprockets (~> 2.2.2)
-      tilt (~> 1.3.3)
+    health-data-standards (3.4.3)
+      activesupport (~> 3.2.14)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      log4r (~> 1.1.10)
+      memoist (~> 0.9.1)
+      mongoid (~> 3.1.4)
+      mongoid-tree (~> 1.0.4)
+      nokogiri (= 1.6.0)
+      rest-client (~> 1.6.7)
+      rubyzip (= 0.9.9)
+      uuid (~> 2.3.7)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
-      mail (~> 2.4.4)
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    actionmailer (3.2.14)
+      actionpack (= 3.2.14)
+      mail (~> 2.5.4)
+    actionpack (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.14)
+      activesupport (= 3.2.14)
       builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    activerecord (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
-      i18n (~> 0.6)
+    activeresource (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     ansi (1.4.3)
-    arel (3.0.2)
+    arel (3.0.3)
     awesome_print (1.1.0)
     builder (3.0.4)
     coderay (1.0.8)
@@ -51,81 +58,67 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.4.0)
-    configatron (2.9.1)
-      yamler (>= 0.1.0)
-    cover_me (1.2.0)
-      configatron
-      hashie
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    hashie (1.2.0)
-    health-data-standards (3.1.1)
-      activesupport (~> 3.2.9)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      log4r (~> 1.1.10)
-      memoist (~> 0.9.0)
-      mongoid (~> 3.1.0)
-      nokogiri (~> 1.5.5)
-      rest-client (~> 1.6.7)
-      rubyzip
-      uuid (~> 2.3.5)
-    hike (1.2.1)
-    hquery-patient-api (1.0.2)
-    i18n (0.6.1)
+    hike (1.2.3)
+    hquery-patient-api (1.0.4)
+    i18n (0.6.9)
     journey (1.0.4)
-    json (1.7.5)
+    json (1.8.1)
     libv8 (3.3.10.4)
     log4r (1.1.10)
-    macaddr (1.6.1)
-      systemu (~> 2.5.0)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    macaddr (1.6.7)
+      systemu (~> 2.6.2)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    memoist (0.9.0)
+    memoist (0.9.1)
     method_source (0.8.1)
-    mime-types (1.20.1)
+    mime-types (1.25.1)
+    mini_portile (0.5.3)
     minitest (4.3.2)
-    mongoid (3.1.3)
+    mongoid (3.1.6)
       activemodel (~> 3.2)
-      moped (~> 1.4.2)
+      moped (~> 1.4)
       origin (~> 1.0)
-      tzinfo (~> 0.3.22)
-    moped (1.4.5)
-    multi_json (1.5.0)
-    nokogiri (1.5.6)
-    origin (1.0.11)
-    polyglot (0.3.3)
+      tzinfo (~> 0.3.29)
+    mongoid-tree (1.0.4)
+      mongoid (>= 3.0, <= 4.0)
+    moped (1.5.2)
+    multi_json (1.9.2)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
+    origin (1.1.0)
+    polyglot (0.3.4)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
-    rack (1.4.4)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.4)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
+    rails (3.2.14)
+      actionmailer (= 3.2.14)
+      actionpack (= 3.2.14)
+      activerecord (= 3.2.14)
+      activeresource (= 3.2.14)
+      activesupport (= 3.2.14)
       bundler (~> 1.0)
-      railties (= 3.2.9)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
+      railties (= 3.2.14)
+    railties (3.2.14)
+      actionpack (= 3.2.14)
+      activesupport (= 3.2.14)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.2)
-    rdoc (3.12)
+    rake (10.2.0)
+    rdoc (3.12.2)
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -135,29 +128,32 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     slop (3.3.3)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    systemu (2.5.2)
+    systemu (2.6.4)
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)
-    thor (0.16.0)
-    tilt (1.3.3)
-    treetop (1.4.12)
+    thor (0.19.1)
+    tilt (1.4.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     turn (0.9.6)
       ansi
-    tzinfo (0.3.35)
+    tzinfo (0.3.39)
     uglifier (1.3.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
     uuid (2.3.7)
       macaddr (~> 1.0)
-    yamler (0.1.0)
 
 PLATFORMS
   ruby
@@ -166,15 +162,16 @@ DEPENDENCIES
   awesome_print
   coffee-rails
   coffee-script
-  cover_me (~> 1.2.0)
-  hqmf2js!
+  health-data-standards!
+  hquery-patient-api (= 1.0.4)
   minitest
   nokogiri
   pry
-  rails (= 3.2.9)
+  rails (= 3.2.14)
   rake
   sass-rails
-  sprockets (~> 2.2.2)
+  simplecov
+  sprockets
   therubyracer
   therubyrhino
   tilt

data/Rakefile

@@ -11,12 +11,16 @@ Dir['lib/tasks/*.rake'].sort.each do |ext|
   load ext
 end
 
-$LOAD_PATH << File.expand_path("../test",__FILE__)
 desc "Run basic tests"
-Rake::TestTask.new("test_units") { |t|
-  t.pattern = 'test/unit/*_test.rb'
+Rake::TestTask.new(:test_unit) do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/**/*_test.rb']
   t.verbose = true
   t.warning = false
-}
+end
+
+task :test => [:test_unit] do
+  system("open coverage/index.html")
+end
 
-task :default => [:test_units,'cover_me:report']
+task :default => [:test]

data/app/assets/javascripts/hqmf_util.js.coffee

@@ -52,6 +52,7 @@ class TS
     else
       earlier = @date
       later = ts.asDate()
+    return Number.MAX_VALUE if !earlier? || !later?
     if granularity=="a"
       TS.yearsDifference(earlier,later)
     else if granularity=="mo"
@@ -91,6 +92,9 @@ class TS
       [a,b] = TS.dropSeconds(@date, other.date)
       a.getTime() > b.getTime()
 
+  equals: (other) ->
+    (@date==null && other.date==null) || (@date.getTime()==other.date.getTime())
+
   # Returns whether this TS is before or concurrent with the supplied TS ignoring seconds
   beforeOrConcurrent: (other) ->  
     if @date==null || other.date==null
@@ -398,6 +402,10 @@ class IVL_TS
       @low.asDate() && other.high.asDate() && @low.withinSameMinute(other.high)
     else
       false
+
+  equals: (other) ->
+    (@low==null && other.low==null) || (@low.equals(other.low)) && (@high==null && other.high==null) || (@high.equals(other.high))
+
 @IVL_TS = IVL_TS
 
 # Used to represent a value that will match any other value that is not null.
@@ -408,29 +416,80 @@ class ANYNonNull
     val != null
 @ANYNonNull = ANYNonNull
 
+invokeOne = (patient, initialSpecificContext, fn) ->
+  if typeof(fn.isTrue)=='function' || typeof(fn)=='boolean'
+    fn
+  else
+    fn(patient, initialSpecificContext)
+@invokeOne = invokeOne
+
+evalUnlessShortCircuit = (fn) ->
+  # if we are short circuiting then return the function uncalled, if we are not then call the function and
+  # evaluate the tree.  If uncalled, from here the function will only be called if required
+  if (Logger.short_circuit) then fn else fn()
+@evalUnlessShortCircuit = evalUnlessShortCircuit
+
+invokeAll = (patient, initialSpecificContext, fns) ->
+  (invokeOne(patient, initialSpecificContext, fn) for fn in fns)
+@invokeAll = invokeAll
+  
 # Returns true if one or more of the supplied values is true
-atLeastOneTrue = (precondition, values...) ->
-  trueValues = (value for value in values when value && value.isTrue())
-  trueValues.length>0
-  hqmf.SpecificsManager.unionAll(new Boolean(trueValues.length>0), values)
+atLeastOneTrue = (precondition, patient, initialSpecificContext, valueFns...) ->
+  evalUnlessShortCircuit ->
+    values = invokeAll(patient, initialSpecificContext, valueFns)
+    trueValues = (value for value in values when value && value.isTrue())
+    hqmf.SpecificsManager.unionAll(new Boolean(trueValues.length>0), values)
 @atLeastOneTrue = atLeastOneTrue
-  
+
 # Returns true if all of the supplied values are true
-allTrue = (precondition, values...) ->
-  trueValues = (value for value in values when value && value.isTrue())
-  hqmf.SpecificsManager.intersectAll(new Boolean(trueValues.length>0 && trueValues.length==values.length), values)
+allTrue = (precondition, patient, initialSpecificContext, valueFns...) ->
+  evalUnlessShortCircuit ->
+    values = []
+    for valueFn in valueFns
+      value = invokeOne(patient, initialSpecificContext, valueFn)
+      # break if the we have a false value and we're short circuiting.  
+      #If we're not short circuiting then we want to calculate everything
+      break if value.isFalse() && Logger.short_circuit
+      values.push(value)
+    trueValues = (value for value in values when value && value.isTrue())
+    if trueValues.length==valueFns.length
+      hqmf.SpecificsManager.intersectAll(new Boolean(trueValues.length>0), trueValues)
+    else
+      # only intersect on false if we are not short circuiting.
+      # if we are not short circuiting then we want to have the specifics context returned for rationale
+      if Logger.short_circuit
+        value = new Boolean(false)
+        value.specificContext = hqmf.SpecificsManager.empty()
+        value
+      else
+        hqmf.SpecificsManager.intersectAll(new Boolean(false), values)
+
+
 @allTrue = allTrue
   
 # Returns true if one or more of the supplied values is false
-atLeastOneFalse = (precondition, values...) ->
-  falseValues = (value for value in values when value.isFalse())
-  hqmf.SpecificsManager.intersectAll(new Boolean(falseValues.length>0), values, true)
+atLeastOneFalse = (precondition, patient, initialSpecificContext, valueFns...) ->
+#   values = invokeAll(patient, initialSpecificContext, valueFns)
+#   falseValues = (value for value in values when value.isFalse())
+#   hqmf.SpecificsManager.intersectAll(new Boolean(falseValues.length>0), values, true)
+  evalUnlessShortCircuit ->
+    values = []
+    hasFalse = false
+    for valueFn in valueFns
+      value = invokeOne(patient, initialSpecificContext, valueFn)
+      values.push(value)
+      if value.isFalse()
+        hasFalse = true
+        break if Logger.short_circuit
+    hqmf.SpecificsManager.intersectAll(new Boolean(values.length>0 && hasFalse), values, true)
 @atLeastOneFalse = atLeastOneFalse
   
 # Returns true if all of the supplied values are false
-allFalse = (precondition, values...) ->
-  falseValues = (value for value in values when value.isFalse())
-  hqmf.SpecificsManager.unionAll(new Boolean(falseValues.length>0 && falseValues.length==values.length), values, true)
+allFalse = (precondition, patient, initialSpecificContext, valueFns...) ->
+  evalUnlessShortCircuit ->
+    values = invokeAll(patient, initialSpecificContext, valueFns)
+    falseValues = (value for value in values when value.isFalse())
+    hqmf.SpecificsManager.unionAll(new Boolean(falseValues.length>0 && falseValues.length==values.length), values, true)
 @allFalse = allFalse
   
 # Return true if compareTo matches value
@@ -447,7 +506,7 @@ anyMatchingValue = (event, valueToMatch) ->
 # Return only those events whose value matches the supplied value
 filterEventsByValue = (events, value) ->
   matchingEvents = (event for event in events when (anyMatchingValue(event, value)))
-  matchingEvents
+  hqmf.SpecificsManager.maintainSpecifics(matchingEvents, events)
 @filterEventsByValue = filterEventsByValue
 
 # Return only those events with a field that matches the supplied value
@@ -530,11 +589,14 @@ XPRODUCT = (eventLists...) ->
 # Create a new list containing all the events from the supplied event lists
 UNION = (eventLists...) ->
   union = []
-  # keep track of the specific occurrences by encounter ID.  This is used in eventsMatchBounds (specifically in buildRowsForMatching down the _.isObject path)
+  # keep track of the specific occurrences by encounter ID.  This is used in 
+  # eventsMatchBounds (specifically in buildRowsForMatching down the _.isObject path)
   specific_occurrence = {}
   for eventList in eventLists
     for event in eventList
-      specific_occurrence[event.id] = eventList.specific_occurrence if eventList.specific_occurrence
+      if eventList.specific_occurrence
+        specific_occurrence[event.id] ||= []
+        specific_occurrence[event.id].push eventList.specific_occurrence 
       union.push(event)
   union.specific_occurrence = specific_occurrence unless _.isEmpty(specific_occurrence)
   hqmf.SpecificsManager.unionAll(union, eventLists)
@@ -745,39 +807,52 @@ applySpecificOccurrenceSubset = (operator, result, range, calculateSpecifics) ->
       result.specificContext = result.specificContext[operator]()
   result
 
+uniqueEvents = (events) ->
+  hash = {}
+  (hash[event.id] = event for event in events)
+  _.values(hash)
+@uniqueEvents = uniqueEvents
+
+# if we have multiple events at the same exact time and they happen to be the one selected by FIRST, RECENT, etc
+# then we want to select all of these issues as the first, most recent, etc.
+selectConcurrent = (target, events) ->
+  targetIVL = target.asIVL_TS()
+  uniqueEvents((result for result in events when result.asIVL_TS().equals(targetIVL)))
+@selectConcurrent = selectConcurrent
+
 FIRST = (events) ->
   result = []
-  result = [events.sort(dateSortAscending)[0]] if (events.length > 0)
+  result = selectConcurrent(events.sort(dateSortAscending)[0], events) if (events.length > 0)
   applySpecificOccurrenceSubset('FIRST',hqmf.SpecificsManager.maintainSpecifics(result, events))
 @FIRST = FIRST
 
 SECOND = (events) ->
   result = []
-  result = [events.sort(dateSortAscending)[1]] if (events.length > 1)
+  result = selectConcurrent(events.sort(dateSortAscending)[1], events) if (events.length > 1)
   applySpecificOccurrenceSubset('SECOND',hqmf.SpecificsManager.maintainSpecifics(result, events))
 @SECOND = SECOND
 
 THIRD = (events) ->
   result = []
-  result = [events.sort(dateSortAscending)[2]] if (events.length > 2)
+  result = selectConcurrent(events.sort(dateSortAscending)[2], events) if (events.length > 2)
   applySpecificOccurrenceSubset('THIRD',hqmf.SpecificsManager.maintainSpecifics(result, events))
 @THIRD = THIRD
 
 FOURTH = (events) ->
   result = []
-  result = [events.sort(dateSortAscending)[3]] if (events.length > 3)
+  result = selectConcurrent(events.sort(dateSortAscending)[3], events) if (events.length > 3)
   applySpecificOccurrenceSubset('FOURTH',hqmf.SpecificsManager.maintainSpecifics(result, events))
 @FOURTH = FOURTH
 
 FIFTH = (events) ->
   result = []
-  result = [events.sort(dateSortAscending)[4]] if (events.length > 4)
+  result = selectConcurrent(events.sort(dateSortAscending)[4], events) if (events.length > 4)
   applySpecificOccurrenceSubset('FIFTH',hqmf.SpecificsManager.maintainSpecifics(result, events))
 @FIFTH = FIFTH
 
 RECENT = (events) ->
   result = []
-  result = [events.sort(dateSortDescending)[0]] if (events.length > 0)
+  result = selectConcurrent(events.sort(dateSortDescending)[0], events) if (events.length > 0)
   applySpecificOccurrenceSubset('RECENT',hqmf.SpecificsManager.maintainSpecifics(result, events))
 @RECENT = RECENT
   

data/app/assets/javascripts/logging_utils.js.coffee

@@ -4,11 +4,18 @@ class @Logger
   @info: (string) ->
     if @enable_logging
       @logger.push("#{Logger.indent()}#{string}")
+
   @record: (id, result) ->
     if @enable_rationale and result? and typeof(result.isTrue) == 'function'
-      @rationale[id] = result.isTrue()
+      if result.isTrue() and result.length
+        json_results = _.map(result,(item) -> {id: item.id, json: item.json})
+        @rationale[id] = {results: json_results }
+      else  
+        @rationale[id] = result.isTrue()
+
   @enable_logging: true
   @enable_rationale: true
+  @short_circuit: true
   @initialized: false
   @indentCount = 0
   @indent: ->
@@ -67,9 +74,10 @@ class @Logger
     Logger.indentCount--
     
     
-@injectLogger = (hqmfjs, enable_logging, enable_rationale) ->
+@injectLogger = (hqmfjs, enable_logging, enable_rationale, short_circuit) ->
   Logger.enable_logging = enable_logging
   Logger.enable_rationale = enable_rationale
+  Logger.short_circuit = short_circuit
 
   # Wrap all of the data criteria functions generated from HQMF
   _.each(_.functions(hqmfjs), (method) ->
@@ -98,20 +106,21 @@ class @Logger
     
     # Wrap selected hQuery Patient API functions
     _.each(_.functions(hQuery.Patient.prototype), (method) ->
-      if (hQuery.Patient.prototype[method].length == 0)
-        hQuery.Patient.prototype[method] = _.wrap(hQuery.Patient.prototype[method], (func) ->
-          Logger.info("called patient.#{method}():")
-          func = _.bind(func, this)
-          result = func()
-          Logger.info("patient.#{method}() -> #{Logger.stringify(result)}")
-          return result;);
-      else
-        hQuery.Patient.prototype[method] = _.wrap(hQuery.Patient.prototype[method], (func) ->
-          args = Array.prototype.slice.call(arguments,1)
-          Logger.info("called patient.#{method}(#{args}):")
-          result = func.apply(this, args)
-          Logger.info("patient.#{method}(#{args}) -> #{Logger.stringify(result)}")
-          return result;);
+      if method != 'getEvents' && method != 'getAndCacheEvents'
+        if (hQuery.Patient.prototype[method].length == 0)
+          hQuery.Patient.prototype[method] = _.wrap(hQuery.Patient.prototype[method], (func) ->
+            Logger.info("called patient.#{method}():")
+            func = _.bind(func, this)
+            result = func()
+            Logger.info("patient.#{method}() -> #{Logger.stringify(result)}")
+            return result;);
+        else
+          hQuery.Patient.prototype[method] = _.wrap(hQuery.Patient.prototype[method], (func) ->
+            args = Array.prototype.slice.call(arguments,1)
+            Logger.info("called patient.#{method}(#{args}):")
+            result = func.apply(this, args)
+            Logger.info("patient.#{method}(#{args}) -> #{Logger.stringify(result)}")
+            return result;);
         
     );