From ad85b78a2330f055957092e67ed5f415c2cdd110 Mon Sep 17 00:00:00 2001 From: "watcha.h" Date: Wed, 27 May 2015 18:12:49 +0700 Subject: [PATCH] report pdf for cycle item summary --- netforce_clinic/models/hd_case.py | 6 ++++-- netforce_clinic/models/report_cycle_item.py | 6 ++++-- .../reports/report_cycle_item.xlsx | Bin 190574 -> 7271 bytes .../templates/report_cycle_item.hbs | 3 --- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py index 4205754..35a64b8 100644 --- a/netforce_clinic/models/hd_case.py +++ b/netforce_clinic/models/hd_case.py @@ -121,8 +121,10 @@ class HDCase(Model): if categ.parent_id: if categ.parent_id.code=='MDC': name=prod.name or "" - name=name.split("-") - name=name[0].title() + #name=name.split("-") + name=name.replace("-SSO","") + name=name.title() + #name=name[0].title() if reimbursable_ctx: if reimbursable_ctx==line.reimbursable: mdc+=amt diff --git a/netforce_clinic/models/report_cycle_item.py b/netforce_clinic/models/report_cycle_item.py index 7b717e6..a0e5f6f 100644 --- a/netforce_clinic/models/report_cycle_item.py +++ b/netforce_clinic/models/report_cycle_item.py @@ -140,7 +140,8 @@ class ReportCycleItem(Model): 'pid': patient.id or '', 'hn': patient.hn_no, 'did': doctor.id, - 'dname': doctor.name or "", + #'dname': doctor.name or "", + 'dname': '%s %s'%(doctor.first_name or "", doctor.last_name or ""), 'date': hdcase.date, 'epo': hdcase.epo, 'mdc': hdcase.mdc, @@ -187,7 +188,7 @@ class ReportCycleItem(Model): if key not in dates.keys(): no=1 count=0 - sub_fee=0 + sub_fee=1 sub_mdc=0 for x in lines: if x['cseq']==line['cseq'] and x['date']==date: @@ -219,6 +220,7 @@ class ReportCycleItem(Model): if no==count: nlines.append({ 'sub': 'show', + 'sub_txt': 'รวม', 'row_color': '#dfdfdf', 'no': count, 'fee': sub_fee, diff --git a/netforce_clinic/reports/report_cycle_item.xlsx b/netforce_clinic/reports/report_cycle_item.xlsx index 7501c87ec80446e2191dc3760ff880ca2ae4ed26..feacb711f6b683c7fdf60b4e95b2192be9496d41 100644 GIT binary patch literal 7271 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 diff --git a/netforce_clinic/templates/report_cycle_item.hbs b/netforce_clinic/templates/report_cycle_item.hbs index eaf1dc4..3229439 100644 --- a/netforce_clinic/templates/report_cycle_item.hbs +++ b/netforce_clinic/templates/report_cycle_item.hbs @@ -38,9 +38,6 @@ {{pname}} {{dname}} {{tname}} - {{dlz_name}} {{dlz_use}}