report pdf for cycle item summary

netforce_clinic/models/hd_case.py

@@ -121,8 +121,10 @@ class HDCase(Model):
                     if categ.parent_id:
                         if categ.parent_id.code=='MDC':
                             name=prod.name or ""
-                            name=name.split("-")
-                            name=name[0].title()
+                            #name=name.split("-")
+                            name=name.replace("-SSO","")
+                            name=name.title()
+                            #name=name[0].title()
                             if reimbursable_ctx:
                                 if reimbursable_ctx==line.reimbursable:
                                     mdc+=amt

netforce_clinic/models/report_cycle_item.py

@@ -140,7 +140,8 @@ class ReportCycleItem(Model):
                    'pid': patient.id or '',
                    'hn': patient.hn_no,
                    'did': doctor.id,
-                   'dname': doctor.name or "",
+                   #'dname': doctor.name or "",
+                   'dname': '%s %s'%(doctor.first_name or "", doctor.last_name or ""),
                    'date': hdcase.date,
                    'epo': hdcase.epo,
                    'mdc': hdcase.mdc,
@@ -187,7 +188,7 @@ class ReportCycleItem(Model):
             if key not in dates.keys():
                 no=1
                 count=0
-                sub_fee=0
+                sub_fee=1
                 sub_mdc=0
                 for x in lines:
                     if x['cseq']==line['cseq'] and x['date']==date:
@@ -219,6 +220,7 @@ class ReportCycleItem(Model):
             if no==count:
                 nlines.append({
                     'sub': 'show',
+                    'sub_txt': 'รวม',
                     'row_color': '#dfdfdf',
                     'no': count,
                     'fee': sub_fee,

netforce_clinic/templates/report_cycle_item.hbs

@@ -38,9 +38,6 @@
                     <td><a href="/ui#name=clinic_patient&active_id={{pid}}&mode=form">{{pname}}</a></td>
                     <td><a href="/ui#name=clinic_staff&active_id={{did}}&mode=form">{{dname}}</a></td>
                     <td><a href="/ui#name=clinic_patient_type&active_id={{tid}}&mode=form">{{tname}}</a></td>
-                    <!--
-                    <td style="text-align:right">{{currency fee zero=""}}</td>
-                    -->
                     <td style="text-align:left"></td>
                     <td><a href="/ui#name=clinic_dialyzer&active_id={{dlz_id}}&mode=form">{{dlz_name}}</a></td>
                     <td>{{dlz_use}}</td>