xxx
parent
ba7528a4c4
commit
92adab36f1
|
@ -81,6 +81,7 @@ class VisitBoard(Model):
|
||||||
'footer': False,
|
'footer': False,
|
||||||
'details':'',
|
'details':'',
|
||||||
'hd_case_state': '',
|
'hd_case_state': '',
|
||||||
|
'hn': '',
|
||||||
}
|
}
|
||||||
|
|
||||||
patient_types={t['id']:t['name'] for t in get_model("clinic.patient.type").search_read([[]],['name'])}
|
patient_types={t['id']:t['name'] for t in get_model("clinic.patient.type").search_read([[]],['name'])}
|
||||||
|
@ -106,6 +107,7 @@ class VisitBoard(Model):
|
||||||
number='*รอการยืนยัน'
|
number='*รอการยืนยัน'
|
||||||
cycle=visit.cycle_id
|
cycle=visit.cycle_id
|
||||||
patient=visit.patient_id
|
patient=visit.patient_id
|
||||||
|
hn_name=patient.hn or ''
|
||||||
visit_date=visit.visit_date
|
visit_date=visit.visit_date
|
||||||
#if visit.state=='confirmed':
|
#if visit.state=='confirmed':
|
||||||
#visit_color='#99ff99'
|
#visit_color='#99ff99'
|
||||||
|
@ -113,6 +115,7 @@ class VisitBoard(Model):
|
||||||
#visit_color='#D84B4B',
|
#visit_color='#D84B4B',
|
||||||
line={
|
line={
|
||||||
'number': number,
|
'number': number,
|
||||||
|
'hn_name': hn_name,
|
||||||
'visit_id': visit.id,
|
'visit_id': visit.id,
|
||||||
'sickbed_name': visit.sickbed_id.name or "",
|
'sickbed_name': visit.sickbed_id.name or "",
|
||||||
'cycle_name': cycle.name,
|
'cycle_name': cycle.name,
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
<th>รอบ</th>
|
<th>รอบ</th>
|
||||||
<th>#</th>
|
<th>#</th>
|
||||||
<th>เลขที่อ้างอิง</th>
|
<th>เลขที่อ้างอิง</th>
|
||||||
|
<th>HN</th>
|
||||||
<th>ผู้ป่วย</th>
|
<th>ผู้ป่วย</th>
|
||||||
<th>สิทธ์</th>
|
<th>สิทธ์</th>
|
||||||
<th>แพทย์</th>
|
<th>แพทย์</th>
|
||||||
|
@ -29,17 +30,18 @@
|
||||||
{{#each lines }}
|
{{#each lines }}
|
||||||
{{#if footer}}
|
{{#if footer}}
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="9" style="text-align:right; background-color:#b9b9b7"><b>{{details}}</b></td>
|
<td colspan="10" style="text-align:right; background-color:#b9b9b7"><b>{{details}}</b></td>
|
||||||
</tr>
|
</tr>
|
||||||
{{else}}
|
{{else}}
|
||||||
<tr style="background-color:{{visit_color}}">
|
<tr style="background-color:{{visit_color}}">
|
||||||
{{#if title}}
|
{{#if title}}
|
||||||
<td style="background-color:#ddddff"><b>{{cycle_name}}</b></td>
|
<td style="background-color:#ddddff"><b>{{cycle_name}}</b></td>
|
||||||
<td style="background-color:#ddddff" colspan="9"></td>
|
<td style="background-color:#ddddff" colspan="10"></td>
|
||||||
{{else}}
|
{{else}}
|
||||||
<td style="background-color:{{cycle_color}}">{{cycle_name}}</td>
|
<td style="background-color:{{cycle_color}}">{{cycle_name}}</td>
|
||||||
<td style="background-color:{{visit_color}}">{{no}}</td>
|
<td style="background-color:{{visit_color}}">{{no}}</td>
|
||||||
<td style="background-color:{{visit_color}}"><a href="/ui#name=clinic_visit&active_id={{visit_id}}&mode=form">{{number}}</a></td>
|
<td style="background-color:{{visit_color}}"><a href="/ui#name=clinic_visit&active_id={{visit_id}}&mode=form">{{number}}</a></td>
|
||||||
|
<td style="background-color:{{visit_color}}">{{hn_name}}</td>
|
||||||
<td style="background-color:{{visit_color}}"><a href="/ui#name=clinic_patient&active_id={{patient_id}}&mode=form">{{patient_name}}</a></td>
|
<td style="background-color:{{visit_color}}"><a href="/ui#name=clinic_patient&active_id={{patient_id}}&mode=form">{{patient_name}}</a></td>
|
||||||
<td style="background-color:{{visit_color}}">{{patient_type}}</td>
|
<td style="background-color:{{visit_color}}">{{patient_type}}</td>
|
||||||
<td style="background-color:{{visit_color}}"><a href="/ui#name=clinic_staff&active_id={{doctor_id}}&mode=form">{{doctor_name}}</a></td>
|
<td style="background-color:{{visit_color}}"><a href="/ui#name=clinic_staff&active_id={{doctor_id}}&mode=form">{{doctor_name}}</a></td>
|
||||||
|
|
Loading…
Reference in New Issue