diff --git a/Modules/Internal/Http/Controllers/Api/RequestLogController.php b/Modules/Internal/Http/Controllers/Api/RequestLogController.php
index fa83bd1e..63f489d2 100644
--- a/Modules/Internal/Http/Controllers/Api/RequestLogController.php
+++ b/Modules/Internal/Http/Controllers/Api/RequestLogController.php
@@ -342,6 +342,9 @@ class RequestLogController extends Controller
         $requestLog->status_final_log = $status;
         $requestLog->approved_final_log_by = auth()->user()->id;
         $requestLog->approved_final_log_at = Carbon::now();
+        if($requestLog->service_code != 'IP'){
+            $requestLog->discharge_date = Carbon::now();
+        }
         $requestLog->save();
 
 
diff --git a/Modules/Internal/Services/MemberEnrollmentService.php b/Modules/Internal/Services/MemberEnrollmentService.php
index 16d9f3cf..4aa24464 100644
--- a/Modules/Internal/Services/MemberEnrollmentService.php
+++ b/Modules/Internal/Services/MemberEnrollmentService.php
@@ -341,11 +341,14 @@ class MemberEnrollmentService
         if ($date_from_row instanceof DateTime) {
             return $date_from_row->format('Y-m-d');
         } else if ($date_from_row != null) {
-            return date('Y-m-d', strtotime($date_from_row));
+            if (strtotime($date_from_row)){
+                return date('Y-m-d', strtotime($date_from_row));
+            } else {
+               throw new ImportRowException(__('Format Date Invalid'), 0, null, $row);
+            }
         } else {
-            return null;
+            throw new ImportRowException(__('Format Date Invalid'), 0, null, $row);
         }
-
     }
 
     public function validateDate($dateString, $dateFormat = 'Ymd'){