update
This commit is contained in:
parent
63c1f1ad29
commit
26e4c7f55e
|
|
@ -501,7 +501,8 @@ class SyncEhrToOaFormJob(BaseJob):
|
||||||
company = str(first_party_by_user_id.get(user_id) or str((org or {}).get("name") or ""))
|
company = str(first_party_by_user_id.get(user_id) or str((org or {}).get("name") or ""))
|
||||||
name = str(emp.get("name") or "")
|
name = str(emp.get("name") or "")
|
||||||
rd_attr = _rd_attr_to_text(_custom_prop_value(emp.get("customProperties"), _EHR_RD_ATTR_KEY))
|
rd_attr = _rd_attr_to_text(_custom_prop_value(emp.get("customProperties"), _EHR_RD_ATTR_KEY))
|
||||||
place = str(rec.get("place") or "")
|
rec_translate = rec.get("translateProperties") or {}
|
||||||
|
place = str((rec_translate or {}).get("PlaceText") or rec.get("place") or "")
|
||||||
entry_date = _date_only(rec.get("entryDate"))
|
entry_date = _date_only(rec.get("entryDate"))
|
||||||
leave_date = _date_only(rec.get("lastWorkDate"))
|
leave_date = _date_only(rec.get("lastWorkDate"))
|
||||||
id_number = str(emp.get("iDNumber") or "")
|
id_number = str(emp.get("iDNumber") or "")
|
||||||
|
|
@ -737,7 +738,8 @@ class SyncEhrToOaFormJob(BaseJob):
|
||||||
company = str(first_party_by_user_id.get(user_id) or str((org or {}).get("name") or ""))
|
company = str(first_party_by_user_id.get(user_id) or str((org or {}).get("name") or ""))
|
||||||
name = str(emp.get("name") or "")
|
name = str(emp.get("name") or "")
|
||||||
rd_attr = _rd_attr_to_text(_custom_prop_value(emp.get("customProperties"), _EHR_RD_ATTR_KEY))
|
rd_attr = _rd_attr_to_text(_custom_prop_value(emp.get("customProperties"), _EHR_RD_ATTR_KEY))
|
||||||
place = str(rec.get("place") or "")
|
rec_translate = rec.get("translateProperties") or {}
|
||||||
|
place = str((rec_translate or {}).get("PlaceText") or rec.get("place") or "")
|
||||||
entry_date = _date_only(rec.get("entryDate"))
|
entry_date = _date_only(rec.get("entryDate"))
|
||||||
leave_date = _date_only(rec.get("lastWorkDate"))
|
leave_date = _date_only(rec.get("lastWorkDate"))
|
||||||
id_number = str(emp.get("iDNumber") or "")
|
id_number = str(emp.get("iDNumber") or "")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue