diff --git a/internal/use-case/main-use-case/adime/case.go b/internal/use-case/main-use-case/adime/case.go
index 01d101ae..bc7d4e98 100644
--- a/internal/use-case/main-use-case/adime/case.go
+++ b/internal/use-case/main-use-case/adime/case.go
@@ -5,9 +5,6 @@ import (
 	"strconv"
 
 	e "simrs-vx/internal/domain/main-entities/adime"
-	ee "simrs-vx/internal/domain/main-entities/employee"
-
-	ue "simrs-vx/internal/use-case/main-use-case/employee"
 
 	dg "github.com/karincake/apem/db-gorm-pg"
 	d "github.com/karincake/dodol"
@@ -49,11 +46,13 @@ func Create(input e.CreateDto) (*d.Data, error) {
 			return pl.SetLogError(&event, input)
 		}
 
-		employee, err := ue.ReadDetailData(ee.ReadDetailDto{User_Id: &input.AuthInfo.User_Id}, &event, tx)
-		if err != nil {
-			return err
+		if input.AuthInfo.Employee_Id != nil {
+			v := uint(*input.AuthInfo.Employee_Id)
+			input.Employee_Id = &v
+		} else {
+			input.Employee_Id = nil
 		}
-		input.Employee_Id = &employee.Id
+
 		if resData, err := CreateData(input, &event, tx); err != nil {
 			return err
 		} else {
diff --git a/internal/use-case/main-use-case/authentication/case.go b/internal/use-case/main-use-case/authentication/case.go
index a32b4253..6c645208 100644
--- a/internal/use-case/main-use-case/authentication/case.go
+++ b/internal/use-case/main-use-case/authentication/case.go
@@ -315,6 +315,7 @@ func ExtractToken(r *http.Request, tokenType TokenType) (data *pa.AuthInfo, err
 		data.Laborant_Id = checkIntPtrClaims(claims, "laborant_id")
 		data.Pharmachist_Id = checkIntPtrClaims(claims, "pharmachist_id")
 		data.Intern_Position_Code = checkStrPtrClaims(claims, "intern_position_code")
+		data.Employee_Id = checkIntPtrClaims(claims, "employee_id")
 		return
 	}
 	return nil, d.FieldError{Code: "token", Message: "token-invalid"}
diff --git a/internal/use-case/main-use-case/sbar/case.go b/internal/use-case/main-use-case/sbar/case.go
index 6c92f2b0..45045e35 100644
--- a/internal/use-case/main-use-case/sbar/case.go
+++ b/internal/use-case/main-use-case/sbar/case.go
@@ -4,11 +4,8 @@ import (
 	"errors"
 	"strconv"
 
-	ee "simrs-vx/internal/domain/main-entities/employee"
 	e "simrs-vx/internal/domain/main-entities/sbar"
 
-	ue "simrs-vx/internal/use-case/main-use-case/employee"
-
 	dg "github.com/karincake/apem/db-gorm-pg"
 	d "github.com/karincake/dodol"
 
@@ -49,11 +46,13 @@ func Create(input e.CreateDto) (*d.Data, error) {
 			return pl.SetLogError(&event, input)
 		}
 
-		employee, err := ue.ReadDetailData(ee.ReadDetailDto{User_Id: &input.AuthInfo.User_Id}, &event, tx)
-		if err != nil {
-			return err
+		if input.AuthInfo.Employee_Id != nil {
+			v := uint(*input.AuthInfo.Employee_Id)
+			input.Employee_Id = &v
+		} else {
+			input.Employee_Id = nil
 		}
-		input.Employee_Id = &employee.Id
+
 		if resData, err := CreateData(input, &event, tx); err != nil {
 			return err
 		} else {
diff --git a/internal/use-case/main-use-case/soapi/case.go b/internal/use-case/main-use-case/soapi/case.go
index fd06e140..3dc8e195 100644
--- a/internal/use-case/main-use-case/soapi/case.go
+++ b/internal/use-case/main-use-case/soapi/case.go
@@ -4,11 +4,8 @@ import (
 	"errors"
 	"strconv"
 
-	ee "simrs-vx/internal/domain/main-entities/employee"
 	e "simrs-vx/internal/domain/main-entities/soapi"
 
-	ue "simrs-vx/internal/use-case/main-use-case/employee"
-
 	dg "github.com/karincake/apem/db-gorm-pg"
 	d "github.com/karincake/dodol"
 
@@ -49,11 +46,13 @@ func Create(input e.CreateDto) (*d.Data, error) {
 			return pl.SetLogError(&event, input)
 		}
 
-		employee, err := ue.ReadDetailData(ee.ReadDetailDto{User_Id: &input.AuthInfo.User_Id}, &event, tx)
-		if err != nil {
-			return err
+		if input.AuthInfo.Employee_Id != nil {
+			v := uint(*input.AuthInfo.Employee_Id)
+			input.Employee_Id = &v
+		} else {
+			input.Employee_Id = nil
 		}
-		input.Employee_Id = &employee.Id
+
 		if resData, err := CreateData(input, &event, tx); err != nil {
 			return err
 		} else {