approve and switch poly

internal/use-case/simgos-sync-use-case/new/division/case.go

@@ -9,7 +9,7 @@ import (
 	db "simrs-vx/pkg/dualtrx-helper"
 
 	e "simrs-vx/internal/domain/main-entities/division"
-	esimgos "simrs-vx/internal/domain/simgos-entities/division"
+	esimgos "simrs-vx/internal/domain/simgos-entities/m-unit"
 	esync "simrs-vx/internal/domain/sync-entities/division"
 	elog "simrs-vx/internal/domain/sync-entities/log"
 )

internal/use-case/simgos-sync-use-case/new/division/helper.go

@@ -9,7 +9,7 @@ import (
 	erc "simrs-vx/internal/domain/references/common"
 
 	e "simrs-vx/internal/domain/main-entities/division"
-	esimgos "simrs-vx/internal/domain/simgos-entities/division"
+	esimgos "simrs-vx/internal/domain/simgos-entities/m-unit"
 	esync "simrs-vx/internal/domain/sync-entities/division"
 	esyncLog "simrs-vx/internal/domain/sync-entities/log"
 )

internal/use-case/simgos-sync-use-case/new/division/lib.go

@@ -10,7 +10,7 @@ import (
 	"gorm.io/gorm"
 
 	e "simrs-vx/internal/domain/main-entities/division"
-	esimgos "simrs-vx/internal/domain/simgos-entities/division"
+	esimgos "simrs-vx/internal/domain/simgos-entities/m-unit"
 	esync "simrs-vx/internal/domain/sync-entities/division"
 	esynclog "simrs-vx/internal/domain/sync-entities/log"
 )

internal/use-case/simgos-sync-use-case/new/encounter/case.go

@@ -9,16 +9,18 @@ import (
 	db "simrs-vx/pkg/dualtrx-helper"
 
 	e "simrs-vx/internal/domain/main-entities/encounter"
-	esimgos "simrs-vx/internal/domain/simgos-entities/encounter"
+	etp "simrs-vx/internal/domain/simgos-entities/t-pendaftaran"
 	esync "simrs-vx/internal/domain/sync-entities/encounter"
 	elog "simrs-vx/internal/domain/sync-entities/log"
+
+	up "simrs-vx/internal/use-case/simgos-sync-use-case/new/patient"
 )
 
 const source = "encounter"
 
 func Create(input e.Encounter) (*d.Data, error) {
 	var (
-		sgData   *esimgos.TPendaftaran
+		sgData   *etp.TPendaftaran
 		syncLink *esync.EncounterLink
 		err      error
 	)
@@ -44,6 +46,18 @@ func Create(input e.Encounter) (*d.Data, error) {
 			return err
 		}
 
+		// STEP: 3 Get MPasien
+		dataPatient, err := up.ReadDetailSimgosByNomrData(sgData.Nomr, &event, tx.Simgos)
+		if err != nil {
+			return err
+		}
+
+		// STEP 4: Update MPasien
+		err = updatePatient(*dataPatient, &event, tx.Simgos)
+		if err != nil {
+			return err
+		}
+
 		return nil
 	})
 
@@ -115,7 +129,7 @@ func Update(input e.Encounter) (*d.Data, error) {
 	}
 
 	// STEP 2: Get Simgos
-	simgos, err := ReadEncounterDetailData(uint16(syncLink.Simgos_Id), &event)
+	simgos, err := ReadTPendaftaranDetailData(uint16(syncLink.Simgos_Id), &event)
 	if err != nil {
 		return nil, err
 	}
@@ -123,7 +137,7 @@ func Update(input e.Encounter) (*d.Data, error) {
 	tx := db.NewTx()
 	err = tx.Simgos.Transaction(func(tx *gorm.DB) error {
 		// Step 2: Update Simgos
-		if err = UpdateTPendaftaranData(input, *simgos, &event, tx); err != nil {
+		if err = UpdateTPendaftaranData(input, *simgos, "update", &event, tx); err != nil {
 			return err
 		}
 
@@ -159,7 +173,7 @@ func Delete(input e.DeleteDto) (*d.Data, error) {
 	}
 
 	// STEP 2: Get Simgos
-	sgData, err := ReadEncounterDetailData(uint16(syncLink.Simgos_Id), &event)
+	sgData, err := ReadTPendaftaranDetailData(uint16(syncLink.Simgos_Id), &event)
 	if err != nil {
 		return nil, err
 	}
@@ -218,7 +232,7 @@ func CheckIn(input e.Encounter) (*d.Data, error) {
 	}
 
 	// STEP 2: Get Simgos
-	simgos, err := ReadEncounterDetailData(uint16(syncLink.Simgos_Id), &event)
+	simgos, err := ReadTPendaftaranDetailData(uint16(syncLink.Simgos_Id), &event)
 	if err != nil {
 		return nil, err
 	}
@@ -226,12 +240,10 @@ func CheckIn(input e.Encounter) (*d.Data, error) {
 	tx := db.NewTx()
 	err = tx.Simgos.Transaction(func(tx *gorm.DB) error {
 		// Step 2: Update Simgos
-		if err = UpdateCheckinData(input, *simgos, &event, tx); err != nil {
+		if err = UpdateTPendaftaranData(input, *simgos, "check-in", &event, tx); err != nil {
 			return err
 		}
 
-		// TODO: insert t_pemeriksaan_hist
-
 		return nil
 	})
 
@@ -246,14 +258,14 @@ func CheckIn(input e.Encounter) (*d.Data, error) {
 	}, nil
 }
 
-func CheckOut(input e.DischargeDto) (*d.Data, error) {
+func CheckOut(input e.Encounter) (*d.Data, error) {
 	event := pl.Event{
-		Feature: "CheckIn",
+		Feature: "CheckOut",
 		Source:  source,
 	}
 
 	// Start log
-	pl.SetLogInfo(&event, input, "started", "check-in")
+	pl.SetLogInfo(&event, input, "started", "check-out")
 
 	// STEP 1: Get Link
 	syncLink, err := ReadDetailLinkData(uint16(input.Id), &event)
@@ -262,7 +274,7 @@ func CheckOut(input e.DischargeDto) (*d.Data, error) {
 	}
 
 	// STEP 2: Get Simgos
-	simgos, err := ReadEncounterDetailData(uint16(syncLink.Simgos_Id), &event)
+	simgos, err := ReadTPendaftaranDetailData(uint16(syncLink.Simgos_Id), &event)
 	if err != nil {
 		return nil, err
 	}
@@ -270,12 +282,146 @@ func CheckOut(input e.DischargeDto) (*d.Data, error) {
 	tx := db.NewTx()
 	err = tx.Simgos.Transaction(func(tx *gorm.DB) error {
 		// Step 2: Update Simgos
-		if err = UpdateCheckoutData(input, *simgos, &event, tx); err != nil {
+		if err = UpdateTPendaftaranData(input, *simgos, "check-out", &event, tx); err != nil {
+			return err
+		}
+
+		return nil
+	})
+
+	pl.SetLogInfo(&event, nil, "complete")
+
+	return &d.Data{
+		Meta: d.IS{
+			"source":    source,
+			"structure": "single-data",
+			"status":    "updated",
+		},
+	}, nil
+}
+
+func Cancel(input e.Encounter) (*d.Data, error) {
+	event := pl.Event{
+		Feature: "Cancel",
+		Source:  source,
+	}
+
+	// Start log
+	pl.SetLogInfo(&event, input, "started", "cancel")
+
+	// STEP 1: Get Link
+	syncLink, err := ReadDetailLinkData(uint16(input.Id), &event)
+	if err != nil {
+		return nil, err
+	}
+
+	// STEP 2: Get Simgos
+	simgos, err := ReadTPendaftaranDetailData(uint16(syncLink.Simgos_Id), &event)
+	if err != nil {
+		return nil, err
+	}
+
+	tx := db.NewTx()
+	err = tx.Simgos.Transaction(func(tx *gorm.DB) error {
+		// Step 2: Update Simgos
+		if err = UpdateTPendaftaranData(input, *simgos, "update-status", &event, tx); err != nil {
+			return err
+		}
+
+		return nil
+	})
+
+	pl.SetLogInfo(&event, nil, "complete")
+
+	return &d.Data{
+		Meta: d.IS{
+			"source":    source,
+			"structure": "single-data",
+			"status":    "updated",
+		},
+	}, nil
+}
+
+func RequestSwitchUnit(input e.Encounter) (*d.Data, error) {
+	event := pl.Event{
+		Feature: "RequestSwitchUnit",
+		Source:  source,
+	}
+
+	// Start log
+	pl.SetLogInfo(&event, input, "started", "request-switch-unit")
+
+	// STEP 1: Get Link
+	syncLink, err := ReadDetailLinkData(uint16(input.Id), &event)
+	if err != nil {
+		return nil, err
+	}
+
+	// STEP 2: Get Simgos
+	tpendaftaran, err := ReadTPendaftaranDetailData(uint16(syncLink.Simgos_Id), &event)
+	if err != nil {
+		return nil, err
+	}
+
+	tx := db.NewTx()
+	err = tx.Simgos.Transaction(func(tx *gorm.DB) error {
+		// Step 2: Update TPendaftaran
+		if err = UpdateTPendaftaranData(input, *tpendaftaran, "update-status", &event, tx); err != nil {
+			return err
+		}
+
+		// Step 3: Insert TPemeriksaanHist
+		if _, err := CreateBulkTPemeriksaanHistData(input, *tpendaftaran, &event, tx); err != nil {
+			return err
+		}
+
+		return nil
+	})
+
+	pl.SetLogInfo(&event, nil, "complete")
+
+	return &d.Data{
+		Meta: d.IS{
+			"source":    source,
+			"structure": "single-data",
+			"status":    "updated",
+		},
+	}, nil
+}
+
+func ApproveSwitchUnit(input e.Encounter) (*d.Data, error) {
+	event := pl.Event{
+		Feature: "RequestSwitchUnit",
+		Source:  source,
+	}
+
+	// Start log
+	pl.SetLogInfo(&event, input, "started", "request-switch-unit")
+
+	// STEP 1: Get Link
+	syncLink, err := ReadDetailLinkData(uint16(input.Id), &event)
+	if err != nil {
+		return nil, err
+	}
+
+	// STEP 2: Get Simgos
+	tpendaftaran, err := ReadTPendaftaranDetailData(uint16(syncLink.Simgos_Id), &event)
+	if err != nil {
+		return nil, err
+	}
+
+	tx := db.NewTx()
+	err = tx.Simgos.Transaction(func(tx *gorm.DB) error {
+		// Step 2: Update TPendaftaran
+		if err = UpdateTPendaftaranData(input, *tpendaftaran, "update-status", &event, tx); err != nil {
+			return err
+		}
+
+		// Step 3: Insert TPemeriksaanHist
+		if _, err := CreateBulkTPemeriksaanHistData(input, *tpendaftaran, &event, tx); err != nil {
 			return err
 		}
 
-		// TODO: insert t_pemeriksaan_hist
-
 		return nil
 	})
 

internal/use-case/simgos-sync-use-case/new/encounter/helper.go

@@ -10,18 +10,22 @@ import (
 	erc "simrs-vx/internal/domain/references/common"
 	ere "simrs-vx/internal/domain/references/encounter"
 	erp "simrs-vx/internal/domain/references/person"
+	pl "simrs-vx/pkg/logger"
 	"strconv"
 
 	e "simrs-vx/internal/domain/main-entities/encounter"
-	esimgos "simrs-vx/internal/domain/simgos-entities/encounter"
+	ep "simrs-vx/internal/domain/simgos-entities/m-pasien"
+	etph "simrs-vx/internal/domain/simgos-entities/t-pemeriksaan-hist"
+	etp "simrs-vx/internal/domain/simgos-entities/t-pendaftaran"
 	esync "simrs-vx/internal/domain/sync-entities/encounter"
 	esyncLog "simrs-vx/internal/domain/sync-entities/log"
 
 	dg "github.com/karincake/apem/db-gorm-pg"
+	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 )
 
-func setDataCreateTPendaftaran(input *e.Encounter) (data esimgos.TPendaftaran, err error) {
+func setDataCreateTPendaftaran(input *e.Encounter) (data etp.TPendaftaran, err error) {
 	data.Nomr = *input.Patient.Number
 
 	// set pasienbaru
@@ -39,7 +43,7 @@ func setDataCreateTPendaftaran(input *e.Encounter) (data esimgos.TPendaftaran, e
 	// set no_kunjung
 	noKunjung, err := generateNoKunjung()
 	if err != nil {
-		return esimgos.TPendaftaran{}, err
+		return etp.TPendaftaran{}, err
 	}
 	data.NoKunjung = uint(noKunjung)
 
@@ -48,7 +52,7 @@ func setDataCreateTPendaftaran(input *e.Encounter) (data esimgos.TPendaftaran, e
 	return
 }
 
-func setDataTPendaftaran(input *e.Encounter, data esimgos.TPendaftaran) {
+func setDataTPendaftaran(input *e.Encounter, data etp.TPendaftaran) {
 	data.Tglreg = input.RegisteredAt
 
 	// set kddokter
@@ -103,7 +107,7 @@ func setDataTPendaftaran(input *e.Encounter, data esimgos.TPendaftaran) {
 	return
 }
 
-func setDataCheckIn(input e.Encounter, data esimgos.TPendaftaran) {
+func setDataCheckIn(input e.Encounter, data etp.TPendaftaran) {
 	// set kddokter
 	kddokter, _ := strconv.Atoi(*input.Responsible_Doctor_Code)
 	data.Kddokter = uint(kddokter)
@@ -121,22 +125,57 @@ func setDataCheckIn(input e.Encounter, data esimgos.TPendaftaran) {
 	return
 }
 
-func setDataCheckOut(input e.DischargeDto, data esimgos.TPendaftaran) {
-	data.Keluarpoly = &now
+func setDataRequestSwitchUnit(input e.Encounter, data etp.TPendaftaran) (hist []etph.TPemeriksaanHist) {
+	if enc := input.InternalReferences; enc != nil {
+		for i, ref := range *enc {
+			hist = append(hist, etph.TPemeriksaanHist{
+				Idxdaftar:       &data.Idxdaftar,
+				Kdpoly:          stringtouint(*ref.Unit_Code),
+				DokterPengonsul: stringtouint(*input.Responsible_Doctor_Code),
+				DokterPenerima:  stringtouint(*ref.Doctor_Code),
+				StartKonsul:     &now,
+			})
+
+			// set user konsul
+			if emp := input.Adm_Employee; emp != nil {
+				if u := emp.User; u != nil {
+					hist[i].UserKonsul = &u.Name
+				}
+			}
+
+			// setaktif
+			aktif := uint16(1)
+			hist[i].StAktif = &aktif
+		}
+	}
+	return
+}
+
+func setDataCheckOut(input e.Encounter, data etp.TPendaftaran) {
+	data.Keluarpoly = input.Discharge_Date
 
 	// set status
 	setStatus(input.Discharge_Method_Code, data)
 	if data.Status == 8 || data.Status == 3 {
-		data.SebabMati1 = input.DeathCause
+		if dc := input.DeathCause; dc != nil {
+			data.SebabMati1 = dc.Value
+		}
+
 	}
-	//if input.Status_Code == erc.DSCCancel {
-	//	data.Status = 11
-	//}
+
+	setPelayanan := uint(1)
+	data.StPelayanan = &setPelayanan
 
 	return
 }
 
-func setKdrujuk(input *ere.RefTypeCode, data esimgos.TPendaftaran) {
+func setDataUpdateStatus(input e.Encounter, data etp.TPendaftaran) {
+	if input.Status_Code == erc.DSCCancel {
+		data.Status = 11
+	}
+}
+
+func setKdrujuk(input *ere.RefTypeCode, data etp.TPendaftaran) {
 	switch *input {
 	case ere.RTCGov:
 		data.Kdrujuk = 1
@@ -149,7 +188,7 @@ func setKdrujuk(input *ere.RefTypeCode, data esimgos.TPendaftaran) {
 	}
 }
 
-func setKdcarabayar(input ere.AllPaymentMethodCode, data esimgos.TPendaftaran) {
+func setKdcarabayar(input ere.AllPaymentMethodCode, data etp.TPendaftaran) {
 	switch input {
 	case ere.APMCPks:
 		data.Kdcarabayar = 12
@@ -164,7 +203,7 @@ func setKdcarabayar(input ere.AllPaymentMethodCode, data esimgos.TPendaftaran) {
 	}
 }
 
-func setStatus(code *ere.DischargeMethodCode, data esimgos.TPendaftaran) {
+func setStatus(code *ere.DischargeMethodCode, data etp.TPendaftaran) {
 	switch *code {
 	case ere.DMCHome:
 		data.Status = 1
@@ -211,7 +250,7 @@ func setStatus(code *ere.DischargeMethodCode, data esimgos.TPendaftaran) {
 	}
 }
 
-func mapRelative(relative *[]epr.PersonRelative, data esimgos.TPendaftaran) {
+func mapRelative(relative *[]epr.PersonRelative, data etp.TPendaftaran) {
 	if relative == nil || len(*relative) == 0 {
 		return
 	}
@@ -293,3 +332,37 @@ func generateNoKunjung() (int, error) {
 
 	return lastNumber + 1, nil
 }
+
+func stringtouint(v string) *uint {
+	u, _ := strconv.Atoi(v)
+	point := uint(u)
+	return &point
+}
+
+func updatePatient(patient ep.MPasien, event *pl.Event, dbx ...*gorm.DB) error {
+	pl.SetLogInfo(event, nil, "started", "DBUpdate")
+
+	var tx *gorm.DB
+	if len(dbx) > 0 {
+		tx = dbx[0]
+	} else {
+		tx = dg.IS["simrs"]
+	}
+
+	if err := tx.Model(&ep.MPasien{}).
+		Where("\"nomr\" = ?", patient.Nomr).
+		Updates(map[string]interface{}{
+			"kdcarabayar": patient.Kdcarabayar,
+		}).Error; err != nil {
+		event.Status = "failed"
+		event.ErrInfo = pl.ErrorInfo{
+			Code:   "update-fail",
+			Detail: "Failed to update patient",
+			Raw:    err,
+		}
+		return pl.SetLogError(event, patient)
+	}
+
+	pl.SetLogInfo(event, patient, "complete")
+	return nil
+}

internal/use-case/simgos-sync-use-case/new/encounter/lib.go

@@ -1,6 +1,7 @@
 package encounter
 
 import (
+	etph "simrs-vx/internal/domain/simgos-entities/t-pemeriksaan-hist"
 	plh "simrs-vx/pkg/lib-helper"
 	pl "simrs-vx/pkg/logger"
 	pu "simrs-vx/pkg/use-case-helper"
@@ -10,14 +11,14 @@ import (
 	"gorm.io/gorm"
 
 	e "simrs-vx/internal/domain/main-entities/encounter"
-	esimgos "simrs-vx/internal/domain/simgos-entities/encounter"
+	etp "simrs-vx/internal/domain/simgos-entities/t-pendaftaran"
 	esync "simrs-vx/internal/domain/sync-entities/encounter"
 	esynclog "simrs-vx/internal/domain/sync-entities/log"
 )
 
 var now = time.Now()
 
-func CreateTPendaftaranData(input e.Encounter, event *pl.Event, dbx ...*gorm.DB) (*esimgos.TPendaftaran, error) {
+func CreateTPendaftaranData(input e.Encounter, event *pl.Event, dbx ...*gorm.DB) (*etp.TPendaftaran, error) {
 	pl.SetLogInfo(event, nil, "started", "DBCreate")
 
 	data, err := setDataCreateTPendaftaran(&input)
@@ -40,9 +41,9 @@ func CreateTPendaftaranData(input e.Encounter, event *pl.Event, dbx ...*gorm.DB)
 	return &data, nil
 }
 
-func ReadEncounterDetailData(simgosId uint16, event *pl.Event) (*esimgos.TPendaftaran, error) {
+func ReadTPendaftaranDetailData(simgosId uint16, event *pl.Event) (*etp.TPendaftaran, error) {
 	pl.SetLogInfo(event, simgosId, "started", "DBReadDetail")
-	data := esimgos.TPendaftaran{}
+	data := etp.TPendaftaran{}
 
 	var tx = dg.IS["simrs"]
 
@@ -58,10 +59,19 @@ func ReadEncounterDetailData(simgosId uint16, event *pl.Event) (*esimgos.TPendaf
 	return &data, nil
 }
 
-func UpdateTPendaftaranData(input e.Encounter, data esimgos.TPendaftaran, event *pl.Event, dbx ...*gorm.DB) error {
+func UpdateTPendaftaranData(input e.Encounter, data etp.TPendaftaran, method string, event *pl.Event, dbx ...*gorm.DB) error {
 	pl.SetLogInfo(event, input, "started", "DBUpdate")
 
-	setDataTPendaftaran(&input, data)
+	switch method {
+	case "update":
+		setDataTPendaftaran(&input, data)
+	case "check-in":
+		setDataCheckIn(input, data)
+	case "check-out":
+		setDataCheckOut(input, data)
+	case "update-status":
+		setDataUpdateStatus(input, data)
+	}
 
 	var tx *gorm.DB
 	if len(dbx) > 0 {
@@ -84,7 +94,7 @@ func UpdateTPendaftaranData(input e.Encounter, data esimgos.TPendaftaran, event
 	return nil
 }
 
-func HardDeleteTPendaftaranData(data *esimgos.TPendaftaran, event *pl.Event, dbx ...*gorm.DB) error {
+func HardDeleteTPendaftaranData(data *etp.TPendaftaran, event *pl.Event, dbx ...*gorm.DB) error {
 	pl.SetLogInfo(event, data, "started", "DBDelete")
 
 	var tx *gorm.DB
@@ -109,59 +119,6 @@ func HardDeleteTPendaftaranData(data *esimgos.TPendaftaran, event *pl.Event, dbx
 	return nil
 }
 
-func UpdateCheckinData(input e.Encounter, data esimgos.TPendaftaran, event *pl.Event, dbx ...*gorm.DB) error {
-	pl.SetLogInfo(event, input, "started", "DBUpdate")
-
-	setDataCheckIn(input, data)
-
-	var tx *gorm.DB
-	if len(dbx) > 0 {
-		tx = dbx[0]
-	} else {
-		tx = dg.IS["simrs"]
-	}
-
-	if err := tx.Save(&data).Error; err != nil {
-		event.Status = "failed"
-		event.ErrInfo = pl.ErrorInfo{
-			Code:   "data-update-fail",
-			Detail: "Database update failed",
-			Raw:    err,
-		}
-		return pl.SetLogError(event, input)
-	}
-
-	pl.SetLogInfo(event, nil, "complete")
-	return nil
-}
-
-func UpdateCheckoutData(input e.DischargeDto, data esimgos.TPendaftaran, event *pl.Event, dbx ...*gorm.DB) error {
-	pl.SetLogInfo(event, input, "started", "DBUpdate")
-
-	setDataCheckOut(input, data)
-
-	var tx *gorm.DB
-	if len(dbx) > 0 {
-		tx = dbx[0]
-	} else {
-		tx = dg.IS["simrs"]
-	}
-
-	if err := tx.Save(&data).Error; err != nil {
-		event.Status = "failed"
-		event.ErrInfo = pl.ErrorInfo{
-			Code:   "data-update-fail",
-			Detail: "Database update failed",
-			Raw:    err,
-		}
-		return pl.SetLogError(event, input)
-	}
-
-	pl.SetLogInfo(event, nil, "complete")
-	return nil
-}
-
-func CreateTPemeriksaanHist
 func CreateLinkData(simxId, simgosId uint, event *pl.Event, dbx ...*gorm.DB) (*esync.EncounterLink, error) {
 	pl.SetLogInfo(event, nil, "started", "DBCreate")
 	data := setDataSimxLink(simxId, simgosId)
@@ -241,3 +198,23 @@ func CreateLogData(input esynclog.SimxLogDto, event *pl.Event, dbx ...*gorm.DB)
 	pl.SetLogInfo(event, nil, "complete")
 	return nil
 }
+
+func CreateBulkTPemeriksaanHistData(input e.Encounter, data etp.TPendaftaran, event *pl.Event, dbx ...*gorm.DB) (hist []etph.TPemeriksaanHist, err error) {
+	pl.SetLogInfo(event, nil, "started", "DBCreate")
+
+	hist = setDataRequestSwitchUnit(input, data)
+
+	var tx *gorm.DB
+	if len(dbx) > 0 {
+		tx = dbx[0]
+	} else {
+		tx = dg.IS["simrs"]
+	}
+
+	if err := tx.Create(&hist).Error; err != nil {
+		return nil, plh.HandleCreateError(input, event, err)
+	}
+
+	pl.SetLogInfo(event, nil, "complete")
+	return hist, nil
+}

internal/use-case/simgos-sync-use-case/new/installation/case.go

@@ -10,7 +10,7 @@ import (
 	db "simrs-vx/pkg/dualtrx-helper"
 
 	e "simrs-vx/internal/domain/main-entities/installation"
-	esimgos "simrs-vx/internal/domain/simgos-entities/installation"
+	esimgos "simrs-vx/internal/domain/simgos-entities/m-instalasi"
 	esync "simrs-vx/internal/domain/sync-entities/installation"
 	elog "simrs-vx/internal/domain/sync-entities/log"
 )

internal/use-case/simgos-sync-use-case/new/installation/helper.go

@@ -8,7 +8,7 @@ import (
 	"encoding/json"
 	e "simrs-vx/internal/domain/main-entities/installation"
 	erc "simrs-vx/internal/domain/references/common"
-	esimgos "simrs-vx/internal/domain/simgos-entities/installation"
+	esimgos "simrs-vx/internal/domain/simgos-entities/m-instalasi"
 	esync "simrs-vx/internal/domain/sync-entities/installation"
 	esyncLog "simrs-vx/internal/domain/sync-entities/log"
 )

internal/use-case/simgos-sync-use-case/new/installation/lib.go

@@ -10,7 +10,7 @@ import (
 	"gorm.io/gorm"
 
 	e "simrs-vx/internal/domain/main-entities/installation"
-	esimgos "simrs-vx/internal/domain/simgos-entities/installation"
+	esimgos "simrs-vx/internal/domain/simgos-entities/m-instalasi"
 	esync "simrs-vx/internal/domain/sync-entities/installation"
 	esynclog "simrs-vx/internal/domain/sync-entities/log"
 )

internal/use-case/simgos-sync-use-case/new/patient/case.go

@@ -9,7 +9,7 @@ import (
 	db "simrs-vx/pkg/dualtrx-helper"
 
 	e "simrs-vx/internal/domain/main-entities/patient"
-	esimgos "simrs-vx/internal/domain/simgos-entities/patient"
+	esimgos "simrs-vx/internal/domain/simgos-entities/m-pasien"
 	elog "simrs-vx/internal/domain/sync-entities/log"
 	esync "simrs-vx/internal/domain/sync-entities/patient"
 )
@@ -109,13 +109,13 @@ func Update(input e.Patient) (*d.Data, error) {
 	pl.SetLogInfo(&event, input, "started", "update")
 
 	// STEP 1: Get Link
-	syncLink, err := ReadDetailLinkData(uint16(input.Id), &event)
+	syncLink, err := ReadDetailLinkData(input.Id, &event)
 	if err != nil {
 		return nil, err
 	}
 
 	// STEP 2: Get Simgos
-	patientData, err := ReadDetailSimgosData(uint16(syncLink.Simgos_Id), &event)
+	patientData, err := ReadDetailSimgosData(syncLink.Simgos_Id, &event)
 	if err != nil {
 		return nil, err
 	}
@@ -130,6 +130,10 @@ func Update(input e.Patient) (*d.Data, error) {
 		return nil
 	})
 
+	if err != nil {
+		return nil, err
+	}
+
 	pl.SetLogInfo(&event, nil, "complete")
 
 	return &d.Data{
@@ -153,13 +157,13 @@ func Delete(input e.DeleteDto) (*d.Data, error) {
 	pl.SetLogInfo(&event, input, "started", "delete")
 
 	// STEP 1: Get Link
-	syncLink, err := ReadDetailLinkData(uint16(input.Id), &event)
+	syncLink, err := ReadDetailLinkData(input.Id, &event)
 	if err != nil {
 		return nil, err
 	}
 
 	// STEP 2: Get Simgos
-	sgData, err := ReadDetailSimgosData(uint16(syncLink.Simgos_Id), &event)
+	sgData, err := ReadDetailSimgosData(syncLink.Simgos_Id, &event)
 	if err != nil {
 		return nil, err
 	}

internal/use-case/simgos-sync-use-case/new/patient/helper.go

@@ -16,7 +16,7 @@ import (
 	epa "simrs-vx/internal/domain/main-entities/person-address"
 	epc "simrs-vx/internal/domain/main-entities/person-contact"
 	epr "simrs-vx/internal/domain/main-entities/person-relative"
-	esimgos "simrs-vx/internal/domain/simgos-entities/patient"
+	esimgos "simrs-vx/internal/domain/simgos-entities/m-pasien"
 	esyncLog "simrs-vx/internal/domain/sync-entities/log"
 	esync "simrs-vx/internal/domain/sync-entities/patient"
 
@@ -37,13 +37,12 @@ func setDataSimgos(input *e.Patient) (data esimgos.MPasien) {
 		mapContact(input.Person.Contacts, &data)
 	}
 
-	if input.Person != nil && input.Person.Relatives != nil {
+	data.PenanggungjawabHubungan = "DIRI SENDIRI"
+	data.PenanggungjawabNama = input.Person.Name
+	data.PenanggungjawabPhone = data.Notelp
+	data.PenanggungjawabAlamat = data.Alamat
+	if input.Person != nil || input.Person.Relatives != nil {
 		mapRelative(input.Person.Relatives, &data)
-	} else {
-		data.PenanggungjawabHubungan = "DIRI SENDIRI"
-		data.PenanggungjawabNama = input.Person.Name
-		data.PenanggungjawabPhone = data.Notelp
-		data.PenanggungjawabAlamat = data.Alamat
 	}
 
 	data.Nip = input.RegisteredBy_User_Name

internal/use-case/simgos-sync-use-case/new/patient/lib.go

@@ -10,7 +10,7 @@ import (
 	"gorm.io/gorm"
 
 	e "simrs-vx/internal/domain/main-entities/patient"
-	esimgos "simrs-vx/internal/domain/simgos-entities/patient"
+	esimgos "simrs-vx/internal/domain/simgos-entities/m-pasien"
 	esynclog "simrs-vx/internal/domain/sync-entities/log"
 	esync "simrs-vx/internal/domain/sync-entities/patient"
 )
@@ -37,7 +37,7 @@ func CreateSimgosData(input e.Patient, event *pl.Event, dbx ...*gorm.DB) (*esimg
 	return &data, nil
 }
 
-func ReadDetailSimgosData(simgosId uint16, event *pl.Event) (*esimgos.MPasien, error) {
+func ReadDetailSimgosData(simgosId uint, event *pl.Event) (*esimgos.MPasien, error) {
 	pl.SetLogInfo(event, simgosId, "started", "DBReadDetail")
 	data := esimgos.MPasien{}
 
@@ -55,6 +55,29 @@ func ReadDetailSimgosData(simgosId uint16, event *pl.Event) (*esimgos.MPasien, e
 	return &data, nil
 }
 
+func ReadDetailSimgosByNomrData(nomr string, event *pl.Event, dbx ...*gorm.DB) (*esimgos.MPasien, error) {
+	pl.SetLogInfo(event, nomr, "started", "DBReadDetail")
+	data := esimgos.MPasien{}
+
+	var tx *gorm.DB
+	if len(dbx) > 0 {
+		tx = dbx[0]
+	} else {
+		tx = dg.IS["simrs"]
+	}
+
+	if err := tx.
+		Where("\"nomr\" = ?", nomr).
+		First(&data).Error; err != nil {
+		if processedErr := pu.HandleReadError(err, event, source, nomr, data); processedErr != nil {
+			return nil, processedErr
+		}
+	}
+
+	pl.SetLogInfo(event, nil, "complete")
+	return &data, nil
+}
+
 func UpdateSimgosData(input e.Patient, patientData *esimgos.MPasien, event *pl.Event, dbx ...*gorm.DB) error {
 	pl.SetLogInfo(event, input, "started", "DBUpdate")
 
@@ -127,7 +150,7 @@ func CreateLinkData(simxId, simgosId uint, event *pl.Event, dbx ...*gorm.DB) (*e
 	return &data, nil
 }
 
-func ReadDetailLinkData(simxId uint16, event *pl.Event) (*esync.PatientLink, error) {
+func ReadDetailLinkData(simxId uint, event *pl.Event) (*esync.PatientLink, error) {
 	pl.SetLogInfo(event, simxId, "started", "DBReadDetail")
 	data := esync.PatientLink{}
 

internal/use-case/simgos-sync-use-case/new/specialist/case.go

@@ -9,7 +9,7 @@ import (
 	db "simrs-vx/pkg/dualtrx-helper"
 
 	e "simrs-vx/internal/domain/main-entities/specialist"
-	esimgos "simrs-vx/internal/domain/simgos-entities/specialist"
+	esimgos "simrs-vx/internal/domain/simgos-entities/m-polihfis"
 	elog "simrs-vx/internal/domain/sync-entities/log"
 	esync "simrs-vx/internal/domain/sync-entities/specialist"
 )

internal/use-case/simgos-sync-use-case/new/specialist/helper.go

@@ -9,7 +9,7 @@ import (
 	erc "simrs-vx/internal/domain/references/common"
 
 	e "simrs-vx/internal/domain/main-entities/specialist"
-	esimgos "simrs-vx/internal/domain/simgos-entities/specialist"
+	esimgos "simrs-vx/internal/domain/simgos-entities/m-polihfis"
 	esyncLog "simrs-vx/internal/domain/sync-entities/log"
 	esync "simrs-vx/internal/domain/sync-entities/specialist"
 )

internal/use-case/simgos-sync-use-case/new/specialist/lib.go

@@ -10,7 +10,7 @@ import (
 	"gorm.io/gorm"
 
 	e "simrs-vx/internal/domain/main-entities/specialist"
-	esimgos "simrs-vx/internal/domain/simgos-entities/specialist"
+	esimgos "simrs-vx/internal/domain/simgos-entities/m-polihfis"
 	esynclog "simrs-vx/internal/domain/sync-entities/log"
 	esync "simrs-vx/internal/domain/sync-entities/specialist"
 )

internal/use-case/simgos-sync-use-case/new/unit/case.go

@@ -9,7 +9,7 @@ import (
 	db "simrs-vx/pkg/dualtrx-helper"
 
 	e "simrs-vx/internal/domain/main-entities/unit"
-	esimgos "simrs-vx/internal/domain/simgos-entities/unit"
+	esimgos "simrs-vx/internal/domain/simgos-entities/m-poly"
 	elog "simrs-vx/internal/domain/sync-entities/log"
 	esync "simrs-vx/internal/domain/sync-entities/unit"
 )
@@ -18,7 +18,7 @@ const source = "unit"
 
 func Create(input e.CreateDto) (*d.Data, error) {
 	var (
-		sgData   *esimgos.MPloy
+		sgData   *esimgos.MPoly
 		syncLink *esync.UnitLink
 		err      error
 	)

internal/use-case/simgos-sync-use-case/new/unit/helper.go

@@ -10,12 +10,12 @@ import (
 
 	e "simrs-vx/internal/domain/main-entities/unit"
 
-	esimgos "simrs-vx/internal/domain/simgos-entities/unit"
+	esimgos "simrs-vx/internal/domain/simgos-entities/m-poly"
 	esyncLog "simrs-vx/internal/domain/sync-entities/log"
 	esync "simrs-vx/internal/domain/sync-entities/unit"
 )
 
-func setDataSimgos[T *e.CreateDto | *e.UpdateDto](input T) (data esimgos.MPloy) {
+func setDataSimgos[T *e.CreateDto | *e.UpdateDto](input T) (data esimgos.MPoly) {
 	var inputSrc *e.CreateDto
 	if inputT, ok := any(input).(*e.CreateDto); ok {
 		inputSrc = inputT

internal/use-case/simgos-sync-use-case/new/unit/lib.go

@@ -10,14 +10,14 @@ import (
 	"gorm.io/gorm"
 
 	e "simrs-vx/internal/domain/main-entities/unit"
-	esimgos "simrs-vx/internal/domain/simgos-entities/unit"
+	esimgos "simrs-vx/internal/domain/simgos-entities/m-poly"
 	esynclog "simrs-vx/internal/domain/sync-entities/log"
 	esync "simrs-vx/internal/domain/sync-entities/unit"
 )
 
 var now = time.Now()
 
-func CreateSimgosData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*esimgos.MPloy, error) {
+func CreateSimgosData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*esimgos.MPoly, error) {
 	pl.SetLogInfo(event, nil, "started", "DBCreate")
 
 	data := setDataSimgos(&input)
@@ -37,9 +37,9 @@ func CreateSimgosData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*esi
 	return &data, nil
 }
 
-func ReadDetailSimgosData(simgosId uint16, event *pl.Event) (*esimgos.MPloy, error) {
+func ReadDetailSimgosData(simgosId uint16, event *pl.Event) (*esimgos.MPoly, error) {
 	pl.SetLogInfo(event, simgosId, "started", "DBReadDetail")
-	data := esimgos.MPloy{}
+	data := esimgos.MPoly{}
 
 	var tx = dg.IS["simrs"]
 
@@ -82,7 +82,7 @@ func UpdateSimgosData(input e.UpdateDto, dataSimgos *esync.UnitLink, event *pl.E
 	return nil
 }
 
-func HardDeleteSimgosData(data *esimgos.MPloy, event *pl.Event, dbx ...*gorm.DB) error {
+func HardDeleteSimgosData(data *esimgos.MPoly, event *pl.Event, dbx ...*gorm.DB) error {
 	pl.SetLogInfo(event, data, "started", "DBDelete")
 
 	var tx *gorm.DB