From 69dacc19c9db311ca34a81e2c7e457975793c528 Mon Sep 17 00:00:00 2001 From: liuyebo <1515783401@qq.com> Date: Thu, 4 Jul 2024 09:22:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E8=AF=8D=E4=BD=8F=E9=99=A2=E5=8F=B7=E5=92=8C=E5=8C=BB=E4=BF=9D?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8D=95=E5=8F=B7=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/keys.py | 8 ++++++-- photo_review/photo_review.py | 12 ++++++++---- photo_review/util/data_util.py | 8 ++++++-- visual_model_test/visual_model_test.py | 5 +++-- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/config/keys.py b/config/keys.py index 8645717..a0e2e9e 100644 --- a/config/keys.py +++ b/config/keys.py @@ -22,12 +22,16 @@ HOSPITAL = ["医院"] DEPARTMENT = ["科室"] # 主治医生 DOCTOR = ["主治医生"] +# 住院号 +ADMISSION_ID = ["住院号"] +# 医保结算单号码 +SETTLEMENT_ID = ["医保结算单号码"] SETTLEMENT_LIST_SCHEMA = \ PATIENT_NAME + ADMISSION_DATE + DISCHARGE_DATE + MEDICAL_EXPENSES + PERSONAL_CASH_PAYMENT \ - + PERSONAL_ACCOUNT_PAYMENT + PERSONAL_FUNDED_AMOUNT + MEDICAL_INSURANCE_TYPE + + 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 + HOSPITAL + DEPARTMENT + PATIENT_NAME + ADMISSION_DATE + DISCHARGE_DATE + DOCTOR + ADMISSION_ID 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 984d667..cc5577a 100644 --- a/photo_review/photo_review.py +++ b/photo_review/photo_review.py @@ -17,7 +17,8 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) 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 + PERSONAL_ACCOUNT_PAYMENT, PERSONAL_FUNDED_AMOUNT, MEDICAL_INSURANCE_TYPE, HOSPITAL, DEPARTMENT, DOCTOR, \ + ADMISSION_ID, SETTLEMENT_ID from config.mysql import MysqlSession from config.photo_review import PHHD_BATCH_SIZE, SLEEP_MINUTES from photo_review.entity.bd_yljg import BdYljg @@ -28,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_insurance_type, handle_original_data, handle_hospital, handle_department, handle_id from photo_review.util.util import get_default_datetime from photo_review.enumeration.task import TaskEnum @@ -281,7 +282,9 @@ def settlement_task(pk_phhd, settlement_list): "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)) + get_best_value_in_keys(settlement_list_ie_result, MEDICAL_INSURANCE_TYPE)), + "admission_id": handle_id(get_best_value_in_keys(settlement_list_ie_result, ADMISSION_ID)), + "settlement_id": handle_id(get_best_value_in_keys(settlement_list_ie_result, SETTLEMENT_ID)), } settlement_data["admission_date"] = handle_date(settlement_data["admission_date_str"]) settlement_data["admission_date"] = handle_date(settlement_data["admission_date_str"]) @@ -302,7 +305,8 @@ def discharge_task(pk_phhd, discharge_record): "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_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)), } 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 76ea4fc..0df8295 100644 --- a/photo_review/util/data_util.py +++ b/photo_review/util/data_util.py @@ -120,5 +120,9 @@ def handle_original_data(string): return string[:255] -if __name__ == '__main__': - print(handle_date("2024年")) +# 处理id类数据 +def handle_id(string): + if not string: + return "" + # 防止过长存入数据库失败 + return string[:50] diff --git a/visual_model_test/visual_model_test.py b/visual_model_test/visual_model_test.py index 3d5480f..2eb0f95 100644 --- a/visual_model_test/visual_model_test.py +++ b/visual_model_test/visual_model_test.py @@ -118,11 +118,12 @@ def main(model_type, pic_name=None): elif model_type == "settlement": task_path = "../config/model/settlement_list_model" test_img_path = ucloud.get_private_url(pic_name) if pic_name else "img/PH20240511000638_1_094306_1.jpg" - schema = ["患者姓名", "入院日期", "出院日期", "费用总额", "个人现金支付", "个人账户支付", "自费金额", "医保类型"] + schema = ["患者姓名", "入院日期", "出院日期", "费用总额", "个人现金支付", "个人账户支付", "自费金额", + "医保类型", "住院号", "医保结算单号码"] elif model_type == "discharge": task_path = "../config/model/discharge_record_model" test_img_path = ucloud.get_private_url(pic_name) if pic_name else "img/PH20240401000003_3_001938_2.jpg" - schema = ["医院", "科室", "患者姓名", "入院日期", "出院日期", "主治医生"] + schema = ["医院", "科室", "患者姓名", "入院日期", "出院日期", "主治医生", "住院号"] elif model_type == "cost": task_path = "../config/model/cost_list_model" test_img_path = ucloud.get_private_url(pic_name) if pic_name else "img/PH20240511000648_4_094542_2.jpg"