From 2f3b7e7dc05be670e0f33242f5abc53a6e9167a6 Mon Sep 17 00:00:00 2001 From: liuyebo <1515783401@qq.com> Date: Tue, 20 Aug 2024 17:15:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E7=A7=91=E5=AE=A4=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=88=AB=E5=90=8D=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- docker-compose.yml | 2 +- photo_review/__init__.py | 3 +++ photo_review/photo_review.py | 8 +++++++- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3ceeb95..47e7c9e 100644 --- a/README.md +++ b/README.md @@ -111,6 +111,6 @@ 2. 调整zx_ocr表名为zx_ie_result 3. 在自动识别时将图片转正并上传到云端 19. 版本号：1.12.0 - 1. 优化医院匹配方法，采用模糊匹配 - 2. 匹配时为医院添加别名 - 3. 添加医院名的分析处理 \ No newline at end of file + 1. 优化医院、科室匹配方法，采用模糊匹配 + 2. 匹配时为医院、科室添加别名 + 3. 添加医院、科室名的分析处理 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 6ba57b7..134329c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ x-env: &template - image: fcb_photo_review:1.12.8 + image: fcb_photo_review:1.12.9 restart: always services: diff --git a/photo_review/__init__.py b/photo_review/__init__.py index 024a49c..95043dc 100644 --- a/photo_review/__init__.py +++ b/photo_review/__init__.py @@ -74,6 +74,9 @@ HOSPITAL_ALIAS = { "九〇四": ["904"], "漂水": ["溧水"], } +DEPARTMENT_ALIAS = { + "耳鼻喉": ["耳鼻咽喉"] +} """ 搜索过滤配置 diff --git a/photo_review/photo_review.py b/photo_review/photo_review.py index e4f1e38..9ff297f 100644 --- a/photo_review/photo_review.py +++ b/photo_review/photo_review.py @@ -17,7 +17,7 @@ from db.mysql import BdYljg, BdYlks, ZxIeResult, ZxIeCost, ZxIeDischarge, ZxIeSe from photo_review import PATIENT_NAME, ADMISSION_DATE, DISCHARGE_DATE, MEDICAL_EXPENSES, PERSONAL_CASH_PAYMENT, \ PERSONAL_ACCOUNT_PAYMENT, PERSONAL_FUNDED_AMOUNT, MEDICAL_INSURANCE_TYPE, HOSPITAL, DEPARTMENT, DOCTOR, \ ADMISSION_ID, SETTLEMENT_ID, AGE, OCR, SETTLEMENT_IE, DISCHARGE_IE, COST_IE, PHHD_BATCH_SIZE, SLEEP_MINUTES, \ - UPPERCASE_MEDICAL_EXPENSES, HOSTNAME, HOSPITAL_ALIAS, HOSPITAL_FILTER + UPPERCASE_MEDICAL_EXPENSES, HOSTNAME, HOSPITAL_ALIAS, HOSPITAL_FILTER, DEPARTMENT_ALIAS from ucloud import ufile from util import image_util, util from util.data_util import handle_date, handle_decimal, parse_department, handle_name, \ @@ -323,6 +323,12 @@ def discharge_task(pk_phhd, discharge_record, identity): match_departments.append(search_result) if search_result and search_result[1] == 100: break + for department_alias_key in DEPARTMENT_ALIAS.keys(): + if department_alias_key in parsed_department: + for department_alias in DEPARTMENT_ALIAS[department_alias_key]: + new_department = parsed_department.replace(department_alias_key, department_alias) + match_departments.append(search_department(new_department)) + break best_match = None best_score = 0 for match_department in match_departments: