diff --git a/netforce_clinic/layouts/clinic_patient_form.xml b/netforce_clinic/layouts/clinic_patient_form.xml
index 54a0a2e..e3beb2f 100644
--- a/netforce_clinic/layouts/clinic_patient_form.xml
+++ b/netforce_clinic/layouts/clinic_patient_form.xml
@@ -80,10 +80,31 @@
                 <field name="parathy"/>
             </group>
         </tab>
-        <tab string="Co-marbid">
-            <field name="comarbid"/>
+        <tab string="Co-marbid">  
+            <separator string="Co-morbidity, before RRT"/>
+            <field name="check1" span="12"/>
+            <field name="check2" span="12"/>
+            <field name="check3" span="12"/>
+            <field name="check4" span="12"/>
+            <field name="check5" span="12"/>
+            <field name="check6" span="12"/>
+            <field name="check7" span="12"/>
+            <field name="check8" span="12"/>
+            <field name="check9" span="12"/>
+            <field name="check10" span="12"/>
+            <field name="check11" span="12"/>
+            <field name="check12" span="12"/>
+            <field name="check13" span="12"/>
+            <field name="check14" span="12"/>
+            <field name="check15" span="12"/>
+            <field name="check16" span="12"/>
+            <field name="check17" span="12"/>
         </tab>
         <tab string="Morbidity">
+            <separator string="Morbidity, After RRT"/>
+            <field name="check18" span="12"/>
+            <field name="check19" span="12"/>
+            <field name="check20" span="12"/>
             <field name="comarbid2"/>
         </tab>
         <tab string="Healthcare">
diff --git a/netforce_clinic/models/clinic_patient.py b/netforce_clinic/models/clinic_patient.py
index 1e9b703..cff713e 100644
--- a/netforce_clinic/models/clinic_patient.py
+++ b/netforce_clinic/models/clinic_patient.py
@@ -23,6 +23,7 @@ class Patient(Model):
         return res # -> {1: 30, 2: 45,.....}
 
     _fields={
+        #Patient's Data
         "number": fields.Char("Patient ID",required=True,search=True),
         "first_name": fields.Char("First Name",required=True,search=True),
         "last_name": fields.Char("Last Name",required=False,search=True),
@@ -47,6 +48,7 @@ class Patient(Model):
         "marital_status": fields.Selection([("single","Single"),("marry","Marry"),("divorce","Divorce"),("separated","Saparated"),("widowed","Widowed")],"Marital Status",required=False),
         "nationality": fields.Char("Nationality",search=True),
         "race": fields.Char("Race",search=True),
+        #Patient's +
         "smoke": fields.Selection([("never","Never"),("stopped","Stopped"),("smoked","Smoked")],"Smoking"),
         "withdrawal" : fields.Selection([("social_security","Social Security"),("health_insurance","Health Insurance"),("etc","ETC.")],"Right of withdrawal"),
         "first_treatment" : fields.Selection([("hd","HD"),("test","Test")], "First treatment"),
@@ -77,8 +79,31 @@ class Patient(Model):
         "hyperucemia": fields.Boolean("Hyperurinencemia"),
         "cga": fields.Boolean("Chronic gouty arthitis"),
         "parathy": fields.Boolean("Parathyroidectomy"),
-        "comarbid": fields.Char("Co-morbid 1"),
-        "comarbid2": fields.Char("Co-morbid 2"),
+        #Co-marbid
+        "check1" : fields.Boolean("The patient had been diagnosed, Acute MI or Unstable angina"),
+        "check2" : fields.Boolean("The patient had been diagnosed, Coronary angioplasty or CABG"),
+        "check3" : fields.Boolean("The patient had been diagnosed, Cerebrovascular accident"),
+        "check4" : fields.Boolean("The patient had been diagnosed, PVD or Amputation"),
+        "check5" : fields.Boolean("The patient had been diagnosed, Congestive heart failure"),
+        "check6" : fields.Boolean("The patient had been diagnosed, Hypertension"),
+        "check7" : fields.Boolean("The patient had been diagnosed, Diabetes"),
+        "check8" : fields.Boolean("The patient had been diagnosed, COPD"),
+        "check9" : fields.Boolean("The patient had been diagnosed, Asthma"),
+        "check10" : fields.Boolean("The patient had been diagnosed, Pulmonary tuberculosis"),
+        "check11" : fields.Boolean("The patient had been diagnosed, of cancer"),
+        "check12" : fields.Boolean("The patient had been diagnosed, Cirrhosis"),
+        "check13" : fields.Boolean("The patient had been diagnosed, Dyslipidemia"),
+        "check14" : fields.Boolean("The patient had been diagnosed, PRCA"),
+        "check15" : fields.Boolean("The patient had been diagnosed, Hyperurinecemia"),
+        "check16" : fields.Boolean("The patient had been diagnosed, Chronic gouty arthitis"),
+        "check17" : fields.Boolean("The patient had been diagnosed, Parathyroidectomy"),
+        #"comarbid" : fields.char("Co-morbid Other"),
+        #Morbidity
+        "check18" : fields.Boolean("Ischemic Heart Disease"),
+        "check19" : fields.Boolean("Of cancer"),
+        "check20" : fields.Boolean("Cerebrovascular accident"),
+        "comarbid2": fields.Char("Co-morbid Other"),
+        #Healthcare
         "comments": fields.One2Many("message","related_id","Comments"),
         "company_id": fields.Many2One("company","Company"),
         "doctorsss": fields.Many2Many("clinic.doctor","Doctors"),