Netforce-Customized
/
clinic
mirror of https://dev.netforce.co.th/netforce-customized/clinic.git
3
0
Fork 0
Code Issues 3 Packages Projects Releases Wiki Activity

report pdf for cycle item summary

conv_bal
watcha.h 2015-05-27 18:12:49 +07:00
parent 49cb7b327b
commit ad85b78a23
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netforce_clinic/models/hd_case.py
View File

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

6
netforce_clinic/models/report_cycle_item.py
View File

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

BIN
netforce_clinic/reports/report_cycle_item.xlsx
View File

Binary file not shown.

3
netforce_clinic/templates/report_cycle_item.hbs
View File

@ -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_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_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><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 style="text-align:left"></td>
<td><a href="/ui#name=clinic_dialyzer&active_id={{dlz_id}}&mode=form">{{dlz_name}}</a></td> <td><a href="/ui#name=clinic_dialyzer&active_id={{dlz_id}}&mode=form">{{dlz_name}}</a></td>
<td>{{dlz_use}}</td> <td>{{dlz_use}}</td>