From c4a5df07b211f5c0cd92f8ac1c7d730ac7683c47 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 19 Jun 2025 15:07:55 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=80=BB=E9=99=A2=E5=AE=98=E7=BD=91?= =?UTF-8?q?=E8=BF=9E=E4=B8=8D=E4=B8=8A=E7=9A=84=E5=BC=82=E5=B8=B8=E5=A4=84?= =?UTF-8?q?=E7=90=862?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mycode/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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()