diff --git a/mycode/main.py b/mycode/main.py index 2668747..52a38a6 100644 --- a/mycode/main.py +++ b/mycode/main.py @@ -232,11 +232,11 @@ def get_cbma_info_from_db_and_ana(year: str = '2023'): cons_dw_1_web = pd.Series(False, index=df_web.index) if df_web is not None else pd.Series(False) for item in dw.split('、'): cons_dw_1 = (df['source'].str.contains(item)) | cons_dw_1 - cons_dw_1_web = (df_web['source'].str.contains(item)) | cons_dw_1_web if df_web is not None else (df_web['source'].str.contains(item)) + cons_dw_1_web = (df_web['source'].str.contains(item)) | cons_dw_1_web if df_web is not None else pd.Series(False) df_fx.at[ind, f'供总院{i}稿数'] = ((cons_dw_1) & ( cons_y_m) & (df['gbiz'] == zybiz)).sum() df_fx.at[ind, f'供总院网站{i}稿数'] = ((cons_dw_1_web) & ( - cons_y_m_web)).sum() + cons_y_m_web)).sum() if df_web is not None else 0 else: df_fx.at[ind, f'供总院{i}稿数'] = (df['source'].str.contains( dw) & (cons_y_m) & (df['gbiz'] == zybiz)).sum()