From 15b91116cdffcb4beabb268458de3ea6c5ff24e6 Mon Sep 17 00:00:00 2001 From: SPP Date: Tue, 9 Jan 2018 14:41:27 +0700 Subject: [PATCH] saved --- netforce_clinic/models/report_cycle_item.py | 6 +++--- .../reports/report_receipt_summary.xlsx | Bin 5555 -> 5660 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/netforce_clinic/models/report_cycle_item.py b/netforce_clinic/models/report_cycle_item.py index c7fd5e5..58752fe 100644 --- a/netforce_clinic/models/report_cycle_item.py +++ b/netforce_clinic/models/report_cycle_item.py @@ -277,7 +277,7 @@ class ReportCycleItem(Model): # if nurse more that cres, should show name of nurses nlines+=more_lines if no==count: - epo_items=[{'name': k, 'qty': v} for k,v in epos.items() if k ] + epo_items=sorted([{'name': k, 'qty': v} for k,v in epos.items() if k ], key=lambda a: a['name']) #sort item #clines=sorted(clines,key=lambda cl: cl[sort_by]) no=1 @@ -322,13 +322,13 @@ class ReportCycleItem(Model): 'fee': sub_fee, 'mdc': sub_mdc, 'epo_items': epo_items, - 'epo_txt': ', '.join(['%s = %s'%(k,v) for k,v in epos.items() if k]) + 'epo_txt': ', '.join(['%s = %s'%(v['name'], v['qty']) for v in epo_items if v]) }) for epo_item in epo_items: if not total_epos.get(epo_item['name']): total_epos[epo_item['name']]=0 total_epos[epo_item['name']]+=epo_item['qty'] or 0 - total_epo_items=[{'name': k, 'qty': v} for k,v in total_epos.items() if k ] + total_epo_items=sorted([{'name': k, 'qty': v} for k,v in total_epos.items() if k ], key=lambda a: a['name']) vscl_lines=[] for k,v in vasculars.items(): vscl_lines.append({ diff --git a/netforce_clinic/reports/report_receipt_summary.xlsx b/netforce_clinic/reports/report_receipt_summary.xlsx index 459685f44dbcae3f3d1393ae99e331de4454fc41..baf98b025533b0bd62c2b244678f2cb05d883fbb 100644 GIT binary patch delta 3082 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 J^zirT{{a4IURwYF