adjustment encounter

internal/interface/main-handler/encounter/handler.go

@@ -26,10 +26,15 @@ func (obj myBase) Create(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": err.Error()}, nil)
 	}
+
 	dto := e.CreateDto{}
 	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
 		return
 	}
+	if valid := validateRequestCreate(w, dto); !valid {
+		return
+	}
+
 	dto.AuthInfo = *authInfo
 	res, err := u.Create(dto)
 	rw.DataResponse(w, res, err)

internal/interface/main-handler/encounter/request-validation.go

@@ -67,22 +67,17 @@ func validateRequestCheckIn(w http.ResponseWriter, i e.CheckinDto) (valid bool)
 func validateRequestCreate(w http.ResponseWriter, i e.CreateDto) (valid bool) {
 	switch {
 	case i.Class_Code == ere.ECAmbulatory:
-		if i.Ambulatory == nil {
-			rw.DataResponse(w, nil, d.FieldError{
-				Code:    dataValidationFail,
-				Message: "ambulatory required",
-			})
+		// field allocatedVisitCount required if ambulatory visitMode_Code is adm
+		if ere.AmbulatoryClassCode(*i.SubClass_Code) == ere.ACCRme && *i.VisitMode_Code == ere.VMCAdm {
+			if *i.AllocatedVisitCount == 0 {
+				rw.DataResponse(w, nil, d.FieldError{
+					Code:    dataValidationFail,
+					Message: "allocatedVisitCount required",
+				})
+				return
+			}
 		}
 	}
 
-	if i.Class_Code == ere.ECAmbulatory && i.Ambulatory.Class_Code == ere.ACCRme && i.Ambulatory.VisitMode_Code == ere.VMCAdm {
-		if *i.Rehab.AllocatedVisitCount == 0 {
-			rw.DataResponse(w, nil, d.FieldError{
-				Code:    dataValidationFail,
-				Message: "rehab.AllocatedVisitCode required",
-			})
-			return
-		}
-	}
-	return
+	return true
 }