Tests quantity with different units

datacapture/src/main/java/com/google/android/fhir/datacapture/MoreTypes.kt

@@ -61,7 +61,9 @@ internal fun Questionnaire.QuestionnaireItemEnableWhenComponent.greaterThan(
  )
  val questionAnswerUcumUnit =
  UnitConverter.getCanonicalForm(UcumValue(questionAnswer.code, questionAnswer.value))
- return questionAnswerUcumUnit.value <= answerUcumUnit.value
+ if (answerUcumUnit.code == questionAnswerUcumUnit.code) {
+ return questionAnswerUcumUnit.value <= answerUcumUnit.value
+ }
  }
  return false
 }
@@ -81,7 +83,9 @@ internal fun Questionnaire.QuestionnaireItemEnableWhenComponent.greaterOrEqual(
  )
  val questionAnswerUcumUnit =
  UnitConverter.getCanonicalForm(UcumValue(questionAnswer.code, questionAnswer.value))
- return questionAnswerUcumUnit.value < answerUcumUnit.value
+ if (answerUcumUnit.code == questionAnswerUcumUnit.code) {
+ return questionAnswerUcumUnit.value < answerUcumUnit.value
+ }
  }
  return false
 }
@@ -99,7 +103,9 @@ internal fun Questionnaire.QuestionnaireItemEnableWhenComponent.lessThan(
  )
  val questionAnswerUcumUnit =
  UnitConverter.getCanonicalForm(UcumValue(questionAnswer.code, questionAnswer.value))
- return questionAnswerUcumUnit.value >= answerUcumUnit.value
+ if (answerUcumUnit.code == questionAnswerUcumUnit.code) {
+ return questionAnswerUcumUnit.value >= answerUcumUnit.value
+ }
  }
  return false
 }
@@ -117,7 +123,9 @@ internal fun Questionnaire.QuestionnaireItemEnableWhenComponent.lessOrEqual(
  )
  val questionAnswerUcumUnit =
  UnitConverter.getCanonicalForm(UcumValue(questionAnswer.code, questionAnswer.value))
- return questionAnswerUcumUnit.value > answerUcumUnit.value
+ if (answerUcumUnit.code == questionAnswerUcumUnit.code) {
+ return questionAnswerUcumUnit.value > answerUcumUnit.value
+ }
  }
  return false
 }

datacapture/src/test/java/com/google/android/fhir/datacapture/MoreTypesTest.kt

@@ -170,6 +170,26 @@ class MoreTypesTest {
  assertThat(enableWhen.greaterThan(answer)).isTrue()
  }
 
+ @Test
+ fun greaterThan_differentQuantityUnits_shouldReturnFalse() {
+ val enableWhen =
+ Questionnaire.QuestionnaireItemEnableWhenComponent().apply {
+ answer =
+ answerQuantity.apply {
+ value = BigDecimal(10)
+ code = "h"
+ }
+ operator = Questionnaire.QuestionnaireItemOperator.GREATER_THAN
+ }
+ val answer =
+ Quantity().apply {
+ value = BigDecimal(10)
+ code = "kg"
+ }
+
+ assertThat(enableWhen.greaterThan(answer)).isFalse()
+ }
+
  @Test
  fun greaterOrEqual_noAnswerGreaterThanEnableAnswer_shouldReturnTrue() {
  val enableWhen =
@@ -232,6 +252,25 @@ class MoreTypesTest {
  assertThat(enableWhen.greaterOrEqual(answer)).isFalse()
  }
 
+ @Test
+ fun greaterOrEqual_differentQuantityUnits_shouldReturnFalse() {
+ val enableWhen =
+ Questionnaire.QuestionnaireItemEnableWhenComponent().apply {
+ answer =
+ answerQuantity.apply {
+ value = BigDecimal(20)
+ code = "h"
+ }
+ }
+ val answer =
+ Quantity().apply {
+ value = BigDecimal(10)
+ code = "kg"
+ }
+
+ assertThat(enableWhen.greaterOrEqual(answer)).isFalse()
+ }
+
  @Test
  fun lessThan_noAnswerLessThanEnableAnswer_shouldReturnTrue() {
  val enableWhen =
@@ -293,6 +332,25 @@ class MoreTypesTest {
  assertThat(enableWhen.lessThan(answer)).isTrue()
  }
 
+ @Test
+ fun lessThan_differentQuantityUnits_shouldReturnFalse() {
+ val enableWhen =
+ Questionnaire.QuestionnaireItemEnableWhenComponent().apply {
+ answer =
+ answerQuantity.apply {
+ value = BigDecimal(20)
+ code = "h"
+ }
+ }
+ val answer =
+ Quantity().apply {
+ value = BigDecimal(30)
+ code = "kg"
+ }
+
+ assertThat(enableWhen.lessThan(answer)).isFalse()
+ }
+
  @Test
  fun lessOrEqual_noAnswerLessOrEqualEnableAnswer_shouldReturnTrue() {
  val enableWhen =
@@ -353,4 +411,23 @@ class MoreTypesTest {
 
  assertThat(enableWhen.lessOrEqual(answer)).isTrue()
  }
+
+ @Test
+ fun lessOrEqual_differentQuantityUnits_shouldReturnFalse() {
+ val enableWhen =
+ Questionnaire.QuestionnaireItemEnableWhenComponent().apply {
+ answer =
+ answerQuantity.apply {
+ value = BigDecimal(20)
+ code = "h"
+ }
+ }
+ val answer =
+ Quantity().apply {
+ value = BigDecimal(30)
+ code = "kg"
+ }
+
+ assertThat(enableWhen.lessOrEqual(answer)).isFalse()
+ }
 }