From 5670f491441d41c157ba706612e78f96ee3b715f Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Fri, 13 Mar 2015 23:31:58 +0700
Subject: [PATCH] improve

---
 .../layouts/clinic_dialyzer_form.xml          |   2 +-
 netforce_clinic/layouts/clinic_gen_menu.xml   |   4 +-
 .../layouts/clinic_patient_form.xml           |   8 +-
 .../layouts/clinic_prod_search.xml            |   6 +-
 .../layouts/clinic_report_cycle_item.xml      |   4 +-
 .../layouts/clinic_visit_board.xml            |  10 ++-
 netforce_clinic/models/hd_case.py             |  35 ++++++++-
 netforce_clinic/models/make_apt.py            |   2 +
 netforce_clinic/models/patient.py             |  22 ++++--
 netforce_clinic/models/report_cycle_item.py   |  69 ++++++++++++++++--
 netforce_clinic/models/select_company.py      |   3 +-
 netforce_clinic/models/visit_board.py         |  11 ++-
 .../reports/report_cycle_item.xlsx            | Bin 5081 -> 5176 bytes
 .../templates/report_cycle_item.hbs           |  33 +++++----
 netforce_clinic/templates/visit_board.hbs     |  43 ++++-------
 netforce_clinic/todo.txt                      |  15 +++-
 16 files changed, 179 insertions(+), 88 deletions(-)
diff --git a/netforce_clinic/layouts/clinic_dialyzer_form.xml b/netforce_clinic/layouts/clinic_dialyzer_form.xml
index faa3a0d..419d626 100644
--- a/netforce_clinic/layouts/clinic_dialyzer_form.xml
+++ b/netforce_clinic/layouts/clinic_dialyzer_form.xml
@@ -1,4 +1,4 @@
-<form model="clinic.dialyzer" attrs='{"readonly":[["state","in",["cancelled","drop","active"]]]}' show_company="1">
+<form model="clinic.dialyzer" attrs='{"readonly":[["state","in",["cancelled","drop","active","expire"]]]}' show_company="1">
     <head>
         <field name="state"/>
         <button string="Options" dropdown="1">
diff --git a/netforce_clinic/layouts/clinic_gen_menu.xml b/netforce_clinic/layouts/clinic_gen_menu.xml
index 349d30f..4230c34 100644
--- a/netforce_clinic/layouts/clinic_gen_menu.xml
+++ b/netforce_clinic/layouts/clinic_gen_menu.xml
@@ -1,5 +1,7 @@
 <inherit inherit="gen_menu">
-    <item string="Users" position="after">
+    <item string="Audit Log" position="after">
+        <divider/>
+        <header string="CUSTOMIZE"/>
         <item string="Department Profiles" action="clinic_department_profile"/>
     </item>
 </inherit>
diff --git a/netforce_clinic/layouts/clinic_patient_form.xml b/netforce_clinic/layouts/clinic_patient_form.xml
index 0993f3f..bbcf467 100644
--- a/netforce_clinic/layouts/clinic_patient_form.xml
+++ b/netforce_clinic/layouts/clinic_patient_form.xml
@@ -12,14 +12,12 @@
     <field name="card_no" required="1"/>
     <field name="type_id"/>
     <field name="title_id" required="1"/>
+    <field name="reg_date"/>
     <field name="first_name" required="1"/>
     <field name="last_name" required="1"/>
-    <field name="reg_date"/>
-    <field name="doctor_id"/>
-    <field name="categ_id"/>
-    <!--<field name="branch_id" required="1"/>-->
-    <!--<field name="department_id"  required="1" domain='[["branch_id","=",branch_id]]'/>-->
     <field name="department_id" required="1"/>
+    <field name="categ_id"/>
+    <field name="doctor_id"/>
     <field name="walkin"/>
     <field name="active" invisible="1"/>
     <tabs>
diff --git a/netforce_clinic/layouts/clinic_prod_search.xml b/netforce_clinic/layouts/clinic_prod_search.xml
index 00682d5..4a42405 100644
--- a/netforce_clinic/layouts/clinic_prod_search.xml
+++ b/netforce_clinic/layouts/clinic_prod_search.xml
@@ -1,5 +1,5 @@
 <inherit model="product" inherit="product_search">
-    <field name="categs" position="before">
-        <field name="categ_id" child_of="1"/>
-    </field>
+<!--<field name="categs" position="before">-->
+<!--<field name="categ_id" child_of="1"/>-->
+<!--</field>-->
 </inherit>
diff --git a/netforce_clinic/layouts/clinic_report_cycle_item.xml b/netforce_clinic/layouts/clinic_report_cycle_item.xml
index 8f0d04c..37d097b 100644
--- a/netforce_clinic/layouts/clinic_report_cycle_item.xml
+++ b/netforce_clinic/layouts/clinic_report_cycle_item.xml
@@ -1,9 +1,9 @@
 <form model="clinic.report.cycle.item">
     <field name="date" span="2" mode="month" onchange="onchange_date"/>
-    <field name="date_from" span="2"/>
+    <field name="date_from" onchange="onchange_datefrom" span="2"/>
     <field name="date_to" span="2"/>
     <field name="cycle_id" span="2"/>
-    <field name="branch_id" span="2"/>
+    <field name="branch_id" onchange="onchange_type" span="2"/>
     <field name="department_id" domain='[["branch_id","=",branch_id]]' span="2"/>
     <group span="6" columns="1">
         <template>
diff --git a/netforce_clinic/layouts/clinic_visit_board.xml b/netforce_clinic/layouts/clinic_visit_board.xml
index 24374c7..801b0b1 100644
--- a/netforce_clinic/layouts/clinic_visit_board.xml
+++ b/netforce_clinic/layouts/clinic_visit_board.xml
@@ -8,5 +8,13 @@
     <field name="branch_id" onchange="onchange_branch" span="2"/>
     <field name="department_id" domain='[["branch_id","=",branch_id]]' span="2"/>
     <button string='Confirm Visits' method="confirm" type="success" icon="arrow-right"/>
-    <separator string="Note: Please Click 'Run Report' Before Confirm Visits"/>
+    <group span="6" columns="1">
+        <template>
+            <div>
+                <p></p>
+                <b>Note: </b>Please Click<b style="color:#3477b0"> "Run Report"</b> Before Confirm Visits.</div>
+        </template>
+    </group>
+    <group span="6" columns="1">
+    </group>
 </form>
diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py
index ba9aa73..54169ce 100644
--- a/netforce_clinic/models/hd_case.py
+++ b/netforce_clinic/models/hd_case.py
@@ -71,11 +71,26 @@ class HDCase(Model):
             }
         return res
 
-    def _get_epo(self,ids,context={}):
+    def _get_expense(self,ids,context={}):
         res={}
         for obj in self.browse(ids):
+            dlz_use=0
+            dlz_max=0
+            dlz_name=[]
+            dlz_id=None
+            for dlz in obj.dialyzers:
+                dz=dlz.dialyzer_id
+                dlz_id=dz.id
+                name=dz.name or ""
+                name=name.split()[-1]
+                dlz_name.append(name)
+                dlz_use+=dlz.use_time or 0
+                dlz_max+=dlz.max_use_time or 0
+            dlz_name=','.join([dlz for dlz in dlz_name])
             names=[]
+            fee=0
             for line in obj.lines:
+                amt=line.amount or 0
                 prod=line.product_id
                 categ=line.product_categ_id
                 if categ and prod and line.reimbursable=='yes':
@@ -85,12 +100,26 @@ class HDCase(Model):
                         if name:
                             name=name[0].title()
                         names.append(name)
-            res[obj.id]=','.join([n for n in names])
+                    elif categ.code=='FEE':
+                        fee+=amt
+            res[obj.id]={
+                'epo': ','.join([n for n in names]),
+                'fee': fee,
+                'dlz_id': dlz_id,
+                'dlz_name': dlz_name,
+                'dlz_use': dlz_use,
+                'dlz_max': dlz_max,
+            }
         return res
 
     _fields={
         "number": fields.Char("Number",required=True,search=True),
-        "epo": fields.Char("EPO",function="_get_epo"),
+        "epo": fields.Char("EPO",function="_get_expense",function_multi=True),
+        "fee": fields.Float("Fee",function="_get_expense",function_multi=True),
+        "dlz_name": fields.Float("DZ",function="_get_expense",function_multi=True),
+        "dlz_use": fields.Float("DZ Use",function="_get_expense",function_multi=True),
+        "dlz_max": fields.Float("DZ Max",function="_get_expense",function_multi=True),
+        "dlz_id": fields.Float("DZ ID",function="_get_expense",function_multi=True),
         'sickbed_id': fields.Many2One("clinic.sickbed",'Sickbed'),
         "ref": fields.Char("Ref",search=True),
         "time_start": fields.DateTime("Start Time",required=True),
diff --git a/netforce_clinic/models/make_apt.py b/netforce_clinic/models/make_apt.py
index cc3ad74..cecdbe2 100644
--- a/netforce_clinic/models/make_apt.py
+++ b/netforce_clinic/models/make_apt.py
@@ -53,6 +53,8 @@ class MakeAPT(Model):
         if not pcs:
             # Create patient cycle with that department
             for pt in get_model("clinic.patient").search_browse([['department_id','=',obj.department_id.id]]):
+                if pt.walkin=='yes':
+                    continue
                 for pc in pt.cycles:
                     vals={
                         'patient_id': pt.id,
diff --git a/netforce_clinic/models/patient.py b/netforce_clinic/models/patient.py
index 5d4101c..73b2518 100644
--- a/netforce_clinic/models/patient.py
+++ b/netforce_clinic/models/patient.py
@@ -182,29 +182,35 @@ class Patient(Model):
                 break
         return ptype_id
     
-    def _get_branch(self,context={}):
-        b_ids=get_model('clinic.branch').search([])
-        if b_ids:
-            return b_ids[0]
-
-    def _get_dpts(self,context={}):
+    def _get_departments(self,context={}):
         return get_model("clinic.department").search([])
 
+    def _get_department(self,context={}):
+        res=get_model('select.company').get_select()
+        if res:
+            return res['department_id']
+
+    def _get_branch(self,context={}):
+        res=get_model('select.company').get_select()
+        if res:
+            return res['branch_id']
+
     _defaults={
         #"number": _get_number,
         "number": "",
         "reg_date": lambda *a: time.strftime("%Y-%m-%d"),
         "company_id": lambda *a: get_active_company(),
         'branch_id': _get_branch,
+        'department_id': _get_department,
         'card_type': 'identification',
         'type_id': _get_type,
         "active" : True,
         'state': 'admit',
         'walkin': 'no',
-        'departments': _get_dpts,
+        'departments': _get_departments,
     }
 
-    _sql_constraints=("clinic_patient_key_uniq","unique(name_check,branch_id)","name should be unique"),
+    _sql_constraints=("clinic_patient_key_uniq","unique(name_check)","name should be unique"),
     _order="reg_date desc"
 
     def check_idcard(self,idcard=''):
diff --git a/netforce_clinic/models/report_cycle_item.py b/netforce_clinic/models/report_cycle_item.py
index 3e42de5..4934666 100644
--- a/netforce_clinic/models/report_cycle_item.py
+++ b/netforce_clinic/models/report_cycle_item.py
@@ -26,11 +26,22 @@ class ReportCycleItem(Model):
         year,month=time.strftime("%Y-%m").split("-")
         date_from=defaults.get('date_from','%s-%s-01'%(year,month))
         date_to=defaults.get('date_to','%s-%s-01'%(year,month))
+        branch_id=defaults.get('branch_id')
+        department_id=defaults.get('department_id')
+        res=get_model('select.company').get_select()
+        if res:
+            if not branch_id:
+                branch_id=res['branch_id']
+            if not department_id:
+                department_id=res['department_id']
         res={
             'date': date,
             'date_from': date_from,
             'date_to': date_to,
+            'branch_id': branch_id,
+            'department_id': department_id,
         }
+        print('res', res)
         return res
     
     def get_report_data(self,ids,context={}):
@@ -39,9 +50,9 @@ class ReportCycleItem(Model):
         defaults=self.default_get(context=context)
         date_from=defaults.get("date_from")
         date_to=defaults.get("date_to")
+        branch_id=defaults.get("branch_id")
+        department_id=defaults.get("department_id")
         month=date_from.split("-")[1]
-        branch_id=None
-        department_id=None
         cycle_id=None
         if ids:
             obj=self.browse(ids)[0]
@@ -62,34 +73,48 @@ class ReportCycleItem(Model):
             dom.append(['branch_id','=',branch_id])
         if department_id:
             dom.append(['department_id','=',department_id])
-        no=1
         lines=[]
+        cycles={}
         for citem in get_model('clinic.cycle.item').search_browse(dom,order="date"):
+            cycle=citem.cycle_id
+            if cycle.id not in cycles.keys():
+                cycles[cycle.id]=[]
+                for line in citem.lines:
+                    nurse=line.nurse_id
+                    cycles[cycle.id].append(nurse.name)
             for hdcase in citem.hd_cases:
                 patient=hdcase.patient_id
                 ptype=patient.type_id
                 doctor=hdcase.doctor_id
                 cycle=hdcase.cycle_id
                 dpt=hdcase.department_id
+                dlz_use=hdcase.dlz_use or 0
+                if dlz_use==hdcase.dlz_max:
+                    dlz_use="%sทิ้ง"%dlz_use
                 lines.append({
-                   'no': no,
                    'pname': patient.name or '',
                    'pid': patient.id or '',
                    'hn': patient.hn_no,
                    'did': doctor.id,
                    'dname': doctor.name or "",
-                   #'date': utils.date2thai(hdcase.date or '',format='%(Td)s %(d)s/%(m)s/%(BY)s'),
                    'date': hdcase.date,
                    'epo': hdcase.epo,
+                   'fee': hdcase.fee,
+                   'dlz_name': hdcase.dlz_name,
+                   'dlz_use': dlz_use,
+                   'dlz_id': hdcase.dlz_id,
+                   'cseq': cycle.sequence or 0,
+                   'cid': cycle.id,
+                   'hdcase_id': hdcase.id,
+                   'note': hdcase.note or "",
                    'cname': cycle.name or '',
-                   'cid': citem.id or '',
+                   'ctid': citem.id or '',
                    'hct': hdcase.hct or 0,
                    'tname': ptype.name or '',
                    'tid': ptype.id,
                    'dpt_id': dpt.id,
                    'dpt_name': dpt.name or "",
                 })
-                no+=1
         month_str=utils.MONTHS['th_TH'][int(month)]
         company_name=company.name or ""
         if department_id:
@@ -98,9 +123,27 @@ class ReportCycleItem(Model):
         elif branch_id:
             branch=get_model("clinic.branch").browse(branch_id)
             company_name+=" ("+branch.name+")"
+        no=1
+        nlines=[]
+        index=0
+        old=[]
+        for line in sorted(lines,key=lambda x:(x['date'],x['cseq'])):
+            cid=line['cid']
+            if not cid in old:
+                old.append(cid)
+                index=0
+            else:
+                index+=1
+            cres=cycles[cid]
+            line['nurse']=''
+            if index < len(cres):
+                line['nurse']=cres[index]
+            line['no']=no
+            nlines.append(line)
+            no+=1
         data={
             'company_name': company_name or "",
-            'lines': lines,
+            'lines': nlines,
             'month': month_str,
             'date_from': date_from,
             'date_to': date_to,
@@ -116,4 +159,14 @@ class ReportCycleItem(Model):
         data['date_to']="%s-%s-%s"%(year,month,total_day)
         return data
 
+    def onchange_type(self,context={}):
+        data=context['data']
+        data['department_id']=None
+        return data
+
+    def onchange_datefrom(self,context={}):
+        data=context['data']
+        data['date_to']=data['date_from']
+        return data
+
 ReportCycleItem.register()
diff --git a/netforce_clinic/models/select_company.py b/netforce_clinic/models/select_company.py
index d9ebfb6..09a48f8 100644
--- a/netforce_clinic/models/select_company.py
+++ b/netforce_clinic/models/select_company.py
@@ -66,13 +66,12 @@ class SelectCompany(Model):
     
     def get_select(self,context={}):
         user_id=get_active_user()
-        db=get_connection()
         department_id=None
         branch_id=None
         user=get_model("base.user").browse(user_id)
         dpt=user.department_id
         department_id=dpt.id
-        res={}
+        branch_id=dpt.branch_id.id
         return {
             'department_id': department_id,
             'branch_id': branch_id,
diff --git a/netforce_clinic/models/visit_board.py b/netforce_clinic/models/visit_board.py
index 3ef5906..2581680 100644
--- a/netforce_clinic/models/visit_board.py
+++ b/netforce_clinic/models/visit_board.py
@@ -1,8 +1,7 @@
 import time
 from calendar import monthrange
-
 from datetime import datetime, timedelta
-#from calendar import monthrange
+
 from netforce.model import Model, fields, get_model
 from netforce.access import get_active_company, get_active_user, set_active_user
 
@@ -40,6 +39,7 @@ class VisitBoard(Model):
     def _get_branch(self,context={}):
         res=get_model('select.company').get_select()
         if res:
+            print('res ', res)
             return res['branch_id']
 
     def _get_department(self,context={}):
@@ -70,9 +70,8 @@ class VisitBoard(Model):
         branch_id=defaults.get("branch_id",None)
         if branch_id:
             branch_id=branch_id[0]
-
-        user_id=get_active_user()
-        set_active_user(1) #FIXME to allow user to see doctor different department
+        #user_id=get_active_user()
+        #set_active_user(1) #FIXME to allow user to see doctor different department
 
         if ids:
             obj=self.browse(ids)[0]
@@ -305,7 +304,7 @@ class VisitBoard(Model):
             'date_from': utils.date2thai(date_from,format='%(d)s %(Tm)s %(By)s',lang="th_TH2"),
             'date_to': utils.date2thai(date_to,format='%(d)s %(Tm)s %(By)s',lang="th_TH2"),
         }
-        set_active_user(user_id)
+        #set_active_user(user_id)
         return data
 
     def onchange_date(self,context={}):
diff --git a/netforce_clinic/reports/report_cycle_item.xlsx b/netforce_clinic/reports/report_cycle_item.xlsx
index b1edd9c4bfc2422374711a1b31c6280e4b720cfc..dc677d6ee7fcf0a48b0350a56f6dbf664061e617 100644
GIT binary patch
delta 2032
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
F{{lplkCFfY

delta 1936
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
T{U9X41|#tbE1yUc{96AvGQD5s

diff --git a/netforce_clinic/templates/report_cycle_item.hbs b/netforce_clinic/templates/report_cycle_item.hbs
index 1821fc1..87fdc25 100644
--- a/netforce_clinic/templates/report_cycle_item.hbs
+++ b/netforce_clinic/templates/report_cycle_item.hbs
@@ -1,8 +1,5 @@
 <center>
-    <h2>สรุปรอบการรักษา</h2>
-    <h3>
-        {{company_name}}<br/>
-    </h3>
+    <h3>{{company_name}}</h3>
     <h4>
         ระหว่างวันที่ {{date_from}} ถึง {{date_to}}
     </h4>
@@ -12,27 +9,31 @@
         <th>#</th>
         <th>วันที่</th>
         <th>รอบ</th>
-        <th>HN</th>
-        <th>ผู้ป่วย</th>
-        <th>สิทธ์</th>
-        <th>ชั้น</th>
+        <th>ชื่อ-สกุล</th>
         <th>แพทย์</th>
-        <th>EPO</th>
-        <th>HCT</th>
+        <th>สิทธ์</th>
+        <th>จ.น.เงิน</th>
+        <th>ยาฉีด</th>
+        <th>DZ</th>
+        <th>N/U</th>
+        <th>พยาบาล</th>
+        <!--<th>หมายเหตุ</th>-->
     </thead>
     <tbody>
         {{#each lines }}
                 <tr>
                     <td>{{no}}</td>
-                    <td><a href="/ui#name=clinic_visit&active_id={{vid}}&mode=form">{{date}}</a></td>
-                    <td><a href="/ui#name=clinic_cycle_item&active_id={{cid}}&mode=form">{{cname}}</a></td>
-                    <td>{{hn}}</td>
+                    <td><a href="/ui#name=clinic_hd_case&active_id={{hdcase_id}}&mode=form">{{date}}</a></td>
+                    <td>{{cname}}</td>
                     <td><a href="/ui#name=clinic_patient&active_id={{pid}}&mode=form">{{pname}}</a></td>
-                    <td><a href="/ui#name=clinic_patient_type&active_id={{tid}}&mode=form">{{tname}}</a></td>
-                    <td><a href="/ui#name=clinic_department&active_id={{dpt_id}}&mode=form">{{dpt_name}}</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>{{currency fee zero=""}}</td>
                     <td>{{epo}}</td>
-                    <td>{{hct}}</td>
+                    <td><a href="/ui#name=clinic_dialyzer&active_id={{dlz_id}}&mode=form">{{dlz_name}}</a></td>
+                    <td>{{dlz_use}}</td>
+                    <td><a href="/ui#name=clinic_cycle_item&active_id={{ctid}}&mode=form">View</a></td>
+                    <!--<td>{{note}}</td>-->
                 </tr>
         {{/each}}
     </tbody>
diff --git a/netforce_clinic/templates/visit_board.hbs b/netforce_clinic/templates/visit_board.hbs
index f374e24..80b5a05 100644
--- a/netforce_clinic/templates/visit_board.hbs
+++ b/netforce_clinic/templates/visit_board.hbs
@@ -1,34 +1,18 @@
 <center>
-    <!--
-    <h2>ตารางนัดผู้ป่วย</h2>
-    <h3>
-        {{parent_company_name}}&nbsp;{{company_name}}<br/>
-    </h3>
-    <h4>
-        {{#if has_duration}}
-            ระหว่างวันที่ {{date_from}} ถึง {{date_to}}
-        {{else}}
-            {{date}}
-        {{/if}}
-    </h4>
-    -->
+    <span>&nbsp;&nbsp;</span>
 </center>
 <table class="table table-condensed table-striped">
     <thead>
-        <th>รอบ</th>
-        <th>#</th>
-        <th>ใบนัด</th>
-        <th>HN</th>
-        <th>ผู้ป่วย</th>
-        <!--
-        <th>สาขา</th>
-        -->
-        <th>สิทธ์</th>
-        <th>แพทย์</th>
-        <th>ชั้น</th>
-        <th>เตียง</th>
-        <th>บันทึกการรักษา</th>
-        <th>หมายเหตุ</th>
+        <th style="text-align:center">รอบ</th>
+        <th style="text-align:center">#</th>
+        <th style="text-align:center">ใบนัด</th>
+        <th style="text-align:center">HN</th>
+        <th style="text-align:center">ผู้ป่วย</th>
+        <th style="text-align:center">สิทธ์</th>
+        <th style="text-align:center">แพทย์</th>
+        <th style="text-align:center">ชั้น</th>
+        <th style="text-align:center">เตียง</th>
+        <th style="text-align:center">บันทึกการรักษา</th>
     </thead>
     <tbody>
         {{#each lines }}
@@ -52,8 +36,8 @@
             {{else}}
                 <tr style="background-color:{{visit_color}}">
                     {{#if title}}
-                        <td style="background-color:#ddddff"><b>{{cycle_name}}</b></td>
-                        <td style="background-color:#ddddff" colspan="10"></td>
+                        <td style="background-color:#ddddff" colspan="4"><b>{{cycle_name}}</b></td>
+                        <td style="background-color:#ddddff" colspan="7"></td>
                     {{else}}
                         <td style="background-color:{{cycle_color}};color:white;width:6%"><center>{{cycle_name}}</center></td>
                         <td style="background-color:{{visit_color}}">{{no}}</td>
@@ -72,7 +56,6 @@
                             <td style="background-color:{{visit_color}}">{{sickbed_name}}</td>
                         {{/if}}
                         <td style="background-color:{{visit_color}}"><a href="/ui#name=clinic_hd_case&active_id={{hd_case_id}}&mode=form">{{hd_case_number}}</a></td>
-                        <td style="background-color:{{visit_color}}">{{note}}</td>
                     {{/if}}
                 </tr>
             {{/if}}
diff --git a/netforce_clinic/todo.txt b/netforce_clinic/todo.txt
index 81f6e30..e322e37 100644
--- a/netforce_clinic/todo.txt
+++ b/netforce_clinic/todo.txt
@@ -11,5 +11,16 @@ report:
     - reciept:
         - remove border line
 
-merge doctor:
-    
+- merge doctor: **
+    - ทวีชัย
+- merge patient
+    - สมเศียร
+
+- ** sequence invoice
+    - LS, LK
+    - Extract number (Invoice) *
+
+- prevent to gen walk in
+- prevent to create visit
+- report P. Moo
+- update patient for K. Ekk
