Merge branch 'dev' of https://github.com/dikstub-rssa/simrs-be into feat/sync-setting-vanili

internal/interface/simgos-sync-handler/new/encounter/handler.go

@@ -51,7 +51,7 @@ func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) {
 	}
 
 	dto := e.DeleteDto{}
-	dto.Id = uint16(id)
+	dto.Id = uint(id)
 
 	res, err := u.Delete(dto)
 	rw.DataResponse(w, res, err)
@@ -77,12 +77,42 @@ func (obj myBase) Checkout(w http.ResponseWriter, r *http.Request) {
 	rw.DataResponse(w, res, err)
 }
 
-func (obj myBase) Cancel(w http.ResponseWriter, r *http.Request) {
+func (obj myBase) UpdateStatus(w http.ResponseWriter, r *http.Request) {
 	dto := e.Encounter{}
 	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
 		return
 	}
 
-	res, err := u.Cancel(dto)
+	res, err := u.UpdateStatus(dto)
+	rw.DataResponse(w, res, err)
+}
+
+func (obj myBase) RequestSwitchUnit(w http.ResponseWriter, r *http.Request) {
+	dto := e.Encounter{}
+	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
+		return
+	}
+
+	res, err := u.RequestSwitchUnit(dto)
+	rw.DataResponse(w, res, err)
+}
+
+func (obj myBase) ApproveSwitchUnit(w http.ResponseWriter, r *http.Request) {
+	dto := e.ApproveCancelUnitDto{}
+	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
+		return
+	}
+
+	res, err := u.ApproveSwitchUnit(dto)
+	rw.DataResponse(w, res, err)
+}
+
+func (obj myBase) CancelSwitchUnit(w http.ResponseWriter, r *http.Request) {
+	dto := e.ApproveCancelUnitDto{}
+	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
+		return
+	}
+
+	res, err := u.CancelSwitchUnit(dto)
 	rw.DataResponse(w, res, err)
 }

internal/interface/simgos-sync-handler/simgos-sync-handler.go

@@ -60,13 +60,16 @@ func SetRoutes() http.Handler {
 		"POST /nomr":   patient.O.GenerateNomr,
 	})
 	hk.GroupRoutes(prefixnew+"/v1/encounter", r, hk.MapHandlerFunc{
-		"POST /":               encounter.O.Create,
-		"POST /log":            encounter.O.CreateLog,
-		"PATCH /{id}":          encounter.O.Update,
-		"DELETE /{id}":         encounter.O.Delete,
-		"PATCH /{id}/checkin":  encounter.O.Checkin,
-		"PATCH /{id}/checkout": encounter.O.Checkout,
-		"PATCH /{id}/cancel":   encounter.O.Cancel,
+		"POST /":                          encounter.O.Create,
+		"POST /log":                       encounter.O.CreateLog,
+		"PATCH /{id}":                     encounter.O.Update,
+		"DELETE /{id}":                    encounter.O.Delete,
+		"PATCH /{id}/checkin":             encounter.O.Checkin,
+		"PATCH /{id}/checkout":            encounter.O.Checkout,
+		"PATCH /{id}/update-status":       encounter.O.UpdateStatus,
+		"PATCH /{id}/req-switch-unit":     encounter.O.RequestSwitchUnit,
+		"PATCH /{id}/approve-switch-unit": encounter.O.ApproveSwitchUnit,
+		"PATCH /{id}/cancel-switch-unit":  encounter.O.CancelSwitchUnit,
 	})
 
 	/******************** SvcToNew ******************/