diff --git a/src/domain/usecases/ValidateMidwiferyAndPersonnelUseCase.ts b/src/domain/usecases/ValidateMidwiferyAndPersonnelUseCase.ts index 354e3b4..b409cff 100644 --- a/src/domain/usecases/ValidateMidwiferyAndPersonnelUseCase.ts +++ b/src/domain/usecases/ValidateMidwiferyAndPersonnelUseCase.ts @@ -296,15 +296,7 @@ export class ValidateMidwiferyAndPersonnelUseCase { } else if (sectionDisaggregation.type === "key_occupations") { return [["2. Nursing Personnel", "3. Midwifery Personnel"]]; } else { - return [ - ["2 - Nursing Personnel", "3 - Midwifery personnel"], - ["2.1 - Nursing Professionals", "3.1 - Midwifery Professionals"], - [ - "2.2 - Nursing Associate Professionals", - "3.2 - Midwifery Associate Professionals", - ], - ["2.3 - Nurses not further defined", "3.3 - Midwives not further defined"], - ]; + return [["2 - Nursing Personnel", "3 - Midwifery personnel"]]; } } diff --git a/src/webapp/pages/analysis/steps/4-nursingMidwifery/useNursingMidwiferyStep.tsx b/src/webapp/pages/analysis/steps/4-nursingMidwifery/useNursingMidwiferyStep.tsx index 8854882..36658b4 100644 --- a/src/webapp/pages/analysis/steps/4-nursingMidwifery/useNursingMidwiferyStep.tsx +++ b/src/webapp/pages/analysis/steps/4-nursingMidwifery/useNursingMidwiferyStep.tsx @@ -5,6 +5,7 @@ import { QualityAnalysis } from "$/domain/entities/QualityAnalysis"; import { QualityAnalysisSection } from "$/domain/entities/QualityAnalysisSection"; import { UpdateAnalysisState } from "$/webapp/pages/analysis/AnalysisPage"; import { Maybe } from "$/utils/ts-utils"; +import _ from "$/domain/entities/generic/Collection"; export function useNursingMidwiferyStep(props: UseNursingMidwiferyStepProps) { const { analysis, section, updateAnalysis } = props; @@ -23,7 +24,12 @@ export function useNursingMidwiferyStep(props: UseNursingMidwiferyStepProps) { text: item.name, })); setDisaggregations(selectedDisaggregations); - setSelectedDissagregations(selectedDisaggregations.map(item => item.value)); + setSelectedDissagregations( + _(selectedDisaggregations) + .map(item => (item.text === "Total" ? item.value : undefined)) + .compact() + .value() + ); }, error => { setError(error.message);