Netforce-Customized
/
clinic
mirror of https://dev.netforce.co.th/netforce-customized/clinic.git
3
0
Fork 0
Code Issues 3 Packages Projects Releases Wiki Activity

saved

dev
SPP 2018-01-09 14:41:27 +07:00
parent 7d4275959a
commit 15b91116cd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netforce_clinic/models/report_cycle_item.py
View File

@ -277,7 +277,7 @@ class ReportCycleItem(Model):
# if nurse more that cres, should show name of nurses # if nurse more that cres, should show name of nurses
nlines+=more_lines nlines+=more_lines
if no==count: 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 #sort item
#clines=sorted(clines,key=lambda cl: cl[sort_by]) #clines=sorted(clines,key=lambda cl: cl[sort_by])
no=1 no=1
@ -322,13 +322,13 @@ class ReportCycleItem(Model):
'fee': sub_fee, 'fee': sub_fee,
'mdc': sub_mdc, 'mdc': sub_mdc,
'epo_items': epo_items, '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: for epo_item in epo_items:
if not total_epos.get(epo_item['name']): if not total_epos.get(epo_item['name']):
total_epos[epo_item['name']]=0 total_epos[epo_item['name']]=0
total_epos[epo_item['name']]+=epo_item['qty'] or 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=[] vscl_lines=[]
for k,v in vasculars.items(): for k,v in vasculars.items():
vscl_lines.append({ vscl_lines.append({

BIN
netforce_clinic/reports/report_receipt_summary.xlsx
View File

Binary file not shown.