diff --git a/netforce_clinic/models/report_cycle_item.py b/netforce_clinic/models/report_cycle_item.py index cba6277..c35e296 100644 --- a/netforce_clinic/models/report_cycle_item.py +++ b/netforce_clinic/models/report_cycle_item.py @@ -242,11 +242,13 @@ class ReportCycleItem(Model): 'v%s_1'%index: vscl_line['qty'], }) index+=1 + vscl_txt=' '.join(['%s = %s'%(x['description'],x['qty']) for x in vscl_lines]) data={ 'company_name': company_name or "", 'lines': nlines, 'vscl_lines': vscl_lines, 'vscl_lines2': vscl_lines2, + 'vscl_txt': vscl_txt, 'ptype_lines': ptype_lines, 'ptype_txt': ptype_txt, 'month': month_str, diff --git a/netforce_clinic/models/report_medical_summary.py b/netforce_clinic/models/report_medical_summary.py index 4ee091e..ba3c65d 100644 --- a/netforce_clinic/models/report_medical_summary.py +++ b/netforce_clinic/models/report_medical_summary.py @@ -202,6 +202,9 @@ class ReportMedicalSummary(Model): elif branch_id: branch=get_model("clinic.branch").browse(branch_id) sub_name="(%s)" % branch.name or "" + from pprint import pprint + for line in lines: + pprint(line) data={ 'company_name': '%s %s' % (company.name or "", sub_name), 'parent_company_name': company.parent_id.name or "", diff --git a/netforce_clinic/reports/report_cycle_item.xlsx b/netforce_clinic/reports/report_cycle_item.xlsx index 4cf0f50..742a7e1 100644 Binary files a/netforce_clinic/reports/report_cycle_item.xlsx and b/netforce_clinic/reports/report_cycle_item.xlsx differ diff --git a/netforce_clinic/templates/report_cycle_item.hbs b/netforce_clinic/templates/report_cycle_item.hbs index f0b4310..eaf1dc4 100644 --- a/netforce_clinic/templates/report_cycle_item.hbs +++ b/netforce_clinic/templates/report_cycle_item.hbs @@ -5,7 +5,7 @@
วันที่ | รอบ | No | @@ -68,63 +68,20 @@ {{/each}} -รวมผู้ป่วยทั้งหมด | -+ | รวมผู้ป่วยทั้งหมด | +{{total_pt}} |
- {{#each ptype_lines}}
- {{name}} : {{qty}}
+ + {{#each ptype_lines}} + {{name}} : {{qty}} + {{/each}} + ++ {{#each vscl_lines}} + {{description}} = {{qty}} {{/each}} + |
---|
{{description}} = | -{{qty}} | - {{/each}} -
---|
# | วันที่ | รอบ |
---|