diff --git a/internal/interface/main-handler/encounter/handler.go b/internal/interface/main-handler/encounter/handler.go
index 6cf91832..3493ab27 100644
--- a/internal/interface/main-handler/encounter/handler.go
+++ b/internal/interface/main-handler/encounter/handler.go
@@ -85,7 +85,7 @@ func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) {
 }
 
 func (obj myBase) CheckOut(w http.ResponseWriter, r *http.Request) {
-	const dataValidationVail = "data-validation-fail"
+	const dataValidationFail = "data-validation-fail"
 
 	dto := e.DischargeDto{}
 	id := rw.ValidateInt(w, "id", r.PathValue("id"))
@@ -103,7 +103,7 @@ func (obj myBase) CheckOut(w http.ResponseWriter, r *http.Request) {
 		case ere.DMCDeath:
 			if dto.DeathCause == nil {
 				rw.DataResponse(w, nil, d.FieldError{
-					Code:    dataValidationVail,
+					Code:    dataValidationFail,
 					Message: "deathCause required if discharge_method_code is death",
 				})
 				return
@@ -111,7 +111,7 @@ func (obj myBase) CheckOut(w http.ResponseWriter, r *http.Request) {
 		case ere.DMCConsulPoly, ere.DMCConsulExecutive:
 			if dto.InternalReferences == nil {
 				rw.DataResponse(w, nil, d.FieldError{
-					Code:    dataValidationVail,
+					Code:    dataValidationFail,
 					Message: fmt.Sprintf("internalReferences required if discharge_method_code is %s", *dto.Discharge_Method_Code),
 				})
 				return
@@ -120,7 +120,7 @@ func (obj myBase) CheckOut(w http.ResponseWriter, r *http.Request) {
 			for _, v := range *dto.InternalReferences {
 				if v.Unit_Id == nil {
 					rw.DataResponse(w, nil, d.FieldError{
-						Code:    dataValidationVail,
+						Code:    dataValidationFail,
 						Message: "internalReferences.unit_id required",
 					})
 					return
@@ -128,7 +128,7 @@ func (obj myBase) CheckOut(w http.ResponseWriter, r *http.Request) {
 
 				if v.Doctor_Id == nil {
 					rw.DataResponse(w, nil, d.FieldError{
-						Code:    dataValidationVail,
+						Code:    dataValidationFail,
 						Message: "internalReferences.doctor_id required",
 					})
 					return
diff --git a/internal/use-case/main-use-case/encounter/helper.go b/internal/use-case/main-use-case/encounter/helper.go
index 36244f83..dda042e3 100644
--- a/internal/use-case/main-use-case/encounter/helper.go
+++ b/internal/use-case/main-use-case/encounter/helper.go
@@ -141,7 +141,7 @@ func createMedication(encounter_id uint, event *pl.Event, tx *gorm.DB) error {
 		return err
 	}
 
-	prescriptionItem, _, err := upi.ReadListData(epi.ReadListDto{FilterDto: epi.FilterDto{Prescription_Id: &prescription.Id}}, event, tx)
+	prescriptionItem, _, err := upi.ReadListData(epi.ReadListDto{FilterDto: epi.FilterDto{Prescription_Id: &prescription.Id}, Includes: "medicineMix"}, event, tx)
 	if err != nil {
 		return err
 	}