refactoring

This commit is contained in:
frankknoll
2022-02-05 15:13:25 +01:00
parent 8345b9b317
commit b9bb504b87

View File

@@ -189,7 +189,8 @@
" \"DIED_sum\": \"DEATHS\",\n",
" \"L_THREAT_sum\": \"LIFE THREATENING ILLNESSES\",\n",
" \"DISABLE_sum\": \"DISABILITIES\"\n",
" })[['ADRs', 'DEATHS', 'DISABILITIES', 'LIFE THREATENING ILLNESSES']]\n",
" })\n",
" batchCodeTable = batchCodeTable[['ADRs', 'DEATHS', 'DISABILITIES', 'LIFE THREATENING ILLNESSES']]\n",
" return batchCodeTable.sort_values(by = 'ADRs', ascending = False)\n",
"\n",
" # create table from https://www.howbadismybatch.com/combined.html\n",
@@ -210,7 +211,8 @@
" \"DISABLE_sum\": \"DISABILITIES\",\n",
" 'HOSPITAL_sum': 'HOSPITALISATIONS',\n",
" 'ER_VISIT_sum': 'EMERGENCY ROOM OR DOCTOR VISITS'\n",
" })[['ADRs', 'DEATHS', 'DISABILITIES', 'LIFE THREATENING ILLNESSES', 'HOSPITALISATIONS', 'EMERGENCY ROOM OR DOCTOR VISITS']]\n",
" })\n",
" batchCodeTable = batchCodeTable[['ADRs', 'DEATHS', 'DISABILITIES', 'LIFE THREATENING ILLNESSES', 'HOSPITALISATIONS', 'EMERGENCY ROOM OR DOCTOR VISITS']]\n",
" batchCodeTable = batchCodeTable.sort_values(by = 'ADRs', ascending = False)\n",
" return self._addCompanyColumn(batchCodeTable, self._createCompanyByBatchCodeTable())\n",
"\n",
@@ -269,7 +271,8 @@
" \"DIED_sum\": \"Deaths\",\n",
" \"L_THREAT_sum\": \"Life Threatening Illnesses\",\n",
" \"DISABLE_sum\": \"Disabilities\"\n",
" })[['Total reports', 'Deaths', 'Disabilities', 'Life Threatening Illnesses']]\n",
" })\n",
" doseTable = doseTable[['Total reports', 'Deaths', 'Disabilities', 'Life Threatening Illnesses']]\n",
" doseTable['Severe reports (%)'] = (doseTable['Deaths'] + doseTable['Disabilities'] + doseTable['Life Threatening Illnesses']) / doseTable['Total reports'] * 100\n",
" return doseTable\n"
]