diff --git a/check_ie_result/check_ie_result.py b/check_ie_result/check_ie_result.py index c870516..208f1ce 100644 --- a/check_ie_result/check_ie_result.py +++ b/check_ie_result/check_ie_result.py @@ -31,7 +31,8 @@ def check_ie_result(pk_phhd): ZxIeSettlement.discharge_date, ZxIeSettlement.medical_expenses, ZxIeSettlement.personal_cash_payment, ZxIeSettlement.personal_account_payment, - ZxIeSettlement.personal_funded_amount, ZxIeSettlement.medical_insurance_type).filter( + ZxIeSettlement.personal_funded_amount, ZxIeSettlement.medical_insurance_type, + ZxIeSettlement.admission_id, ZxIeSettlement.settlement_id).filter( ZxIeSettlement.pk_phhd == pk_phhd).one() settlement_result = { "pk_ie_settlement": settlement.pk_ie_settlement, @@ -43,13 +44,16 @@ def check_ie_result(pk_phhd): "personal_account_payment": settlement.personal_account_payment, "personal_funded_amount": settlement.personal_funded_amount, "medical_insurance_type": settlement.medical_insurance_type, + "admission_id": settlement.admission_id, + "settlement_id": settlement.settlement_id, } json_result["settlement"] = settlement_result discharge = session.query(ZxIeDischarge.pk_ie_discharge, ZxIeDischarge.hospital, ZxIeDischarge.pk_yljg, ZxIeDischarge.department, ZxIeDischarge.pk_ylks, ZxIeDischarge.name, ZxIeDischarge.admission_date, ZxIeDischarge.discharge_date, - ZxIeDischarge.doctor).filter(ZxIeDischarge.pk_phhd == pk_phhd).one() + ZxIeDischarge.doctor, ZxIeDischarge.admission_id).filter( + ZxIeDischarge.pk_phhd == pk_phhd).one() discharge_result = { "pk_ie_discharge": discharge.pk_ie_discharge, "hospital": discharge.hospital, @@ -60,6 +64,7 @@ def check_ie_result(pk_phhd): "admission_date": discharge.admission_date, "discharge_date": discharge.discharge_date, "doctor": discharge.doctor, + "admission_id": discharge.admission_id, } json_result["discharge"] = discharge_result @@ -126,4 +131,4 @@ def check_ie_result(pk_phhd): if __name__ == '__main__': - check_ie_result(3990334) + check_ie_result(3572938)