diff --git a/HowBadIsMyBatch.ipynb b/HowBadIsMyBatch.ipynb index 20813d4b618..4fce092c656 100644 --- a/HowBadIsMyBatch.ipynb +++ b/HowBadIsMyBatch.ipynb @@ -261,19 +261,20 @@ " \n", " @staticmethod\n", " def getDoseTable(dataFrame):\n", + " filteredDataFrame = DataFrameFilter(dataFrame).filterByCovid19And()\n", " return DoseAnalysis._getDoseTable(\n", - " dataFrame.groupby(\n", - " dataFrame['VAX_DOSE_SERIES'].rename('Dose')))\n", + " filteredDataFrame.groupby(\n", + " filteredDataFrame['VAX_DOSE_SERIES'].rename('Dose')))\n", "\n", " @staticmethod\n", " def getDoseByMonthTable(dataFrame):\n", - " # https://stackoverflow.com/questions/61879166/pandas-groupby-month-and-year-date-as-datetime64ns-and-summarized-by-count\n", + " filteredDataFrame = DataFrameFilter(dataFrame).filterByCovid19And()\n", " return DoseAnalysis._getDoseTable(\n", - " dataFrame.groupby(\n", + " filteredDataFrame.groupby(\n", " [\n", - " dataFrame['RECVDATE'].dt.year.rename('Year'),\n", - " dataFrame['RECVDATE'].dt.month.rename('Month'),\n", - " dataFrame['VAX_DOSE_SERIES'].rename('Dose')\n", + " filteredDataFrame['RECVDATE'].dt.year.rename('Year'),\n", + " filteredDataFrame['RECVDATE'].dt.month.rename('Month'),\n", + " filteredDataFrame['VAX_DOSE_SERIES'].rename('Dose')\n", " ]))\n", "\n", " @staticmethod\n",