From d50f527a399004895a389af7f1d0de26576d8e7e Mon Sep 17 00:00:00 2001 From: "watcha.h@almacom.co.th" Date: Wed, 1 Jul 2015 23:13:04 +0700 Subject: [PATCH] fix report cycle item --- netforce_clinic/models/report_cycle_item.py | 10 ++-------- .../reports/report_cycle_item.xlsx | Bin 5737 -> 5738 bytes 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/netforce_clinic/models/report_cycle_item.py b/netforce_clinic/models/report_cycle_item.py index a2793f3..7cb0cc1 100644 --- a/netforce_clinic/models/report_cycle_item.py +++ b/netforce_clinic/models/report_cycle_item.py @@ -111,6 +111,8 @@ class ReportCycleItem(Model): 'first_name': nurse.first_name or "", }) for hdcase in citem.hd_cases: + if hdcase.state not in ('paid', 'waiting_payment'): + continue patient=hdcase.patient_id vascular=patient.vascular_acc if vascular: @@ -124,9 +126,6 @@ class ReportCycleItem(Model): dpt=hdcase.department_id dlz_use=hdcase.dlz_use or 0 dlz_drop=False - #if dlz_use==hdcase.dlz_max: - #dlz_use="%sทิ้ง"%dlz_use - #dlz_drop=True for dlz_line in hdcase.dialyzers: dlz=dlz_line.dialyzer_id if dlz.state in ('drop','expire'): @@ -134,11 +133,6 @@ class ReportCycleItem(Model): dlz_drop=True cancel=False row_color='' - if hdcase.state not in ('paid', 'waiting_payment'): - continue - #if hdcase.state=='cancelled': - #cancel=True - #row_color='#b6b6b6' lines.append({ 'dlz_drop': dlz_drop, 'cancel': cancel, diff --git a/netforce_clinic/reports/report_cycle_item.xlsx b/netforce_clinic/reports/report_cycle_item.xlsx index dedff2db6ee5cb10292a457cd215cc3822527f56..9b6dd227e990c19e25d317bbb533148b7d4c917d 100644 GIT binary patch delta 2366 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