From ed76f85f12f940c0f521151f63e86c988c6d2f37 Mon Sep 17 00:00:00 2001 From: Marsway Date: Tue, 28 Apr 2026 14:14:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20ehr=20=E5=9F=9F=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extensions/sync_ehr_to_oa/job.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/extensions/sync_ehr_to_oa/job.py b/extensions/sync_ehr_to_oa/job.py index fa26b96..64bb9f5 100644 --- a/extensions/sync_ehr_to_oa/job.py +++ b/extensions/sync_ehr_to_oa/job.py @@ -29,6 +29,7 @@ _OA_SQLSERVER_JOB_NO_COLUMN = "field0001" _OA_SQLSERVER_ID_COLUMN = "id" _EHR_RD_ATTR_KEY = "extyfsx_606508_585814777" _EHR_HRBP_ID_KEY = "extdyhrbp_606508_1933587232" +_EHR_DOMAIN_ACCOUNT_KEY = "extADAccountName_606508_511687157" def _cell_value(cell: Any) -> str: @@ -345,7 +346,7 @@ class SyncEhrToOaFormJob(BaseJob): if not app_key or not app_secret: raise ValueError("secret_cfg.app_key and secret_cfg.app_secret are required") - domain_custom_key = str(params.get("domain_account_custom_key") or "").strip() or None + domain_custom_key = str(params.get("domain_account_custom_key") or "").strip() or _EHR_DOMAIN_ACCOUNT_KEY mobile_custom_key = str(params.get("mobile_phone_custom_key") or "").strip() or None verbose_trace = _to_bool_or_none(params.get("verbose_trace")) if verbose_trace is None: @@ -563,7 +564,7 @@ class SyncEhrToOaFormJob(BaseJob): manager = str(manager_member.get("id") or "") manager_show = str(manager_member.get("name") or manager_code) is_leaving = "是" if _date_only(rec.get("lastWorkDate")) else "否" - domain_account = _custom_prop_value(emp.get("customProperties"), domain_custom_key) or str(emp.get("_Name") or "") + domain_account = _custom_prop_value(emp.get("customProperties"), domain_custom_key) logger.info( "EHR 字段预览：job_no=%s company=%s name=%s rd_attr=%s place=%s entry_date=%s leave_date=%s id_number=%s mobile_phone=%s hrbp_id=%s hrbp_show=%s manager_id=%s manager_show=%s is_leaving=%s domain_account=%s", job_no, @@ -808,7 +809,7 @@ class SyncEhrToOaFormJob(BaseJob): manager = str(manager_member.get("id") or "") manager_show = str(manager_member.get("name") or manager_code) is_leaving = "是" if _date_only(rec.get("lastWorkDate")) else "否" - domain_account = _custom_prop_value(emp.get("customProperties"), domain_custom_key) or str(emp.get("_Name") or "") + domain_account = _custom_prop_value(emp.get("customProperties"), domain_custom_key) if place_debug_count < 50: logger.info( "工作地点调试：job_no=%s PlaceText=%r place_code=%r chosen=%r",