BN-70 | Add. Mark Diagnosis As Condition (#35)

* BN-70 | Refactor. Rename DiagnosesForm As ConditionsAndDiagnoses

* BN-70 | Add. ConditionsAndDiagnoses Store

* BN-70 | Add. Link To Mark As Condition In SelectedDiagnosisItem

* BN-70 | Fix. Validate Conditions And Diagnoses Together

* BN-70 | Add. SelectedConditionItem Component

* BN-70 | Add. Condition Support To ConditionsAndDiagnoses Form

* BN-70 | Add. OnsetDate Calculator Util

* BN-70 | Add. createEncounterConditionResource To ConditionResource Service

* BN-70 | Add. createConditionsBundleEntries Function

* BN-70 | Add. SelectedConditions To ConsultationBundle On Save

* BN-70 | Fix. Default Condition Count To 100

* BN-70 | Fix. Type Duplication In Conditions

Replaced Custom FHIR Types with Standard Types

* BN-70 | Fix. Separation of Concerns In useConditions Hook

* BN-70 | Fix. Remove Recorded Date From Conditions Table

* BN-70 | Add. Show OnsetDate Based On Date Distance

* BN-70 | Fix. i18n Translation Keys For Conditions Table

* BN-70 | Refactor. Improve i18n Key Translation

Author: rahu1ramesh

public/locales/locale_en.json

@@ -21,24 +21,42 @@
   "ALLERGY_TYPE_DRUG": "Drug",
   "CERTAINITY_CONFIRMED": "Confirmed",
   "CERTAINITY_PROVISIONAL": "Provisional",
-  "CLINICAL_DAYS_TRANSLATION_KEY": "days",
-  "CLINICAL_MONTHS_TRANSLATION_KEY": "months",
-  "CLINICAL_YEARS_TRANSLATION_KEY": "years",
+  "CLINICAL_DAYS_TRANSLATION_KEY_one": "day",
+  "CLINICAL_DAYS_TRANSLATION_KEY_other": "days",
+  "CLINICAL_MONTHS_TRANSLATION_KEY_one": "month",
+  "CLINICAL_MONTHS_TRANSLATION_KEY_other": "months",
+  "CLINICAL_YEARS_TRANSLATION_KEY_one": "year",
+  "CLINICAL_YEARS_TRANSLATION_KEY_other": "years",
   "CONDITION_LIST_ACTIVE": "Active",
   "CONDITION_LIST_CONDITION": "Condition",
   "CONDITION_LIST_DATE": "Date",
   "CONDITION_LIST_DISPLAY_CONTROL_TITLE": "Conditions",
   "CONDITION_LIST_INACTIVE": "Inactive",
-  "CONDITION_LIST_NO_CONDITIONS": "No conditions found",
+  "CONDITION_LIST_NO_CONDITIONS": "No conditions recorded",
   "CONDITION_LIST_STATUS": "Status",
   "CONDITION_TABLE_NOT_AVAILABLE": "Not available",
-  "CONDITION_TABLE_ONSET_DATE": "Onset Date",
-  "CONDITION_TABLE_PROVIDER": "Provider",
+  "CONDITION_TABLE_DURATION": "Duration",
+  "CONDITION_TABLE_RECORDED_BY": "Recorded By",
   "CONDITION_TABLE_RECORDED_DATE": "Recorded Date",
+  "CONDITION_ONSET_SINCE_FORMAT": "Since {{timeAgo}}",
+  "CONDITIONS_ADD_AS_CONDITION": "Add to condition",
+  "CONDITIONS_ALREADY_EXISTS": "Condition already exists",
+  "CONDITIONS_DURATION_DAYS": "Days",
+  "CONDITIONS_DURATION_MONTHS": "Months",
+  "CONDITIONS_DURATION_UNIT_LABEL": "Unit",
+  "CONDITIONS_DURATION_UNIT_REQUIRED": "Duration unit is required",
+  "CONDITIONS_DURATION_VALUE_LABEL": "Duration",
+  "CONDITIONS_DURATION_VALUE_PLACEHOLDER": "Enter duration",
+  "CONDITIONS_DURATION_VALUE_REQUIRED": "Duration value is required",
+  "CONDITIONS_DURATION_YEARS": "Years",
+  "CONDITIONS_SECTION_TITLE": "Added Conditions",
+  "CONDITIONS_SUCCESS_ADDED": "Condition added successfully",
   "CONFIG_ERROR_NOT_FOUND": "Configuration not found",
   "CONFIG_ERROR_SCHEMA_VALIDATION_FAILED": "Configuration does not match required schema",
   "CONFIG_ERROR_VALIDATION_FAILED": "Configuration validation failed",
   "CONSULTATION_ERROR_GENERIC": "Error creating consultation bundle",
+  "CONSULTATION_ERROR_INVALID_ALLERGY_PARAMS": "Invalid or missing allergy parameters",
+  "CONSULTATION_ERROR_INVALID_CONDITION_PARAMS": "Invalid or missing condition parameters",
   "CONSULTATION_ERROR_INVALID_DIAGNOSIS_PARAMS": "Invalid or missing diagnosis parameters",
   "CONSULTATION_ERROR_INVALID_ENCOUNTER_REFERENCE": "Invalid or missing encounter reference",
   "CONSULTATION_ERROR_INVALID_ENCOUNTER_SUBJECT": "Invalid or missing encounter subject",
@@ -58,7 +76,7 @@
   "DIAGNOSES_ADDED_DIAGNOSES": "Added Diagnoses",
   "DIAGNOSES_CERTAINTY_ARIA_LABEL": "Diagnoses Certainty",
   "DIAGNOSES_DISPLAY_CONTROL_HEADING": "Diagnoses",
-  "DIAGNOSES_FORM_TITLE": "Diagnoses",
+  "CONDITIONS_AND_DIAGNOSES_FORM_TITLE": "Conditions and Diagnoses",
   "DIAGNOSES_SEARCH_ARIA_LABEL": "Search for diagnoses",
   "DIAGNOSES_SEARCH_PLACEHOLDER": "Search to add new diagnosis",
   "DIAGNOSES_SELECT_CERTAINTY": "Select Certainty",

public/locales/locale_es.json

@@ -21,24 +21,42 @@
   "ALLERGY_TYPE_DRUG": "Droga",
   "CERTAINITY_CONFIRMED": "Confirmado",
   "CERTAINITY_PROVISIONAL": "Provisorio",
-  "CLINICAL_DAYS_TRANSLATION_KEY": "días",
-  "CLINICAL_MONTHS_TRANSLATION_KEY": "meses",
-  "CLINICAL_YEARS_TRANSLATION_KEY": "años",
+  "CLINICAL_DAYS_TRANSLATION_KEY_one": "día",
+  "CLINICAL_DAYS_TRANSLATION_KEY_other": "días",
+  "CLINICAL_MONTHS_TRANSLATION_KEY_one": "mes",
+  "CLINICAL_MONTHS_TRANSLATION_KEY_other": "meses",
+  "CLINICAL_YEARS_TRANSLATION_KEY_one": "año",
+  "CLINICAL_YEARS_TRANSLATION_KEY_other": "años",
   "CONDITION_LIST_ACTIVE": "Activo",
   "CONDITION_LIST_CONDITION": "Condición",
   "CONDITION_LIST_DATE": "Fecha",
   "CONDITION_LIST_DISPLAY_CONTROL_TITLE": "Condiciones",
   "CONDITION_LIST_INACTIVE": "Inactivo",
-  "CONDITION_LIST_NO_CONDITIONS": "No hay Condiciones disponibles",
+  "CONDITION_LIST_NO_CONDITIONS": "No hay Condiciones registradas",
   "CONDITION_LIST_STATUS": "Estado",
   "CONDITION_TABLE_NOT_AVAILABLE": "No disponible",
-  "CONDITION_TABLE_ONSET_DATE": "Fecha de inicio",
-  "CONDITION_TABLE_PROVIDER": "Proveedor",
+  "CONDITION_TABLE_DURATION": "Duración",
+  "CONDITION_TABLE_RECORDED_BY": "Grabado por",
   "CONDITION_TABLE_RECORDED_DATE": "Fecha de grabación",
+  "CONDITION_ONSET_SINCE_FORMAT": "Hace {{timeAgo}}",
+  "CONDITIONS_ADD_AS_CONDITION": "Agregar como Condición",
+  "CONDITIONS_ALREADY_EXISTS": "La condición ya existe",
+  "CONDITIONS_DURATION_DAYS": "Días",
+  "CONDITIONS_DURATION_MONTHS": "Meses",
+  "CONDITIONS_DURATION_UNIT_LABEL": "Unidad",
+  "CONDITIONS_DURATION_UNIT_REQUIRED": "Se requiere la unidad de duración",
+  "CONDITIONS_DURATION_VALUE_LABEL": "Duración",
+  "CONDITIONS_DURATION_VALUE_PLACEHOLDER": "Ingrese la duración",
+  "CONDITIONS_DURATION_VALUE_REQUIRED": "Se requiere el valor de duración",
+  "CONDITIONS_DURATION_YEARS": "Años",
+  "CONDITIONS_SECTION_TITLE": "Condiciones Agregadas",
+  "CONDITIONS_SUCCESS_ADDED": "Condición agregada exitosamente",
   "CONFIG_ERROR_NOT_FOUND": "Configuración no encontrada",
   "CONFIG_ERROR_SCHEMA_VALIDATION_FAILED": "La configuración no coincide con el esquema requerido",
   "CONFIG_ERROR_VALIDATION_FAILED": "La validación de la configuración falló",
   "CONSULTATION_ERROR_GENERIC": "Error al crear el paquete de consulta",
+  "CONSULTATION_ERROR_INVALID_ALLERGY_PARAMS": "Parámetros de alergia inválidos o faltantes",
+  "CONSULTATION_ERROR_INVALID_CONDITION_PARAMS": "Parámetros de condición inválidos o faltantes",
   "CONSULTATION_ERROR_INVALID_DIAGNOSIS_PARAMS": "Parámetros de diagnóstico inválidos o faltantes",
   "CONSULTATION_ERROR_INVALID_ENCOUNTER_REFERENCE": "Referencia de encuentro inválida o faltante",
   "CONSULTATION_ERROR_INVALID_ENCOUNTER_SUBJECT": "Sujeto de encuentro inválido o faltante",
@@ -58,7 +76,7 @@
   "DIAGNOSES_ADDED_DIAGNOSES": "Diagnósticos Agregados",
   "DIAGNOSES_CERTAINTY_ARIA_LABEL": "Certeza del Diagnóstico",
   "DIAGNOSES_DISPLAY_CONTROL_HEADING": "Diagnósticos",
-  "DIAGNOSES_FORM_TITLE": "Diagnósticos",
+  "CONDITIONS_AND_DIAGNOSES_FORM_TITLE": "Condiciones y Diagnósticos",
   "DIAGNOSES_SEARCH_ARIA_LABEL": "Buscar diagnósticos",
   "DIAGNOSES_SEARCH_PLACEHOLDER": "Buscar para agregar un diagnóstico",
   "DIAGNOSES_SELECT_CERTAINTY": "Seleccionar Certeza",

src/__mocks__/conditionMocks.ts

@@ -1,12 +1,8 @@
-import {
-  FhirCondition,
-  FhirConditionBundle,
-  ConditionStatus,
-  FormattedCondition,
-} from '../types/condition';
+import { Condition, Bundle } from 'fhir/r4';
+import { ConditionStatus, FormattedCondition } from '@types/condition';
 
 export const mockPatientUUID = '02f47490-d657-48ee-98e7-4c9133ea168b';
-export const mockCondition: FhirCondition = {
+export const mockCondition: Condition = {
   resourceType: 'Condition',
   id: '21fc9270-5e82-4073-9468-0bc3c1a105a5',
   meta: {
@@ -54,7 +50,7 @@ export const mockCondition: FhirCondition = {
   },
 };
 
-export const mockConditions: FhirCondition[] = [mockCondition];
+export const mockConditions: Condition[] = [mockCondition];
 
 export const mockFormattedConditions: FormattedCondition[] = [
   {
@@ -94,7 +90,7 @@ export const mockFormattedConditionsWithNotes: FormattedCondition[] = [
     note: ['Patient reports pain in the upper right quadrant'],
   },
 ];
-export const mockConditionBundle: FhirConditionBundle = {
+export const mockConditionBundle: Bundle = {
   resourceType: 'Bundle',
   id: '8c9cde77-2ae9-4c05-b149-964b4cf3e8f5',
   meta: {
@@ -117,7 +113,7 @@ export const mockConditionBundle: FhirConditionBundle = {
   ],
 };
 
-export const mockEmptyConditionBundle: FhirConditionBundle = {
+export const mockEmptyConditionBundle: Bundle = {
   resourceType: 'Bundle',
   id: 'empty-bundle',
   meta: {
@@ -154,7 +150,7 @@ export const mockMalformedBundle = {
   ],
 };
 
-export const mockConditionWithoutOptionalFields: FhirCondition = {
+export const mockConditionWithoutOptionalFields: Condition = {
   resourceType: 'Condition',
   id: 'condition-without-optionals',
   meta: {
@@ -177,7 +173,7 @@ export const mockConditionWithoutOptionalFields: FhirCondition = {
   },
 };
 
-export const mockConditionBundleWithoutOptionals: FhirConditionBundle = {
+export const mockConditionBundleWithoutOptionals: Bundle = {
   resourceType: 'Bundle',
   id: 'bundle-without-optionals',
   meta: {

src/components/clinical/consultationPad/ConsultationPad.tsx

@@ -2,14 +2,15 @@ import React, { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import ActionArea from '@components/common/actionArea/ActionArea';
 import { Column, Grid, MenuItemDivider } from '@carbon/react';
-import BasicForm from '@/components/clinical/forms/encounterDetails/EncounterDetails';
-import DiagnosesForm from '@components/clinical/forms/diagnoses/DiagnosesForm';
+import BasicForm from '@components/clinical/forms/encounterDetails/EncounterDetails';
+import DiagnosesForm from '@components/clinical/forms/conditionsAndDiagnoses/ConditionsAndDiagnoses';
 import AllergiesForm from '@components/clinical/forms/allergies/AllergiesForm';
 import { ConsultationBundle } from '@types/consultationBundle';
 import {
   postConsultationBundle,
   createDiagnosisBundleEntries,
   createAllergiesBundleEntries,
+  createConditionsBundleEntries,
 } from '@services/consultationBundleService';
 import useNotification from '@hooks/useNotification';
 import { createEncounterResource } from '@utils/fhir/encounterResourceCreator';
@@ -18,7 +19,7 @@ import {
   createConsultationBundle,
 } from '@utils/fhir/consultationBundleCreator';
 import { ERROR_TITLES } from '@constants/errors';
-import { useDiagnosisStore } from '@stores/diagnosisStore';
+import { useConditionsAndDiagnosesStore } from '@stores/conditionsAndDiagnosesStore';
 import useAllergyStore from '@stores/allergyStore';
 import { useEncounterDetailsStore } from '@stores/encounterDetailsStore';
 import * as styles from './styles/ConsultationPad.module.scss';
@@ -36,9 +37,10 @@ const ConsultationPad: React.FC<ConsultationPadProps> = ({ onClose }) => {
   // Use the diagnosis store
   const {
     selectedDiagnoses,
-    validateAllDiagnoses,
+    selectedConditions,
+    validate,
     reset: resetDiagnoses,
-  } = useDiagnosisStore();
+  } = useConditionsAndDiagnosesStore();
   // Use the allergy store
   const {
     selectedAllergies,
@@ -115,20 +117,29 @@ const ConsultationPad: React.FC<ConsultationPadProps> = ({ onClose }) => {
       practitionerUUID: user!.uuid,
     });
 
+    const conditionEntries = createConditionsBundleEntries({
+      selectedConditions,
+      encounterSubject: encounterResource.subject!,
+      encounterReference: enconterResourceURL,
+      practitionerUUID: user!.uuid,
+      consultationDate,
+    });
+
     const consultationBundle = createConsultationBundle([
       encounterBundleEntry,
       ...diagnosisEntries,
       ...allergyEntries,
+      ...conditionEntries,
     ]);
 
     return postConsultationBundle<ConsultationBundle>(consultationBundle);
   };
 
   const handleOnPrimaryButtonClick = async () => {
     if (!isSubmitting && canSubmitConsultation) {
-      const isDiagnosesValid = validateAllDiagnoses();
+      const isConditionsAndDiagnosesValid = validate();
       const isAllergiesValid = validateAllAllergies();
-      if (!isDiagnosesValid || !isAllergiesValid) {
+      if (!isConditionsAndDiagnosesValid || !isAllergiesValid) {
         return;
       }