Ajout de passage dans les 7-30 jours

0_Preprocessing.ipynb

@@ -84,7 +84,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 25,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -112,7 +112,42 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 22,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Passage dans les 30 et 7 jours\n",
+    "\n",
+    "derniers_passages = pd.read_sql(f\"\"\"\n",
+    "    SELECT DISTINCT\n",
+    "        s1.stay_id,\n",
+    "        CAST(MAX((julianday(s1.intime)-julianday(s2.intime))) <= 7 AS INT) last_7,\n",
+    "        CAST(MAX((julianday(s1.intime)-julianday(s2.intime))) <= 30 AS INT) last_30\n",
+    "    FROM edstays s1\n",
+    "    INNER JOIN edstays s2\n",
+    "        ON s1.subject_id = s2.subject_id\n",
+    "            AND s1.stay_id != s2.stay_id\n",
+    "            AND s1.intime >= s2.intime\n",
+    "    WHERE (julianday(s1.intime)-julianday(s2.intime)) <= 30\n",
+    "    GROUP BY s1.stay_id \n",
+    "\"\"\", conn)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 29,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "stays = stays \\\n",
+    "    .join(derniers_passages.set_index(\"stay_id\"), on=\"stay_id\")\n",
+    "stays[\"last_7\"] = stays[\"last_7\"].fillna(0)\n",
+    "stays[\"last_30\"] = stays[\"last_30\"].fillna(0)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 30,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -123,7 +158,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 31,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -136,7 +171,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
+   "execution_count": 32,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -154,7 +189,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 21,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -171,7 +206,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 40,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -190,7 +225,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 42,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -210,7 +245,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 43,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -245,7 +280,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 44,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [