epo name

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=prod.description or prod.name or ""
-                            #name=name.split("-")
+                            ##name=name.split("-")
-                            name=name.replace("-SSO","")
+                            #name=name.replace("-SSO","")
-                            name=name.title()
+                            #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=prod.description or prod.name or ""
-                        name=name.split("-")
+                        #name=name.split("-")
-                        if name:
+                        #if name:
-                            name=name[0].title()
+                            #name=name[0].title()
-                        epo_names.append(name)
+                        epo_names.append(name.title())
                     elif categ.code=='FEE':
                         fee+=amt*sign
                     elif categ.code=='DLZ':

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}}
                     </td>
-                    <td>{{mdc_name}}</td>
+                    <td>{{epo_name}}</td>
                     <td>{{currency fee zero=""}}</td>
                     <td>{{currency mdc zero=""}}</td>
                     <td>{{currency lab zero=""}}</td>
@@ -116,7 +116,7 @@
                     <td style="width:20%">{{idcard}}</td>
                     <td>{{ptype}}</td>
                     <td>{{hct}}</td>
-                    <td>{{mdc_name}}</td>
+                    <td>{{epo_name}}</td>
                     <td>{{currency fee zero=""}}</td>
                     <td>{{currency mdc zero=""}}</td>
                     <td>{{currency srv zero=""}}</td>

netforce_clinic/todo.txt

@@ -1,22 +1 @@
-- show log for each model that use _log=True
+- move patient to antother location
-- 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
-    ====
-
------