diff --git a/dags/mt/supply/facilitys.py b/dags/mt/supply/facilitys.py index fd46153..ad0a168 100644 --- a/dags/mt/supply/facilitys.py +++ b/dags/mt/supply/facilitys.py @@ -25,35 +25,35 @@ curr_month_start_date = dateutils.parse_date(curr_month_start, '%Y%m%d') district_facilitys_df = pd.DataFrame() district_facilitys_school_df = pd.DataFrame(list(district_facilitys_conn.aggregate([ - {'$match': {'school': {'$ne': None}}}, + {'$match': {'school': {'$ne': None}, 'city': {'$in': cities}}}, {'$project': {'city': '$city', 'region': '$region', 'district_name': '$district_name', 'school': {'$size': '$school'}}} ]).batch_size(10000))) district_facilitys_school_df = district_facilitys_school_df.drop(columns=['_id']) district_facilitys_supermarket_df = pd.DataFrame(list(district_facilitys_conn.aggregate([ - {'$match': {'supermarket': {'$ne': None}}}, + {'$match': {'supermarket': {'$ne': None}, 'city': {'$in': cities}}}, {'$project': {'city': '$city', 'region': '$region', 'district_name': '$district_name', 'supermarket': {'$size': '$supermarket'}}} ]).batch_size(10000))) district_facilitys_supermarket_df = district_facilitys_supermarket_df.drop(columns=['_id']) district_facilitys_subway_df = pd.DataFrame(list(district_facilitys_conn.aggregate([ - {'$match': {'subway': {'$ne': None}}}, + {'$match': {'subway': {'$ne': None}, 'city': {'$in': cities}}}, {'$project': {'city': '$city', 'region': '$region', 'district_name': '$district_name', 'subway': {'$size': '$subway'}}} ]).batch_size(10000))) district_facilitys_subway_df = district_facilitys_subway_df.drop(columns=['_id']) district_facilitys_bank_df = pd.DataFrame(list(district_facilitys_conn.aggregate([ - {'$match': {'bank': {'$ne': None}}}, + {'$match': {'bank': {'$ne': None}, 'city': {'$in': cities}}}, {'$project': {'city': '$city', 'region': '$region', 'district_name': '$district_name', 'bank': {'$size': '$bank'}}} ]).batch_size(10000))) district_facilitys_bank_df = district_facilitys_bank_df.drop(columns=['_id']) district_facilitys_hospital_df = pd.DataFrame(list(district_facilitys_conn.aggregate([ - {'$match': {'hospital': {'$ne': None}}}, + {'$match': {'hospital': {'$ne': None}, 'city': {'$in': cities}}}, {'$project': {'city': '$city', 'region': '$region', 'district_name': '$district_name', 'hospital': {'$size': '$hospital'}}} ]).batch_size(10000)))