diff --git a/netforce_clinic/layouts/clinic_hd_case_list.xml b/netforce_clinic/layouts/clinic_hd_case_list.xml
index 6db7347..92bb743 100644
--- a/netforce_clinic/layouts/clinic_hd_case_list.xml
+++ b/netforce_clinic/layouts/clinic_hd_case_list.xml
@@ -4,6 +4,7 @@
     <field name="cycle_id"/>
     <field name="patient_id"/>
     <field name="patient_type_id"/>
+    <field name="epo"/>
     <field name="department_id"/>
     <field name="doctor_id"/>
     <field name="state"/>
diff --git a/netforce_clinic/layouts/clinic_patient_form.xml b/netforce_clinic/layouts/clinic_patient_form.xml
index d0f91ab..224e390 100644
--- a/netforce_clinic/layouts/clinic_patient_form.xml
+++ b/netforce_clinic/layouts/clinic_patient_form.xml
@@ -12,10 +12,10 @@
     <field name="type_id"/>
     <field name="name"/>
     <field name="reg_date"/>
-    <field name="categ_id"/>
     <field name="doctor_id"/>
-    <field name="department_id"/>
     <field name="branch_id"/>
+    <field name="categ_id"/>
+    <field name="department_id" domain='[["branch_id","=",branch_id]]'/>
     <tabs>
         <tab string="General Information">
             <group span="6" columns="1">
diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py
index 4918e66..cd5b7c9 100644
--- a/netforce_clinic/models/hd_case.py
+++ b/netforce_clinic/models/hd_case.py
@@ -71,8 +71,26 @@ class HDCase(Model):
             }
         return res
 
+    def _get_epo(self,ids,context={}):
+        res={}
+        for obj in self.browse(ids):
+            names=[]
+            for line in obj.lines:
+                prod=line.product_id
+                categ=line.product_categ_id
+                if categ and prod:
+                    if categ.code=='EPO':
+                        name=prod.name or ""
+                        name=name.split("-") #XXX
+                        if name:
+                            name=name[0].title()
+                        names.append(name)
+            res[obj.id]=','.join([n for n in names])
+        return res
+
     _fields={
         "number": fields.Char("Number",required=True,search=True),
+        "epo": fields.Char("EPO",function="_get_epo"),
         '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/patient.py b/netforce_clinic/models/patient.py
index aca8c7c..e539076 100644
--- a/netforce_clinic/models/patient.py
+++ b/netforce_clinic/models/patient.py
@@ -214,8 +214,24 @@ class Patient(Model):
             if not vals['active']:
                 vals['resign_date']=time.strftime("%Y-%m-%d")
                 vals['rm_remain_visit']=True
+            else:
+                vals['rm_remain_visit']=False
 
         for obj in self.browse(ids):
+            if 'department_id' in vals.keys():
+                vids=get_model("clinic.visit").search([['patient_id','=',obj.id],['state','in',['draft','pending']]])
+                for visit in get_model('clinic.visit').browse(vids):
+                    visit.write({
+                        'department_id': vals['department_id']
+                    })
+                    print("update visit set department = %s"%(visit.department_id.name))
+            if 'branch_id' in vals.keys():
+                vids=get_model("clinic.visit").search([['patient_id','=',obj.id],['state','in',['draft','pending']]])
+                for visit in get_model('clinic.visit').browse(vids):
+                    visit.write({
+                        'branch_id': vals['branch_id']
+                    })
+                    print("update visit set branch_id = %s"%(visit.department_id.name))
             if 'doctor_id' in vals.keys():
                 for vs in get_model("clinic.visit").search_browse([['state','in',['draft','pending']],['patient_id','=',obj.id]]):
                     vs.write({
diff --git a/netforce_clinic/todo.txt b/netforce_clinic/todo.txt
index 2f31a54..436ce5f 100644
--- a/netforce_clinic/todo.txt
+++ b/netforce_clinic/todo.txt
@@ -1,5 +1,5 @@
 todo:
-    matching payment
-    create contact from staff
-        - xxxx
-    script to clear invoice
+    show epo in list of hd case
+    matching payment > ok
+    create contact from staff -> ok
+    script to clear invoice -