diff --git a/netforce_clinic/layouts/clinic_menu.xml b/netforce_clinic/layouts/clinic_menu.xml
index 6e06776..8a6dc40 100644
--- a/netforce_clinic/layouts/clinic_menu.xml
+++ b/netforce_clinic/layouts/clinic_menu.xml
@@ -37,10 +37,10 @@
     </item>
     <item string="HD Cases" action="clinic_hd_case"/>
     <item string="Reports">
-        <item string="New Patient" action="clinic_report_new_patient"/>
-        <item string="Discontinue Patient" action="clinic_report_discontinue_patient"/>
         <item string="HD Case Summary" action="clinic_report_hd_case_summary"/>
         <item string="Medical Summary" action="clinic_report_medical_summary"/>
+        <item string="New Patient" action="clinic_report_new_patient"/>
+        <item string="Discontinue Patient" action="clinic_report_discontinue_patient"/>
     </item>
     <item string="Settings">
         <item string="Departments" action="clinic_department"/>
diff --git a/netforce_clinic/models/report_discontinue_patient.py b/netforce_clinic/models/report_discontinue_patient.py
index 37d6f6c..c8a6b66 100644
--- a/netforce_clinic/models/report_discontinue_patient.py
+++ b/netforce_clinic/models/report_discontinue_patient.py
@@ -1,6 +1,7 @@
 import time
 
 from netforce.model import Model,fields,get_model
+from netforce.access import get_active_company
 
 class ReportDiscontinuePatient(Model):
     _name="clinic.report.discontinue.patient"
@@ -16,7 +17,12 @@ class ReportDiscontinuePatient(Model):
     }
     
     def get_report_data(self,ids,context={}):
-        data={}
+        company_id=get_active_company()
+        company=get_model('company').browse(company_id)
+        data={
+            'company_name': company.name or "",
+            'parent_company_name': company.parent_id.name or "",
+        }
         return data
 
 ReportDiscontinuePatient.register()
diff --git a/netforce_clinic/models/report_medical_summary.py b/netforce_clinic/models/report_medical_summary.py
index 6af0f08..c520a37 100644
--- a/netforce_clinic/models/report_medical_summary.py
+++ b/netforce_clinic/models/report_medical_summary.py
@@ -1,6 +1,7 @@
 import time
 
 from netforce.model import Model,fields,get_model
+from netforce.access import get_active_company
 
 class ReportMedicalSummary(Model):
     _name="clinic.report.medical.summary"
@@ -16,7 +17,12 @@ class ReportMedicalSummary(Model):
     }
     
     def get_report_data(self,ids,context={}):
-        data={}
+        company_id=get_active_company()
+        company=get_model('company').browse(company_id)
+        data={
+            'company_name': company.name or "",
+            'parent_company_name': company.parent_id.name or "",
+        }
         return data
 
 ReportMedicalSummary.register()
diff --git a/netforce_clinic/models/report_new_patient.py b/netforce_clinic/models/report_new_patient.py
index a670eb6..5278f09 100644
--- a/netforce_clinic/models/report_new_patient.py
+++ b/netforce_clinic/models/report_new_patient.py
@@ -1,6 +1,7 @@
 import time
 
 from netforce.model import Model,fields,get_model
+from netforce.access import get_active_company
 
 class ReportNewPatient(Model):
     _name="clinic.report.new.patient"
@@ -16,7 +17,12 @@ class ReportNewPatient(Model):
     }
     
     def get_report_data(self,ids,context={}):
-        data={}
+        company_id=get_active_company()
+        company=get_model('company').browse(company_id)
+        data={
+            'company_name': company.name or "",
+            'parent_company_name': company.parent_id.name or "",
+        }
         return data
 
 ReportNewPatient.register()
diff --git a/netforce_clinic/templates/old/report_hd_case_summary.hbs b/netforce_clinic/templates/old/report_hd_case_summary.hbs
new file mode 100644
index 0000000..08e880f
--- /dev/null
+++ b/netforce_clinic/templates/old/report_hd_case_summary.hbs
@@ -0,0 +1,93 @@
+<center>
+    <h2>
+    ใบสรุปการทำ Hemodialysis
+    </h2>
+    <h3>
+        {{parent_company_name}}&nbsp;{{company_name}}<br/>
+    </h3>
+    <h4>
+        ประจำเดือน {{month}} {{year}}
+    </h4>
+</center>
+<table class="table">
+    <thead class="scroll-header">
+        <th></th>
+        <th></th>
+        <th></th>
+        <th></th>
+        <th></th>
+    </thead>
+    <tbody>
+        {{#each lines}}
+            <tr> 
+                <td>{{topic}}</td>
+                <td>{{month}}</td>
+                <td>เท่ากับ</td>
+                {{#if link}}
+                    <td><a style="text-decoration: underline" href="ui#name=clinic_report_hd_case_detail&defaults.date_from={{date_from}}&defaults.date_to={{date_to}}" >{{amount}}</a></td>
+                {{else}}
+                    <td>{{amount}}</td>
+                {{/if}}
+                <td>{{unit}}</td>
+            </tr>
+        {{/each}}
+    </tbody>
+</table>
+<table class="table">
+    <tr>
+        <td style="width:50%">
+            <table class="table">
+                <thead>
+                    <th><h4>รายชื่อผู้ป่วยรับใหม่</h4></th>
+                </thead>
+                <tbody>
+                    {{#each new_patient_lines}}
+                        <tr>
+                            <td>{{no}}.  {{name}}    {{note}}</td>
+                        </tr>
+                    {{/each}}
+                </tbody>
+                <tfoot>
+                </tfoot>
+            </table>
+        </td>
+        <td>
+            <table class="table">
+                <thead>
+                    <th><h4>รวมจำนวนยาที่ใช้ประจำเดือน</h4></th>
+                    <th></th>
+                    <th></th>
+                    <th></th>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td><b>ปกส.</b></td>
+                        <td><b>uc</b></td>
+                        <td><b>ซื้อ</b></td>
+                        <td><b>รวม</b></td>
+                    </tr>
+                </tbody>
+                <tfoot>
+                </tfoot>
+            </table>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <table class="table">
+                <thead>
+                    <th><h4>รายชื่อผู้ป่วยจำหน่าย<h4></th>
+                </thead>
+                <tbody>
+                    {{#each resign_patient_lines}}
+                        <tr>
+                            <td>{{no}}.  {{name}}    {{note}}</td>
+                        </tr>
+                    {{/each}}
+                </tbody>
+                <tfoot>
+                </tfoot>
+            </table>
+        </td>
+    </tr>
+</table>
diff --git a/netforce_clinic/templates/report_discontinue_patient.hbs b/netforce_clinic/templates/report_discontinue_patient.hbs
index f4640f1..4fcc918 100644
--- a/netforce_clinic/templates/report_discontinue_patient.hbs
+++ b/netforce_clinic/templates/report_discontinue_patient.hbs
@@ -1 +1,27 @@
-<h1>Discontinue Patient</h1>
+<center>
+    <h2>รายชื่อผู้ป่วยจำหน่าย</h2>
+    <h3>
+        {{parent_company_name}}&nbsp;{{company_name}}<br/>
+    </h3>
+    <h4>
+        ประจำเดือน {{month}} {{year}}
+    </h4>
+</center>
+<table class="table">
+    <thead>
+        <th>#</th>
+        <th>ชื่อ</th>
+        <th>หมายเหตุ</th>
+    </thead>
+    <tbody>
+        {{#each lines}}
+            <tr>
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+        {{/each}}
+    </tbody>
+    <tfoot>
+    </tfoot>
+</table>
diff --git a/netforce_clinic/templates/report_hd_case_summary.hbs b/netforce_clinic/templates/report_hd_case_summary.hbs
index 08e880f..2f057a0 100644
--- a/netforce_clinic/templates/report_hd_case_summary.hbs
+++ b/netforce_clinic/templates/report_hd_case_summary.hbs
@@ -33,61 +33,3 @@
         {{/each}}
     </tbody>
 </table>
-<table class="table">
-    <tr>
-        <td style="width:50%">
-            <table class="table">
-                <thead>
-                    <th><h4>รายชื่อผู้ป่วยรับใหม่</h4></th>
-                </thead>
-                <tbody>
-                    {{#each new_patient_lines}}
-                        <tr>
-                            <td>{{no}}.  {{name}}    {{note}}</td>
-                        </tr>
-                    {{/each}}
-                </tbody>
-                <tfoot>
-                </tfoot>
-            </table>
-        </td>
-        <td>
-            <table class="table">
-                <thead>
-                    <th><h4>รวมจำนวนยาที่ใช้ประจำเดือน</h4></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td><b>ปกส.</b></td>
-                        <td><b>uc</b></td>
-                        <td><b>ซื้อ</b></td>
-                        <td><b>รวม</b></td>
-                    </tr>
-                </tbody>
-                <tfoot>
-                </tfoot>
-            </table>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <table class="table">
-                <thead>
-                    <th><h4>รายชื่อผู้ป่วยจำหน่าย<h4></th>
-                </thead>
-                <tbody>
-                    {{#each resign_patient_lines}}
-                        <tr>
-                            <td>{{no}}.  {{name}}    {{note}}</td>
-                        </tr>
-                    {{/each}}
-                </tbody>
-                <tfoot>
-                </tfoot>
-            </table>
-        </td>
-    </tr>
-</table>
diff --git a/netforce_clinic/templates/report_medical_summary.hbs b/netforce_clinic/templates/report_medical_summary.hbs
index e486fbd..2f7198d 100644
--- a/netforce_clinic/templates/report_medical_summary.hbs
+++ b/netforce_clinic/templates/report_medical_summary.hbs
@@ -1 +1,29 @@
-<h1>Medical Summary</h1>
+<center>
+    <h2>รวมจำนวนยาที่ใช้ประจำเดือน</h2>
+    <h3>
+        {{parent_company_name}}&nbsp;{{company_name}}<br/>
+    </h3>
+    <h4>
+        ประจำเดือน {{month}} {{year}}
+    </h4>
+</center>
+<table class="table">
+    <thead>
+        <th>ประเภทการรักษา</th>
+        <th>uc</th>
+        <th>ซื้อ</th>
+        <th>รวม</th>
+    </thead>
+    <tbody>
+        {{#each lines}}
+            <tr>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+        {{/each}}
+    </tbody>
+    <tfoot>
+    </tfoot>
+</table>
diff --git a/netforce_clinic/templates/report_new_patient.hbs b/netforce_clinic/templates/report_new_patient.hbs
index dd3bf3b..63f045d 100644
--- a/netforce_clinic/templates/report_new_patient.hbs
+++ b/netforce_clinic/templates/report_new_patient.hbs
@@ -1 +1,27 @@
-<h1>New Patient </h1>
+<center>
+    <h2>รายชื่อผู้ป่วยรับใหม่</h2>
+    <h3>
+        {{parent_company_name}}&nbsp;{{company_name}}<br/>
+    </h3>
+    <h4>
+        ประจำเดือน {{month}} {{year}}
+    </h4>
+</center>
+<table class="table">
+    <thead>
+            <th>#</th>
+            <th>ชื่อ</th>
+            <th>หมายเหตุ</th>
+    </thead>
+    <tbody>
+        {{#each lines}}
+            <tr>
+                <td>{{no}}</td>
+                <td>{{name}}</td>
+                <td>{{note}}</td>
+            </tr>
+        {{/each}}
+    </tbody>
+    <tfoot>
+    </tfoot>
+</table>