diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index c82629a..b5b1eaf 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -745,11 +745,11 @@ class KhazanahController extends Controller
             if($request->jenismodal === 'perubatan')
             {
                 $listUser=User::where('name','=',$request->tuntutan)->get();
-                // $totalsebenar = floatval($listUser[0]->perubatan) - floatval($request->bayaran);
-                $overrideuser = User::where('cawangan','=',$auth_user['cawangan'])
+                $totalsebenar = floatval($listUser[0]->perubatan_asal) - floatval($updatepanjar['bakiperubatan']);
+                User::where('cawangan','=',$auth_user['cawangan'])
                 ->where('name','=',$request->tuntutan)
                 ->update(array(
-                    'perubatan' => $updatepanjar['bakiperubatan']
+                    'perubatan' => $totalsebenar
                 ));
             }
 
@@ -777,14 +777,15 @@ class KhazanahController extends Controller
         {
             if($updatepanjar['jenis'] === 'perubatan')
             {
-                $listUser = User::where('name','=',$updatepanjar['tuntutoleh'])->get();
+                $listUser = User::where('name','=',$updatepanjar['tuntutoleh'])->first();
+                $listUser = optional($listUser)->toArray();
 
-                // $totalsebenar = floatval($listUser[0]->perubatan) + floatval($denopanjar['serahan']);
+                $totalsebenar = floatval($listUser['perubatan_asal']) + $updatepanjar['bakiperubatan'];
 
-                $overrideuser = User::where('cawangan','=',$auth_user['cawangan'])
+                User::where('cawangan','=',$auth_user['cawangan'])
                 ->where('name','=',$updatepanjar['tuntutoleh'])
                 ->update(array(
-                    'perubatan' => $updatepanjar['bakiperubatan']
+                    'perubatan' => $totalsebenar
                 ));
 
             }
diff --git a/public/js/perubatan.js b/public/js/perubatan.js
index c78ddd3..761280a 100644
--- a/public/js/perubatan.js
+++ b/public/js/perubatan.js
@@ -1,17 +1,50 @@
-let editfunc = () => {
-    document.getElementById('editButton').style.display = 'none';
-    document.getElementById('saveButton').style.display = 'block';
-    document.getElementById('cancelButton').style.display = 'block';
+let editfunc = (pageid) => {
+    let editbtn = document.getElementById('divedit-' + pageid);
+    let divbtn = document.getElementById('div-' + pageid);
+    let inputbtn = document.getElementById('input-' + pageid);
+
+    if(editbtn.classList.contains('d-block')){
+        editbtn.classList.remove('d-block');
+        editbtn.classList.add('d-none');
+    }
+
+    if(divbtn.classList.contains('d-none')){
+        divbtn.classList.remove('d-none');
+        divbtn.classList.add('d-block');
+    }
+    inputbtn.disabled = false;
+
 }
 
-let savefunc = () => {
-    document.getElementById('editButton').style.display = 'block';
-    document.getElementById('saveButton').style.display = 'none';
-    document.getElementById('cancelButton').style.display = 'none';
+let savefunc = (pageid) => {
+    // let editbtn = document.getElementById('editButton-' + pageid);
+    // let divbtn = document.getElementById('div-' + pageid);
+
+    // if(editbtn.classList.contains('d-block')){
+    //     editbtn.classList.remove('d-block');
+    //     editbtn.classList.add('d-none');
+    // }
+
+    // if(divbtn.classList.contains('d-none')){
+    //     divbtn.classList.remove('d-none');
+    //     divbtn.classList.add('d-block');
+    // }
 }
 
-let cancelfunc = () => {
-    document.getElementById('editButton').style.display = 'block';
-    document.getElementById('saveButton').style.display = 'none';
-    document.getElementById('cancelButton').style.display = 'none';
+let cancelfunc = (pageid) => {
+    let editbtn = document.getElementById('divedit-' + pageid);
+    let divbtn = document.getElementById('div-' + pageid);
+    let inputbtn = document.getElementById('input-' + pageid);
+
+    if(editbtn.classList.contains('d-none')){
+        editbtn.classList.remove('d-none');
+        editbtn.classList.add('d-block');
+    }
+
+    if(divbtn.classList.contains('d-block')){
+        divbtn.classList.remove('d-block');
+        divbtn.classList.add('d-none');
+    }
+
+    inputbtn.disabled = true;
 }
\ No newline at end of file
diff --git a/resources/views/operasi/perubatan/index.blade.php b/resources/views/operasi/perubatan/index.blade.php
index eca0334..fb5b131 100644
--- a/resources/views/operasi/perubatan/index.blade.php
+++ b/resources/views/operasi/perubatan/index.blade.php
@@ -37,14 +37,15 @@
                                     <td scope="col">{{ $page->name }}</td>
                                     <td scope="col">{{ $page->perubatan }}</td>
                                     <td scope="col">
-                                        <span class="d-none">{{ $page->perubatan_asal }}</span>
-                                        <input name="perubatan" class="form-control w-50" value="{{ $page->perubatan_asal }}"/>
+                                        <input name="perubatan" id="input-{{ $page->id }}" class="" value="{{ $page->perubatan_asal }}" disabled/>
                                     </td>
                                     <td>
-                                        <btn class="btn btn-primary" id="editButton" onclick="editfunc()">Edit</btn>
-                                        <div class="d-none">
-                                            <btn class="btn btn-primary" id="saveButton" onclick="savefunc()">Save</btn>
-                                            <btn class="btn btn-danger" id="cancelButton" onclick="cancelfunc()">Cancel</btn>
+                                        <div id="divedit-{{ $page->id }}" class="d-block">
+                                            <btn class="btn btn-primary" id="editButton-{{ $page->id }}" onclick="editfunc({{ $page->id }})">Edit</btn>
+                                        </div>
+                                        <div class="d-none" id="div-{{ $page->id }}">
+                                            <btn class="btn btn-primary" id="saveButton-{{ $page->id }}" onclick="savefunc({{ $page->id }})">Save</btn>
+                                            <btn class="btn btn-danger" id="cancelButton-{{ $page->id }}" onclick="cancelfunc({{ $page->id }})">Cancel</btn>
                                         </div>
                                     </td>
                                 </tr>