From c3760db0e0892b3bf44c3b97d89a9a27f3f1ac1b Mon Sep 17 00:00:00 2001 From: "watcha.h" Date: Fri, 29 May 2015 10:07:04 +0700 Subject: [PATCH] improve report cycle item summary --- netforce_clinic/models/report_cycle_item.py | 1 + .../reports/report_cycle_item.xlsx | Bin 7618 -> 7613 bytes 2 files changed, 1 insertion(+) diff --git a/netforce_clinic/models/report_cycle_item.py b/netforce_clinic/models/report_cycle_item.py index a0e5f6f..0566d07 100644 --- a/netforce_clinic/models/report_cycle_item.py +++ b/netforce_clinic/models/report_cycle_item.py @@ -142,6 +142,7 @@ class ReportCycleItem(Model): '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, 'epo': hdcase.epo, 'mdc': hdcase.mdc, diff --git a/netforce_clinic/reports/report_cycle_item.xlsx b/netforce_clinic/reports/report_cycle_item.xlsx index 9822a054c1f11f3abc922f9a4330b99aabd80a2f..47be46a0d2cde3ce0490afb4a5dd864666c8e7c3 100644 GIT binary patch literal 7613 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 Ak^lez literal 7618 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