fix merge issue in patient_referral_screen.dart

lib/screens/patients/profile/referral/patient_referral_screen.dart

@@ -46,15 +46,17 @@ class _PatientReferralScreen extends State<PatientReferralScreen>
   @override
   Widget build(BuildContext context) {
     return AppScaffold(
+        isShowAppBar: true,
         appBar: PatientSearchHeader(
           title: TranslationBase.of(context).patientsreferral,
         ),
+        appBarTitle: TranslationBase.of(context).patientsreferral,
         body: Scaffold(
           extendBodyBehindAppBar: true,
           // backgroundColor: Colors.white,
           appBar: PreferredSize(
             preferredSize:
-                Size.fromHeight(MediaQuery.of(context).size.height * 0.070),
+            Size.fromHeight(MediaQuery.of(context).size.height * 0.070),
             child: Center(
               child: Container(
                 height: Helpers.getTabHeight(context),
@@ -67,14 +69,14 @@ class _PatientReferralScreen extends State<PatientReferralScreen>
                     indicatorSize: TabBarIndicatorSize.tab,
                     labelColor: Theme.of(context).primaryColor,
                     labelPadding:
-                        EdgeInsets.only(top: 0, left: 0, right: 0, bottom: 0),
+                    EdgeInsets.only(top: 0, left: 0, right: 0, bottom: 0),
                     unselectedLabelColor: Colors.grey[800],
                     tabs: [
                       Container(
                         decoration: Helpers.getBoxTabsBoxDecoration(
                             isActive: index == 0, isFirst: true),
                         child: Center(
-                          child: Helpers.getTabText(title:TranslationBase.of(context).myReferredPatient, isActive:index == 0 )
+                            child: Helpers.getTabText(title:TranslationBase.of(context).myReferredPatient, isActive:index == 0 )
                         ),
                       ),
                       Center(
@@ -82,7 +84,7 @@ class _PatientReferralScreen extends State<PatientReferralScreen>
                           decoration:Helpers.getBoxTabsBoxDecoration(
                               isActive: index == 1, isMiddle: true),
                           child: Center(
-                            child:Helpers.getTabText(title:TranslationBase.of(context).referral, isActive:index == 1 )
+                              child:Helpers.getTabText(title:TranslationBase.of(context).referral, isActive:index == 1 )
                           ),
                         ),
                       ),
@@ -101,20 +103,22 @@ class _PatientReferralScreen extends State<PatientReferralScreen>
               ),
             ),
           ),
-          Expanded(
-            child: TabBarView(
-              physics: BouncingScrollPhysics(),
-              controller: _tabController,
-              children: <Widget>[
-                ReferredPatientScreen(),
-                MyReferralInPatientScreen(),
-                ReferralDischargedPatientPage()
-                // MyReferredPatient(),
-              ],
-            ),
-          )
-        ],
-      ),
-    );
+          body: Column(
+            children: <Widget>[
+              Expanded(
+                child: TabBarView(
+                  physics: BouncingScrollPhysics(),
+                  controller: _tabController,
+                  children: <Widget>[
+                    ReferredPatientScreen(),
+                    MyReferralInPatientScreen(),
+                    ReferralDischargedPatientPage()
+                    // MyReferredPatient(),
+                  ],
+                ),
+              )
+            ],
+          ),
+        ));
   }
 }