diff --git a/cmd/main-migration/migrations/20251104042334.sql b/cmd/main-migration/migrations/20251104042334.sql
new file mode 100644
index 00000000..7628d821
--- /dev/null
+++ b/cmd/main-migration/migrations/20251104042334.sql
@@ -0,0 +1,2 @@
+-- Modify "Chemo" table
+ALTER TABLE "public"."Chemo" DROP COLUMN "Class_Code", ADD COLUMN "Bed" character varying(1024) NULL, ADD COLUMN "Needs" character varying(2048) NULL;
diff --git a/cmd/main-migration/migrations/20251104043530.sql b/cmd/main-migration/migrations/20251104043530.sql
new file mode 100644
index 00000000..0d34792a
--- /dev/null
+++ b/cmd/main-migration/migrations/20251104043530.sql
@@ -0,0 +1,19 @@
+-- Modify "Ambulatory" table
+ALTER TABLE "public"."Ambulatory" DROP CONSTRAINT "fk_Ambulatory_Encounter", ADD COLUMN "VisitMode_Code" text NULL, ADD CONSTRAINT "fk_Encounter_Ambulatory" FOREIGN KEY ("Encounter_Id") REFERENCES "public"."Encounter" ("Id") ON UPDATE NO ACTION ON DELETE NO ACTION;
+-- Modify "Emergency" table
+ALTER TABLE "public"."Emergency" DROP CONSTRAINT "fk_Emergency_Encounter", ADD CONSTRAINT "fk_Encounter_Emergency" FOREIGN KEY ("Encounter_Id") REFERENCES "public"."Encounter" ("Id") ON UPDATE NO ACTION ON DELETE NO ACTION;
+-- Modify "Inpatient" table
+ALTER TABLE "public"."Inpatient" DROP CONSTRAINT "fk_Inpatient_Encounter", ADD CONSTRAINT "fk_Encounter_Inpatient" FOREIGN KEY ("Encounter_Id") REFERENCES "public"."Encounter" ("Id") ON UPDATE NO ACTION ON DELETE NO ACTION;
+-- Create "Rehab" table
+CREATE TABLE "public"."Rehab" (
+  "Id" bigserial NOT NULL,
+  "CreatedAt" timestamptz NULL,
+  "UpdatedAt" timestamptz NULL,
+  "DeletedAt" timestamptz NULL,
+  "Encounter_Id" bigint NULL,
+  "Doctor_Id" bigint NULL,
+  "AllocatedVisitCount" bigint NULL,
+  PRIMARY KEY ("Id"),
+  CONSTRAINT "fk_Rehab_Doctor" FOREIGN KEY ("Doctor_Id") REFERENCES "public"."Doctor" ("Id") ON UPDATE NO ACTION ON DELETE NO ACTION,
+  CONSTRAINT "fk_Rehab_Encounter" FOREIGN KEY ("Encounter_Id") REFERENCES "public"."Encounter" ("Id") ON UPDATE NO ACTION ON DELETE NO ACTION
+);
diff --git a/cmd/main-migration/migrations/atlas.sum b/cmd/main-migration/migrations/atlas.sum
index eca39d6d..c701690e 100644
--- a/cmd/main-migration/migrations/atlas.sum
+++ b/cmd/main-migration/migrations/atlas.sum
@@ -1,67 +1,69 @@
-h1:DcO8hW6ltApCY7bmxeSji280ls5j97uZeEb034pHQqY=
-20250904105930.sql h1:Vv4vCurl7m7/ZB6TjRpkubHpQ4RYwSUn0QHdzfoGpzY=
-20250904141448.sql h1:FYCHH9Os4KkrZMDu/jR8FMP+wLMRW+Mb0PkLU/9BRDg=
-20250908062237.sql h1:oanBpKZd+akPu2I/xYhUSbd0G5tAFbXzKLER/Zs8ENI=
-20250908062323.sql h1:miNG9COddXkD1jGTgaROMAZ618eT6oiLGiJhXWnQwhE=
-20250908073811.sql h1:gOi5cnGG1htlpfizybYmUIT0vYjZTBfXiI0nPSYK2u8=
-20250908073839.sql h1:cWNDA4YikjoOteAJuNLFILjQUJPFB6o8Wxreiek4QyI=
-20250910055902.sql h1:nxxOGnU0BbH/v3IPgeIOXOwH8d3tKomw7h6FTeMnnBs=
-20250915123412.sql h1:mz7SiWfrdf0qE1VTSAAnA/147d6gyp6ry5vZ2bR9SH0=
-20250916043819.sql h1:RHXVtmMkB6wfv06HfPyHMBmUfIpFt1xveafNz0kwKnE=
-20250917040616.sql h1:MYVDht+akBlzQGKNu2hTTTLPEcH1bxT/Q8MK6WEtuhs=
-20250917040751.sql h1:J79YyS2JzWgh5oKXMTgh67uo3gLxKaAsxRiZmSIfjBs=
-20250917045138.sql h1:/SM1N4O8X3yxpoJgMEARmS1uOkuLKsTOy4PLsRCOKaQ=
-20250917093645.sql h1:PNBTGZ7s10e5b5+Tie8YfVQBN0zKtJ5T34oK1iOUEb4=
-20250918073552.sql h1:jG7+g3i8ODYaJdcdZz12v3nbsZ5mB9wG6kWnGyTQIRI=
-20250918073742.sql h1:j+rgw7puxE7s+phqPVZHmPk0af3rcaA56Itp86y1suY=
-20250918074745.sql h1:rPmP4DXs6OnY4Vp+xO/z9jFpJt/RrJ52SJJjIIxeDvc=
-20250923025134.sql h1:2r6pcwnBSU5Y9Czk1OHBoh4yZXiMtEca9X8843fTEX0=
-20250924051317.sql h1:iUAk2gsGoEGIPQ0lEEUp8maMSId8emNbP+kP712ABIA=
-20250929034321.sql h1:UlpALNVmdi95zOIT0yc6ZyTj9bBjQEIpZhvgrc52M+k=
-20250929034428.sql h1:feF+H4nDyHh5bdx48Oiz0A1qecZfi6v3qTTdjzJ45Dg=
-20250930025550.sql h1:6XT1kXI3Z3ZIxxmvT7poufZWWCW0QiejZPaFV5wBnjI=
-20250930140351.sql h1:HxnmAbh9gCy8jwl/9ycGktiByaUripsjFFvohofY2CY=
-20251002085604.sql h1:SjLPi+ZN6qDccK3DaEQCgNsZpPwr5kynWXwbwEsziCI=
-20251003032030.sql h1:oHfxNSuqTxU8Zaf9H+h8TuUb1Da03wcyc6hZjDrUQ2s=
-20251005060450.sql h1:GIuCcrd4MwjmXpvbzDzPYL18BV3QaZZ+Y2FmEzjvi0E=
-20251006041122.sql h1:uNDQbSw0M08lYoMvUNlQtS3iDzpPM1ixT13ugSAoWjE=
-20251006045658.sql h1:z+t7yCK54Q4SSiF9kUyUhkYB2F+kzSW9TB7ogxd9wzw=
-20251006045928.sql h1:1lATLFLp4BWwGZqAjZdP0Dc6ypNXiYcwjoNkqGa8NFE=
-20251007022859.sql h1:HXXwWrkyvzJzJGAt9mGskCRBBV/c1JfPmfjDocmJhQ4=
-20251008031337.sql h1:Ln5pCF3Hxa5foHZLcds+z/us2eH6VAhhEj3w0TAGlVs=
-20251008031554.sql h1:aB4MUS2lmqG0//4HKUWorcPSpWya0VC4QItvGyskEVI=
-20251008052346.sql h1:MI3AZgU5XcwZT2OvvlWAxdRtL0eJ3jjRwt56IY1+pRU=
-20251008073620.sql h1:sztWXuSNYwpEraaSapSsYwno75LO5H/N7ob7OJQ8X/A=
-20251009042854.sql h1:TnPXj+dCJls3IU//cuqJZymyBzZMKs7ayazfgtAFRxM=
-20251009052657.sql h1:leXbs0CP8r5dRilmYyLRk1MICqak3ea1/LWMtFrijqQ=
-20251010031743.sql h1:SgHNY/lQ88G2F4nZyMfiOkDntb+gtOR+nEQLqXBTwv4=
-20251010070721.sql h1:AnJnhXsMzDvK4AFgYw6B16Kpo/hljrZtcpc9m2VOSHQ=
-20251010072711.sql h1:aXPTtNwLcTuw8C/yAxwxvqs0ayEjNzI1uuE0vE3ERa8=
-20251013044536.sql h1:7Pq6JcvTpPBYDCW2dz3HdgUwY65HlhEVWy9TiG8iONE=
-20251013051438.sql h1:X6t8bkqpUYYokBunSufMQUe5vCg0VyO6dxbm7ngosUc=
-20251013081808.sql h1:495pLguXL2Ozh+ycn4UYZgZbn6WbjXNbyZUc3JU8qhI=
-20251014060047.sql h1:nCgImMRGHhziiW57O1ofWaXCAPGaCOHN7PldQ3OSmM4=
-20251014063537.sql h1:2cLmID79jP6cuQ1YJaWTtghFiM1GtHMC0ZQl30Hpy1M=
-20251014063720.sql h1:bzLKKVAjSHgDFoiI/glj7t1ETlSAKx+AlsIAaP0ru2g=
-20251015045455.sql h1:S547+UugQhlTRcn1Lm1IfqT5RNPttIWIiD+RTx69YaE=
-20251016010845.sql h1:c9DUvxl17pUkf0azdYGM/YDzYxIJkLcfZOcMI4rL+R0=
-20251016011023.sql h1:u3ivg83bXgYHBbojbWpemLxPE9Dmmj53B6LXo664jxw=
-20251016062912.sql h1:W9n1hWchfYkqNX9LO9uxFxEXAb/iY+Pexjnhmp6PbgI=
-20251017060617.sql h1:VU6yZ2+LfHpDZ3+TIH40t3F5YXPCpTppuF9+uSqa4b8=
-20251017082207.sql h1:QshZslfedckz7iDpSGmPyY9sP6dy6ckHbs8L1TuXIA4=
-20251018032635.sql h1:M1U/9W/F9wlW5YDmVAmHFfUJU7FWFaX0DblpfZcYWrE=
-20251018040322.sql h1:Zk/vw0e6AzWFO2ElLOzB+OrSz6k+h1Ynxp0TImAzxwY=
-20251019093915.sql h1:3Q0kPiZwJnHn5rAvdh0w1LBdiA7W2xBmZWncoPXb044=
-20251020062553.sql h1:mJwC/J8GzPAIXckNMvy1f/Nguk2VVf8roD/Raclhbao=
-20251021041042.sql h1:d1BAOGAQhqr+oOwcpAVozUsTh457VSDEk2qQFavGG58=
-20251021075552.sql h1:TNChGQ1Zlr/1iQ6qvK4iDTAJpe6L/z/M6e/O0SkQVaM=
-20251023044432.sql h1:GA2AdJk2ULyjr6igtu9C/CEi4YUIks8r9jXGGaCvPsk=
-20251024034832.sql h1:RXmbEhMkOLK5g1QL6up8iRPcwYfo89oLP26ZHvrUK9o=
-20251024074315.sql h1:3GnPQSbuAAfMa8oWDyBjhXqn1j1zunY/w0ydX0IGPrA=
-20251025013451.sql h1:5eNrA9LDxA4i5CCP7wSyOgFZ6t6jBWVil+oGzJpkJ2E=
-20251025013609.sql h1:+N6EHc1kv3hqf16CUhXe+UITPmoxOPfi4MECLmJXNrc=
-20251027075128.sql h1:PQflgsjce/p2ClbybLtdehdPNDcMZ9Lb1vd98xd0K8E=
-20251027091406.sql h1:bYXV57GvodCMjg0/ox+XKGIAGhrDlVuJ1wO4foNEKtQ=
-20251102002037.sql h1:ZcwULsJU2lI9t5pX7ukmfAHSx4ZxdxLUX6jzLDc2SrU=
-20251102091932.sql h1:A6y9j4wAqm4/HfMDxhpy/ChDn3UNRVN99KGgSCX+e18=
-20251103081637.sql h1:RFqJNhJItSwJQaMP5IcQ14mL7eQ3EJjGZua9zLWzwMU=
+h1:DapfqgPn4h3ozXgxIdxW/bzPLHdc//0uHjK+W42/jic=
+20250904105930.sql h1:MEM6blCgke9DzWQSTnLzasbPIrcHssNNrJqZpSkEo6k=
+20250904141448.sql h1:J8cmYNk4ZrG9fhfbi2Z1IWz7YkfvhFqTzrLFo58BPY0=
+20250908062237.sql h1:Pu23yEW/aKkwozHoOuROvHS/GK4ngARJGdO7FB7HZuI=
+20250908062323.sql h1:oXl6Z143tOpIl4EfP4B8JNU8LrMvVmHEtCgAfiB4gs8=
+20250908073811.sql h1:m2aNXfnGxnLq1+rVWrh4f60q7fhyhV3gEwNu/OIqQlE=
+20250908073839.sql h1:cPk54xjLdMs26uY8ZHjNWLuyfAMzV7Zb0/9oJQrsw04=
+20250910055902.sql h1:5xwjAV6QbtZT9empTJKfhyAjdknbHzb15B0Ku5dzqtQ=
+20250915123412.sql h1:D83xaU2YlDEd21HLup/YQpQ2easMToYCyy/oK6AFgQs=
+20250916043819.sql h1:ekoTJsBqQZ8G8n0qJ03d13+eoNoc7sAUEQGA5D/CCxk=
+20250917040616.sql h1:zoCnmcXuM7AVv85SmN7RmFglCgJnoDmpRWExH0LAc9Q=
+20250917040751.sql h1:J1xyRrh32y1+lezwAyNwPcUQ6ABBSgbvzNLva4SVdQU=
+20250917045138.sql h1:jKe1Z0uOLG4SGBYM+S/3P+/zMPztmgoderD5swnMuCg=
+20250917093645.sql h1:cNI3Pbz1R3LxvIXLuexafJFCXUXrmuFCgXXJ2sG+FW0=
+20250918073552.sql h1:RJ1SvMzP6aeWnoPVD3eVAmIQOkcp6Php8z3QRri6v4g=
+20250918073742.sql h1:+cEsnJTJFybe2fR69ZoOiX2R6c6iITl4m6WTZ1hjyzY=
+20250918074745.sql h1:2hNVQCXF/dVYXAh+T/7oBFgERGWxzVb2FXJjwkFWGCI=
+20250923025134.sql h1:Ykz/qpHiGDXPsCsWTjydQFVSibZP2D+h2fIeb2h2JGA=
+20250924051317.sql h1:yQuW6SwJxIOM5fcxeAaie5lSm1oLysU/C2hH2xNCVoQ=
+20250929034321.sql h1:101FJ8VH12mrZWlt/X1gvKUGOhoiF8tFbjiapAjnHzg=
+20250929034428.sql h1:i+pROD9p+g5dOmmZma6WF/0Hw5g3Ha28NN85iTo1K34=
+20250930025550.sql h1:+F+CsCUXD/ql0tHGEow70GhPBX1ZybVn+bh/T4YMh7Y=
+20250930140351.sql h1:9AAEG1AnOAH+o0+oHL5G7I8vqlWOhwRlCGyyCpT/y1Q=
+20251002085604.sql h1:3xZ68eYp4urXRnvotNH1XvG2mYOSDV/j3zHEZ/txg5E=
+20251003032030.sql h1:HB+mQ2lXMNomHDpaRhB/9IwYI9/YiDO5eOJ+nAQH/jw=
+20251005060450.sql h1:LbtCE2b+8osM3CvnmQJH1uCPtn+d7WchsslBOz8bL3Q=
+20251006041122.sql h1:MlS7f21z06sutnf9dIekt5fuHJr4lgcQ4uCuCXAGsfc=
+20251006045658.sql h1:3FmGCPCzjgMPdWDRodZTsx3KVaodd9zB9ilib69aewk=
+20251006045928.sql h1:Z5g31PmnzNwk/OKdODcxZGm8fjJQdMFK32Xfnt3bRHg=
+20251007022859.sql h1:FO03zEfaNEk/aXwY81d5Lp3MoBB9kPQuXlXJ4BPiSR8=
+20251008031337.sql h1:l+sxUAGvcTfj3I6kAFHo+T6AYodC9k9GkR+jaKO2xXc=
+20251008031554.sql h1:AqrVfIhSzY3PCy8ZlP5W91wn2iznfIuj5qQfubp6/94=
+20251008052346.sql h1:nxnXmooIJ6r1mmzwnw+6efxLfc/k9h2aE6RMptPRons=
+20251008073620.sql h1:6YsJp1W4SmQJ1lxpqF27BBlDC1zqhw7Yhc7pLzQTY6M=
+20251009042854.sql h1:nkBV+R6j0fg7/JY6wH3eb5Vv0asJLnXmb6lINfT/GLQ=
+20251009052657.sql h1:EPvdsib5rzCGPryd10HShGKvFPwM/R5S2lIVwtYxpms=
+20251010031743.sql h1:T8IZmx8/btRFKLzTe78MzcBsPJNodnLvB0tby9QkirQ=
+20251010070721.sql h1:5NQUk/yOV6sABLCB7swx++YIOyJe6MnU+yt1nRzde5w=
+20251010072711.sql h1:ZJNqR2piyu8xJhBvVABSlnGEoKSKae3wuEs+wshPe4k=
+20251013044536.sql h1:0Xjw8fNILiT8nnfrJDZgQnPf3dntmIoilbapnih8AE4=
+20251013051438.sql h1:lfSuw5mgJnePBJamvhZ81osFIouXeiIEiSZ/evdwo48=
+20251013081808.sql h1:ijgjNX08G6GBjA/ks8EKtb7P7Y7Cg7zbhqEOruGnv6M=
+20251014060047.sql h1:0jqj49WTtneEIMQDBoo4c095ZGi8sCrA8NnHBrPU6D8=
+20251014063537.sql h1:VZLXol0PTsTW21Epg6vBPsztWkDtcxup9F/z88EGgIg=
+20251014063720.sql h1:2HVUyCV0ud3BJJDH2GEKZN/+IWLFPCsN1KqhP6csO14=
+20251015045455.sql h1:MeLWmMhAOAz8b15Dd7IAQnt6JxjSml02XCXK22C0Lpg=
+20251016010845.sql h1:4BncQdDOasRZJkzVJrSJJA7091A9VPNVx/faUCUPhBM=
+20251016011023.sql h1:9JB9eFZKURK5RoCVDKR6glSvdJ8NTXrN7K/4q51zkz4=
+20251016062912.sql h1:ACNn0fe+EMqUt3hoY+Dr3uqAV/QICBa1+mIW7fUc9Fk=
+20251017060617.sql h1:4T3t9ifWrEQTPMSM0XJ98pF7Qdt+UfgtMui17bhrnWI=
+20251017082207.sql h1:8vLG1l/saRRMHXkyA4nelJyjaSddhZd6r7R+Uo4JS/c=
+20251018032635.sql h1:2xey5gnO3y2XSOrU8MLlIfoylPKbRGDRtHDD07B3MbQ=
+20251018040322.sql h1:k/pdNiSoT8zFPqNQ/avOD0vYkNh3BTD64IlHrfVXr7I=
+20251019093915.sql h1:hFcQE0y+p5dZiVwePGsRGto9m/q6kJNiUZbVDd5Rnjk=
+20251020062553.sql h1:Iw7hulcm5iRQlfW+ygA4iTPxLqkxx6h9vXMXEwUAHKs=
+20251021041042.sql h1:wMgSivBV2A0NDcsLmKGIp0kMcVh2IODSG9b4dgzCaOM=
+20251021075552.sql h1:8gfSMAglflNO6L0sSzxFNEubYN8/O4thT7OQT+WH+3M=
+20251023044432.sql h1:MkvajJs3bfk9+wHvQ43/ccAluJEBARm1gWr1u92ccLA=
+20251024034832.sql h1:x3s3VEVYLOSKLAFxJGb2+c1FyTMMvPE+9k4Ew7rKQaI=
+20251024074315.sql h1:EjAjelgi5qAfcRq/8vPTlGGYHvAKxNTllm8f0SzZDns=
+20251025013451.sql h1:6hnuIiwYiG+6nLhOY/+Yyn+I6ZCFNRZxrJNqBV6HLqE=
+20251025013609.sql h1:evPJaTD8WxYRMOJZHkSr7ONLx9PYxT+ankzQt9c/sJ0=
+20251027075128.sql h1:/iFQBM1sytjqpyQSOx61q33gnorMgxTiFVSuL6bQqsM=
+20251027091406.sql h1:eCZGtUkxAzEAqpC9UsGpP8Df9mS0DEOqSl885LgqpvM=
+20251102002037.sql h1:lFJbuoZ2LMQnUNGdcwHVY3Xlfslgzu9t2WByT8yfOZI=
+20251102091932.sql h1:rmdhb5m+P+fU8jROBZNyeYgZKuQvucsuljXv4ZVzvks=
+20251103081637.sql h1:tf3BcwTeIw+oxMEisKDDfyKnBfalTLs8b0PJA8JWYxY=
+20251104042334.sql h1:a76eSmiEVviWWjsfAkiriDxRYGhlg8qIjZ2CVQZDnbA=
+20251104043530.sql h1:tGP1AhyYzPZAA05IwfJfWWhNISrud3xCmeRFdZ/28SQ=
diff --git a/internal/domain/main-entities/ambulatory/dto.go b/internal/domain/main-entities/ambulatory/dto.go
index 455f7f02..9b6bc314 100644
--- a/internal/domain/main-entities/ambulatory/dto.go
+++ b/internal/domain/main-entities/ambulatory/dto.go
@@ -2,7 +2,6 @@ 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"
 )
 
@@ -44,7 +43,6 @@ 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"`
 }
 
diff --git a/internal/domain/main-entities/ambulatory/entity.go b/internal/domain/main-entities/ambulatory/entity.go
index 58a9810e..ecf9915e 100644
--- a/internal/domain/main-entities/ambulatory/entity.go
+++ b/internal/domain/main-entities/ambulatory/entity.go
@@ -2,14 +2,12 @@ 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 Ambulatory struct {
-	ecore.Main                           // adjust this according to the needs
-	Encounter_Id *uint                   `json:"encounter_id"`
-	Encounter    *ee.Encounter           `json:"encounter,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
-	Class_Code   ere.AmbulatoryClassCode `json:"class_code" gorm:"size:10"`
+	ecore.Main                             // adjust this according to the needs
+	Encounter_Id   *uint                   `json:"encounter_id"`
+	Class_Code     ere.AmbulatoryClassCode `json:"class_code" gorm:"size:10"`
+	VisitMode_Code ere.VisitModeCode       `json:"visitMode_code"`
 }
diff --git a/internal/domain/main-entities/chemo/entity.go b/internal/domain/main-entities/chemo/entity.go
index 4052ea72..a56dae76 100644
--- a/internal/domain/main-entities/chemo/entity.go
+++ b/internal/domain/main-entities/chemo/entity.go
@@ -9,7 +9,6 @@ import (
 	eus "simrs-vx/internal/domain/main-entities/user"
 
 	erc "simrs-vx/internal/domain/references/common"
-	ere "simrs-vx/internal/domain/references/encounter"
 )
 
 type Chemo struct {
@@ -22,5 +21,6 @@ type Chemo struct {
 	VerifiedBy         *eus.User            `json:"verifiedBy,omitempty" gorm:"foreignKey:VerifiedBy_User_Id;references:Id"`
 	SrcUnit_Id         *uint                `json:"src_unit_id"`
 	SrcUnit            *eun.Unit            `json:"src_unit,omitempty" gorm:"foreignKey:SrcUnit_Id;references:Id"`
-	Class_Code         ere.ChemoClassCode   `json:"class_code"`
+	Bed                *string              `json:"bed" gorm:"size:1024"`
+	Needs              *string              `json:"needs" gorm:"size:2048"`
 }
diff --git a/internal/domain/main-entities/emergency/dto.go b/internal/domain/main-entities/emergency/dto.go
index 99628b88..45aa9955 100644
--- a/internal/domain/main-entities/emergency/dto.go
+++ b/internal/domain/main-entities/emergency/dto.go
@@ -2,7 +2,6 @@ package emergency
 
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
-	ee "simrs-vx/internal/domain/main-entities/encounter"
 	ere "simrs-vx/internal/domain/references/encounter"
 )
 
@@ -44,12 +43,14 @@ type MetaDto struct {
 type ResponseDto struct {
 	ecore.Main
 	Encounter_Id *uint                  `json:"encounter_id"`
-	Encounter    *ee.Encounter          `json:"encounter,omitempty"`
 	Class_Code   ere.EmergencyClassCode `json:"class_code"`
 }
 
 func (d Emergency) ToResponse() ResponseDto {
-	resp := ResponseDto{}
+	resp := ResponseDto{
+		Encounter_Id: d.Encounter_Id,
+		Class_Code:   d.Class_Code,
+	}
 	resp.Main = d.Main
 	return resp
 }
diff --git a/internal/domain/main-entities/emergency/entity.go b/internal/domain/main-entities/emergency/entity.go
index 1e6fb078..655a441d 100644
--- a/internal/domain/main-entities/emergency/entity.go
+++ b/internal/domain/main-entities/emergency/entity.go
@@ -2,14 +2,11 @@ package emergency
 
 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 Emergency struct {
 	ecore.Main                          // adjust this according to the needs
 	Encounter_Id *uint                  `json:"encounter_id"`
-	Encounter    *ee.Encounter          `json:"encounter,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
 	Class_Code   ere.EmergencyClassCode `json:"class_code" gorm:"size:10"`
 }
diff --git a/internal/domain/main-entities/encounter/entity.go b/internal/domain/main-entities/encounter/entity.go
index 37779409..5e950def 100644
--- a/internal/domain/main-entities/encounter/entity.go
+++ b/internal/domain/main-entities/encounter/entity.go
@@ -3,13 +3,17 @@ package encounter
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
 	evs "simrs-vx/internal/domain/bpjs-entities/vclaim-sep"
+	eam "simrs-vx/internal/domain/main-entities/ambulatory"
 	ea "simrs-vx/internal/domain/main-entities/appointment"
 	edc "simrs-vx/internal/domain/main-entities/death-cause"
 	ed "simrs-vx/internal/domain/main-entities/doctor"
+	eem "simrs-vx/internal/domain/main-entities/emergency"
 	ee "simrs-vx/internal/domain/main-entities/employee"
+	eip "simrs-vx/internal/domain/main-entities/inpatient"
 	ei "simrs-vx/internal/domain/main-entities/insurance-company"
 	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"
@@ -61,6 +65,10 @@ type Encounter struct {
 	InternalReferences        *[]eir.InternalReference `json:"internalReferences,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
 	DeathCause                *edc.DeathCause          `json:"deathCause,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
 	NewStatus                 bool                     `json:"newStatus"`
+	Ambulatory                *eam.Ambulatory          `json:"ambulatory,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
+	Emergency                 *eem.Emergency           `json:"emergency,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
+	Inpatient                 *eip.Inpatient           `json:"inpatient,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
+	Rehab                     *er.Basic                `json:"rehab,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
 }
 
 func (d Encounter) IsDone() bool {
diff --git a/internal/domain/main-entities/inpatient/dto.go b/internal/domain/main-entities/inpatient/dto.go
index d92232dd..11a864eb 100644
--- a/internal/domain/main-entities/inpatient/dto.go
+++ b/internal/domain/main-entities/inpatient/dto.go
@@ -2,7 +2,6 @@ package inpatient
 
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
-	ee "simrs-vx/internal/domain/main-entities/encounter"
 	ei "simrs-vx/internal/domain/main-entities/infra"
 
 	ere "simrs-vx/internal/domain/references/encounter"
@@ -48,7 +47,6 @@ type MetaDto struct {
 type ResponseDto struct {
 	ecore.Main
 	Encounter_Id *uint                  `json:"encounter_id"`
-	Encounter    *ee.Encounter          `json:"encounter,omitempty"`
 	Class_Code   ere.InpatientClassCode `json:"class_code"`
 	Infra_Id     *uint16                `json:"infra_id"`
 	Infra        *ei.Infra              `json:"infra,omitempty"`
@@ -57,7 +55,6 @@ type ResponseDto struct {
 func (d Inpatient) ToResponse() ResponseDto {
 	resp := ResponseDto{
 		Encounter_Id: d.Encounter_Id,
-		Encounter:    d.Encounter,
 		Class_Code:   d.Class_Code,
 		Infra_Id:     d.Infra_Id,
 		Infra:        d.Infra,
diff --git a/internal/domain/main-entities/inpatient/entity.go b/internal/domain/main-entities/inpatient/entity.go
index 328f5d12..f88eb2fb 100644
--- a/internal/domain/main-entities/inpatient/entity.go
+++ b/internal/domain/main-entities/inpatient/entity.go
@@ -2,16 +2,13 @@ package inpatient
 
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
-	ee "simrs-vx/internal/domain/main-entities/encounter"
 	ei "simrs-vx/internal/domain/main-entities/infra"
-
 	ere "simrs-vx/internal/domain/references/encounter"
 )
 
 type Inpatient struct {
 	ecore.Main                          // adjust this according to the needs
 	Encounter_Id *uint                  `json:"encounter_id"`
-	Encounter    *ee.Encounter          `json:"encounter,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
 	Class_Code   ere.InpatientClassCode `json:"class_code" gorm:"size:10"`
 	Infra_Id     *uint16                `json:"infra_id"`
 	Infra        *ei.Infra              `json:"infra,omitempty" gorm:"foreignKey:Infra_Id;references:Id"`
diff --git a/internal/domain/main-entities/rehab/base/entity.go b/internal/domain/main-entities/rehab/base/entity.go
new file mode 100644
index 00000000..b1713811
--- /dev/null
+++ b/internal/domain/main-entities/rehab/base/entity.go
@@ -0,0 +1,18 @@
+package base
+
+import (
+	ecore "simrs-vx/internal/domain/base-entities/core"
+	ed "simrs-vx/internal/domain/main-entities/doctor"
+)
+
+type Basic struct {
+	ecore.Main                     // adjust this according to the needs
+	Encounter_Id        *uint      `json:"encounter_id"`
+	Doctor_Id           *uint      `json:"doctor_id"`
+	Doctor              *ed.Doctor `json:"doctor,omitempty" gorm:"foreignKey:Doctor_Id;references:Id"`
+	AllocatedVisitCount *int       `json:"allocatedVisitCount"`
+}
+
+func (Basic) TableName() string {
+	return "Rehab"
+}
diff --git a/internal/domain/main-entities/rehab/entity.go b/internal/domain/main-entities/rehab/entity.go
new file mode 100644
index 00000000..7293ba9f
--- /dev/null
+++ b/internal/domain/main-entities/rehab/entity.go
@@ -0,0 +1,11 @@
+package rehab
+
+import (
+	ee "simrs-vx/internal/domain/main-entities/encounter"
+	eb "simrs-vx/internal/domain/main-entities/rehab/base"
+)
+
+type Rehab struct {
+	eb.Basic
+	Encounter *ee.Encounter `json:"encounter,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
+}
diff --git a/internal/domain/references/clinical/clinical.go b/internal/domain/references/clinical/clinical.go
index c0eb3594..8120adb3 100644
--- a/internal/domain/references/clinical/clinical.go
+++ b/internal/domain/references/clinical/clinical.go
@@ -113,11 +113,12 @@ const (
 	MULCPF      McuUrgencyLevelCode = "priority-form" // Form Prioritas
 	MULCRT      McuUrgencyLevelCode = "routine"       // Pemeriksaan Rutin
 
-	STCEarlyNurse  SoapiTypeCode = "early-nurse" // Kajian Awal Medis
+	//STCEarlyNurse  SoapiTypeCode = "early-nurse" // Kajian Awal Medis
 	STCEEarlyMedic SoapiTypeCode = "early-medic" // Kajian Awal Rehab Medis
 	STCEarlyRehab  SoapiTypeCode = "early-rehab" // Kajian Awal Rehab Medik
 	STCFunc        SoapiTypeCode = "function"    // Assessment Fungsi
 	STCProgress    SoapiTypeCode = "progress"    // CPPT
+	STCDevRecord   SoapiTypeCode = "dev-record"  // Catatan Perkembangan
 
 	MAChemo      MedicalAction = "chemo"
 	MAHemo       MedicalAction = "hemo"
diff --git a/internal/domain/references/encounter/encounter.go b/internal/domain/references/encounter/encounter.go
index eeccb8fe..97eae05b 100644
--- a/internal/domain/references/encounter/encounter.go
+++ b/internal/domain/references/encounter/encounter.go
@@ -18,6 +18,7 @@ type (
 	RefTypeCode           string
 	AllPaymentMethodCode  string
 	SEPRefTypeCode        string
+	VisitModeCode         string
 )
 
 const (
@@ -69,10 +70,12 @@ const (
 	CSCPLab CheckupScopeCode = "pa-lab"    // Patology Anatomy Laboratorium
 	CSCRad  CheckupScopeCode = "radiology" // Radiology
 
-	ACCReg AmbulatoryClassCode = "reg"       // Regular
-	ACCRme AmbulatoryClassCode = "rme"       // Rehab Medik
-	ACCCad AmbulatoryClassCode = "chemo-adm" // Chemotherapy
-	ACCCac AmbulatoryClassCode = "chemo-act" // Chemotherapy
+	ACCReg AmbulatoryClassCode = "reg" // Regular
+	// ACCRehab ACCRme AmbulatoryClassCode = "rme"       // Rehab Medik
+	// ACCCad AmbulatoryClassCode = "chemo-adm"         // Chemotherapy
+	// ACCCac AmbulatoryClassCode = "chemo-act"        // Chemotherapy
+	ACCRehab AmbulatoryClassCode = "rehab" // Rehab Medik
+	ACCChemo AmbulatoryClassCode = "chemo" // Rehab Medik
 
 	ICCIp  InpatientClassCode = "ip"  // Regular Rawat Inap
 	ICCICU InpatientClassCode = "icu" // ICU
@@ -106,6 +109,9 @@ const (
 
 	SRTCInternal SEPRefTypeCode = "internal" // Rujukan Internal
 	SRTCExternal SEPRefTypeCode = "external" // Faskes Lain
+
+	VMCAdm    VisitModeCode = "adm"
+	VMCSeries VisitModeCode = "series"
 )
 
 func (ec EncounterClassCode) Code() string {
diff --git a/internal/interface/migration/main-entities.go b/internal/interface/migration/main-entities.go
index 28fd0376..fac22ea6 100644
--- a/internal/interface/migration/main-entities.go
+++ b/internal/interface/migration/main-entities.go
@@ -74,6 +74,7 @@ import (
 	proceduresrc "simrs-vx/internal/domain/main-entities/procedure-src"
 	province "simrs-vx/internal/domain/main-entities/province"
 	regency "simrs-vx/internal/domain/main-entities/regency"
+	rehab "simrs-vx/internal/domain/main-entities/rehab"
 	responsibledoctorhist "simrs-vx/internal/domain/main-entities/responsible-doctor-hist"
 	room "simrs-vx/internal/domain/main-entities/room"
 	sbar "simrs-vx/internal/domain/main-entities/sbar"
@@ -195,5 +196,6 @@ func getMainEntities() []any {
 		&admemployeehist.AdmEmployeeHist{},
 		&vclaimmember.VclaimMember{},
 		&controlletter.ControlLetter{},
+		&rehab.Rehab{},
 	}
 }
diff --git a/internal/use-case/main-use-case/ambulatory/helper.go b/internal/use-case/main-use-case/ambulatory/helper.go
index f78f0b65..912211c0 100644
--- a/internal/use-case/main-use-case/ambulatory/helper.go
+++ b/internal/use-case/main-use-case/ambulatory/helper.go
@@ -28,7 +28,7 @@ func CheckClassCode(input *string) (ere.AmbulatoryClassCode, error) {
 	if input != nil {
 		subCode := ere.AmbulatoryClassCode(*input)
 		switch subCode {
-		case ere.ACCReg, ere.ACCRme, ere.ACCCad, ere.ACCCac:
+		case ere.ACCReg, ere.ACCRehab, ere.ACCChemo:
 			return subCode, nil
 		default:
 			return "", errors.New("unknown sub class code")
diff --git a/internal/use-case/main-use-case/encounter/case.go b/internal/use-case/main-use-case/encounter/case.go
index 11b17e2b..829cf86c 100644
--- a/internal/use-case/main-use-case/encounter/case.go
+++ b/internal/use-case/main-use-case/encounter/case.go
@@ -104,7 +104,7 @@ func Create(input e.CreateDto) (*d.Data, error) {
 				return err
 			}
 
-			if subCode == ere.ACCCac || subCode == ere.ACCCad {
+			if subCode == ere.ACCChemo {
 				chemoCreate := ec.CreateDto{
 					Encounter_Id: &data.Id,
 					Status_Code:  erc.DVCNew,