diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index a96a0258..f7e38d5d 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -1160,6 +1160,7 @@ const Map<String, Map<String, String>> localizedValues = {
   "doctorRota": {"en": "Doctor Rota", "ar":"دوران الطبيب"},
   "dateFrom": {"en": "Date From", "ar":"التاريخ من"},
   "dateTo": {"en": "Date To", "ar":"التاريخ إلى"},
+  "nursingStation": {"en": "Nursing Station", "ar":"محطة التمريض"},
   "searchFindSchedule": {"en": "Search and find out the doctor’s schedule ", "ar":"بحث ومعرفة جدول الطبيب"},
   "onePrimaryDiagnosis": {"en": "There has to be at-least 1 principal diagnosis", "ar":"يجب أن يكون هناك تشخيص رئيسي واحد على الأقل"},
   "principalDiagnosisCannot": {"en": "Principal Diagnosis cannot modify once the order created", "ar":"لا يمكن تعديل التشخيص الرئيسي بمجرد إنشاء الطلب"},
@@ -1167,6 +1168,7 @@ const Map<String, Map<String, String>> localizedValues = {
   "principalCoveredOrNot": {"en": "Principal Diagnosis is not covered for this patient", "ar":"لا يتم تغطية التشخيص الرئيسي لهذا المريض"},
   "complexDiagnosis": {"en": "Complex Diagnosis", "ar":"التشخيص المعقد"},
   "pharmacyInterventionApproval": {"en": "Pharmacy Intervention Approval", "ar":"الموافقة على التدخل الصيدلي"},
+  "pharmacyApproval": {"en": "Pharmacy Approval", "ar":"موافقة الصيدلية"},
 
 
 
diff --git a/lib/screens/pharmaacy_intervention/PharmacyIntervention.dart b/lib/screens/pharmaacy_intervention/PharmacyIntervention.dart
index 917917fc..9001080f 100644
--- a/lib/screens/pharmaacy_intervention/PharmacyIntervention.dart
+++ b/lib/screens/pharmaacy_intervention/PharmacyIntervention.dart
@@ -51,14 +51,14 @@ class _PharmacyIntervention extends State<PharmacyIntervention>
     return AppScaffold(
         isShowAppBar: true,
         appBar: PatientSearchHeader(
-          title: TranslationBase.of(context).pharmacyInterventionApproval,
+          title: TranslationBase.of(context).pharmacyApproval,
           fontSize: 18,
           showSearchIcon: true,
           onSearchPressed: () {
             SearchDialog();
           },
         ),
-        appBarTitle: TranslationBase.of(context).pharmacyInterventionApproval,
+        appBarTitle: TranslationBase.of(context).pharmacyApproval,
         body: Column(
           children: [
             SizedBox(
@@ -144,6 +144,7 @@ class PharmacyInterventionDialog extends StatefulWidget {
 class _PharmacyInterventionDialogState
     extends State<PharmacyInterventionDialog> {
   final TextEditingController admissionNumber = TextEditingController();
+  final TextEditingController nursingStation = TextEditingController();
 
   final TextEditingController patientId = TextEditingController();
 
@@ -151,7 +152,6 @@ class _PharmacyInterventionDialogState
 
   String dateTo = '';
 
-
   @override
   void initState() {
     super.initState();
@@ -170,27 +170,37 @@ class _PharmacyInterventionDialogState
         child: Column(
           mainAxisSize: MainAxisSize.min,
           children: [
-            _titleAndTextField(
-                TranslationBase.of(context).admissionNumber, admissionNumber),
-            SizedBox(height: 4,),
-
-            _titleAndTextField(
-                TranslationBase.of(context).patientID, patientId),
-            SizedBox(height: 4,),
-
+            _titleAndTextField(TranslationBase.of(context).nursingStation,
+                nursingStation, TextInputType.number),
+            SizedBox(
+              height: 4,
+            ),
+            _titleAndTextField(TranslationBase.of(context).admissionNumber,
+                admissionNumber, TextInputType.number),
+            SizedBox(
+              height: 4,
+            ),
+            _titleAndTextField(TranslationBase.of(context).patientID, patientId,
+                TextInputType.number),
+            SizedBox(
+              height: 4,
+            ),
             _dateSelection(TranslationBase.of(context).dateFrom, (date) {
               setState(() {
                 dateFrom = date;
               });
             }, dateFrom),
-            SizedBox(height: 4,),
-
+            SizedBox(
+              height: 4,
+            ),
             _dateSelection(TranslationBase.of(context).dateTo, (date) {
               setState(() {
                 dateTo = date;
               });
             }, dateTo),
-            SizedBox(height: 8,),
+            SizedBox(
+              height: 8,
+            ),
             Row(children: [
               Expanded(
                 child: AppButton(
@@ -212,7 +222,7 @@ class _PharmacyInterventionDialogState
   Widget _dateSelection(
       String title, Function(String) onDateSelected, String selectedDate) {
     return GestureDetector(
-      onTap: ()=> _selectDate(onDateSelected),
+      onTap: () => _selectDate(onDateSelected),
       child: Row(
         mainAxisSize: MainAxisSize.min,
         children: [
@@ -231,52 +241,32 @@ class _PharmacyInterventionDialogState
   }
 
   Future _selectDate(Function(String) updateDate) async {
-    // if (calenderType == CalenderType.Hijri) {
-    //   JDateModel hijriDate = JDateModel(dateTime: DateTime.now());
-    //   final JPickerValue? pickedH = await showGlobalDatePicker(
-    //     context: context,
-    //     pickerType: PickerType.JHijri,
-    //     startDate: birthDateInHijri ?? hijriDate,
-    //     endDate: JDateModel(
-    //       jhijri: JHijri(fDate: hijriDate.dateTime),
-    //     ),
-    //
-    //     // firstDate: new HijriCalendar()
-    //     //   ..hYear = 1438
-    //     //   ..hMonth = 12
-    //     //   ..hDay = 25,
-    //     pickerMode: DatePickerMode.day,
-    //   );
-    //   if (pickedH != null && birthDateInHijri != pickedH) updateDate(pickedH);
-    // } else {
     final DateTime? picked = await showDatePicker(
-      context: context,
-      initialDate: DateTime.now(),
-      firstDate: DateTime(DateTime.now().year - 150),
-      lastDate: DateTime(DateTime.now().year + 150),
-      initialEntryMode: DatePickerEntryMode.calendar,
-      builder: (_, child) {
-        return Theme(
-          data: ThemeData.light().copyWith(
-            colorScheme: ColorScheme.fromSwatch(
-              primarySwatch: Colors.red,
-              accentColor: AppGlobal.appRedColor,
+        context: context,
+        initialDate: DateTime.now(),
+        firstDate: DateTime(DateTime.now().year - 150),
+        lastDate: DateTime(DateTime.now().year + 150),
+        initialEntryMode: DatePickerEntryMode.calendar,
+        builder: (_, child) {
+          return Theme(
+            data: ThemeData.light().copyWith(
+              colorScheme: ColorScheme.fromSwatch(
+                primarySwatch: Colors.red,
+                accentColor: AppGlobal.appRedColor,
+              ),
+              dialogBackgroundColor: Colors.white,
             ),
-            dialogBackgroundColor: Colors.white,
-          ),
-          child: child!,
-        );
-      }
-
-    );
+            child: child!,
+          );
+        });
     if (picked != null) {
-
       updateDate(getFormattedDate(picked));
     }
     // }
   }
 
-  Widget _titleAndTextField(String title, TextEditingController controller) {
+  Widget _titleAndTextField(String title, TextEditingController controller,
+      TextInputType? inputType) {
     return Row(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
       mainAxisSize: MainAxisSize.min,
@@ -284,6 +274,7 @@ class _PharmacyInterventionDialogState
         Text(title),
         Expanded(
           child: TextFormField(
+            keyboardType: inputType,
             decoration: InputDecoration(
               hintText: '',
               focusedBorder: InputBorder.none,
@@ -300,10 +291,10 @@ class _PharmacyInterventionDialogState
 
   void initFromDate() {
     var time = DateTime.now();
-   dateFrom = getFormattedDate(time);
+    dateFrom = getFormattedDate(time);
   }
 
-  String getFormattedDate(DateTime time){
+  String getFormattedDate(DateTime time) {
     return DateFormat('MM/dd/yyyy').format(time);
   }
 }
diff --git a/lib/utils/translations_delegate_base_utils.dart b/lib/utils/translations_delegate_base_utils.dart
index a6ab1858..9d21b156 100644
--- a/lib/utils/translations_delegate_base_utils.dart
+++ b/lib/utils/translations_delegate_base_utils.dart
@@ -1467,8 +1467,12 @@ class TranslationBase {
       localizedValues['updateAssessmentDetails']![locale.languageCode]!;
   String get pharmacyInterventionApproval =>
       localizedValues['pharmacyInterventionApproval']![locale.languageCode]!;
+  String get pharmacyApproval =>
+      localizedValues['pharmacyApproval']![locale.languageCode]!;
   String get admissionNumber =>
       localizedValues['admissionNumber']![locale.languageCode]!;
+  String get nursingStation =>
+      localizedValues['nursingStation']![locale.languageCode]!;
 }
 
 class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {