Exclude primary dx and RTRIM ICD-9 in Elixhauser no_drg

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: Chessing234

mimic-iii/concepts/comorbidity/elixhauser_ahrq_v37_no_drg.sql

@@ -5,8 +5,15 @@
 -- The code:
 --  removes "primary" ICD9_CODE (seq_num != 1)
 --  uses AHRQ published rules to define comorbidities
+--  RTRIM icd9_code so space-padded values still match BETWEEN/equality
 with
-eliflg as
+icd as
+(
+  select hadm_id, seq_num, RTRIM(icd9_code) as icd9_code
+  from `physionet-data.mimiciii_clinical.diagnoses_icd`
+  where seq_num != 1
+)
+, eliflg as
 (
 select hadm_id, seq_num, icd9_code
 -- note that these codes will seem incomplete at first
@@ -390,8 +397,7 @@ select hadm_id, seq_num, icd9_code
   when icd9_code = '3091' then 1
   when icd9_code = '311'         then 1
 		end as depress  /* Depression */
-from `physionet-data.mimiciii_clinical.diagnoses_icd` icd
-WHERE seq_num = 1
+from icd
 )
 -- collapse the icd9_code specific flags into hadm_id specific flags
 -- this groups comorbidities together for a single patient admission

mimic-iii/concepts_duckdb/comorbidity/elixhauser_ahrq_v37_no_drg.sql

@@ -1,6 +1,14 @@
 -- THIS SCRIPT IS AUTOMATICALLY GENERATED. DO NOT EDIT IT DIRECTLY.
 DROP TABLE IF EXISTS mimiciii_derived.elixhauser_ahrq_v37_no_drg; CREATE TABLE mimiciii_derived.elixhauser_ahrq_v37_no_drg AS
-WITH eliflg AS (
+WITH icd AS (
+  SELECT
+    hadm_id,
+    seq_num,
+    RTRIM(icd9_code) AS icd9_code
+  FROM mimiciii.diagnoses_icd
+  WHERE
+    seq_num <> 1
+), eliflg AS (
   SELECT
     hadm_id,
     seq_num,
@@ -559,9 +567,7 @@ WITH eliflg AS (
       WHEN icd9_code = '311'
       THEN 1
     END AS depress
-  FROM mimiciii.diagnoses_icd AS icd
-  WHERE
-    seq_num = 1
+  FROM icd
 ), eligrp AS (
   SELECT
     hadm_id,

mimic-iii/concepts_postgres/comorbidity/elixhauser_ahrq_v37_no_drg.sql

@@ -1,7 +1,21 @@
 -- THIS SCRIPT IS AUTOMATICALLY GENERATED. DO NOT EDIT IT DIRECTLY.
 DROP TABLE IF EXISTS mimiciii_derived.elixhauser_ahrq_v37_no_drg; CREATE TABLE mimiciii_derived.elixhauser_ahrq_v37_no_drg AS
-/* This code uses the latest version of Elixhauser provided by AHRQ */ /* However, it does *not* filter based on diagnosis related groups (DRGs) */ /* As such, "comorbidities" identified are more likely to be associated with the primary reason for their hospital stay */ /* The code: */ /*  removes "primary" ICD9_CODE (seq_num != 1) */ /*  uses AHRQ published rules to define comorbidities */
-WITH eliflg AS (
+/* This code uses the latest version of Elixhauser provided by AHRQ */
+/* However, it does *not* filter based on diagnosis related groups (DRGs) */
+/* As such, "comorbidities" identified are more likely to be associated with the primary reason for their hospital stay */
+/* The code: */
+/*  removes "primary" ICD9_CODE (seq_num != 1) */
+/*  uses AHRQ published rules to define comorbidities */
+/*  RTRIM icd9_code so space-padded values still match BETWEEN/equality */
+WITH icd AS (
+  SELECT
+    hadm_id,
+    seq_num,
+    RTRIM(icd9_code) AS icd9_code
+  FROM mimiciii.diagnoses_icd
+  WHERE
+    seq_num <> 1
+), eliflg AS (
   SELECT
     hadm_id,
     seq_num,
@@ -562,9 +576,7 @@ WITH eliflg AS (
       WHEN icd9_code = '311'
       THEN 1
     END AS depress /* Depression */
-  FROM mimiciii.diagnoses_icd AS icd
-  WHERE
-    seq_num = 1
+  FROM icd
 ), eligrp /* collapse the icd9_code specific flags into hadm_id specific flags */ /* this groups comorbidities together for a single patient admission */ AS (
   SELECT
     hadm_id,
@@ -613,7 +625,8 @@ WITH eliflg AS (
   GROUP BY
     hadm_id
 )
-/* now merge these flags together to define elixhauser */ /* most are straightforward.. but hypertension flags are a bit more complicated */
+/* now merge these flags together to define elixhauser */
+/* most are straightforward.. but hypertension flags are a bit more complicated */
 SELECT
   adm.subject_id,
   adm.hadm_id,