Merge pull request #511 from The-Strategy-Unit/486_add-age-group-to-full-results

add age_group to IP full results converted to other activity types

Author: yiwen-h

src/nhp/model/inpatients.py

@@ -307,7 +307,7 @@ def _save_results_get_op_converted(self, model_results: pd.DataFrame) -> pd.Data
         ix = model_results["classpat"] == "-1"
         return (
             model_results[ix]
-            .groupby(["age", "sex", "tretspef", "tretspef_grouped", "sitetret"])
+            .groupby(["age", "age_group", "sex", "tretspef", "tretspef_grouped", "sitetret"])
             .size()
             .to_frame("attendances")
             .assign(tele_attendances=0)
@@ -318,7 +318,7 @@ def _save_results_get_sdec_converted(self, model_results: pd.DataFrame) -> pd.Da
         ix = model_results["classpat"] == "-3"
         return (
             model_results[ix]
-            .groupby(["age", "sex", "sitetret"])
+            .groupby(["age", "age_group", "sex", "sitetret"])
             .size()
             .to_frame("arrivals")
             .assign(

tests/unit/nhp/model/test_inpatients.py

@@ -589,6 +589,7 @@ def test_save_results_get_op_converted(mock_model):
             "classpat": ["-1", "1"] * 3,
             "speldur": [0, 1] * 3,
             "age": [1, 2] * 3,
+            "age_group": ["a", "b"] * 3,
             "sex": [1, 2] * 3,
             "tretspef": ["a", "b"] * 3,
             "tretspef_grouped": ["a", "b"] * 3,
@@ -598,6 +599,7 @@ def test_save_results_get_op_converted(mock_model):
     expected = pd.DataFrame(
         {
             "age": [1, 1],
+            "age_group": ["a", "a"],
             "sex": [1, 1],
             "tretspef": ["a", "a"],
             "tretspef_grouped": ["a", "a"],
@@ -624,6 +626,7 @@ def test_save_results_get_sdec_converted(mock_model):
             "classpat": ["-3", "1"] * 3,
             "speldur": [0, 1] * 3,
             "age": [1, 2] * 3,
+            "age_group": ["a", "b"] * 3,
             "sex": [1, 2] * 3,
             "tretspef": ["a", "b"] * 3,
             "tretspef_grouped": ["a", "b"] * 3,
@@ -633,6 +636,7 @@ def test_save_results_get_sdec_converted(mock_model):
     expected = pd.DataFrame(
         {
             "age": [1, 1],
+            "age_group": ["a", "a"],
             "sex": [1, 1],
             "sitetret": ["1", "2"],
             "arrivals": [2, 1],