Fix diagnosis dialog logic (#5664)

https://app.shortcut.com/simpledotorg/story/17242/update-the-dialog-on-medical-history-and-patient-summary-screen?team_id=1&iteration_ids=17253

---------

Co-authored-by: sagarwal <[email protected]>

Author: siddh1004

CHANGELOG.md

@@ -40,6 +40,7 @@
 - Add `hypertensionDiagnosedAt` and `diabetesDiagnosedAt` in `MedicalHistory` table
 - Hide schedule appointment sheet for suspected patients
 - Add `Suspected` flag to recent patient list item
+- Update diagnosis required error dialog to include referral feature
 
 ## 2025.09.09
 

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

@@ -0,0 +1,30 @@
+package org.simple.clinic.medicalhistory
+
+import android.app.Dialog
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatDialogFragment
+import androidx.fragment.app.FragmentManager
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.simple.clinic.R
+
+class SelectDiagnosisOrReferralRequiredErrorDialog : AppCompatDialogFragment() {
+
+  companion object {
+
+    private const val FRAGMENT_TAG = "select_diagnosis_or_referral_required__error_alert"
+
+    fun show(fragmentManager: FragmentManager) {
+      val fragment = SelectDiagnosisOrReferralRequiredErrorDialog()
+
+      fragment.show(fragmentManager, FRAGMENT_TAG)
+    }
+  }
+
+  override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+    return MaterialAlertDialogBuilder(requireContext())
+        .setTitle(getString(R.string.select_diagnosis_error_diagnosis_required))
+        .setMessage(getString(R.string.select_diagnosis_or_referral_required_error_message))
+        .setPositiveButton(getString(R.string.select_diagnosis_error_ok), null)
+        .create()
+  }
+}

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

@@ -0,0 +1,29 @@
+package org.simple.clinic.medicalhistory
+
+import android.app.Dialog
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatDialogFragment
+import androidx.fragment.app.FragmentManager
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.simple.clinic.R
+
+class SelectDiagnosisRequiredErrorDialog : AppCompatDialogFragment() {
+
+  companion object {
+
+    private const val FRAGMENT_TAG = "select_diagnosis_required_error_alert"
+    fun show(fragmentManager: FragmentManager) {
+      val fragment = SelectDiagnosisRequiredErrorDialog()
+
+      fragment.show(fragmentManager, FRAGMENT_TAG)
+    }
+  }
+
+  override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+    return MaterialAlertDialogBuilder(requireContext())
+        .setTitle(getString(R.string.select_diagnosis_error_diagnosis_required))
+        .setMessage(getString(R.string.select_diagnosis_error_enter_diagnosis_both_hypertension_diabetes))
+        .setPositiveButton(getString(R.string.select_diagnosis_error_ok), null)
+        .create()
+  }
+}

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

@@ -0,0 +1,30 @@
+package org.simple.clinic.medicalhistory
+
+import android.app.Dialog
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatDialogFragment
+import androidx.fragment.app.FragmentManager
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.simple.clinic.R
+
+class SelectHypertensionDiagnosisOrReferralRequiredErrorDialog : AppCompatDialogFragment() {
+
+  companion object {
+
+    private const val FRAGMENT_TAG = "select_hypertension_diagnosis_or_referral_required__error_alert"
+
+    fun show(fragmentManager: FragmentManager) {
+      val fragment = SelectHypertensionDiagnosisOrReferralRequiredErrorDialog()
+
+      fragment.show(fragmentManager, FRAGMENT_TAG)
+    }
+  }
+
+  override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+    return MaterialAlertDialogBuilder(requireContext())
+        .setTitle(getString(R.string.select_diagnosis_error_diagnosis_required))
+        .setMessage(getString(R.string.select_diagnosis_error_enter_diagnosis_or_referral_hypertension_message))
+        .setPositiveButton(getString(R.string.select_diagnosis_error_ok), null)
+        .create()
+  }
+}

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

@@ -0,0 +1,30 @@
+package org.simple.clinic.medicalhistory
+
+import android.app.Dialog
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatDialogFragment
+import androidx.fragment.app.FragmentManager
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.simple.clinic.R
+
+class SelectHypertensionDiagnosisRequiredErrorDialog : AppCompatDialogFragment() {
+
+  companion object {
+
+    private const val FRAGMENT_TAG = "select_hypertension_diagnosis_required__error_alert"
+
+    fun show(fragmentManager: FragmentManager) {
+      val fragment = SelectHypertensionDiagnosisRequiredErrorDialog()
+
+      fragment.show(fragmentManager, FRAGMENT_TAG)
+    }
+  }
+
+  override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+    return MaterialAlertDialogBuilder(requireContext())
+        .setTitle(getString(R.string.select_diagnosis_error_diagnosis_required))
+        .setMessage(getString(R.string.select_diagnosis_error_enter_diagnosis_hypertension))
+        .setPositiveButton(getString(R.string.select_diagnosis_error_ok), null)
+        .create()
+  }
+}

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

@@ -21,8 +21,12 @@ data object ShowOngoingHypertensionTreatmentError : NewMedicalHistoryViewEffect(
 
 data object ShowDiagnosisRequiredError : NewMedicalHistoryViewEffect()
 
+data object ShowDiagnosisOrReferralRequiredError : NewMedicalHistoryViewEffect()
+
 data object ShowHypertensionDiagnosisRequiredError : NewMedicalHistoryViewEffect()
 
+data object ShowHypertensionDiagnosisOrReferralRequiredError : NewMedicalHistoryViewEffect()
+
 data object ShowChangeDiagnosisErrorDialog : NewMedicalHistoryViewEffect()
 
 data object ShowOngoingDiabetesTreatmentErrorDialog : NewMedicalHistoryViewEffect()

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

@@ -18,7 +18,10 @@ import org.simple.clinic.R
 import org.simple.clinic.appconfig.Country
 import org.simple.clinic.di.injector
 import org.simple.clinic.feature.Features
-import org.simple.clinic.medicalhistory.SelectDiagnosisErrorDialog
+import org.simple.clinic.medicalhistory.SelectDiagnosisOrReferralRequiredErrorDialog
+import org.simple.clinic.medicalhistory.SelectDiagnosisRequiredErrorDialog
+import org.simple.clinic.medicalhistory.SelectHypertensionDiagnosisOrReferralRequiredErrorDialog
+import org.simple.clinic.medicalhistory.SelectHypertensionDiagnosisRequiredErrorDialog
 import org.simple.clinic.medicalhistory.SelectOngoingDiabetesTreatmentErrorDialog
 import org.simple.clinic.medicalhistory.SelectOngoingHypertensionTreatmentErrorDialog
 import org.simple.clinic.medicalhistory.ui.NewMedicalHistoryUi
@@ -110,15 +113,19 @@ class NewMedicalHistoryScreen : Fragment(), NewMedicalHistoryUiActions, HandlesB
   }
 
   override fun showDiagnosisRequiredErrorDialog() {
-    SelectDiagnosisErrorDialog.show(activity.supportFragmentManager, true)
+    SelectDiagnosisRequiredErrorDialog.show(activity.supportFragmentManager)
+  }
+
+  override fun showDiagnosisOrReferralRequiredErrorDialog() {
+    SelectDiagnosisOrReferralRequiredErrorDialog.show(activity.supportFragmentManager)
   }
 
   override fun showHypertensionDiagnosisRequiredErrorDialog() {
-    MaterialAlertDialogBuilder(requireContext())
-        .setTitle(getString(R.string.select_diagnosis_error_diagnosis_required))
-        .setMessage(getString(R.string.select_diagnosis_error_enter_diagnosis_hypertension))
-        .setPositiveButton(getString(R.string.select_diagnosis_error_ok), null)
-        .show()
+    SelectHypertensionDiagnosisRequiredErrorDialog.show(activity.supportFragmentManager)
+  }
+
+  override fun showHypertensionDiagnosisRequiredOrReferralErrorDialog() {
+    SelectHypertensionDiagnosisOrReferralRequiredErrorDialog.show(activity.supportFragmentManager)
   }
 
   override fun showChangeDiagnosisErrorDialog() {

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

@@ -6,7 +6,10 @@ interface NewMedicalHistoryUiActions {
   fun openPatientSummaryScreen(patientUuid: UUID)
   fun showOngoingHypertensionTreatmentErrorDialog()
   fun showDiagnosisRequiredErrorDialog()
+
+  fun showDiagnosisOrReferralRequiredErrorDialog()
   fun showHypertensionDiagnosisRequiredErrorDialog()
+  fun showHypertensionDiagnosisRequiredOrReferralErrorDialog()
   fun showChangeDiagnosisErrorDialog()
   fun showOngoingDiabetesTreatmentErrorDialog()
 

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

@@ -27,22 +27,41 @@ class NewMedicalHistoryUpdate : Update<NewMedicalHistoryModel, NewMedicalHistory
   }
 
   private fun saveClicked(model: NewMedicalHistoryModel): Next<NewMedicalHistoryModel, NewMedicalHistoryEffect> {
+    val screening = model.isScreeningFeatureEnabled
+    val diabetesEnabled = model.facilityDiabetesManagementEnabled
+
     return when {
+
       model.showChangeDiagnosisError -> {
         next(model.changeDiagnosisErrorShown(), ShowChangeDiagnosisErrorDialog)
       }
-      model.facilityDiabetesManagementEnabled && !model.hasAnsweredBothDiagnosisQuestions -> {
+
+      screening && diabetesEnabled &&
+          !model.hasAnsweredBothDiagnosisQuestions -> {
+        dispatch(ShowDiagnosisOrReferralRequiredError)
+      }
+
+      screening && !diabetesEnabled &&
+          !model.hasAnsweredHypertensionDiagnosis -> {
+        dispatch(ShowHypertensionDiagnosisOrReferralRequiredError)
+      }
+
+      !screening && diabetesEnabled && !model.hasAnsweredBothDiagnosisQuestions -> {
         dispatch(ShowDiagnosisRequiredError)
       }
-      !model.facilityDiabetesManagementEnabled && !model.hasAnsweredHypertensionDiagnosis -> {
+
+      !screening && !diabetesEnabled && !model.hasAnsweredHypertensionDiagnosis -> {
         dispatch(ShowHypertensionDiagnosisRequiredError)
       }
+
       model.showOngoingHypertensionTreatment && !model.answeredIsOnHypertensionTreatment -> {
         dispatch(ShowOngoingHypertensionTreatmentError)
       }
+
       model.showOngoingDiabetesTreatment && !model.answeredIsOnDiabetesTreatment -> {
         dispatch(ShowOngoingDiabetesTreatmentErrorDialog)
       }
+
       else -> registerPatient(model)
     }
   }