diff --git a/config/keys.py b/config/keys.py index a0e2e9e..fc6c58b 100644 --- a/config/keys.py +++ b/config/keys.py @@ -26,12 +26,14 @@ DOCTOR = ["主治医生"] ADMISSION_ID = ["住院号"] # 医保结算单号码 SETTLEMENT_ID = ["医保结算单号码"] +# 年龄 +AGE = ["年龄"] SETTLEMENT_LIST_SCHEMA = \ PATIENT_NAME + ADMISSION_DATE + DISCHARGE_DATE + MEDICAL_EXPENSES + PERSONAL_CASH_PAYMENT \ + PERSONAL_ACCOUNT_PAYMENT + PERSONAL_FUNDED_AMOUNT + MEDICAL_INSURANCE_TYPE + ADMISSION_ID + SETTLEMENT_ID DISCHARGE_RECORD_SCHEMA = \ - HOSPITAL + DEPARTMENT + PATIENT_NAME + ADMISSION_DATE + DISCHARGE_DATE + DOCTOR + ADMISSION_ID + HOSPITAL + DEPARTMENT + PATIENT_NAME + ADMISSION_DATE + DISCHARGE_DATE + DOCTOR + ADMISSION_ID + AGE COST_LIST_SCHEMA = PATIENT_NAME + ADMISSION_DATE + DISCHARGE_DATE + MEDICAL_EXPENSES diff --git a/photo_review/photo_review.py b/photo_review/photo_review.py index cc5577a..4936eb7 100644 --- a/photo_review/photo_review.py +++ b/photo_review/photo_review.py @@ -18,7 +18,7 @@ from time import sleep from sqlalchemy import update from config.keys 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 + ADMISSION_ID, SETTLEMENT_ID, AGE from config.mysql import MysqlSession from config.photo_review import PHHD_BATCH_SIZE, SLEEP_MINUTES from photo_review.entity.bd_yljg import BdYljg @@ -29,7 +29,7 @@ from photo_review.entity.zx_ie_settlement import ZxIeSettlement from photo_review.entity.zx_phhd import ZxPhhd from photo_review.entity.zx_phrec import ZxPhrec from photo_review.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_insurance_type, handle_original_data, handle_hospital, handle_department, handle_id, handle_age from photo_review.util.util import get_default_datetime from photo_review.enumeration.task import TaskEnum @@ -307,6 +307,7 @@ def discharge_task(pk_phhd, discharge_record): "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)), "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)), } discharge_data["admission_date"] = handle_date(discharge_data["admission_date_str"]) discharge_data["discharge_date"] = handle_date(discharge_data["discharge_date_str"]) diff --git a/photo_review/util/data_util.py b/photo_review/util/data_util.py index 0df8295..ed46ca2 100644 --- a/photo_review/util/data_util.py +++ b/photo_review/util/data_util.py @@ -126,3 +126,12 @@ def handle_id(string): return "" # 防止过长存入数据库失败 return string[:50] + + +# 处理年龄类数据 +def handle_age(string): + if not string: + return "" + string = string.split("岁")[0] + num = re.sub(r'\D', '', string) + return num[-3:]