diff --git a/cumulus_library/studies/core/core_templates/encounter.sql.jinja b/cumulus_library/studies/core/core_templates/encounter.sql.jinja index 4afa6fb0..54fa8e8f 100644 --- a/cumulus_library/studies/core/core_templates/encounter.sql.jinja +++ b/cumulus_library/studies/core/core_templates/encounter.sql.jinja @@ -93,7 +93,7 @@ temp_encounter AS ( edd.display AS dischargeDisposition_display FROM temp_encounter_nullable AS e - LEFT JOIN core__encounter_dn_priority AS edt ON e.id = edt.id + LEFT JOIN core__encounter_dn_type AS edt ON e.id = edt.id LEFT JOIN core__encounter_dn_servicetype AS eds ON e.id = eds.id LEFT JOIN core__encounter_dn_priority AS edp ON e.id = edp.id LEFT JOIN core__encounter_dn_reasoncode AS edr ON e.id = edr.id diff --git a/cumulus_library/studies/core/reference_sql/builder_encounter.sql b/cumulus_library/studies/core/reference_sql/builder_encounter.sql index f17813c4..43bebd80 100644 --- a/cumulus_library/studies/core/reference_sql/builder_encounter.sql +++ b/cumulus_library/studies/core/reference_sql/builder_encounter.sql @@ -580,7 +580,7 @@ temp_encounter AS ( edd.display AS dischargeDisposition_display FROM temp_encounter_nullable AS e - LEFT JOIN core__encounter_dn_priority AS edt ON e.id = edt.id + LEFT JOIN core__encounter_dn_type AS edt ON e.id = edt.id LEFT JOIN core__encounter_dn_servicetype AS eds ON e.id = eds.id LEFT JOIN core__encounter_dn_priority AS edp ON e.id = edp.id LEFT JOIN core__encounter_dn_reasoncode AS edr ON e.id = edr.id diff --git a/tests/test_data/core/core__count_encounter_all_types_month.txt b/tests/test_data/core/core__count_encounter_all_types_month.txt index 2b60e5da..82f657a4 100644 --- a/tests/test_data/core/core__count_encounter_all_types_month.txt +++ b/tests/test_data/core/core__count_encounter_all_types_month.txt @@ -1,47 +1,23 @@ -(22, 'ambulatory', 'cumulus__none', 'cumulus__none', 'cumulus__none', '2018-06-01') -(22, 'ambulatory', 'cumulus__none', 'cumulus__none', None, '2018-06-01') -(22, 'ambulatory', 'cumulus__none', None, 'cumulus__none', '2018-06-01') -(22, 'ambulatory', 'cumulus__none', None, None, '2018-06-01') (22, 'ambulatory', None, 'cumulus__none', 'cumulus__none', '2018-06-01') (22, 'ambulatory', None, 'cumulus__none', None, '2018-06-01') (22, 'ambulatory', None, None, 'cumulus__none', '2018-06-01') (22, 'ambulatory', None, None, None, '2018-06-01') -(24, 'ambulatory', 'cumulus__none', 'cumulus__none', 'cumulus__none', '2018-07-01') -(24, 'ambulatory', 'cumulus__none', 'cumulus__none', None, '2018-07-01') -(24, 'ambulatory', 'cumulus__none', None, 'cumulus__none', '2018-07-01') -(24, 'ambulatory', 'cumulus__none', None, None, '2018-07-01') (24, 'ambulatory', None, 'cumulus__none', 'cumulus__none', '2018-07-01') (24, 'ambulatory', None, 'cumulus__none', None, '2018-07-01') (24, 'ambulatory', None, None, 'cumulus__none', '2018-07-01') (24, 'ambulatory', None, None, None, '2018-07-01') -(24, None, 'cumulus__none', 'cumulus__none', 'cumulus__none', '2018-06-01') -(24, None, 'cumulus__none', 'cumulus__none', None, '2018-06-01') -(24, None, 'cumulus__none', None, 'cumulus__none', '2018-06-01') -(24, None, 'cumulus__none', None, None, '2018-06-01') (24, None, None, 'cumulus__none', 'cumulus__none', '2018-06-01') (24, None, None, 'cumulus__none', None, '2018-06-01') (24, None, None, None, 'cumulus__none', '2018-06-01') (24, None, None, None, None, '2018-06-01') -(26, None, 'cumulus__none', 'cumulus__none', 'cumulus__none', '2018-07-01') -(26, None, 'cumulus__none', 'cumulus__none', None, '2018-07-01') -(26, None, 'cumulus__none', None, 'cumulus__none', '2018-07-01') -(26, None, 'cumulus__none', None, None, '2018-07-01') (26, None, None, 'cumulus__none', 'cumulus__none', '2018-07-01') (26, None, None, 'cumulus__none', None, '2018-07-01') (26, None, None, None, 'cumulus__none', '2018-07-01') (26, None, None, None, None, '2018-07-01') -(46, 'ambulatory', 'cumulus__none', 'cumulus__none', 'cumulus__none', None) -(46, 'ambulatory', 'cumulus__none', 'cumulus__none', None, None) -(46, 'ambulatory', 'cumulus__none', None, 'cumulus__none', None) -(46, 'ambulatory', 'cumulus__none', None, None, None) (46, 'ambulatory', None, 'cumulus__none', 'cumulus__none', None) (46, 'ambulatory', None, 'cumulus__none', None, None) (46, 'ambulatory', None, None, 'cumulus__none', None) (46, 'ambulatory', None, None, None, None) -(50, None, 'cumulus__none', 'cumulus__none', 'cumulus__none', None) -(50, None, 'cumulus__none', 'cumulus__none', None, None) -(50, None, 'cumulus__none', None, 'cumulus__none', None) -(50, None, 'cumulus__none', None, None, None) (50, None, None, 'cumulus__none', 'cumulus__none', None) (50, None, None, 'cumulus__none', None, None) (50, None, None, None, 'cumulus__none', None) diff --git a/tests/test_data/core/core__encounter.txt b/tests/test_data/core/core__encounter.txt index 742fdb69..9e4356b5 100644 --- a/tests/test_data/core/core__encounter.txt +++ b/tests/test_data/core/core__encounter.txt @@ -1,50 +1,50 @@ -('029d1814-d7bf-0624-524d-7ccda5f320f6', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 15, 'female', 'black or african american', 'not hispanic or latino', '672', datetime.date(2018, 6, 3), datetime.date(2018, 6, 3), datetime.date(2018, 5, 28), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/e80dda2c-a260-dbf7-3167-bf0945f3a91d', 'Encounter/029d1814-d7bf-0624-524d-7ccda5f320f6') -('02eb4e14-1a6f-d968-2c26-c0cf5023afe0', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 57, 'female', 'white', 'not hispanic or latino', '660', datetime.date(2018, 6, 7), datetime.date(2018, 6, 7), datetime.date(2018, 6, 4), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/c7ad408d-fcae-b54a-eb1d-26d48f7a5f84', 'Encounter/02eb4e14-1a6f-d968-2c26-c0cf5023afe0') -('03e34b19-2889-b828-792d-2a83400c55be', 'finished', 'EMER', 'emergency', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 20, 'female', 'white', 'not hispanic or latino', '662', datetime.date(2018, 7, 19), datetime.date(2018, 7, 19), datetime.date(2018, 7, 16), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/ad3ed58a-5645-af0a-eeca-ab543123a8aa', 'Encounter/03e34b19-2889-b828-792d-2a83400c55be') -('11381dc6-0e06-da55-0735-d1e7bbf8bb35', 'finished', 'EMER', 'emergency', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 8, 'male', 'white', 'hispanic or latino', '672', datetime.date(2018, 7, 15), datetime.date(2018, 7, 15), datetime.date(2018, 7, 9), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/dffa62dc-8ec2-1cd6-ee75-f9156a5283fe', 'Encounter/11381dc6-0e06-da55-0735-d1e7bbf8bb35') -('1154d05c-8727-9373-4224-25b9fdba9ab3', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 25, 'female', 'white', 'hispanic or latino', '671', datetime.date(2018, 6, 14), datetime.date(2018, 6, 14), datetime.date(2018, 6, 11), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/24906e2c-e556-71dc-23d9-3e1d5fb08986', 'Encounter/1154d05c-8727-9373-4224-25b9fdba9ab3') -('1d679c3a-2765-5e13-e2a3-4bd76a898fc6', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 50, 'male', 'white', 'not hispanic or latino', '662', datetime.date(2018, 6, 15), datetime.date(2018, 6, 15), datetime.date(2018, 6, 11), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/cb8c0665-30ee-479c-8994-d29f1a6848b0', 'Encounter/1d679c3a-2765-5e13-e2a3-4bd76a898fc6') -('299b6495-3fe7-8db3-c494-6e1ce8b7986d', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 30, 'male', 'black or african american', 'hispanic or latino', '660', datetime.date(2018, 6, 2), datetime.date(2018, 6, 2), datetime.date(2018, 5, 28), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/8877ef1f-7cd7-3242-d7f0-73cf3f7165f4', 'Encounter/299b6495-3fe7-8db3-c494-6e1ce8b7986d') -('2b1ee164-6c87-420d-a9e2-6c235ebeef71', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 15, 'male', 'white', 'not hispanic or latino', '672', datetime.date(2018, 6, 8), datetime.date(2018, 6, 8), datetime.date(2018, 6, 4), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/6a883108-7b87-120b-d163-d369336e04e5', 'Encounter/2b1ee164-6c87-420d-a9e2-6c235ebeef71') -('2f55edb9-a906-0b40-e183-89b1d65d1aa1', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 16, 'female', 'white', 'not hispanic or latino', '672', datetime.date(2018, 7, 21), datetime.date(2018, 7, 21), datetime.date(2018, 7, 16), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/0734762a-9db6-22fc-b595-c3e472bb2a9a', 'Encounter/2f55edb9-a906-0b40-e183-89b1d65d1aa1') -('32d0ae2d-1be8-9e90-a4da-4c222abd88a9', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 72, 'male', 'white', 'not hispanic or latino', '662', datetime.date(2018, 7, 2), datetime.date(2018, 7, 2), datetime.date(2018, 7, 2), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/17fde357-dcc9-af8b-a8d3-4bd213afeb22', 'Encounter/32d0ae2d-1be8-9e90-a4da-4c222abd88a9') -('366df7d3-2ea9-db22-7cdd-60fa8a5c45ca', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, '431857002', 'http://snomed.info/sct', 'Chronic kidney disease stage 4 (disorder)', None, None, None, 66, 'male', 'black or african american', 'not hispanic or latino', '678', datetime.date(2018, 6, 15), datetime.date(2018, 6, 15), datetime.date(2018, 6, 11), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/ad239efc-637c-e428-c829-b87e700d5446', 'Encounter/366df7d3-2ea9-db22-7cdd-60fa8a5c45ca') -('37604257-be1a-120f-81ee-336f81603f92', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, '431857002', 'http://snomed.info/sct', 'Chronic kidney disease stage 4 (disorder)', None, None, None, 48, 'male', 'white', 'not hispanic or latino', '666', datetime.date(2018, 7, 16), datetime.date(2018, 7, 16), datetime.date(2018, 7, 16), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/50f8b42e-17a6-e932-8546-da94004c597c', 'Encounter/37604257-be1a-120f-81ee-336f81603f92') -('4b03a408-6694-88e3-0e63-3ee464ecd6cd', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 73, 'male', 'white', 'not hispanic or latino', '660', datetime.date(2018, 7, 11), datetime.date(2018, 7, 11), datetime.date(2018, 7, 9), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/5ce2e599-fb6e-9b4d-3c2e-87310619b957', 'Encounter/4b03a408-6694-88e3-0e63-3ee464ecd6cd') -('4c4d0730-201f-5b75-c657-8d0de09cc28f', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 60, 'female', 'white', 'not hispanic or latino', '676', datetime.date(2018, 6, 14), datetime.date(2018, 6, 14), datetime.date(2018, 6, 11), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/267fc42d-cd9e-8527-1f9e-887fe7776147', 'Encounter/4c4d0730-201f-5b75-c657-8d0de09cc28f') -('5c3450fb-12f0-08f3-6e4d-8a5e433e19a4', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 46, 'female', 'white', 'not hispanic or latino', '660', datetime.date(2018, 6, 21), datetime.date(2018, 6, 21), datetime.date(2018, 6, 18), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/a46846ca-3f95-2cbb-3a9d-5eae150a0273', 'Encounter/5c3450fb-12f0-08f3-6e4d-8a5e433e19a4') -('5c994000-aa78-2be5-e6cf-99f230d50c2f', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, '01', 'http://www.nubc.org/patient-discharge', 'Discharged to home care or self care (routine discharge)', 81, 'male', 'white', 'not hispanic or latino', '672', datetime.date(2018, 7, 13), datetime.date(2018, 7, 13), datetime.date(2018, 7, 9), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/9eaa056b-1efc-0cc8-70ff-62c8f704cc13', 'Encounter/5c994000-aa78-2be5-e6cf-99f230d50c2f') -('6565ef5c-30b9-8697-6ca6-2b77894d5437', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 19, 'female', 'white', 'not hispanic or latino', '668', datetime.date(2018, 7, 19), datetime.date(2018, 7, 19), datetime.date(2018, 7, 16), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/d3c0274f-f42b-8d2b-15f2-82331e723383', 'Encounter/6565ef5c-30b9-8697-6ca6-2b77894d5437') -('65f8fdca-a949-80a0-8072-094e9aaee474', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, '10509002', 'http://snomed.info/sct', 'Acute bronchitis (disorder)', None, None, None, 9, 'female', 'white', 'not hispanic or latino', '674', datetime.date(2018, 6, 17), datetime.date(2018, 6, 17), datetime.date(2018, 6, 11), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/7f941bcc-e7b2-99e1-585f-129d0ef1c13d', 'Encounter/65f8fdca-a949-80a0-8072-094e9aaee474') -('683b04eb-663a-849f-715f-4ccd70bf1524', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 12, 'female', 'white', 'not hispanic or latino', '660', datetime.date(2018, 7, 26), datetime.date(2018, 7, 26), datetime.date(2018, 7, 23), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/cc9fb8e2-fe52-b72a-aebb-9d10260f121b', 'Encounter/683b04eb-663a-849f-715f-4ccd70bf1524') -('6a952afd-3be5-e27e-9e05-5a1e085e34d0', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, '444814009', 'http://snomed.info/sct', 'Viral sinusitis (disorder)', None, None, None, 16, 'male', 'white', 'not hispanic or latino', '674', datetime.date(2018, 7, 21), datetime.date(2018, 7, 21), datetime.date(2018, 7, 16), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/f9399f0d-5401-09f3-d4ff-89b1aa51b9c8', 'Encounter/6a952afd-3be5-e27e-9e05-5a1e085e34d0') -('75312bd2-d5ac-c62e-c9df-0004783725c7', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 11, 'female', 'white', 'not hispanic or latino', '662', datetime.date(2018, 7, 2), datetime.date(2018, 7, 2), datetime.date(2018, 7, 2), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/3ae095ec-8fe0-133b-36d4-8785a6ad8df3', 'Encounter/75312bd2-d5ac-c62e-c9df-0004783725c7') -('75b68644-535d-bdc1-4c31-aa9fe7e1822f', 'finished', 'EMER', 'emergency', None, None, None, None, None, None, None, None, None, '55680006', 'http://snomed.info/sct', 'Drug overdose', None, None, None, 25, 'female', 'white', 'not hispanic or latino', '672', datetime.date(2018, 6, 30), datetime.date(2018, 6, 30), datetime.date(2018, 6, 25), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/82b8a670-4700-30e8-24a0-b83efa3c5e0a', 'Encounter/75b68644-535d-bdc1-4c31-aa9fe7e1822f') -('79d8f213-7847-646b-8a66-5da208cc1c27', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, '431857002', 'http://snomed.info/sct', 'Chronic kidney disease stage 4 (disorder)', None, None, None, 77, 'male', 'white', 'not hispanic or latino', '674', datetime.date(2018, 7, 14), datetime.date(2018, 7, 14), datetime.date(2018, 7, 9), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/26a3984f-b2a8-e67f-7abc-ff147a0e6e35', 'Encounter/79d8f213-7847-646b-8a66-5da208cc1c27') -('83d0d564-3bbf-48eb-7445-bd2b81130671', 'finished', 'EMER', 'emergency', None, None, None, None, None, None, None, None, None, '55680006', 'http://snomed.info/sct', 'Drug overdose', None, None, None, 69, 'male', 'white', 'not hispanic or latino', '660', datetime.date(2018, 6, 16), datetime.date(2018, 6, 17), datetime.date(2018, 6, 11), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/16be855b-ece2-8b96-1ef9-a4d93adf3289', 'Encounter/83d0d564-3bbf-48eb-7445-bd2b81130671') -('8ff1dc01-5a28-b2d8-3b42-4b7a7d539970', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 55, 'female', 'white', 'not hispanic or latino', '662', datetime.date(2018, 7, 15), datetime.date(2018, 7, 15), datetime.date(2018, 7, 9), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/c1bfec36-dc2c-afc8-c767-3d35ed2bf6f0', 'Encounter/8ff1dc01-5a28-b2d8-3b42-4b7a7d539970') -('91f94a9d-69a7-e30a-cd1a-68c52dc01e70', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 22, 'female', 'white', 'not hispanic or latino', '662', datetime.date(2018, 6, 29), datetime.date(2018, 6, 29), datetime.date(2018, 6, 25), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/a28be3e1-a6bd-7df4-fc81-1140848f8453', 'Encounter/91f94a9d-69a7-e30a-cd1a-68c52dc01e70') -('98d4bd14-d78e-debb-e7dc-2df7786aedf3', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 89, 'male', 'white', 'hispanic or latino', '667', datetime.date(2018, 7, 9), datetime.date(2018, 7, 9), datetime.date(2018, 7, 9), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/e455ca3f-fc16-6ffc-297a-adc27e2db183', 'Encounter/98d4bd14-d78e-debb-e7dc-2df7786aedf3') -('aa890974-162f-5906-dc71-2bb6d2185314', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, '431857002', 'http://snomed.info/sct', 'Chronic kidney disease stage 4 (disorder)', None, None, None, 50, 'male', 'white', 'not hispanic or latino', '672', datetime.date(2018, 7, 2), datetime.date(2018, 7, 2), datetime.date(2018, 7, 2), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/c7c5c028-f1fb-962b-8db2-dfd4c6d6b02a', 'Encounter/aa890974-162f-5906-dc71-2bb6d2185314') -('aabb3ac3-c4a3-f613-9507-63280adb9209', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 0, 'female', 'white', 'not hispanic or latino', '675', datetime.date(2018, 7, 31), datetime.date(2018, 7, 31), datetime.date(2018, 7, 30), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/2a0e1946-acf6-5a7e-9399-a9cbc4730199', 'Encounter/aabb3ac3-c4a3-f613-9507-63280adb9209') -('b5974881-ae62-ddd6-b905-8c86c1ca9e33', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, '271737000', 'http://snomed.info/sct', 'Anemia (disorder)', None, None, None, 41, 'male', 'white', 'not hispanic or latino', '675', datetime.date(2018, 6, 25), datetime.date(2018, 6, 25), datetime.date(2018, 6, 25), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/47c37c92-5932-9cfe-66be-208556780fe0', 'Encounter/b5974881-ae62-ddd6-b905-8c86c1ca9e33') -('b864bcd8-14e0-8bec-b7cc-f8629d91470e', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 15, 'female', 'white', 'not hispanic or latino', '662', datetime.date(2018, 6, 28), datetime.date(2018, 6, 28), datetime.date(2018, 6, 25), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/c20e5afd-30df-ac3d-6684-cc29438a9bc4', 'Encounter/b864bcd8-14e0-8bec-b7cc-f8629d91470e') -('ba84689e-2f9f-7cea-af1f-d69ffdd3a3eb', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 39, 'female', 'white', 'not hispanic or latino', '670', datetime.date(2018, 6, 15), datetime.date(2018, 6, 15), datetime.date(2018, 6, 11), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/7bf52d54-0d2a-265a-15aa-eeed7aaf4af6', 'Encounter/ba84689e-2f9f-7cea-af1f-d69ffdd3a3eb') -('bca7cabc-b2fc-8a08-c69b-5bc0afa20d80', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, '271737000', 'http://snomed.info/sct', 'Anemia (disorder)', None, None, None, 28, 'female', 'white', 'not hispanic or latino', '674', datetime.date(2018, 7, 13), datetime.date(2018, 7, 13), datetime.date(2018, 7, 9), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/3627adb8-f741-acf3-2dd6-10f3bcbe1077', 'Encounter/bca7cabc-b2fc-8a08-c69b-5bc0afa20d80') -('beb26500-4ccd-ce0a-44f6-74f44be5fafe', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 14, 'female', 'white', 'not hispanic or latino', '667', datetime.date(2018, 6, 7), datetime.date(2018, 6, 7), datetime.date(2018, 6, 4), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/149de67a-2809-59a8-bfa2-36df509021dc', 'Encounter/beb26500-4ccd-ce0a-44f6-74f44be5fafe') -('c4605953-3103-ede6-e0c0-e0588e6f019e', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 61, 'female', 'white', 'not hispanic or latino', '675', datetime.date(2018, 7, 27), datetime.date(2018, 7, 27), datetime.date(2018, 7, 23), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/a5b171a7-9b28-20e7-86a7-936ecbf55f36', 'Encounter/c4605953-3103-ede6-e0c0-e0588e6f019e') -('c6ec2350-43d4-abab-2e84-4d2aadb337a7', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 53, 'male', 'white', 'not hispanic or latino', '678', datetime.date(2018, 7, 2), datetime.date(2018, 7, 2), datetime.date(2018, 7, 2), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/26baae20-c8c5-003a-ab6b-ebcc49be20db', 'Encounter/c6ec2350-43d4-abab-2e84-4d2aadb337a7') -('ca45bbef-ef2a-3b3c-ea5e-76bcd5865780', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, '72892002', 'http://snomed.info/sct', 'Normal pregnancy', None, None, None, 48, 'female', 'white', 'hispanic or latino', '672', datetime.date(2018, 6, 12), datetime.date(2018, 6, 12), datetime.date(2018, 6, 11), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/9b17654f-a902-3d56-9000-4ade3dd3059f', 'Encounter/ca45bbef-ef2a-3b3c-ea5e-76bcd5865780') -('d2782687-6885-037c-957d-579fbd681d2a', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 54, 'male', 'white', 'not hispanic or latino', '000', datetime.date(2018, 6, 13), datetime.date(2018, 6, 13), datetime.date(2018, 6, 11), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/3cf7af45-2bee-aa9c-d524-40b487149d60', 'Encounter/d2782687-6885-037c-957d-579fbd681d2a') -('d5f342b7-017c-f2e7-8697-5a038c91518e', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, '72892002', 'http://snomed.info/sct', 'Normal pregnancy', None, None, None, 20, 'female', 'white', 'not hispanic or latino', '660', datetime.date(2018, 7, 28), datetime.date(2018, 7, 28), datetime.date(2018, 7, 23), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/2da1bee2-2bc2-4511-84e1-42860310e2fb', 'Encounter/d5f342b7-017c-f2e7-8697-5a038c91518e') -('d735c414-9dd3-c9b1-285c-8da79a7fbbdf', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, '431857002', 'http://snomed.info/sct', 'Chronic kidney disease stage 4 (disorder)', None, None, None, 61, 'female', 'white', 'not hispanic or latino', '662', datetime.date(2018, 7, 29), datetime.date(2018, 7, 29), datetime.date(2018, 7, 23), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/7cef0e6f-9aea-4079-dfc6-18a96454708e', 'Encounter/d735c414-9dd3-c9b1-285c-8da79a7fbbdf') -('d73ed087-e0ae-78e0-7a05-1bac1060c476', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 45, 'female', 'white', 'not hispanic or latino', '667', datetime.date(2018, 7, 10), datetime.date(2018, 7, 10), datetime.date(2018, 7, 9), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/51032f44-d514-26e9-3e85-e956561c076e', 'Encounter/d73ed087-e0ae-78e0-7a05-1bac1060c476') -('dc5ed645-3979-e765-3e03-6ba2173027c3', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 90, 'male', 'white', 'not hispanic or latino', '671', datetime.date(2018, 7, 7), datetime.date(2018, 7, 7), datetime.date(2018, 7, 2), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/ac91b90d-97e4-4fc5-41cd-036bac49e6e8', 'Encounter/dc5ed645-3979-e765-3e03-6ba2173027c3') -('de9d67de-6ae3-32f7-20f2-e719ae23a9a3', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 3, 'male', 'white', 'not hispanic or latino', '672', datetime.date(2018, 7, 30), datetime.date(2018, 7, 30), datetime.date(2018, 7, 30), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/2858705f-5af1-9869-4d94-894e09a9f99a', 'Encounter/de9d67de-6ae3-32f7-20f2-e719ae23a9a3') -('e5dabcb6-1d7a-7467-dbba-b864d0d5f5b0', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 49, 'female', 'white', 'not hispanic or latino', '662', datetime.date(2018, 7, 28), datetime.date(2018, 7, 28), datetime.date(2018, 7, 23), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/0b052286-9534-99a8-8d5e-06c2c04a7df7', 'Encounter/e5dabcb6-1d7a-7467-dbba-b864d0d5f5b0') -('e613f29d-7505-6f2e-a1f5-bfbec300752d', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, '88805009', 'http://snomed.info/sct', 'Chronic congestive heart failure (disorder)', None, None, None, 84, 'female', 'white', 'not hispanic or latino', '667', datetime.date(2018, 6, 29), datetime.date(2018, 6, 29), datetime.date(2018, 6, 25), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/1c498b42-61fd-6341-69c3-053f6e4fe404', 'Encounter/e613f29d-7505-6f2e-a1f5-bfbec300752d') -('e922a884-7039-a171-a65e-78051fe7afe6', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 1, 'male', 'white', 'not hispanic or latino', '665', datetime.date(2018, 6, 13), datetime.date(2018, 6, 13), datetime.date(2018, 6, 11), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/8022fbbe-aaa4-056c-d0f5-ec074bf0656c', 'Encounter/e922a884-7039-a171-a65e-78051fe7afe6') -('ed151e04-3dd6-8cb7-a3e5-777c8a8667f1', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, '195662009', 'http://snomed.info/sct', 'Acute viral pharyngitis (disorder)', None, None, None, 57, 'female', 'white', 'not hispanic or latino', '000', datetime.date(2018, 6, 6), datetime.date(2018, 6, 6), datetime.date(2018, 6, 4), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/19158de4-66a2-f70f-e3bf-4396b312c8f1', 'Encounter/ed151e04-3dd6-8cb7-a3e5-777c8a8667f1') -('f2752dd7-1bf1-739d-dd8c-40122d0b63bc', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, '161665007', 'http://snomed.info/sct', 'History of renal transplant (situation)', None, None, None, 77, 'male', 'white', 'not hispanic or latino', '674', datetime.date(2018, 6, 1), datetime.date(2018, 6, 2), datetime.date(2018, 5, 28), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/9c8d8539-0b1e-73e2-b64f-83f1ea601fa4', 'Encounter/f2752dd7-1bf1-739d-dd8c-40122d0b63bc') -('f964be66-3fcd-95c8-0021-71c7d24c91b7', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, '431857002', 'http://snomed.info/sct', 'Chronic kidney disease stage 4 (disorder)', None, None, None, 63, 'female', 'white', 'not hispanic or latino', '661', datetime.date(2018, 6, 5), datetime.date(2018, 6, 5), datetime.date(2018, 6, 4), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/a5bc08ea-9462-c4f5-1bd2-ff342598ac99', 'Encounter/f964be66-3fcd-95c8-0021-71c7d24c91b7') -('fd0754a4-e96d-cba7-b3c0-77697a09c86e', 'finished', 'AMB', 'ambulatory', None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, 100, 'female', 'white', 'not hispanic or latino', '672', datetime.date(2018, 7, 10), datetime.date(2018, 7, 10), datetime.date(2018, 7, 9), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/6385ddd7-2639-6505-3789-0521b8f66c8b', 'Encounter/fd0754a4-e96d-cba7-b3c0-77697a09c86e') +('029d1814-d7bf-0624-524d-7ccda5f320f6', 'finished', 'AMB', 'ambulatory', '371883000', 'http://snomed.info/sct', 'Outpatient procedure', None, None, None, None, None, None, None, None, None, None, None, None, 15, 'female', 'black or african american', 'not hispanic or latino', '672', datetime.date(2018, 6, 3), datetime.date(2018, 6, 3), datetime.date(2018, 5, 28), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/e80dda2c-a260-dbf7-3167-bf0945f3a91d', 'Encounter/029d1814-d7bf-0624-524d-7ccda5f320f6') +('02eb4e14-1a6f-d968-2c26-c0cf5023afe0', 'finished', 'AMB', 'ambulatory', '162673000', 'http://snomed.info/sct', 'General examination of patient (procedure)', None, None, None, None, None, None, None, None, None, None, None, None, 57, 'female', 'white', 'not hispanic or latino', '660', datetime.date(2018, 6, 7), datetime.date(2018, 6, 7), datetime.date(2018, 6, 4), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/c7ad408d-fcae-b54a-eb1d-26d48f7a5f84', 'Encounter/02eb4e14-1a6f-d968-2c26-c0cf5023afe0') +('03e34b19-2889-b828-792d-2a83400c55be', 'finished', 'EMER', 'emergency', '50849002', 'http://snomed.info/sct', 'Emergency room admission (procedure)', None, None, None, None, None, None, None, None, None, None, None, None, 20, 'female', 'white', 'not hispanic or latino', '662', datetime.date(2018, 7, 19), datetime.date(2018, 7, 19), datetime.date(2018, 7, 16), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/ad3ed58a-5645-af0a-eeca-ab543123a8aa', 'Encounter/03e34b19-2889-b828-792d-2a83400c55be') +('11381dc6-0e06-da55-0735-d1e7bbf8bb35', 'finished', 'EMER', 'emergency', '50849002', 'http://snomed.info/sct', 'Emergency room admission (procedure)', None, None, None, None, None, None, None, None, None, None, None, None, 8, 'male', 'white', 'hispanic or latino', '672', datetime.date(2018, 7, 15), datetime.date(2018, 7, 15), datetime.date(2018, 7, 9), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/dffa62dc-8ec2-1cd6-ee75-f9156a5283fe', 'Encounter/11381dc6-0e06-da55-0735-d1e7bbf8bb35') +('1154d05c-8727-9373-4224-25b9fdba9ab3', 'finished', 'AMB', 'ambulatory', '162673000', 'http://snomed.info/sct', 'General examination of patient (procedure)', None, None, None, None, None, None, None, None, None, None, None, None, 25, 'female', 'white', 'hispanic or latino', '671', datetime.date(2018, 6, 14), datetime.date(2018, 6, 14), datetime.date(2018, 6, 11), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/24906e2c-e556-71dc-23d9-3e1d5fb08986', 'Encounter/1154d05c-8727-9373-4224-25b9fdba9ab3') +('1d679c3a-2765-5e13-e2a3-4bd76a898fc6', 'finished', 'AMB', 'ambulatory', '185349003', 'http://snomed.info/sct', 'Encounter for check up', None, None, None, None, None, None, None, None, None, None, None, None, 50, 'male', 'white', 'not hispanic or latino', '662', datetime.date(2018, 6, 15), datetime.date(2018, 6, 15), datetime.date(2018, 6, 11), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/cb8c0665-30ee-479c-8994-d29f1a6848b0', 'Encounter/1d679c3a-2765-5e13-e2a3-4bd76a898fc6') +('299b6495-3fe7-8db3-c494-6e1ce8b7986d', 'finished', 'AMB', 'ambulatory', '185349003', 'http://snomed.info/sct', 'Encounter for check up (procedure)', None, None, None, None, None, None, None, None, None, None, None, None, 30, 'male', 'black or african american', 'hispanic or latino', '660', datetime.date(2018, 6, 2), datetime.date(2018, 6, 2), datetime.date(2018, 5, 28), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/8877ef1f-7cd7-3242-d7f0-73cf3f7165f4', 'Encounter/299b6495-3fe7-8db3-c494-6e1ce8b7986d') +('2b1ee164-6c87-420d-a9e2-6c235ebeef71', 'finished', 'AMB', 'ambulatory', '702927004', 'http://snomed.info/sct', 'Urgent care clinic (environment)', None, None, None, None, None, None, None, None, None, None, None, None, 15, 'male', 'white', 'not hispanic or latino', '672', datetime.date(2018, 6, 8), datetime.date(2018, 6, 8), datetime.date(2018, 6, 4), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/6a883108-7b87-120b-d163-d369336e04e5', 'Encounter/2b1ee164-6c87-420d-a9e2-6c235ebeef71') +('2f55edb9-a906-0b40-e183-89b1d65d1aa1', 'finished', 'AMB', 'ambulatory', '371883000', 'http://snomed.info/sct', 'Outpatient procedure', None, None, None, None, None, None, None, None, None, None, None, None, 16, 'female', 'white', 'not hispanic or latino', '672', datetime.date(2018, 7, 21), datetime.date(2018, 7, 21), datetime.date(2018, 7, 16), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/0734762a-9db6-22fc-b595-c3e472bb2a9a', 'Encounter/2f55edb9-a906-0b40-e183-89b1d65d1aa1') +('32d0ae2d-1be8-9e90-a4da-4c222abd88a9', 'finished', 'AMB', 'ambulatory', '185349003', 'http://snomed.info/sct', 'Encounter for check up (procedure)', None, None, None, None, None, None, None, None, None, None, None, None, 72, 'male', 'white', 'not hispanic or latino', '662', datetime.date(2018, 7, 2), datetime.date(2018, 7, 2), datetime.date(2018, 7, 2), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/17fde357-dcc9-af8b-a8d3-4bd213afeb22', 'Encounter/32d0ae2d-1be8-9e90-a4da-4c222abd88a9') +('366df7d3-2ea9-db22-7cdd-60fa8a5c45ca', 'finished', 'AMB', 'ambulatory', '185347001', 'http://snomed.info/sct', 'Encounter for problem (procedure)', None, None, None, None, None, None, '431857002', 'http://snomed.info/sct', 'Chronic kidney disease stage 4 (disorder)', None, None, None, 66, 'male', 'black or african american', 'not hispanic or latino', '678', datetime.date(2018, 6, 15), datetime.date(2018, 6, 15), datetime.date(2018, 6, 11), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/ad239efc-637c-e428-c829-b87e700d5446', 'Encounter/366df7d3-2ea9-db22-7cdd-60fa8a5c45ca') +('37604257-be1a-120f-81ee-336f81603f92', 'finished', 'AMB', 'ambulatory', '185347001', 'http://snomed.info/sct', 'Encounter for problem (procedure)', None, None, None, None, None, None, '431857002', 'http://snomed.info/sct', 'Chronic kidney disease stage 4 (disorder)', None, None, None, 48, 'male', 'white', 'not hispanic or latino', '666', datetime.date(2018, 7, 16), datetime.date(2018, 7, 16), datetime.date(2018, 7, 16), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/50f8b42e-17a6-e932-8546-da94004c597c', 'Encounter/37604257-be1a-120f-81ee-336f81603f92') +('4b03a408-6694-88e3-0e63-3ee464ecd6cd', 'finished', 'AMB', 'ambulatory', '185349003', 'http://snomed.info/sct', 'Encounter for check up (procedure)', None, None, None, None, None, None, None, None, None, None, None, None, 73, 'male', 'white', 'not hispanic or latino', '660', datetime.date(2018, 7, 11), datetime.date(2018, 7, 11), datetime.date(2018, 7, 9), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/5ce2e599-fb6e-9b4d-3c2e-87310619b957', 'Encounter/4b03a408-6694-88e3-0e63-3ee464ecd6cd') +('4c4d0730-201f-5b75-c657-8d0de09cc28f', 'finished', 'AMB', 'ambulatory', '702927004', 'http://snomed.info/sct', 'Urgent care clinic (environment)', None, None, None, None, None, None, None, None, None, None, None, None, 60, 'female', 'white', 'not hispanic or latino', '676', datetime.date(2018, 6, 14), datetime.date(2018, 6, 14), datetime.date(2018, 6, 11), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/267fc42d-cd9e-8527-1f9e-887fe7776147', 'Encounter/4c4d0730-201f-5b75-c657-8d0de09cc28f') +('5c3450fb-12f0-08f3-6e4d-8a5e433e19a4', 'finished', 'AMB', 'ambulatory', '308335008', 'http://snomed.info/sct', 'Patient encounter procedure', None, None, None, None, None, None, None, None, None, None, None, None, 46, 'female', 'white', 'not hispanic or latino', '660', datetime.date(2018, 6, 21), datetime.date(2018, 6, 21), datetime.date(2018, 6, 18), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/a46846ca-3f95-2cbb-3a9d-5eae150a0273', 'Encounter/5c3450fb-12f0-08f3-6e4d-8a5e433e19a4') +('5c994000-aa78-2be5-e6cf-99f230d50c2f', 'finished', 'AMB', 'ambulatory', '185349003', 'http://snomed.info/sct', 'Encounter for check up (procedure)', None, None, None, None, None, None, None, None, None, '01', 'http://www.nubc.org/patient-discharge', 'Discharged to home care or self care (routine discharge)', 81, 'male', 'white', 'not hispanic or latino', '672', datetime.date(2018, 7, 13), datetime.date(2018, 7, 13), datetime.date(2018, 7, 9), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/9eaa056b-1efc-0cc8-70ff-62c8f704cc13', 'Encounter/5c994000-aa78-2be5-e6cf-99f230d50c2f') +('6565ef5c-30b9-8697-6ca6-2b77894d5437', 'finished', 'AMB', 'ambulatory', '308335008', 'http://snomed.info/sct', 'Patient encounter procedure', None, None, None, None, None, None, None, None, None, None, None, None, 19, 'female', 'white', 'not hispanic or latino', '668', datetime.date(2018, 7, 19), datetime.date(2018, 7, 19), datetime.date(2018, 7, 16), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/d3c0274f-f42b-8d2b-15f2-82331e723383', 'Encounter/6565ef5c-30b9-8697-6ca6-2b77894d5437') +('65f8fdca-a949-80a0-8072-094e9aaee474', 'finished', 'AMB', 'ambulatory', '185345009', 'http://snomed.info/sct', 'Encounter for symptom', None, None, None, None, None, None, '10509002', 'http://snomed.info/sct', 'Acute bronchitis (disorder)', None, None, None, 9, 'female', 'white', 'not hispanic or latino', '674', datetime.date(2018, 6, 17), datetime.date(2018, 6, 17), datetime.date(2018, 6, 11), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/7f941bcc-e7b2-99e1-585f-129d0ef1c13d', 'Encounter/65f8fdca-a949-80a0-8072-094e9aaee474') +('683b04eb-663a-849f-715f-4ccd70bf1524', 'finished', 'AMB', 'ambulatory', '410620009', 'http://snomed.info/sct', 'Well child visit (procedure)', None, None, None, None, None, None, None, None, None, None, None, None, 12, 'female', 'white', 'not hispanic or latino', '660', datetime.date(2018, 7, 26), datetime.date(2018, 7, 26), datetime.date(2018, 7, 23), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/cc9fb8e2-fe52-b72a-aebb-9d10260f121b', 'Encounter/683b04eb-663a-849f-715f-4ccd70bf1524') +('6a952afd-3be5-e27e-9e05-5a1e085e34d0', 'finished', 'AMB', 'ambulatory', '185345009', 'http://snomed.info/sct', 'Encounter for symptom', None, None, None, None, None, None, '444814009', 'http://snomed.info/sct', 'Viral sinusitis (disorder)', None, None, None, 16, 'male', 'white', 'not hispanic or latino', '674', datetime.date(2018, 7, 21), datetime.date(2018, 7, 21), datetime.date(2018, 7, 16), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/f9399f0d-5401-09f3-d4ff-89b1aa51b9c8', 'Encounter/6a952afd-3be5-e27e-9e05-5a1e085e34d0') +('75312bd2-d5ac-c62e-c9df-0004783725c7', 'finished', 'AMB', 'ambulatory', '410620009', 'http://snomed.info/sct', 'Well child visit (procedure)', None, None, None, None, None, None, None, None, None, None, None, None, 11, 'female', 'white', 'not hispanic or latino', '662', datetime.date(2018, 7, 2), datetime.date(2018, 7, 2), datetime.date(2018, 7, 2), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/3ae095ec-8fe0-133b-36d4-8785a6ad8df3', 'Encounter/75312bd2-d5ac-c62e-c9df-0004783725c7') +('75b68644-535d-bdc1-4c31-aa9fe7e1822f', 'finished', 'EMER', 'emergency', '50849002', 'http://snomed.info/sct', 'Emergency room admission (procedure)', None, None, None, None, None, None, '55680006', 'http://snomed.info/sct', 'Drug overdose', None, None, None, 25, 'female', 'white', 'not hispanic or latino', '672', datetime.date(2018, 6, 30), datetime.date(2018, 6, 30), datetime.date(2018, 6, 25), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/82b8a670-4700-30e8-24a0-b83efa3c5e0a', 'Encounter/75b68644-535d-bdc1-4c31-aa9fe7e1822f') +('79d8f213-7847-646b-8a66-5da208cc1c27', 'finished', 'AMB', 'ambulatory', '185347001', 'http://snomed.info/sct', 'Encounter for problem (procedure)', None, None, None, None, None, None, '431857002', 'http://snomed.info/sct', 'Chronic kidney disease stage 4 (disorder)', None, None, None, 77, 'male', 'white', 'not hispanic or latino', '674', datetime.date(2018, 7, 14), datetime.date(2018, 7, 14), datetime.date(2018, 7, 9), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/26a3984f-b2a8-e67f-7abc-ff147a0e6e35', 'Encounter/79d8f213-7847-646b-8a66-5da208cc1c27') +('83d0d564-3bbf-48eb-7445-bd2b81130671', 'finished', 'EMER', 'emergency', '50849002', 'http://snomed.info/sct', 'Emergency room admission (procedure)', None, None, None, None, None, None, '55680006', 'http://snomed.info/sct', 'Drug overdose', None, None, None, 69, 'male', 'white', 'not hispanic or latino', '660', datetime.date(2018, 6, 16), datetime.date(2018, 6, 17), datetime.date(2018, 6, 11), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/16be855b-ece2-8b96-1ef9-a4d93adf3289', 'Encounter/83d0d564-3bbf-48eb-7445-bd2b81130671') +('8ff1dc01-5a28-b2d8-3b42-4b7a7d539970', 'finished', 'AMB', 'ambulatory', '185349003', 'http://snomed.info/sct', 'Encounter for check up (procedure)', None, None, None, None, None, None, None, None, None, None, None, None, 55, 'female', 'white', 'not hispanic or latino', '662', datetime.date(2018, 7, 15), datetime.date(2018, 7, 15), datetime.date(2018, 7, 9), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/c1bfec36-dc2c-afc8-c767-3d35ed2bf6f0', 'Encounter/8ff1dc01-5a28-b2d8-3b42-4b7a7d539970') +('91f94a9d-69a7-e30a-cd1a-68c52dc01e70', 'finished', 'AMB', 'ambulatory', '308335008', 'http://snomed.info/sct', 'Patient encounter procedure', None, None, None, None, None, None, None, None, None, None, None, None, 22, 'female', 'white', 'not hispanic or latino', '662', datetime.date(2018, 6, 29), datetime.date(2018, 6, 29), datetime.date(2018, 6, 25), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/a28be3e1-a6bd-7df4-fc81-1140848f8453', 'Encounter/91f94a9d-69a7-e30a-cd1a-68c52dc01e70') +('98d4bd14-d78e-debb-e7dc-2df7786aedf3', 'finished', 'AMB', 'ambulatory', '185349003', 'http://snomed.info/sct', 'Encounter for check up (procedure)', None, None, None, None, None, None, None, None, None, None, None, None, 89, 'male', 'white', 'hispanic or latino', '667', datetime.date(2018, 7, 9), datetime.date(2018, 7, 9), datetime.date(2018, 7, 9), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/e455ca3f-fc16-6ffc-297a-adc27e2db183', 'Encounter/98d4bd14-d78e-debb-e7dc-2df7786aedf3') +('aa890974-162f-5906-dc71-2bb6d2185314', 'finished', 'AMB', 'ambulatory', '185347001', 'http://snomed.info/sct', 'Encounter for problem (procedure)', None, None, None, None, None, None, '431857002', 'http://snomed.info/sct', 'Chronic kidney disease stage 4 (disorder)', None, None, None, 50, 'male', 'white', 'not hispanic or latino', '672', datetime.date(2018, 7, 2), datetime.date(2018, 7, 2), datetime.date(2018, 7, 2), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/c7c5c028-f1fb-962b-8db2-dfd4c6d6b02a', 'Encounter/aa890974-162f-5906-dc71-2bb6d2185314') +('aabb3ac3-c4a3-f613-9507-63280adb9209', 'finished', 'AMB', 'ambulatory', '410620009', 'http://snomed.info/sct', 'Well child visit (procedure)', None, None, None, None, None, None, None, None, None, None, None, None, 0, 'female', 'white', 'not hispanic or latino', '675', datetime.date(2018, 7, 31), datetime.date(2018, 7, 31), datetime.date(2018, 7, 30), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/2a0e1946-acf6-5a7e-9399-a9cbc4730199', 'Encounter/aabb3ac3-c4a3-f613-9507-63280adb9209') +('b5974881-ae62-ddd6-b905-8c86c1ca9e33', 'finished', 'AMB', 'ambulatory', '185347001', 'http://snomed.info/sct', 'Encounter for problem', None, None, None, None, None, None, '271737000', 'http://snomed.info/sct', 'Anemia (disorder)', None, None, None, 41, 'male', 'white', 'not hispanic or latino', '675', datetime.date(2018, 6, 25), datetime.date(2018, 6, 25), datetime.date(2018, 6, 25), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/47c37c92-5932-9cfe-66be-208556780fe0', 'Encounter/b5974881-ae62-ddd6-b905-8c86c1ca9e33') +('b864bcd8-14e0-8bec-b7cc-f8629d91470e', 'finished', 'AMB', 'ambulatory', '698314001', 'http://snomed.info/sct', 'Consultation for treatment', None, None, None, None, None, None, None, None, None, None, None, None, 15, 'female', 'white', 'not hispanic or latino', '662', datetime.date(2018, 6, 28), datetime.date(2018, 6, 28), datetime.date(2018, 6, 25), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/c20e5afd-30df-ac3d-6684-cc29438a9bc4', 'Encounter/b864bcd8-14e0-8bec-b7cc-f8629d91470e') +('ba84689e-2f9f-7cea-af1f-d69ffdd3a3eb', 'finished', 'AMB', 'ambulatory', '698314001', 'http://snomed.info/sct', 'Consultation for treatment', None, None, None, None, None, None, None, None, None, None, None, None, 39, 'female', 'white', 'not hispanic or latino', '670', datetime.date(2018, 6, 15), datetime.date(2018, 6, 15), datetime.date(2018, 6, 11), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/7bf52d54-0d2a-265a-15aa-eeed7aaf4af6', 'Encounter/ba84689e-2f9f-7cea-af1f-d69ffdd3a3eb') +('bca7cabc-b2fc-8a08-c69b-5bc0afa20d80', 'finished', 'AMB', 'ambulatory', '185347001', 'http://snomed.info/sct', 'Encounter for problem', None, None, None, None, None, None, '271737000', 'http://snomed.info/sct', 'Anemia (disorder)', None, None, None, 28, 'female', 'white', 'not hispanic or latino', '674', datetime.date(2018, 7, 13), datetime.date(2018, 7, 13), datetime.date(2018, 7, 9), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/3627adb8-f741-acf3-2dd6-10f3bcbe1077', 'Encounter/bca7cabc-b2fc-8a08-c69b-5bc0afa20d80') +('beb26500-4ccd-ce0a-44f6-74f44be5fafe', 'finished', 'AMB', 'ambulatory', '698314001', 'http://snomed.info/sct', 'Consultation for treatment', None, None, None, None, None, None, None, None, None, None, None, None, 14, 'female', 'white', 'not hispanic or latino', '667', datetime.date(2018, 6, 7), datetime.date(2018, 6, 7), datetime.date(2018, 6, 4), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/149de67a-2809-59a8-bfa2-36df509021dc', 'Encounter/beb26500-4ccd-ce0a-44f6-74f44be5fafe') +('c4605953-3103-ede6-e0c0-e0588e6f019e', 'finished', 'AMB', 'ambulatory', '162673000', 'http://snomed.info/sct', 'General examination of patient (procedure)', None, None, None, None, None, None, None, None, None, None, None, None, 61, 'female', 'white', 'not hispanic or latino', '675', datetime.date(2018, 7, 27), datetime.date(2018, 7, 27), datetime.date(2018, 7, 23), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/a5b171a7-9b28-20e7-86a7-936ecbf55f36', 'Encounter/c4605953-3103-ede6-e0c0-e0588e6f019e') +('c6ec2350-43d4-abab-2e84-4d2aadb337a7', 'finished', 'AMB', 'ambulatory', '162673000', 'http://snomed.info/sct', 'General examination of patient (procedure)', None, None, None, None, None, None, None, None, None, None, None, None, 53, 'male', 'white', 'not hispanic or latino', '678', datetime.date(2018, 7, 2), datetime.date(2018, 7, 2), datetime.date(2018, 7, 2), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/26baae20-c8c5-003a-ab6b-ebcc49be20db', 'Encounter/c6ec2350-43d4-abab-2e84-4d2aadb337a7') +('ca45bbef-ef2a-3b3c-ea5e-76bcd5865780', 'finished', 'AMB', 'ambulatory', '424619006', 'http://snomed.info/sct', 'Prenatal visit', None, None, None, None, None, None, '72892002', 'http://snomed.info/sct', 'Normal pregnancy', None, None, None, 48, 'female', 'white', 'hispanic or latino', '672', datetime.date(2018, 6, 12), datetime.date(2018, 6, 12), datetime.date(2018, 6, 11), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/9b17654f-a902-3d56-9000-4ade3dd3059f', 'Encounter/ca45bbef-ef2a-3b3c-ea5e-76bcd5865780') +('d2782687-6885-037c-957d-579fbd681d2a', 'finished', 'AMB', 'ambulatory', '162673000', 'http://snomed.info/sct', 'General examination of patient (procedure)', None, None, None, None, None, None, None, None, None, None, None, None, 54, 'male', 'white', 'not hispanic or latino', '000', datetime.date(2018, 6, 13), datetime.date(2018, 6, 13), datetime.date(2018, 6, 11), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/3cf7af45-2bee-aa9c-d524-40b487149d60', 'Encounter/d2782687-6885-037c-957d-579fbd681d2a') +('d5f342b7-017c-f2e7-8697-5a038c91518e', 'finished', 'AMB', 'ambulatory', '424619006', 'http://snomed.info/sct', 'Prenatal visit', None, None, None, None, None, None, '72892002', 'http://snomed.info/sct', 'Normal pregnancy', None, None, None, 20, 'female', 'white', 'not hispanic or latino', '660', datetime.date(2018, 7, 28), datetime.date(2018, 7, 28), datetime.date(2018, 7, 23), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/2da1bee2-2bc2-4511-84e1-42860310e2fb', 'Encounter/d5f342b7-017c-f2e7-8697-5a038c91518e') +('d735c414-9dd3-c9b1-285c-8da79a7fbbdf', 'finished', 'AMB', 'ambulatory', '185347001', 'http://snomed.info/sct', 'Encounter for problem (procedure)', None, None, None, None, None, None, '431857002', 'http://snomed.info/sct', 'Chronic kidney disease stage 4 (disorder)', None, None, None, 61, 'female', 'white', 'not hispanic or latino', '662', datetime.date(2018, 7, 29), datetime.date(2018, 7, 29), datetime.date(2018, 7, 23), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/7cef0e6f-9aea-4079-dfc6-18a96454708e', 'Encounter/d735c414-9dd3-c9b1-285c-8da79a7fbbdf') +('d73ed087-e0ae-78e0-7a05-1bac1060c476', 'finished', 'AMB', 'ambulatory', '698314001', 'http://snomed.info/sct', 'Consultation for treatment', None, None, None, None, None, None, None, None, None, None, None, None, 45, 'female', 'white', 'not hispanic or latino', '667', datetime.date(2018, 7, 10), datetime.date(2018, 7, 10), datetime.date(2018, 7, 9), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/51032f44-d514-26e9-3e85-e956561c076e', 'Encounter/d73ed087-e0ae-78e0-7a05-1bac1060c476') +('dc5ed645-3979-e765-3e03-6ba2173027c3', 'finished', 'AMB', 'ambulatory', '702927004', 'http://snomed.info/sct', 'Urgent care clinic (environment)', None, None, None, None, None, None, None, None, None, None, None, None, 90, 'male', 'white', 'not hispanic or latino', '671', datetime.date(2018, 7, 7), datetime.date(2018, 7, 7), datetime.date(2018, 7, 2), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/ac91b90d-97e4-4fc5-41cd-036bac49e6e8', 'Encounter/dc5ed645-3979-e765-3e03-6ba2173027c3') +('de9d67de-6ae3-32f7-20f2-e719ae23a9a3', 'finished', 'AMB', 'ambulatory', '410620009', 'http://snomed.info/sct', 'Well child visit (procedure)', None, None, None, None, None, None, None, None, None, None, None, None, 3, 'male', 'white', 'not hispanic or latino', '672', datetime.date(2018, 7, 30), datetime.date(2018, 7, 30), datetime.date(2018, 7, 30), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/2858705f-5af1-9869-4d94-894e09a9f99a', 'Encounter/de9d67de-6ae3-32f7-20f2-e719ae23a9a3') +('e5dabcb6-1d7a-7467-dbba-b864d0d5f5b0', 'finished', 'AMB', 'ambulatory', '162673000', 'http://snomed.info/sct', 'General examination of patient (procedure)', None, None, None, None, None, None, None, None, None, None, None, None, 49, 'female', 'white', 'not hispanic or latino', '662', datetime.date(2018, 7, 28), datetime.date(2018, 7, 28), datetime.date(2018, 7, 23), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/0b052286-9534-99a8-8d5e-06c2c04a7df7', 'Encounter/e5dabcb6-1d7a-7467-dbba-b864d0d5f5b0') +('e613f29d-7505-6f2e-a1f5-bfbec300752d', 'finished', 'AMB', 'ambulatory', '448337001', 'http://snomed.info/sct', 'Telemedicine consultation with patient', None, None, None, None, None, None, '88805009', 'http://snomed.info/sct', 'Chronic congestive heart failure (disorder)', None, None, None, 84, 'female', 'white', 'not hispanic or latino', '667', datetime.date(2018, 6, 29), datetime.date(2018, 6, 29), datetime.date(2018, 6, 25), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/1c498b42-61fd-6341-69c3-053f6e4fe404', 'Encounter/e613f29d-7505-6f2e-a1f5-bfbec300752d') +('e922a884-7039-a171-a65e-78051fe7afe6', 'finished', 'AMB', 'ambulatory', '410620009', 'http://snomed.info/sct', 'Well child visit (procedure)', None, None, None, None, None, None, None, None, None, None, None, None, 1, 'male', 'white', 'not hispanic or latino', '665', datetime.date(2018, 6, 13), datetime.date(2018, 6, 13), datetime.date(2018, 6, 11), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/8022fbbe-aaa4-056c-d0f5-ec074bf0656c', 'Encounter/e922a884-7039-a171-a65e-78051fe7afe6') +('ed151e04-3dd6-8cb7-a3e5-777c8a8667f1', 'finished', 'AMB', 'ambulatory', '185345009', 'http://snomed.info/sct', 'Encounter for symptom', None, None, None, None, None, None, '195662009', 'http://snomed.info/sct', 'Acute viral pharyngitis (disorder)', None, None, None, 57, 'female', 'white', 'not hispanic or latino', '000', datetime.date(2018, 6, 6), datetime.date(2018, 6, 6), datetime.date(2018, 6, 4), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/19158de4-66a2-f70f-e3bf-4396b312c8f1', 'Encounter/ed151e04-3dd6-8cb7-a3e5-777c8a8667f1') +('f2752dd7-1bf1-739d-dd8c-40122d0b63bc', 'finished', 'AMB', 'ambulatory', '439740005', 'http://snomed.info/sct', 'Postoperative follow-up visit (procedure)', None, None, None, None, None, None, '161665007', 'http://snomed.info/sct', 'History of renal transplant (situation)', None, None, None, 77, 'male', 'white', 'not hispanic or latino', '674', datetime.date(2018, 6, 1), datetime.date(2018, 6, 2), datetime.date(2018, 5, 28), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/9c8d8539-0b1e-73e2-b64f-83f1ea601fa4', 'Encounter/f2752dd7-1bf1-739d-dd8c-40122d0b63bc') +('f964be66-3fcd-95c8-0021-71c7d24c91b7', 'finished', 'AMB', 'ambulatory', '185347001', 'http://snomed.info/sct', 'Encounter for problem (procedure)', None, None, None, None, None, None, '431857002', 'http://snomed.info/sct', 'Chronic kidney disease stage 4 (disorder)', None, None, None, 63, 'female', 'white', 'not hispanic or latino', '661', datetime.date(2018, 6, 5), datetime.date(2018, 6, 5), datetime.date(2018, 6, 4), datetime.date(2018, 6, 1), datetime.date(2018, 1, 1), 'Patient/a5bc08ea-9462-c4f5-1bd2-ff342598ac99', 'Encounter/f964be66-3fcd-95c8-0021-71c7d24c91b7') +('fd0754a4-e96d-cba7-b3c0-77697a09c86e', 'finished', 'AMB', 'ambulatory', '702927004', 'http://snomed.info/sct', 'Urgent care clinic (environment)', None, None, None, None, None, None, None, None, None, None, None, None, 100, 'female', 'white', 'not hispanic or latino', '672', datetime.date(2018, 7, 10), datetime.date(2018, 7, 10), datetime.date(2018, 7, 9), datetime.date(2018, 7, 1), datetime.date(2018, 1, 1), 'Patient/6385ddd7-2639-6505-3789-0521b8f66c8b', 'Encounter/fd0754a4-e96d-cba7-b3c0-77697a09c86e') diff --git a/tests/test_data/duckdb_data/expected_export/core/core__count_encounter_all_types.csv b/tests/test_data/duckdb_data/expected_export/core/core__count_encounter_all_types.csv index fc457976..d20a99fb 100644 --- a/tests/test_data/duckdb_data/expected_export/core/core__count_encounter_all_types.csv +++ b/tests/test_data/duckdb_data/expected_export/core/core__count_encounter_all_types.csv @@ -3,15 +3,7 @@ cnt,class_display,type_display,serviceType_display,priority_display 50,,,,cumulus__none 50,,,cumulus__none, 50,,,cumulus__none,cumulus__none -50,,cumulus__none,, -50,,cumulus__none,,cumulus__none -50,,cumulus__none,cumulus__none, -50,,cumulus__none,cumulus__none,cumulus__none 46,ambulatory,,, 46,ambulatory,,,cumulus__none 46,ambulatory,,cumulus__none, -46,ambulatory,,cumulus__none,cumulus__none -46,ambulatory,cumulus__none,, -46,ambulatory,cumulus__none,,cumulus__none -46,ambulatory,cumulus__none,cumulus__none, -46,ambulatory,cumulus__none,cumulus__none,cumulus__none +46,ambulatory,,cumulus__none,cumulus__none \ No newline at end of file diff --git a/tests/test_data/duckdb_data/expected_export/core/core__count_encounter_all_types_month.csv b/tests/test_data/duckdb_data/expected_export/core/core__count_encounter_all_types_month.csv index 1204c1c3..35640a26 100644 --- a/tests/test_data/duckdb_data/expected_export/core/core__count_encounter_all_types_month.csv +++ b/tests/test_data/duckdb_data/expected_export/core/core__count_encounter_all_types_month.csv @@ -3,47 +3,23 @@ cnt,class_display,type_display,serviceType_display,priority_display,period_start 50,,,,cumulus__none, 50,,,cumulus__none,, 50,,,cumulus__none,cumulus__none, -50,,cumulus__none,,, -50,,cumulus__none,,cumulus__none, -50,,cumulus__none,cumulus__none,, -50,,cumulus__none,cumulus__none,cumulus__none, 46,ambulatory,,,, 46,ambulatory,,,cumulus__none, 46,ambulatory,,cumulus__none,, 46,ambulatory,,cumulus__none,cumulus__none, -46,ambulatory,cumulus__none,,, -46,ambulatory,cumulus__none,,cumulus__none, -46,ambulatory,cumulus__none,cumulus__none,, -46,ambulatory,cumulus__none,cumulus__none,cumulus__none, 26,,,,,2018-07-01 26,,,,cumulus__none,2018-07-01 26,,,cumulus__none,,2018-07-01 26,,,cumulus__none,cumulus__none,2018-07-01 -26,,cumulus__none,,,2018-07-01 -26,,cumulus__none,,cumulus__none,2018-07-01 -26,,cumulus__none,cumulus__none,,2018-07-01 -26,,cumulus__none,cumulus__none,cumulus__none,2018-07-01 24,,,,,2018-06-01 24,,,,cumulus__none,2018-06-01 24,,,cumulus__none,,2018-06-01 24,,,cumulus__none,cumulus__none,2018-06-01 -24,,cumulus__none,,,2018-06-01 -24,,cumulus__none,,cumulus__none,2018-06-01 -24,,cumulus__none,cumulus__none,,2018-06-01 -24,,cumulus__none,cumulus__none,cumulus__none,2018-06-01 24,ambulatory,,,,2018-07-01 24,ambulatory,,,cumulus__none,2018-07-01 24,ambulatory,,cumulus__none,,2018-07-01 24,ambulatory,,cumulus__none,cumulus__none,2018-07-01 -24,ambulatory,cumulus__none,,,2018-07-01 -24,ambulatory,cumulus__none,,cumulus__none,2018-07-01 -24,ambulatory,cumulus__none,cumulus__none,,2018-07-01 -24,ambulatory,cumulus__none,cumulus__none,cumulus__none,2018-07-01 22,ambulatory,,,,2018-06-01 22,ambulatory,,,cumulus__none,2018-06-01 22,ambulatory,,cumulus__none,,2018-06-01 -22,ambulatory,,cumulus__none,cumulus__none,2018-06-01 -22,ambulatory,cumulus__none,,,2018-06-01 -22,ambulatory,cumulus__none,,cumulus__none,2018-06-01 -22,ambulatory,cumulus__none,cumulus__none,,2018-06-01 -22,ambulatory,cumulus__none,cumulus__none,cumulus__none,2018-06-01 +22,ambulatory,,cumulus__none,cumulus__none,2018-06-01 \ No newline at end of file diff --git a/tests/test_data/duckdb_data/expected_export/core/core__count_encounter_type_month.csv b/tests/test_data/duckdb_data/expected_export/core/core__count_encounter_type_month.csv index b7e3d842..bb5afe09 100644 --- a/tests/test_data/duckdb_data/expected_export/core/core__count_encounter_type_month.csv +++ b/tests/test_data/duckdb_data/expected_export/core/core__count_encounter_type_month.csv @@ -1,13 +1,7 @@ cnt,class_display,type_display,period_start_month 50,,, -50,,cumulus__none, 46,ambulatory,, -46,ambulatory,cumulus__none, 26,,,2018-07-01 -26,,cumulus__none,2018-07-01 24,,,2018-06-01 -24,,cumulus__none,2018-06-01 24,ambulatory,,2018-07-01 -24,ambulatory,cumulus__none,2018-07-01 22,ambulatory,,2018-06-01 -22,ambulatory,cumulus__none,2018-06-01