diff --git a/internal/modules/expenses/dto/expense.dto.go b/internal/modules/expenses/dto/expense.dto.go
index 680407a4..bee50c6d 100644
--- a/internal/modules/expenses/dto/expense.dto.go
+++ b/internal/modules/expenses/dto/expense.dto.go
@@ -34,28 +34,23 @@ type ExpenseBaseDTO struct {
 }
 
 type ExpenseListDTO struct {
-	Id              uint64                           `json:"id"`
-	ReferenceNumber string                           `json:"reference_number"`
-	PoNumber        string                           `json:"po_number"`
-	Category        string                           `json:"category"`
-	ExpenseDate     time.Time                        `json:"expense_date"`
-	GrandTotal      float64                          `json:"grand_total"`
-	CreatedUser     *userDTO.UserRelationDTO         `json:"created_user,omitempty"`
-	CreatedAt       time.Time                        `json:"created_at"`
-	UpdatedAt       time.Time                        `json:"updated_at"`
-	LatestApproval  *approvalDTO.ApprovalRelationDTO `json:"latest_approval,omitempty"`
+	ExpenseBaseDTO
+	CreatedUser    *userDTO.UserRelationDTO         `json:"created_user,omitempty"`
+	CreatedAt      time.Time                        `json:"created_at"`
+	UpdatedAt      time.Time                        `json:"updated_at"`
+	LatestApproval *approvalDTO.ApprovalRelationDTO `json:"latest_approval,omitempty"`
 }
 
 type ExpenseDetailDTO struct {
 	ExpenseBaseDTO
 	Documents       []DocumentDTO                    `json:"documents,omitempty"`
 	RealizationDocs []DocumentDTO                    `json:"realization_docs,omitempty"`
-	CreatedUser     *userDTO.UserRelationDTO         `json:"created_user,omitempty"`
 	Kandangs        []KandangGroupDTO                `json:"kandangs,omitempty"`
 	TotalPengajuan  float64                          `json:"total_pengajuan"`
 	TotalRealisasi  float64                          `json:"total_realisasi"`
 	CreatedAt       time.Time                        `json:"created_at"`
 	UpdatedAt       time.Time                        `json:"updated_at"`
+	CreatedUser     *userDTO.UserRelationDTO         `json:"created_user,omitempty"`
 	LatestApproval  *approvalDTO.ApprovalRelationDTO `json:"latest_approval,omitempty"`
 }
 
@@ -149,16 +144,11 @@ func ToExpenseListDTO(e entity.Expense) ExpenseListDTO {
 	}
 
 	return ExpenseListDTO{
-		Id:              e.Id,
-		ReferenceNumber: e.ReferenceNumber,
-		PoNumber:        e.PoNumber,
-		Category:        e.Category,
-		ExpenseDate:     e.ExpenseDate,
-		GrandTotal:      e.GrandTotal,
-		CreatedUser:     createdUser,
-		CreatedAt:       e.CreatedAt,
-		UpdatedAt:       e.UpdatedAt,
-		LatestApproval:  latestApproval,
+		ExpenseBaseDTO: ToExpenseBaseDTO(&e),
+		CreatedUser:    createdUser,
+		CreatedAt:      e.CreatedAt,
+		UpdatedAt:      e.UpdatedAt,
+		LatestApproval: latestApproval,
 	}
 }