Merge pull request #71 from Asymmetrik/hotfix/dosage

fix doseSimpleQuantity to doseQuantity
bluehalo · Aug 21, 2018 · 9562702 · 9562702
2 parents e05e59a + fe03b19
commit 9562702
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/server/standards/stu3/base/Dosage.js b/src/server/standards/stu3/base/Dosage.js
@@ -121,12 +121,12 @@ class Dosage extends Element {
 	}
 
 	// Amount of medication per dose.
-	get doseSimpleQuantity () {
-		return this._doseSimpleQuantity;
+	get doseQuantity () {
+		return this._doseQuantity;
 	}
 
-	set doseSimpleQuantity ( new_value ) {
-		this._doseSimpleQuantity = new Quantity(new_value);
+	set doseQuantity ( new_value ) {
+		this._doseQuantity = new Quantity(new_value);
 	}
 
 	// Upper limit on medication per unit of time.
@@ -196,7 +196,7 @@ class Dosage extends Element {
 			route: this._route,
 			method: this._method,
 			doseRange: this._doseRange,
-			doseSimpleQuantity: this._doseSimpleQuantity,
+			doseQuantity: this._doseQuantity,
 			maxDosePerPeriod: this._maxDosePerPeriod,
 			maxDosePerAdministration: this._maxDosePerAdministration,
 			maxDosePerLifetime: this._maxDosePerLifetime,

diff --git a/src/server/standards/stu3/uscore/Dosage.js b/src/server/standards/stu3/uscore/Dosage.js
@@ -122,12 +122,12 @@ class Dosage extends Element {
 	}
 
 	// Amount of medication per dose.
-	get doseSimpleQuantity () {
-		return this._doseSimpleQuantity;
+	get doseQuantity () {
+		return this._doseQuantity;
 	}
 
-	set doseSimpleQuantity ( new_value ) {
-		this._doseSimpleQuantity = new Quantity(new_value);
+	set doseQuantity ( new_value ) {
+		this._doseQuantity = new Quantity(new_value);
 	}
 
 	// Upper limit on medication per unit of time.
@@ -197,7 +197,7 @@ class Dosage extends Element {
 			route: this._route && this._route.toJSON(),
 			method: this._method && this._method.toJSON(),
 			doseRange: this._doseRange && this._doseRange.toJSON(),
-			doseSimpleQuantity: this._doseSimpleQuantity && this._doseSimpleQuantity.toJSON(),
+			doseQuantity: this._doseQuantity && this._doseQuantity.toJSON(),
 			maxDosePerPeriod: this._maxDosePerPeriod && this._maxDosePerPeriod.toJSON(),
 			maxDosePerAdministration: this._maxDosePerAdministration && this._maxDosePerAdministration.toJSON(),
 			maxDosePerLifetime: this._maxDosePerLifetime && this._maxDosePerLifetime.toJSON(),