diff --git a/netforce_clinic/models/report_hd_case_summary.py b/netforce_clinic/models/report_hd_case_summary.py index 2cece3b..df74939 100644 --- a/netforce_clinic/models/report_hd_case_summary.py +++ b/netforce_clinic/models/report_hd_case_summary.py @@ -145,6 +145,7 @@ class ReportHDCaseSummary(Model): dom.append(['branch_id','=',branch_id]) if department_id: dom.append(['department_id','=',department_id]) + print("dom ==> ", dom) npatient=len(get_model("clinic.patient").search(dom)) dom=replace_quote('%s'%dom) items['topic%s'%count]={ diff --git a/netforce_clinic/reports/report_cycle_item.xlsx b/netforce_clinic/reports/report_cycle_item.xlsx index 3abafdc..8002e43 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 c8fffd2..fd6eb88 100644 --- a/netforce_clinic/templates/report_cycle_item.hbs +++ b/netforce_clinic/templates/report_cycle_item.hbs @@ -12,8 +12,10 @@ ชื่อ-สกุล แพทย์ สิทธ์ + + ยาฉีด DZ N/U พยาบาล @@ -36,8 +38,10 @@ {{pname}} {{dname}} {{tname}} + + {{dlz_name}} {{dlz_use}} {{nfirst_name}} @@ -52,8 +56,10 @@ {{pname}} {{dname}} {{tname}} + + {{mdc_name}} {{dlz_name}} {{dlz_use}} {{nfirst_name}} @@ -62,14 +68,16 @@ {{/each}} - รวมทั้งหมด + รวมผู้ป่วยทั้งหมด {{total_pt}} + +