Add Suspected option to hypertension and diabetes questions (#5654)

https://app.shortcut.com/simpledotorg/story/16915/update-the-patient-summary-screen-to-include-suspected-option-for-the-patient-has-hypertension-diabetes-questions?team_id=1&iteration_ids=16939

---------

Co-authored-by: sagarwal <sagarwal@rtsl.org>

Author: siddh1004

CHANGELOG.md

@@ -34,6 +34,7 @@
 ### Changes
 
 - Hide next button when registration is going
+- Add Suspected option to hypertension and diabetes questions
 
 ## 2025.09.09
 

app/src/main/java/org/simple/clinic/home/overdue/OverdueModel.kt

@@ -34,9 +34,6 @@ data class OverdueModel(
     }
   }
 
-  val isDiabetesManagementEnabled: Boolean
-    get() = facility!!.config.diabetesManagementEnabled
-
   val hasLoadedCurrentFacility: Boolean
     get() = facility != null
 

app/src/main/java/org/simple/clinic/medicalhistory/Answer.kt

@@ -1,20 +1,27 @@
 package org.simple.clinic.medicalhistory
 
 import android.os.Parcelable
+import androidx.annotation.StringRes
 import androidx.annotation.VisibleForTesting
 import androidx.room.TypeConverter
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.ToJson
 import kotlinx.parcelize.Parcelize
+import org.simple.clinic.R
 import org.simple.clinic.util.room.SafeEnumTypeAdapter
 
-sealed class Answer : Parcelable {
+sealed class Answer(
+    @StringRes val labelRes: Int? = null
+) : Parcelable {
 
   @Parcelize
-  data object Yes : Answer()
+  data object Yes : Answer(R.string.newmedicalhistory_yes)
 
   @Parcelize
-  data object No : Answer()
+  data object No : Answer(R.string.newmedicalhistory_no)
+
+  @Parcelize
+  data object Suspected : Answer(R.string.newmedicalhistory_suspected)
 
   @Parcelize
   data object Unanswered : Answer()
@@ -27,6 +34,7 @@ sealed class Answer : Parcelable {
       knownMappings = mapOf(
           Yes to "yes",
           No to "no",
+          Suspected to "suspected",
           // The actual value of the Unanswered enum should be "unanswered",
           // but the current api representation is "unknown". This is a little
           // confusing because we use Unknown as the convention for values which

app/src/main/java/org/simple/clinic/medicalhistory/MedicalHistory.kt

@@ -79,8 +79,14 @@ data class MedicalHistory(
     }
   }
 
+  val hypertensionRecorded: Boolean
+    get() = diagnosedWithHypertension != Unanswered
+
+  val diabetesRecorded: Boolean
+    get() = diagnosedWithDiabetes != Unanswered
+
   val diagnosisRecorded: Boolean
-    get() = diagnosedWithHypertension != Unanswered && diagnosedWithDiabetes != Unanswered
+    get() = hypertensionRecorded && diabetesRecorded
 
   fun answered(question: MedicalHistoryQuestion, answer: Answer): MedicalHistory {
     return when (question) {

app/src/main/java/org/simple/clinic/medicalhistory/MedicalHistoryQuestionView.kt

@@ -12,18 +12,32 @@ class SelectDiagnosisErrorDialog : AppCompatDialogFragment() {
   companion object {
 
     private const val FRAGMENT_TAG = "select_diagnosis_error_alert"
+    private const val KEY_DIABETES_MANAGEMENT_ENABLED = "key_diabetes_management_enabled"
 
-    fun show(fragmentManager: FragmentManager) {
-      val fragment = SelectDiagnosisErrorDialog()
+    fun show(fragmentManager: FragmentManager, diabetesManagementEnabled: Boolean) {
+      val fragment = SelectDiagnosisErrorDialog().apply {
+        arguments = Bundle().apply {
+          putBoolean(KEY_DIABETES_MANAGEMENT_ENABLED, diabetesManagementEnabled)
+        }
+      }
 
       fragment.show(fragmentManager, FRAGMENT_TAG)
     }
   }
 
   override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+    val diabetesManagementEnabled =
+        arguments?.getBoolean(KEY_DIABETES_MANAGEMENT_ENABLED) ?: false
+
+    val messageRes = if (diabetesManagementEnabled) {
+      R.string.select_diagnosis_error_enter_diagnosis_both_hypertension_diabetes
+    } else {
+      R.string.select_diagnosis_error_enter_diagnosis_hypertension
+    }
+
     return MaterialAlertDialogBuilder(requireContext())
         .setTitle(getString(R.string.select_diagnosis_error_diagnosis_required))
-        .setMessage(getString(R.string.select_diagnosis_error_enter_diagnosis_both_hypertension_diabetes))
+        .setMessage(getString(messageRes))
         .setPositiveButton(getString(R.string.select_diagnosis_error_ok), null)
         .create()
   }

app/src/main/java/org/simple/clinic/medicalhistory/SelectDiagnosisErrorDialog.kt

@@ -54,9 +54,6 @@ class NewMedicalHistoryScreen : Fragment(), NewMedicalHistoryUiActions, HandlesB
   @Inject
   lateinit var features: Features
 
-  @Inject
-  lateinit var newMedicalHistoryEffectHandler: NewMedicalHistoryEffectHandler.Factory
-
   private val viewEffectHandler by unsafeLazy { NewMedicalHistoryViewEffectHandler(this) }
 
   private val viewModel by viewModels<NewMedicalHistoryViewModel>(
@@ -73,7 +70,7 @@ class NewMedicalHistoryScreen : Fragment(), NewMedicalHistoryUiActions, HandlesB
     context.injector<Injector>().inject(this)
   }
 
-  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
     return ComposeView(requireContext()).apply {
       setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
 
@@ -113,7 +110,7 @@ class NewMedicalHistoryScreen : Fragment(), NewMedicalHistoryUiActions, HandlesB
   }
 
   override fun showDiagnosisRequiredErrorDialog() {
-    SelectDiagnosisErrorDialog.show(activity.supportFragmentManager)
+    SelectDiagnosisErrorDialog.show(activity.supportFragmentManager, true)
   }
 
   override fun showHypertensionDiagnosisRequiredErrorDialog() {

app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryScreen.kt

@@ -0,0 +1,73 @@
+package org.simple.clinic.medicalhistory.ui
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.requiredHeight
+import androidx.compose.material.Card
+import androidx.compose.material.Divider
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import org.simple.clinic.R
+import org.simple.clinic.common.ui.theme.SimpleTheme
+import org.simple.clinic.medicalhistory.Answer
+import org.simple.clinic.medicalhistory.MedicalHistoryQuestion
+
+@Composable
+fun DiagnosisContainer(
+    hypertensionAnswer: Answer?,
+    diabetesAnswer: Answer?,
+    showDiabetesDiagnosisView: Boolean,
+    modifier: Modifier = Modifier,
+    onAnswerChange: (MedicalHistoryQuestion, Answer) -> Unit,
+) {
+  Card(modifier = modifier) {
+    Column(
+        modifier = Modifier
+            .padding(dimensionResource(R.dimen.spacing_16))
+    ) {
+
+      MedicalHistoryDiagnosisQuestionItem(
+          header = stringResource(R.string.medicalhistorysummaryview_hypertension_diagnosis),
+          question = MedicalHistoryQuestion.DiagnosedWithHypertension,
+          options = listOf(Answer.Yes, Answer.No, Answer.Suspected),
+          selectedAnswer = hypertensionAnswer,
+          onAnswerChange = onAnswerChange
+      )
+
+      if (showDiabetesDiagnosisView) {
+
+        Spacer(Modifier.requiredHeight(dimensionResource(R.dimen.spacing_16)))
+
+        Divider(color = SimpleTheme.colors.onSurface11)
+
+        Spacer(Modifier.requiredHeight(dimensionResource(R.dimen.spacing_16)))
+
+        MedicalHistoryDiagnosisQuestionItem(
+            header = stringResource(R.string.medicalhistorysummaryview_diabetes_diagnosis),
+            question = MedicalHistoryQuestion.DiagnosedWithDiabetes,
+            options = listOf(Answer.Yes, Answer.No, Answer.Suspected),
+            selectedAnswer = diabetesAnswer,
+            onAnswerChange = onAnswerChange
+        )
+      }
+    }
+  }
+}
+
+@Preview
+@Composable
+fun DiagnosisContainerPreview(modifier: Modifier = Modifier) {
+  SimpleTheme {
+    DiagnosisContainer(
+        hypertensionAnswer = Answer.Yes,
+        diabetesAnswer = Answer.No,
+        showDiabetesDiagnosisView = true,
+        modifier = modifier,
+        onAnswerChange = { _, _ -> }
+    )
+  }
+}