diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py index 5ac0f51..ef785fe 100644 --- a/netforce_clinic/models/hd_case.py +++ b/netforce_clinic/models/hd_case.py @@ -120,10 +120,10 @@ class HDCase(Model): sign=-1 if categ.parent_id: if categ.parent_id.code=='MDC': - name=prod.name or "" - #name=name.split("-") - name=name.replace("-SSO","") - name=name.title() + name=prod.description or prod.name or "" + ##name=name.split("-") + #name=name.replace("-SSO","") + #name=name.title() #name=name[0].title() if reimbursable_ctx: if reimbursable_ctx==line.reimbursable: @@ -133,11 +133,11 @@ class HDCase(Model): mdc+=amt mdc_names.append(name or "") if categ.code=='EPO': - name=prod.name or "" - name=name.split("-") - if name: - name=name[0].title() - epo_names.append(name) + name=prod.description or prod.name or "" + #name=name.split("-") + #if name: + #name=name[0].title() + epo_names.append(name.title()) elif categ.code=='FEE': fee+=amt*sign elif categ.code=='DLZ': diff --git a/netforce_clinic/templates/report_account_hd_case_summary.hbs b/netforce_clinic/templates/report_account_hd_case_summary.hbs index 5a6ac69..3d36ab0 100644 --- a/netforce_clinic/templates/report_account_hd_case_summary.hbs +++ b/netforce_clinic/templates/report_account_hd_case_summary.hbs @@ -89,7 +89,7 @@ {{view "link" string=inv_number action="cust_invoice" action_options="form_view_xml&cust_invoice_form&mode=form" active_id=inv_id}} {{/if}} - {{mdc_name}} + {{epo_name}} {{currency fee zero=""}} {{currency mdc zero=""}} {{currency lab zero=""}} @@ -116,7 +116,7 @@ {{idcard}} {{ptype}} {{hct}} - {{mdc_name}} + {{epo_name}} {{currency fee zero=""}} {{currency mdc zero=""}} {{currency srv zero=""}} diff --git a/netforce_clinic/todo.txt b/netforce_clinic/todo.txt index 1404d24..aff5c34 100644 --- a/netforce_clinic/todo.txt +++ b/netforce_clinic/todo.txt @@ -1,22 +1 @@ -- show log for each model that use _log=True -- create report patient cycle setting -> link to patient to change cycle setting - ------ -- move patient to another location - - dispose - - copy patient to location_to - -if location_to == location_from - - update same - - go to the list view - - shold be dispear - ==== - ตารางประวัติการรักษาผู้ป่วย - - record - - dispose (archive) - - resign - - report - - hd.case.summary.detail - find dispose - ==== - ------ +- move patient to antother location