diff --git a/internal/domain/main-entities/ambulatory/dto.go b/internal/domain/main-entities/ambulatory/dto.go
index 42ece735..f580467a 100644
--- a/internal/domain/main-entities/ambulatory/dto.go
+++ b/internal/domain/main-entities/ambulatory/dto.go
@@ -50,6 +50,7 @@ type ResponseDto struct {
 
 func (d Ambulatory) ToResponse() ResponseDto {
 	resp := ResponseDto{
+		Encounter_Id:   d.Encounter_Id,
 		Class_Code:     d.Class_Code,
 		VisitMode_Code: d.VisitMode_Code,
 	}
diff --git a/internal/domain/main-entities/encounter/dto.go b/internal/domain/main-entities/encounter/dto.go
index 0d5e1aae..6782b18c 100644
--- a/internal/domain/main-entities/encounter/dto.go
+++ b/internal/domain/main-entities/encounter/dto.go
@@ -48,8 +48,8 @@ type CreateDto struct {
 	Appointment_Id        *uint                  `json:"appointment_id"`
 	RefTypeCode           ere.RefTypeCode        `json:"refTypeCode"`
 	NewStatus             bool                   `json:"newStatus"`
-	VisitMode_Code        *ere.VisitModeCode     `json:"visitMode_code"` // if subClass_Code is rehab
-	AllocatedVisitCount   *int                   `json:"allocatedVisitCount"`
+	VisitMode_Code        *ere.VisitModeCode     `json:"visitMode_code"`      // if subClass_Code is rehab
+	AllocatedVisitCount   *int                   `json:"allocatedVisitCount"` // if subClass_Code is rehab and VisitMode_Code is "adm"
 
 	pa.AuthInfo
 }
diff --git a/internal/use-case/main-use-case/encounter/helper.go b/internal/use-case/main-use-case/encounter/helper.go
index 4bf7be60..67cef58b 100644
--- a/internal/use-case/main-use-case/encounter/helper.go
+++ b/internal/use-case/main-use-case/encounter/helper.go
@@ -641,7 +641,7 @@ func getSoapiEncounterAdm(enc e.Encounter, event *pl.Event) (dataSoapi []es.Crea
 		}
 	}
 
-	err = dg.I.Debug().
+	err = dg.I.
 		Model(&es.Soapi{}).
 		Joins("JOIN \"Employee\" ON \"Employee\".\"Id\" = \"Soapi\".\"Employee_Id\"").
 		Where("\"Encounter_Id\" = ?", enc.Id).
diff --git a/internal/use-case/main-use-case/encounter/lib.go b/internal/use-case/main-use-case/encounter/lib.go
index d80fd513..0c51a8d6 100644
--- a/internal/use-case/main-use-case/encounter/lib.go
+++ b/internal/use-case/main-use-case/encounter/lib.go
@@ -276,7 +276,6 @@ func verifyAllocatedVisitCount(i e.CreateDto, event *pl.Event) (e.Encounter, boo
 	}
 
 	err = tx.
-		Debug().
 		Model(&e.Encounter{}).
 		Joins("JOIN \"Ambulatory\" ON \"Ambulatory\".\"Encounter_Id\" = \"Encounter\".\"Id\"").
 		Where("\"Patient_Id\" = ?", i.Patient_Id).