hquery-patient-api 0.3.0 → 1.0.0

data/Gemfile

@@ -1,14 +1,21 @@
 source :rubygems
 
-gem 'execjs'
 gem 'sprockets'
 gem 'coffee-script'
 gem 'uglifier'
 gem 'rake'
 gem 'tilt'
-gem 'therubyrhino', :platforms => :jruby
 
 group :test do
   gem 'minitest'
   gem 'turn', :require => false
+
+  platforms :ruby do
+    gem "libv8" 
+    gem "therubyracer", :require => 'v8'
+  end
+  
+  platforms :jruby do
+    gem "therubyrhino"
+  end
 end

data/Rakefile

@@ -15,6 +15,7 @@ Rake::TestTask.new("test_units") { |t|
 
 
 namespace :doc do
+  desc "Generate JS from CoffeeScript"
   task :generate_js do
     ctx = Sprockets::Environment.new(File.expand_path("../", __FILE__))
     Tilt::CoffeeScriptTemplate.default_bare=true 

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

@@ -39,7 +39,7 @@ class hQuery.Allergy  extends hQuery.CodedEntry
   Adverse event types SHALL be coded as specified in HITSP/C80 Section 2.2.3.4.2 Allergy/Adverse Event Type
   @returns {CodedValue}
   ###
-  adverseEventType: -> new hQuery.CodedValue @json['type']['code'], @json['type']['codeSystem']
+  adverseEventType: -> hQuery.createCodedValue @json['type']
 
   ###*
   This indicates the reaction that may be caused by the product or agent.  
@@ -55,7 +55,7 @@ class hQuery.Allergy  extends hQuery.CodedEntry
   235719002  Food intolerance (disorder)
   @returns {CodedValue} 
   ###
-  reaction: -> new hQuery.CodedValue @json['reaction']['code'], @json['reaction']['codeSystem']
+  reaction: -> hQuery.createCodedValue @json['reaction']
 
   ###*
   This is a description of the level of the severity of the allergy or intolerance.
@@ -68,7 +68,7 @@ class hQuery.Allergy  extends hQuery.CodedEntry
     399166001  Fatal
   @returns {CodedValue} 
   ###
-  severity: -> new hQuery.CodedValue @json['severity']['code'], @json['severity']['codeSystem']
+  severity: -> hQuery.createCodedValue @json['severity']
 
   ###*
   Additional comment or textual information

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

@@ -54,7 +54,7 @@ class hQuery.Condition extends hQuery.CodedEntry
   Ordinality
   @returns {CodedValue}
   ###
-  ordinality: -> new hQuery.CodedValue @json['ordinality_code']['code'], @json['ordinality_code']['codeSystem']
+  ordinality: -> hQuery.createCodedValue @json['ordinality']
 
   ###*
   age at onset
@@ -67,13 +67,13 @@ class hQuery.Condition extends hQuery.CodedEntry
   cause of death
   @returns {hQuery.CauseOfDeath}
   ###
-  causeOfDeath: -> new hQuery.CauseOfDeath @json['causeOfDeath']
+  causeOfDeath: -> new hQuery.CauseOfDeath @json['causeOfDeath'] if  @json['causeOfDeath']
   
   ###*
   problem status
   @returns {hQuery.CodedValue}
   ###
-  problemStatus: -> new hQuery.CodedValue @json['problemStatus']['code'], @json['problemStatus']['codeSystem']
+  problemStatus: -> hQuery.createCodedValue  @json['problemStatus']
   
   ###*
   comment
@@ -85,4 +85,4 @@ class hQuery.Condition extends hQuery.CodedEntry
   This is a description of the level of the severity of the condition.
   @returns {CodedValue} 
   ###
-  severity: -> new hQuery.CodedValue @json['severity']['code'], @json['severity']['codeSystem']
+  severity: -> hQuery.createCodedValue @json['severity']

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

@@ -346,6 +346,12 @@ class hQuery.CodedEntry
     # id of the entry from the source document if available
     @source_id = @json['id']
     @_freeTextType = @json['description']
+    
+  ###*
+  Adjust the start and end times of this event to the supplied timestamp
+  ###
+  setTimestamp: (timestamp) ->
+    @_date = @_startDate = @_endDate = timestamp
 
   ###*
   Date and time at which the coded entry took place
@@ -456,11 +462,14 @@ class hQuery.CodedEntry
   Indicates the reason an entry was negated.
   @returns {hQuery.CodedValue}   Used to indicate reason an immunization was not administered.
   ###
-  negationReason: -> 
-    if @json['negationReason'] && @json['negationReason']['code'] && @json['negationReason']['codeSystem']
-      new hQuery.CodedValue @json['negationReason']['code'], @json['negationReason']['codeSystem']
-    else
-      null
+  negationReason: -> hQuery.createCodedValue  @json['negationReason']
+
+  ###*
+  Explains the reason for an entry.
+  @returns {hQuery.CodedValue}   Used to explain the rationale for a given entry.
+  ###
+  reason: -> hQuery.createCodedValue @json['reason']
+  
 
 ###*
 @class Represents a list of hQuery.CodedEntry instances. Offers utility methods for matching
@@ -493,7 +502,8 @@ class hQuery.CodedEntryList extends Array
     for entry in this
       afterStart = (!start || entry.timeStamp()>=start)
       beforeEnd = (!end || entry.timeStamp()<=end)
-      if (afterStart && beforeEnd && entry.includesCodeFrom(codeSet) && (includeNegated || !entry.negationInd()))
+      matchesCode = codeSet == null || entry.includesCodeFrom(codeSet)
+      if (afterStart && beforeEnd && matchesCode && (includeNegated || !entry.negationInd()))
         cloned.push(entry)
     cloned
 
@@ -553,4 +563,5 @@ hQuery.createCodedValues = (jsonCodes) ->
       codedValues.push new hQuery.CodedValue code, codeSystem
   codedValues
 
-
+hQuery.createCodedValue = (json) ->
+  new hQuery.CodedValue json['code'], json['codeSystem'] if json?

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

@@ -9,48 +9,77 @@ this.hQuery ||= {}
 ###*
 An Encounter is an interaction, regardless of the setting, between a patient and a
 practitioner who is vested with primary responsibility for diagnosing, evaluating,
-or treating the patient's condition. It may include visits, appointments, as well
+or treating the patients condition. It may include visits, appointments, as well
 as non face-to-face interactions. It is also a contact between a patient and a
 practitioner who has primary responsibility for assessing and treating the
 patient at a given contact, exercising independent judgment.
 @class An Encounter is an interaction, regardless of the setting, between a patient and a
-practitioner 
+practitioner
 @augments hQuery.CodedEntry
 @exports Encounter as hQuery.Encounter 
 ###
 class hQuery.Encounter extends hQuery.CodedEntry
   constructor: (@json) ->
     super(@json)
+    @_admitTime = hQuery.dateFromUtcSeconds @json['admitTime'] if @json['admitTime']
+    @_dischargeTime = hQuery.dateFromUtcSeconds @json['dischargeTime'] if @json['dischargeTime']
+    @_facility = new hQuery.Facility @json['facility'] if @json['facility']
   	
   ###*
   @returns {String}
   ####
-  dischargeDisp: -> @json['dischargeDisp']
+  dischargeDisposition: -> @json['dischargeDisposition']
   
   ###*
   A code indicating the priority of the admission (e.g., Emergency, Urgent, Elective, et cetera) from
   National Uniform Billing Committee (NUBC)
   @returns {CodedValue}
   ###
-  admitType: -> new hQuery.CodedValue @json['admitType']['code'], @json['admitType']['codeSystem']
+  admitType: -> hQuery.createCodedValue @json['admitType']
+  
+  ###*
+  Date and time at which the patient was admitted for the encounter
+  @returns {Date}
+  ###
+  admitTime: -> @_admitTime
+
+  ###*
+  Date and time at which the patient was discharged for the encounter
+  @returns {Date}
+  ###
+  dischargeTime: -> @_dischargeTime
   
   ###*
   @returns {hQuery.Actor}
   ###
-  performer: -> new hQuery.Actor @json['performer']
+  performer: -> new hQuery.Actor @json['performer'] if @json['performer']
   
   ###*
   @returns {hQuery.Organization}
   ###
-  facility: -> new hQuery.Facility @json['facility']
+  facility: -> @_facility
+  facilityArrival: -> @_facility?.startDate()
+  facilityDeparture: -> @_facility?.endDate()
 
   ###*
-  @returns {hQuery.DateRange}
+  @returns {hQuery.CodedEntry}
   ###
-  encounterDuration: -> new hQuery.DateRange @json
+  reasonForVisit: -> new hQuery.CodedEntry @json['reason'] if @json['reason']
   
   ###*
-  @returns {hQuery.CodedEntry}
+  @returns {Integer}
   ###
-  reasonForVisit: -> new hQuery.CodedEntry @json['reason']
+  lengthOfStay: ->
+    return 0 unless @startDate()? && @endDate()?
+    Math.floor((@endDate() - @startDate()) / (1000 * 60 * 60 * 24))
+
+
+  ###*
+  @returns {CodedValue}
+  ###
+  transferTo: -> hQuery.createCodedValue @json['transferTo']
   
+  ###*
+  @returns {CodedValue}
+  ###
+  transferFrom: -> hQuery.createCodedValue @json['transferFrom']

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

@@ -43,6 +43,5 @@ class hQuery.FunctionalStatus extends hQuery.CodedEntry
   @returns {hQuery.CodedValue}
   ###
   source: ->
-    if @json["source"]?
-      new hQuery.CodedValue @json["source"]["code"], @json["source"]["codeSystem"]
+    hQuery.createCodedValue @json["source"]
   

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

@@ -78,7 +78,7 @@ class hQuery.Immunization extends hQuery.CodedEntry
   ###*
   @returns{hQuery.Scalar} 
   ###
-  medicationSeriesNumber: ->  new hQuery.Scalar @json['medicationSeriesNumber']
+  medicationSeriesNumber: ->  new hQuery.Scalar @json['medicationSeriesNumber'] if  @json['medicationSeriesNumber']
   
   ###*
   @returns{hQuery.MedicationInformation}
@@ -93,7 +93,7 @@ class hQuery.Immunization extends hQuery.CodedEntry
   ###*
   @returns{hQuery.Actor} Performer of immunization
   ###
-  performer:-> new hQuery.Actor @json['performer']
+  performer:-> new hQuery.Actor @json['performer'] if @json['performer']
   
   ###*
   @returns {comment} human readable description of event
@@ -111,5 +111,5 @@ class hQuery.Immunization extends hQuery.CodedEntry
   It indicates the reason an immunization was not administered.
   @returns {hQuery.NoImmunization}   Used to indicate reason an immunization was not administered.
   ###
-  refusalReason: -> new hQuery.NoImmunization @json['negationReason']['code'], @json['negationReason']['codeSystem']
+  refusalReason: -> new hQuery.NoImmunization @json['negationReason']?['code'], @json['negationReason']?['codeSystem']
  

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

@@ -17,7 +17,7 @@ class hQuery.Language extends hQuery.CodedEntry
   ###*
   @returns {hQuery.CodedValue}
   ###
-  modeCode: -> new hQuery.CodedValue @json['modeCode']['code'], @json['modeCode']['codeSystem']
+  modeCode: -> hQuery.createCodedValue @json['modeCode']
   
   ###*
   @returns {String}

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

@@ -25,4 +25,9 @@ class hQuery.MedicalEquipment extends hQuery.CodedEntry
   ###*
   @returns {CodedValue}
   ###
-  anatomicalStructure: -> new hQuery.CodedValue @json['anatomicalStructure']['code'], @json['anatomicalStructure']['codeSystem']
+  anatomicalStructure: -> hQuery.createCodedValue @json['anatomicalStructure']
+
+  ###*
+  @returns {Date} The actual or intended removal time of the device.
+  ###
+  removalTime: -> hQuery.dateFromUtcSeconds @json['removalTime'] if @json['removalTime']

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

@@ -37,7 +37,7 @@ class hQuery.AdministrationTiming
   mean that the medication should be taken every 8 hours.
   @returns {hQuery.Scalar}
   ###
-  period: -> new hQuery.Scalar @json['period']
+  period: -> new hQuery.Scalar @json['period'] if @json['period']
   
   ###*
   Indicates whether it is the interval (time between dosing), or frequency 
@@ -54,8 +54,8 @@ class hQuery.AdministrationTiming
 ###
 class hQuery.DoseRestriction
   constructor: (@json) ->
-  numerator: -> new hQuery.Scalar @json['numerator']
-  denominator: -> new hQuery.Scalar @json['denominator']
+  numerator: -> new hQuery.Scalar @json['numerator'] if @json['numerator'] 
+  denominator: -> new hQuery.Scalar @json['denominator'] if @json['denominator']
 
 
 ###*
@@ -66,11 +66,11 @@ class hQuery.Fulfillment
   constructor: (@json) ->
 
   dispenseDate: -> hQuery.dateFromUtcSeconds @json['dispenseDate']
-  dispensingPharmacyLocation: -> new hQuery.Address @json['dispensingPharmacyLocation']
-  quantityDispensed: -> new hQuery.Scalar @json['quantityDispensed']
+  dispensingPharmacyLocation: -> new hQuery.Address @json['dispensingPharmacyLocation'] if @json['dispensingPharmacyLocation']
+  quantityDispensed: -> new hQuery.Scalar @json['quantityDispensed'] if @json['quantityDispensed']
   prescriptionNumber: -> @json['prescriptionNumber']
   fillNumber: -> @json['fillNumber']
-  fillStatus: -> new hQuery.Status @json['fillStatus']
+  fillStatus: -> new hQuery.Status @json['fillStatus'] if @json['fillStatus']
 
 ###*
 @class OrderInformation - information abour an order for a medication
@@ -81,7 +81,7 @@ class hQuery.OrderInformation
   
   orderNumber: -> @json['orderNumber']
   fills: -> @json['fills']
-  quantityOrdered: -> new hQuery.Scalar @json['quantityOrdered']
+  quantityOrdered: -> new hQuery.Scalar @json['quantityOrdered'] if @json['quantityOrdered']
   orderExpirationDateTime: -> hQuery.dateFromUtcSeconds @json['orderExpirationDateTime']
   orderDateTime: -> hQuery.dateFromUtcSeconds @json['orderDateTime']
 
@@ -173,7 +173,7 @@ class hQuery.Medication  extends hQuery.CodedEntry
   ###
   indicateMedicationStop: -> hQuery.dateFromUtcSeconds @json['end_time']
 
-  administrationTiming: -> new hQuery.AdministrationTiming @json['administrationTiming']
+  administrationTiming: -> new hQuery.AdministrationTiming @json['administrationTiming'] if @json['administrationTiming']
 
   ###*
   @returns {CodedValue}  Contains routeCode or adminstrationUnitCode information.
@@ -185,22 +185,22 @@ class hQuery.Medication  extends hQuery.CodedEntry
     product as presented to the patient.
     See http://www.fda.gov/Drugs/InformationOnDrugs/ucm142454.htm
   ###
-  route: -> new hQuery.CodedValue @json['route']['code'], @json['route']['codeSystem']
+  route: -> hQuery.createCodedValue @json['route']
 
   ###*
   @returns {hQuery.Scalar} the dose
   ###
-  dose: -> new hQuery.Scalar @json['dose']
+  dose: -> new hQuery.Scalar @json['dose'] if @json['dose']
 
   ###*
   @returns {CodedValue}
   ###
-  site: -> new hQuery.CodedValue @json['site']['code'], @json['site']['codeSystem']
+  site: -> hQuery.createCodedValue @json['site'] if @json['site']
 
   ###*
   @returns {hQuery.DoseRestriction}
   ###
-  doseRestriction: -> new hQuery.DoseRestriction @json['doseRestriction']
+  doseRestriction: -> new hQuery.DoseRestriction @json['doseRestriction'] if @json['doseRestriction']
 
   ###*
   @returns {String}
@@ -215,27 +215,27 @@ class hQuery.Medication  extends hQuery.CodedEntry
   ###*
   @returns {CodedValue}
   ###
-  indication: -> new hQuery.CodedValue @json['indication']['code'], @json['indication']['codeSystem']
+  indication: -> hQuery.createCodedValue @json['indication']
 
   ###*
   @returns {CodedValue}
   ###
-  productForm: -> new hQuery.CodedValue @json['productForm']['code'], @json['productForm']['codeSystem']
+  productForm: -> hQuery.createCodedValue @json['productForm']
 
   ###*
   @returns {CodedValue}
   ###
-  vehicle: -> new hQuery.CodedValue @json['vehicle']['code'], @json['vehicle']['codeSystem']
+  vehicle: -> hQuery.createCodedValue  @json['vehicle']
 
   ###*
   @returns {CodedValue}
   ###
-  reaction: -> new hQuery.CodedValue @json['reaction']['code'], @json['reaction']['codeSystem']
+  reaction: -> hQuery.createCodedValue @json['reaction']
 
   ###*
   @returns {CodedValue}
   ###
-  deliveryMethod: -> new hQuery.CodedValue @json['deliveryMethod']['code'], @json['deliveryMethod']['codeSystem']
+  deliveryMethod: -> hQuery.createCodedValue @json['deliveryMethod']
 
   ###*
   @returns {hQuery.MedicationInformation}
@@ -245,14 +245,14 @@ class hQuery.Medication  extends hQuery.CodedEntry
   ###*
   @returns {hQuery.TypeOfMedication} Indicates whether this is an over the counter or prescription medication
   ###
-  typeOfMedication: -> new hQuery.TypeOfMedication @json['typeOfMedication']['code'], @json['typeOfMedication']['codeSystem']
+  typeOfMedication: -> new hQuery.TypeOfMedication @json['typeOfMedication']?['code'], @json['typeOfMedication']?['codeSystem']
 
   ###*
   Values conform to value set 2.16.840.1.113883.1.11.20.7 - Medication Status
   Values may be: On Hold, No Longer Active, Active, Prior History
   @returns {hQuery.StatusOfMedication}   Used to indicate the status of the medication.
   ###
-  statusOfMedication: -> new hQuery.StatusOfMedication @json['statusOfMedication']['code'], @json['statusOfMedication']['codeSystem']
+  statusOfMedication: -> new hQuery.StatusOfMedication @json['statusOfMedication']?['code'], @json['statusOfMedication']?['codeSystem']
 
   ###*
   @returns {String} free text instructions to the patient

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

@@ -63,7 +63,7 @@ class hQuery.Patient extends hQuery.Person
   gender: -> @json['gender']
 
   ###*
-  @returns {Date} containing the patient's birthdate
+  @returns {Date} containing the patients birthdate
   ###
   birthtime: ->
     hQuery.dateFromUtcSeconds @json['birthdate']
@@ -92,7 +92,7 @@ class hQuery.Patient extends hQuery.Person
   ###
   maritalStatus: -> 
     if @json['maritalStatus']
-      return new hQuery.CodedValue @json['maritalStatus']['code'], @json['maritalStatus']['codeSystem']
+      return hQuery.createCodedValue @json['maritalStatus']
   
   ###*
   @returns {CodedValue}  of the spiritual faith affiliation of the patient
@@ -100,7 +100,7 @@ class hQuery.Patient extends hQuery.Person
   ###
   religiousAffiliation: -> 
     if @json['religiousAffiliation']
-      return new hQuery.CodedValue @json['religiousAffiliation']['code'], @json['religiousAffiliation']['codeSystem']
+      return hQuery.createCodedValue @json['religiousAffiliation']
   
   ###*
   @returns {CodedValue}  of the race of the patient
@@ -108,7 +108,7 @@ class hQuery.Patient extends hQuery.Person
   ###
   race: -> 
     if @json['race']
-      return new hQuery.CodedValue @json['race']['code'], @json['race']['codeSystem']
+      return hQuery.createCodedValue @json['race']
   
   ###*
   @returns {CodedValue} of the ethnicity of the patient
@@ -116,7 +116,7 @@ class hQuery.Patient extends hQuery.Person
   ###
   ethnicity: -> 
     if @json['ethnicity']
-      return new hQuery.CodedValue @json['ethnicity']['code'], @json['ethnicity']['codeSystem']
+      return hQuery.createCodedValue @json['ethnicity']
   
   ###*
   @returns {CodedValue} This is the code specifying the level of confidentiality of the document.
@@ -124,7 +124,7 @@ class hQuery.Patient extends hQuery.Person
   ###
   confidentiality: -> 
     if  @json['confidentiality']
-      return new hQuery.CodedValue @json['confidentiality']['code'], @json['confidentiality']['codeSystem']
+      return hQuery.createCodedValue @json['confidentiality']
   
   ###*
   @returns {Address} of the location where the patient was born

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

@@ -19,10 +19,27 @@ class hQuery.Procedure extends hQuery.CodedEntry
   ###*
   @returns {hQuery.Actor} The provider that performed the procedure
   ###
-  performer: -> new hQuery.Actor @json['performer']
+  performer: -> new hQuery.Actor @json['performer'] if @json['performer']
   
   ###*
   @returns {hQuery.CodedValue} A SNOMED code indicating the body site on which the 
   procedure was performed
   ###
-  site: -> new hQuery.CodedValue @json['site']['code'], @json['site']['codeSystem']
+  site: -> new hQuery.CodedValue @json['site']?['code'], @json['site']?['codeSystem']
+
+  ###*
+  @returns {hQuery.CodedValue} A SNOMED code indicating where the procedure was performed.
+  ###
+  source: -> 
+    hQuery.createCodedValue @json['source']
+
+  ###*
+  @returns {Date} The actual or intended start of an incision.
+  ###
+  incisionTime: -> hQuery.dateFromUtcSeconds @json['incisionTime'] if @json['incisionTime']
+
+  ###*
+  Ordinality
+  @returns {CodedValue}
+  ###
+  ordinality: -> hQuery.createCodedValue @json['ordinality']

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

@@ -16,17 +16,17 @@ class hQuery.Provider
   ###*
   @returns {hQuery.Person}
   ###
-  providerEntity: -> new hQuery.Person @json['providerEntity']
+  providerEntity: -> new hQuery.Person @json['providerEntity'] if @json['providerEntity']
   
   ###*
   @returns {hQuery.DateRange}
   ###
-  careProvisionDateRange: -> new hQuery.DateRange @json['careProvisionDateRange']
+  careProvisionDateRange: -> new hQuery.DateRange @json['careProvisionDateRange'] if @json['careProvisionDateRange']
       
   ###*
   @returns {hQuery.CodedValue}
   ###
-  role: -> new hQuery.CodedValue @json['role']['code'], @json['role']['codeSystem']
+  role: -> hQuery.createCodedValue @json['role']
   
   ###*
   @returns {String}
@@ -37,7 +37,7 @@ class hQuery.Provider
   ###*
   @returns {hQuery.CodedValue}
   ###
-  providerType: -> new hQuery.CodedValue @json['providerType']['code'], @json['providerType']['codeSystem']
+  providerType: -> hQuery.createCodedValue @json['providerType']
     
   
   ###*

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

@@ -29,7 +29,7 @@ class hQuery.Result extends hQuery.CodedEntry
   ###*
   @returns {CodedValue}
   ###
-  interpretation: -> new hQuery.CodedValue @json['interpretation'].code, @json['interpretation'].codeSystem
+  interpretation: -> hQuery.createCodedValue  @json['interpretation']
   
   ###*
   @returns {String}

data/hquery_patientapi.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.email = "talk@hquery.org"
   s.homepage = "http://github.com/hquery/patient_api"
   s.authors = ["Marc Hadley", "Andy Gregorowicz", "Rob Dingwell"]
-  s.version = '0.3.0'
+  s.version = '1.0.0'
 
   s.files = `git ls-files`.split("\n")
 end

data/test/fixtures/patient/barry_berry.json

@@ -99,10 +99,14 @@
           }
         ]
       },
+      "transferTo": {
+        "code": "444933003",
+        "codeSystem": "SNOMED-CT"
+      },
       "time": 1268042997,
       "description": "Outpatient encounter",
       "_id": "OP12345",
-      "dischargeDisp": "Home",
+      "dischargeDisposition": "Home",
       "admitType": {
         "code": "04",
         "codeSystem": "regular"
@@ -112,8 +116,8 @@
           "name": "General Hospital"
         }
       },
-      "low": 1124956803,
-      "hi": 1314259203,
+      "start_time": 1124956803,
+      "end_time": 1314259203,
       "reason": {
         "codes": {
           "CPT": [
@@ -153,8 +157,7 @@
       "description": "Colorectal Cancer",
       "ageAtOnset": 20,
       "priority": 1,
-      "ordinality": "principal",
-      "ordinality_code": {
+      "ordinality": {
         "code": "8319008",
         "codeSystem": "SNOMED-CT"
       },
@@ -217,7 +220,12 @@
           "last": "Tables"
         }
       },
-      "description": "Colonscopy"
+      "description": "Colonscopy",
+      "source": {
+        "code": "158967008",
+        "codeSystem": "SNOMED-CT"
+      },
+      "incisionTime": 1073238725
     }
   ],
   "results": [
@@ -345,6 +353,10 @@
       },
       "time": 1286382415,
       "description": "Multivitamin",
+      "reason": {
+        "code": "195911009",
+        "codeSystem": "SNOMED-CT"
+      },
       "brandName": "Centrum Silver",
       "route": {
         "code": "C38288",

data/test/unit/patient_api_test.rb

@@ -1,4 +1,9 @@
 require File.expand_path("../../test_helper", __FILE__)
+if RUBY_PLATFORM=='java'
+  require 'rhino'
+else
+  require 'v8'
+end
 
 class PatientApiTest  < Test::Unit::TestCase
   def setup
@@ -7,8 +12,21 @@ class PatientApiTest  < Test::Unit::TestCase
     initialize_patient = 'var patient = new hQuery.Patient(barry);'
     date = Time.new(2010,1,1)
     initialize_date = "var sampleDate = new Date(#{date.to_i*1000});"
-    @context = ExecJS.compile(patient_api + "\nvar barry = " + fixture_json + ";\n" + initialize_patient + "\n" + initialize_date)
+    if RUBY_PLATFORM=='java'
+      @context = Rhino::Context.new
+    else
+      @context = V8::Context.new
+    end
+
+    @context.eval(patient_api + "\nvar barry = " + fixture_json + ";\n" + initialize_patient + "\n" + initialize_date)
   end
+  
+  def test_utils
+    @context.eval('var encounter = patient.encounters()[0]')
+    assert_equal 2005, @context.eval('encounter.startDate().getFullYear()')
+    @context.eval('encounter.setTimestamp(new Date(2010,1,1))')
+    assert_equal 2010, @context.eval('encounter.startDate().getFullYear()')
+  end    
 
   def test_demographics
     assert_equal 'Barry', @context.eval('patient.given()')
@@ -42,16 +60,18 @@ class PatientApiTest  < Test::Unit::TestCase
     assert_equal 'CPT', @context.eval('patient.encounters()[0].type()[0].codeSystemName()')
     assert_equal 'OP12345', @context.eval('patient.encounters()[0].id')
     assert_equal 'Outpatient encounter', @context.eval('patient.encounters()[0].freeTextType()')
-    assert_equal 'Home', @context.eval('patient.encounters()[0].dischargeDisp()')
+    assert_equal 'Home', @context.eval('patient.encounters()[0].dischargeDisposition()')
     assert_equal '04', @context.eval('patient.encounters()[0].admitType().code()')
     assert_equal 'General Hospital', @context.eval('patient.encounters()[0].performer().organization().organizationName()')
-    assert_equal 2005, @context.eval('patient.encounters()[0].encounterDuration().low().getFullYear()')
-    assert_equal 2011, @context.eval('patient.encounters()[0].encounterDuration().hi().getFullYear()')
+    assert_equal 2005, @context.eval('patient.encounters()[0].startDate().getFullYear()')
+    assert_equal 2011, @context.eval('patient.encounters()[0].endDate().getFullYear()')
     assert_equal 'PCP referred', @context.eval('patient.encounters()[0].reasonForVisit().freeTextType()')
     assert_equal 'CPT', @context.eval('patient.encounters()[0].reasonForVisit().type()[0].codeSystemName()')
     assert_equal 'HL7 Healthcare Service Location', @context.eval('patient.encounters()[0].facility().codeSystemName()')
     assert_equal '1155-1', @context.eval('patient.encounters()[0].facility().code()')
     assert_equal 'General Hospital', @context.eval('patient.encounters()[0].facility().name()')
+    assert_equal 2191, @context.eval('patient.encounters()[0].lengthOfStay()')
+    assert_equal "444933003", @context.eval('patient.encounters()[0].transferTo().code()')
   end
 
   def test_procedures
@@ -66,6 +86,8 @@ class PatientApiTest  < Test::Unit::TestCase
     assert_equal '71854001', @context.eval('patient.procedures()[0].site().code()')
     assert_equal 'Bobby', @context.eval('patient.procedures()[0].performer().person().given()')
     assert_equal 'Tables', @context.eval('patient.procedures()[0].performer().person().last()')
+    assert_equal '158967008', @context.eval('patient.procedures()[0].source().code()')
+    assert_equal 1073238725000, @context.eval('patient.procedures()[0].incisionTime().getTime()')
   end
 
   def test_vital_signs
@@ -113,6 +135,7 @@ class PatientApiTest  < Test::Unit::TestCase
     assert_equal 30, @context.eval('patient.medications()[0].orderInformation()[0].quantityOrdered().value()')
     assert_equal 20, @context.eval('patient.medications()[0].orderInformation()[0].fills()')
     assert_equal 3, @context.eval('patient.medications()[0].cumulativeMedicationDuration()["scalar"]')
+    assert_equal "195911009", @context.eval('patient.medications()[0].reason().code()')
   end
   
   def test_immunizations

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hquery-patient-api
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies: []
 description: A javascript library abstraction for dealing with patients in hQuery
   map reduce functions