From 1f128c0cb41e0bd4bd42e34a44aeded8c78cafc8 Mon Sep 17 00:00:00 2001 From: liuyebo <1515783401@qq.com> Date: Wed, 12 Jun 2024 12:33:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8E=9F=E5=A7=8B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=95=BF=E5=BA=A6=E6=A0=A1=E9=AA=8C=EF=BC=8C=E9=81=BF?= =?UTF-8?q?=E5=85=8D=E6=95=B0=E6=8D=AE=E5=BA=93=E4=BF=9D=E5=AD=98=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- photo_review/photo_review.py | 28 ++++++++++++++++------------ photo_review/util/data_util.py | 8 ++++++++ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/photo_review/photo_review.py b/photo_review/photo_review.py index 54c2ae2..a6994a3 100644 --- a/photo_review/photo_review.py +++ b/photo_review/photo_review.py @@ -19,7 +19,7 @@ from photo_review.entity.zx_ocr import ZxOcr 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, handle_department, handle_name, \ - handle_insurance_type + handle_insurance_type, handle_original_data from photo_review.util.ucloud import get_private_url from photo_review.util.util import get_default_datetime @@ -126,12 +126,16 @@ def photo_review(pk_phhd): settlement_data = { "pk_phhd": pk_phhd, "name": handle_name(get_best_value_in_keys(settlement_list_ie_result, PATIENT_NAME)), - "admission_date_str": get_best_value_in_keys(settlement_list_ie_result, ADMISSION_DATE), - "discharge_date_str": get_best_value_in_keys(settlement_list_ie_result, DISCHARGE_DATE), - "medical_expenses_str": get_best_value_in_keys(settlement_list_ie_result, MEDICAL_EXPENSES), - "personal_cash_payment_str": get_best_value_in_keys(settlement_list_ie_result, PERSONAL_CASH_PAYMENT), - "personal_account_payment_str": get_best_value_in_keys(settlement_list_ie_result, PERSONAL_ACCOUNT_PAYMENT), - "personal_funded_amount_str": get_best_value_in_keys(settlement_list_ie_result, PERSONAL_FUNDED_AMOUNT), + "admission_date_str": handle_original_data(get_best_value_in_keys(settlement_list_ie_result, ADMISSION_DATE)), + "discharge_date_str": handle_original_data(get_best_value_in_keys(settlement_list_ie_result, DISCHARGE_DATE)), + "medical_expenses_str": handle_original_data( + get_best_value_in_keys(settlement_list_ie_result, MEDICAL_EXPENSES)), + "personal_cash_payment_str": handle_original_data( + get_best_value_in_keys(settlement_list_ie_result, PERSONAL_CASH_PAYMENT)), + "personal_account_payment_str": handle_original_data( + get_best_value_in_keys(settlement_list_ie_result, PERSONAL_ACCOUNT_PAYMENT)), + "personal_funded_amount_str": handle_original_data( + get_best_value_in_keys(settlement_list_ie_result, PERSONAL_FUNDED_AMOUNT)), "medical_insurance_type": handle_insurance_type( get_best_value_in_keys(settlement_list_ie_result, MEDICAL_INSURANCE_TYPE)) } @@ -150,8 +154,8 @@ def photo_review(pk_phhd): "hospital": get_best_value_in_keys(discharge_record_ie_result, HOSPITAL), "department": get_best_value_in_keys(discharge_record_ie_result, DEPARTMENT), "name": handle_name(get_best_value_in_keys(discharge_record_ie_result, PATIENT_NAME)), - "admission_date_str": get_best_value_in_keys(discharge_record_ie_result, ADMISSION_DATE), - "discharge_date_str": get_best_value_in_keys(discharge_record_ie_result, DISCHARGE_DATE), + "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)) } discharge_data["admission_date"] = handle_date(discharge_data["admission_date_str"]) @@ -185,9 +189,9 @@ def photo_review(pk_phhd): cost_data = { "pk_phhd": pk_phhd, "name": handle_name(get_best_value_in_keys(cost_list_ie_result, PATIENT_NAME)), - "admission_date_str": get_best_value_in_keys(cost_list_ie_result, ADMISSION_DATE), - "discharge_date_str": get_best_value_in_keys(cost_list_ie_result, DISCHARGE_DATE), - "medical_expenses_str": get_best_value_in_keys(cost_list_ie_result, MEDICAL_EXPENSES) + "admission_date_str": handle_original_data(get_best_value_in_keys(cost_list_ie_result, ADMISSION_DATE)), + "discharge_date_str": handle_original_data(get_best_value_in_keys(cost_list_ie_result, DISCHARGE_DATE)), + "medical_expenses_str": handle_original_data(get_best_value_in_keys(cost_list_ie_result, MEDICAL_EXPENSES)) } cost_data["admission_date"] = handle_date(cost_data["admission_date_str"]) cost_data["discharge_date"] = handle_date(cost_data["discharge_date_str"]) diff --git a/photo_review/util/data_util.py b/photo_review/util/data_util.py index e94b32e..a345c51 100644 --- a/photo_review/util/data_util.py +++ b/photo_review/util/data_util.py @@ -88,3 +88,11 @@ def handle_insurance_type(string): if not string: return "" return string.replace(":", "").replace("：", "") + + +# 处理原始数据 +def handle_original_data(string): + if not string: + return "" + # 防止过长存入数据库失败 + return string[:255]