diff --git a/internal/interface/main-handler/main-handler.go b/internal/interface/main-handler/main-handler.go
index d7c482e0..b5ef823b 100644
--- a/internal/interface/main-handler/main-handler.go
+++ b/internal/interface/main-handler/main-handler.go
@@ -34,6 +34,7 @@ import (
 	practiceschedule "simrs-vx/internal/interface/main-handler/practice-schedule"
 	prescription "simrs-vx/internal/interface/main-handler/prescription"
 	prescriptionitem "simrs-vx/internal/interface/main-handler/prescription-item"
+	procedureroom "simrs-vx/internal/interface/main-handler/procedure-room"
 	procedureroomorder "simrs-vx/internal/interface/main-handler/procedure-room-order"
 	procedureroomorderitem "simrs-vx/internal/interface/main-handler/procedure-room-order-item"
 	responsibledoctorhist "simrs-vx/internal/interface/main-handler/responsible-doctor-hist"
@@ -271,6 +272,7 @@ func SetRoutes() http.Handler {
 		"DELETE /{id}":         materialorder.O.Delete,
 		"PATCH /{id}/complete": materialorder.O.Complete,
 	})
+	hc.RegCrud(r, "/v1/procedure-room", procedureroom.O)
 	hc.RegCrud(r, "/v1/procedure-room-order", procedureroomorder.O)
 	hc.RegCrud(r, "/v1/procedure-room-order-item", procedureroomorderitem.O)
 	hk.GroupRoutes("/v1/consultation", r, auth.GuardMW, hk.MapHandlerFunc{
diff --git a/internal/interface/main-handler/procedure-room/handler.go b/internal/interface/main-handler/procedure-room/handler.go
new file mode 100644
index 00000000..6d6aeb1c
--- /dev/null
+++ b/internal/interface/main-handler/procedure-room/handler.go
@@ -0,0 +1,71 @@
+package procedureroom
+
+import (
+	"net/http"
+
+	rw "github.com/karincake/risoles"
+	sf "github.com/karincake/semprit"
+
+	// ua "github.com/karincake/tumpeng/auth/svc"
+
+	e "simrs-vx/internal/domain/main-entities/procedure-room"
+	u "simrs-vx/internal/use-case/main-use-case/procedure-room"
+)
+
+type myBase struct{}
+
+var O myBase
+
+func (obj myBase) Create(w http.ResponseWriter, r *http.Request) {
+	dto := e.CreateDto{}
+	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
+		return
+	}
+	res, err := u.Create(dto)
+	rw.DataResponse(w, res, err)
+}
+
+func (obj myBase) GetList(w http.ResponseWriter, r *http.Request) {
+	dto := e.ReadListDto{}
+	sf.UrlQueryParam(&dto, *r.URL)
+	res, err := u.ReadList(dto)
+	rw.DataResponse(w, res, err)
+}
+
+func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) {
+	id := rw.ValidateInt(w, "id", r.PathValue("id"))
+	if id == 0 {
+		return
+	}
+	dto := e.ReadDetailDto{}
+	dto.Id = uint16(id)
+	res, err := u.ReadDetail(dto)
+	rw.DataResponse(w, res, err)
+}
+
+func (obj myBase) Update(w http.ResponseWriter, r *http.Request) {
+	id := rw.ValidateInt(w, "id", r.PathValue("id"))
+	if id == 0 {
+		return
+	}
+
+	dto := e.UpdateDto{}
+	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
+		return
+	}
+	dto.Id = uint16(id)
+	res, err := u.Update(dto)
+	rw.DataResponse(w, res, err)
+}
+
+func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) {
+	id := rw.ValidateInt(w, "id", r.PathValue("id"))
+	if id == 0 {
+		return
+	}
+
+	dto := e.DeleteDto{}
+	dto.Id = uint16(id)
+	res, err := u.Delete(dto)
+	rw.DataResponse(w, res, err)
+}
diff --git a/internal/use-case/main-use-case/procedure-room-order/helper.go b/internal/use-case/main-use-case/procedure-room-order/helper.go
index 6e91b7e3..9f47d54d 100644
--- a/internal/use-case/main-use-case/procedure-room-order/helper.go
+++ b/internal/use-case/main-use-case/procedure-room-order/helper.go
@@ -19,7 +19,6 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.ProcedureRoomOrder)
 	}
 
 	data.Encounter_Id = inputSrc.Encounter_Id
-	data.Infra_Code = inputSrc.Infra_Code
 	data.MaterialPackage_Code = inputSrc.MaterialPackage_Code
 	data.Status_Code = erc.DSCNew
 }