diff --git a/docker-compose.yml b/docker-compose.yml index 85dc1c0..db984d6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ x-env: &template - image: fcb_photo_review:1.12.5 + image: fcb_photo_review:1.12.6 restart: always services: diff --git a/photo_review/__init__.py b/photo_review/__init__.py index 3e50121..f1a40d4 100644 --- a/photo_review/__init__.py +++ b/photo_review/__init__.py @@ -70,6 +70,9 @@ HOSPITAL_ALIAS = { "江阴": ["江阴市"], "溧阳": ["溧阳市"], "六合": ["六合区"], + "沐阳": ["沭阳"], + "连水": ["涟水"], + "中医医院": ["中医院"], } """ diff --git a/photo_review/photo_review.py b/photo_review/photo_review.py index 8211294..59a98cf 100644 --- a/photo_review/photo_review.py +++ b/photo_review/photo_review.py @@ -245,6 +245,9 @@ def discharge_task(pk_phhd, discharge_record, identity): for hospital in hospitals: parsed_hospitals = parse_hospital(hospital) for parsed_hospital in parsed_hospitals: + hospital_index = parsed_hospital.find("医院") + if hospital_index != -1 and hospital_index != len(parsed_hospital) - 2: + parsed_hospital = parsed_hospital[:hospital_index + 2] + "%" + parsed_hospital[hospital_index + 2:] hospital_like_conditions.append(BdYljg.name.like(f'%{parsed_hospital}%')) for hospital_alias_key in HOSPITAL_ALIAS.keys(): if hospital_alias_key in parsed_hospital: