diff --git a/internal/domain/simgos-entities/t-rekammedik/entity.go b/internal/domain/simgos-entities/t-rekammedik/entity.go
index 8599db5d..84cec1ef 100644
--- a/internal/domain/simgos-entities/t-rekammedik/entity.go
+++ b/internal/domain/simgos-entities/t-rekammedik/entity.go
@@ -8,13 +8,13 @@ type TRekammedik struct {
 	Idxdaftar         uint       `json:"idxdaftar" gorm:"column:idxdaftar"`
 	Kdpoly            uint       `json:"kdpoly" gorm:"column:kdpoly"`
 	Pengirim          string     `json:"pengirim" gorm:"column:pengirim"`
-	Penerima          string     `json:"penerima" gorm:"column:penerima"`
-	Statusrm          uint       `json:"statusrm" gorm:"column:statusrm"`
-	PenerimaPoly      string     `json:"penerima_poly" gorm:"column:penerima_poly"`
+	Penerima          *string    `json:"penerima" gorm:"column:penerima"`
+	Statusrm          *uint      `json:"statusrm" gorm:"column:statusrm"`
+	PenerimaPoly      *string    `json:"penerima_poly" gorm:"column:penerima_poly"`
 	JamKirimRm        *time.Time `json:"jam_kirim_rm" gorm:"column:jam_kirim_rm"`
 	JamTerimaRm       *time.Time `json:"jam_terima_rm" gorm:"column:jam_terima_rm"`
-	PjBerkasRm        string     `json:"pj_berkas_rm" gorm:"column:pj_berkas_rm"`
-	StatusFisikBerkas string     `json:"status_fisik_berkas" gorm:"column:status_fisik_berkas"`
+	PjBerkasRm        *string    `json:"pj_berkas_rm" gorm:"column:pj_berkas_rm"`
+	StatusFisikBerkas *string    `json:"status_fisik_berkas" gorm:"column:status_fisik_berkas"`
 }
 
 func (TRekammedik) TableName() string {
diff --git a/internal/use-case/main-use-case/encounter/case.go b/internal/use-case/main-use-case/encounter/case.go
index 1ff2eb11..62a7c992 100644
--- a/internal/use-case/main-use-case/encounter/case.go
+++ b/internal/use-case/main-use-case/encounter/case.go
@@ -124,7 +124,8 @@ func Create(input e.CreateDto) (*d.Data, error) {
 
 		dataEncounter, err := ReadDetailData(e.ReadDetailDto{
 			Id: data.Id,
-			Includes: "Adm_Employee.User,Patient.Person.Relatives," +
+			Includes: "Adm_Employee.User,Adm_Employee.Person," +
+				"Patient.Person.Relatives," +
 				"Patient.Person.VclaimMember,VclaimReference," +
 				"Patient.Person.Contacts,Patient.Person.Addresses"},
 			&event, tx)
diff --git a/internal/use-case/simgos-sync-use-case/new/encounter/case.go b/internal/use-case/simgos-sync-use-case/new/encounter/case.go
index 55c0a912..4258e4a3 100644
--- a/internal/use-case/simgos-sync-use-case/new/encounter/case.go
+++ b/internal/use-case/simgos-sync-use-case/new/encounter/case.go
@@ -40,7 +40,7 @@ func Create(input e.Encounter) (*d.Data, error) {
 		}
 
 		// STEP 2: Insert TRekammedik
-		err = CreateTRekammedik(tPendaftaran, &event, tx.Simgos)
+		err = CreateTRekammedik(input, tPendaftaran, &event, tx.Simgos)
 		if err != nil {
 			return err
 		}
diff --git a/internal/use-case/simgos-sync-use-case/new/encounter/helper.go b/internal/use-case/simgos-sync-use-case/new/encounter/helper.go
index 8baa5a6f..97656afe 100644
--- a/internal/use-case/simgos-sync-use-case/new/encounter/helper.go
+++ b/internal/use-case/simgos-sync-use-case/new/encounter/helper.go
@@ -386,12 +386,17 @@ func mapAddress(addresses *[]epa.PersonAddress, data *etp.TPendaftaran) {
 	data.PenanggungjawabAlamat = a.Address
 }
 
-func setDataTRekammedik(input *etp.TPendaftaran) (data etrm.TRekammedik) {
-	data.TglKirim = input.Tglreg
-	data.Idxdaftar = input.Idxdaftar
-	data.Kdpoly = input.Kdpoly
-	data.Pengirim = input.Nip
-	data.JamKirimRm = input.Tglreg
+func setDataTRekammedik(input e.Encounter, tdaftar *etp.TPendaftaran) (data etrm.TRekammedik) {
+	data.TglKirim = tdaftar.Tglreg
+	data.Idxdaftar = tdaftar.Idxdaftar
+	data.Kdpoly = tdaftar.Kdpoly
+	data.JamKirimRm = tdaftar.Tglreg
+
+	if emp := input.Adm_Employee; emp != nil {
+		if p := emp.Person; p != nil {
+			data.Pengirim = p.Name
+		}
+	}
 
 	return
 }
diff --git a/internal/use-case/simgos-sync-use-case/new/encounter/lib.go b/internal/use-case/simgos-sync-use-case/new/encounter/lib.go
index 35bf86ac..95f86ede 100644
--- a/internal/use-case/simgos-sync-use-case/new/encounter/lib.go
+++ b/internal/use-case/simgos-sync-use-case/new/encounter/lib.go
@@ -198,9 +198,9 @@ func CreateLogData(input esynclog.SimxLogDto, event *pl.Event, dbx ...*gorm.DB)
 	return nil
 }
 
-func CreateTRekammedik(input *etp.TPendaftaran, event *pl.Event, dbx ...*gorm.DB) error {
+func CreateTRekammedik(input e.Encounter, tpendaftaran *etp.TPendaftaran, event *pl.Event, dbx ...*gorm.DB) error {
 	pl.SetLogInfo(event, nil, "started", "DBCreate")
-	data := setDataTRekammedik(input)
+	data := setDataTRekammedik(input, tpendaftaran)
 
 	var tx *gorm.DB
 	if len(dbx) > 0 {