diff --git a/internal/domain/main-entities/ambulatory/dto.go b/internal/domain/main-entities/ambulatory/dto.go
index 455f7f02..42ece735 100644
--- a/internal/domain/main-entities/ambulatory/dto.go
+++ b/internal/domain/main-entities/ambulatory/dto.go
@@ -2,13 +2,13 @@ package ambulatory
 
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
-	ee "simrs-vx/internal/domain/main-entities/encounter"
 	ere "simrs-vx/internal/domain/references/encounter"
 )
 
 type CreateDto struct {
-	Encounter_Id *uint                   `json:"encounter_id"`
-	Class_Code   ere.AmbulatoryClassCode `json:"class_code" validate:"maxLength=10"`
+	Encounter_Id   *uint                   `json:"encounter_id"`
+	Class_Code     ere.AmbulatoryClassCode `json:"class_code" validate:"maxLength=10"`
+	VisitMode_Code ere.VisitModeCode       `json:"visitMode_code"`
 }
 
 type ReadListDto struct {
@@ -43,13 +43,16 @@ type MetaDto struct {
 
 type ResponseDto struct {
 	ecore.Main
-	Encounter_Id *uint                   `json:"encounter_id"`
-	Encounter    *ee.Encounter           `json:"encounter,omitempty"`
-	Class_Code   ere.AmbulatoryClassCode `json:"class_code"`
+	Encounter_Id   *uint                   `json:"encounter_id"`
+	Class_Code     ere.AmbulatoryClassCode `json:"class_code"`
+	VisitMode_Code ere.VisitModeCode       `json:"visitMode_code"`
 }
 
 func (d Ambulatory) ToResponse() ResponseDto {
-	resp := ResponseDto{}
+	resp := ResponseDto{
+		Class_Code:     d.Class_Code,
+		VisitMode_Code: d.VisitMode_Code,
+	}
 	resp.Main = d.Main
 	return resp
 }
diff --git a/internal/domain/main-entities/encounter/dto.go b/internal/domain/main-entities/encounter/dto.go
index 6a716d6e..d20d53cf 100644
--- a/internal/domain/main-entities/encounter/dto.go
+++ b/internal/domain/main-entities/encounter/dto.go
@@ -22,6 +22,7 @@ import (
 	ee "simrs-vx/internal/domain/main-entities/employee"
 	eir "simrs-vx/internal/domain/main-entities/internal-reference"
 	ep "simrs-vx/internal/domain/main-entities/patient"
+	er "simrs-vx/internal/domain/main-entities/rehab/base"
 	es "simrs-vx/internal/domain/main-entities/specialist"
 	ess "simrs-vx/internal/domain/main-entities/subspecialist"
 	eu "simrs-vx/internal/domain/main-entities/unit"
@@ -50,7 +51,7 @@ type CreateDto struct {
 	RefTypeCode           ere.RefTypeCode        `json:"refTypeCode"`
 	NewStatus             bool                   `json:"newStatus"`
 	Ambulatory            *eam.CreateDto         `json:"ambulatory"`
-	Re
+	Rehab                 *er.Basic              `json:"rehab"`
 
 	pa.AuthInfo
 }