diff --git a/netforce_clinic/models/report_cycle_item.py b/netforce_clinic/models/report_cycle_item.py index 78e5f41..b108c00 100644 --- a/netforce_clinic/models/report_cycle_item.py +++ b/netforce_clinic/models/report_cycle_item.py @@ -147,7 +147,6 @@ class ReportCycleItem(Model): 'pid': patient.id or '', 'hn': patient.hn_no, 'did': doctor.id, - #'dname': doctor.name or "", 'dname': '%s %s'%(doctor.first_name or "", doctor.last_name or ""), 'dfirst': doctor.first_name or "", 'date': hdcase.date, @@ -273,7 +272,6 @@ class ReportCycleItem(Model): 'month': month_str, 'date_from': date_from, 'date_to': date_to, - 'total_pt': pt, 'total_fee': total_fee, 'total_mdc': total_mdc, 'total_pt': total_pt, diff --git a/netforce_clinic/templates/report_cycle_item.hbs b/netforce_clinic/templates/report_cycle_item.hbs index 494f853..bf041bd 100644 --- a/netforce_clinic/templates/report_cycle_item.hbs +++ b/netforce_clinic/templates/report_cycle_item.hbs @@ -14,6 +14,7 @@ แพทย์ สิทธ์ ยาฉีด + HCT DZ N/U พยาบาล @@ -37,6 +38,7 @@ {{dname}} {{tname}} {{mdc_name}} + {{hct}} {{dlz_name}} {{dlz_use}} {{nfirst_name}} @@ -53,6 +55,7 @@ {{dname}} {{tname}} {{mdc_name}} + {{hct}} {{dlz_name}} {{dlz_use}} {{nfirst_name}} @@ -64,7 +67,7 @@ รวมผู้ป่วยทั้งหมด {{total_pt}} - +

{{#each ptype_lines}} {{name}} : {{qty}}