not yet finish

internal/use-case/main-use-case/ambulatory/helper.go

@@ -22,7 +22,6 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Ambulatory) {
 
 	data.Encounter_Id = inputSrc.Encounter_Id
 	data.Class_Code = inputSrc.Class_Code
-	data.VisitMode_Code = inputSrc.VisitMode_Code
 }
 
 func CheckClassCode(input *string) (ere.AmbulatoryClassCode, error) {

internal/use-case/main-use-case/encounter/case.go

@@ -128,9 +128,8 @@ func Create(input e.CreateDto) (*d.Data, error) {
 		case ere.ECAmbulatory:
 			subCodeAmbulatory := subCode.(ere.AmbulatoryClassCode)
 			ambCreate := ea.CreateDto{
-				Encounter_Id:   &data.Id,
-				Class_Code:     subCodeAmbulatory,
-				VisitMode_Code: *input.VisitMode_Code,
+				Encounter_Id: &data.Id,
+				Class_Code:   subCodeAmbulatory,
 			}
 			_, err = ua.CreateData(ambCreate, &event, tx)
 			if err != nil {
@@ -153,7 +152,6 @@ func Create(input e.CreateDto) (*d.Data, error) {
 				// create data rehab
 				if _, err = ur.CreateData(er.CreateDto{
 					Encounter_Id:        &data.Id,
-					Doctor_Id:           input.Appointment_Doctor_Id,
 					AllocatedVisitCount: input.AllocatedVisitCount}, &event, tx); err != nil {
 					return err
 				}
@@ -441,7 +439,7 @@ func Delete(input e.DeleteDto) (*d.Data, error) {
 }
 
 func CheckOut(input e.DischargeDto) (*d.Data, error) {
-	rdDto := e.ReadDetailDto{Id: uint16(input.Id), Includes: "Ambulatory"}
+	rdDto := e.ReadDetailDto{Id: uint16(input.Id), Includes: "Ambulatory,Rehab"}
 	var data *e.Encounter
 	var err error
 
@@ -682,7 +680,6 @@ func CheckIn(input e.CheckinDto) (*d.Data, error) {
 		if data.Ambulatory.Class_Code == ere.ACCRehab {
 			if err := updateRehabDoctor(er.UpdateDto{CreateDto: er.CreateDto{
 				Encounter_Id: &data.Id,
-				Doctor_Id:    input.Responsible_Doctor_Id,
 			}}, &event, tx); err != nil {
 				return err
 			}

internal/use-case/main-use-case/encounter/helper.go

@@ -781,31 +781,31 @@ func setDBError(event *pl.Event, err error, ctx any) error {
 	return pl.SetLogError(event, ctx)
 }
 
-func updateRehabDoctor(input er.UpdateDto, event *pl.Event, dbx ...*gorm.DB) error {
-	pl.SetLogInfo(event, "started", "DBUpdate")
-
-	var tx *gorm.DB
-	if len(dbx) > 0 {
-		tx = dbx[0]
-	} else {
-		tx = dg.I
-	}
-
-	result := tx.
-		Model(&er.Rehab{}).
-		Where("\"Encounter_Id\" = (?)", input.Encounter_Id).
-		Update("\"Doctor_Id\"", input.Doctor_Id)
-
-	if result.Error != nil {
-		event.Status = "failed"
-		event.ErrInfo = pl.ErrorInfo{
-			Code:   "data-update-fail",
-			Detail: "Database update failed",
-			Raw:    result.Error,
-		}
-		return pl.SetLogError(event, input)
-	}
-
-	pl.SetLogInfo(event, nil, "complete")
-	return nil
-}
+//func updateRehabDoctor(input er.UpdateDto, event *pl.Event, dbx ...*gorm.DB) error {
+//	pl.SetLogInfo(event, "started", "DBUpdate")
+//
+//	var tx *gorm.DB
+//	if len(dbx) > 0 {
+//		tx = dbx[0]
+//	} else {
+//		tx = dg.I
+//	}
+//
+//	result := tx.
+//		Model(&er.Rehab{}).
+//		Where("\"Encounter_Id\" = (?)", input.Encounter_Id).
+//		Update("\"Doctor_Id\"", input.Doctor_Id)
+//
+//	if result.Error != nil {
+//		event.Status = "failed"
+//		event.ErrInfo = pl.ErrorInfo{
+//			Code:   "data-update-fail",
+//			Detail: "Database update failed",
+//			Raw:    result.Error,
+//		}
+//		return pl.SetLogError(event, input)
+//	}
+//
+//	pl.SetLogInfo(event, nil, "complete")
+//	return nil
+//}

internal/use-case/main-use-case/encounter/lib.go

@@ -292,5 +292,5 @@ func verifyAllocatedVisitCount(i e.CreateDto, event *pl.Event) (e.Encounter, boo
 		return e.Encounter{}, false, pl.SetLogError(event, i)
 	}
 
-	return recentEncounterAdm, countEncounterSeries < int64(*recentEncounterAdm.Rehab.AllocatedVisitCount), nil
+	return recentEncounterAdm, countEncounterSeries < int64(*recentEncounterAdm.Rehab_Adm.AllocatedVisitCount), nil
 }

internal/use-case/main-use-case/rehab/helper.go

@@ -18,6 +18,9 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Rehab) {
 	}
 
 	data.Encounter_Id = inputSrc.Encounter_Id
-	data.Doctor_Id = inputSrc.Doctor_Id
+	data.Parent_Encounter_Id = inputSrc.Parent_Encounter_Id
 	data.AllocatedVisitCount = inputSrc.AllocatedVisitCount
+	data.ExpiredAt = inputSrc.ExpiredAt
+	data.VisitMode_Code = &inputSrc.VisitMode_Code
+	data.Status_Code = &inputSrc.Status_Code
 }