diff --git a/docker-compose.yml b/docker-compose.yml index 576a4b1..afde6a5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ x-env: &template - image: fcb_photo_review:1.14.9 + image: fcb_photo_review:1.14.10 restart: always x-review: diff --git a/photo_review/auto_photo_review.py b/photo_review/auto_photo_review.py index 808ad64..14d6635 100644 --- a/photo_review/auto_photo_review.py +++ b/photo_review/auto_photo_review.py @@ -26,7 +26,7 @@ from ucloud import ufile from util import image_util, util, html_util from util.data_util import handle_date, handle_decimal, parse_department, handle_name, \ handle_insurance_type, handle_original_data, handle_hospital, handle_department, handle_id, handle_age, parse_money, \ - parse_hospital + parse_hospital, handle_doctor # 合并信息抽取结果 @@ -411,7 +411,7 @@ def discharge_task(pk_phhd, discharge_record, identity): "name": handle_name(get_best_value_in_keys(discharge_record_ie_result, PATIENT_NAME)), "admission_date_str": handle_original_data(get_best_value_in_keys(discharge_record_ie_result, ADMISSION_DATE)), "discharge_date_str": handle_original_data(get_best_value_in_keys(discharge_record_ie_result, DISCHARGE_DATE)), - "doctor": handle_name(get_best_value_in_keys(discharge_record_ie_result, DOCTOR)), + "doctor": handle_doctor(get_best_value_in_keys(discharge_record_ie_result, DOCTOR)), "admission_id": handle_id(get_best_value_in_keys(discharge_record_ie_result, ADMISSION_ID)), "age": handle_age(get_best_value_in_keys(discharge_record_ie_result, AGE)), } diff --git a/util/data_util.py b/util/data_util.py index 2d0a3ae..ccebea6 100644 --- a/util/data_util.py +++ b/util/data_util.py @@ -126,6 +126,12 @@ def handle_name(string): return re.sub(r'[^⺀-鿿·]', '', string)[:30] +def handle_doctor(string): + if not string: + return "无" + return re.sub(r'[^⺀-鿿·]', '', string)[:30] + + # 处理医保类型数据 def handle_insurance_type(string): if not string: