diff --git a/internal/interface/main-handler/encounter/handler.go b/internal/interface/main-handler/encounter/handler.go
index 8b8babc9..70231efb 100644
--- a/internal/interface/main-handler/encounter/handler.go
+++ b/internal/interface/main-handler/encounter/handler.go
@@ -338,3 +338,29 @@ func (obj myBase) CreateWithPatient(w http.ResponseWriter, r *http.Request) {
 	res, err := u.CreateWithPatient(dto)
 	rw.DataResponse(w, res, err)
 }
+
+func (obj myBase) CreateWithPatient(w http.ResponseWriter, r *http.Request) {
+	authInfo, err := pa.GetAuthInfo(r)
+	if err != nil {
+		rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": err.Error()}, nil)
+	}
+
+	dto := e.CreateWithPatientDto{}
+	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
+		return
+	}
+
+	// validate SubClass
+	if err := verifyClassCode(dto.Encounter); err != nil {
+		rw.DataResponse(w, nil, d.FieldError{
+			Code:    dataValidationFail,
+			Message: err.Error(),
+		})
+		return
+	}
+
+	dto.Encounter.AuthInfo = *authInfo
+	dto.Patient.AuthInfo = *authInfo
+	res, err := u.CreateWithPatient(dto)
+	rw.DataResponse(w, res, err)
+}