diff --git a/database/satu_data/surat_kontrol/surat_kontrol.go b/database/satu_data/surat_kontrol/surat_kontrol.go
index 1047acf..a8b3869 100644
--- a/database/satu_data/surat_kontrol/surat_kontrol.go
+++ b/database/satu_data/surat_kontrol/surat_kontrol.go
@@ -304,7 +304,6 @@ func GetDataSuratKontrolByIDsrukon(idxdaftar string, id string) (*suratkontrol.G
 		dkp2."Display_diagnosis_primer_utama" as "Nama_diagnosa",
 		dsk."Tipe_surat_kontrol" as "Tipe_SurKon",
 		dsk."User_created_surat_kontrol" as "User",
-		dsk."Nomor_kartu",
 		dsk."Kode_icd",
 		dsk."Diagnosa"
 		from data_surat_kontrol dsk
@@ -313,7 +312,7 @@ func GetDataSuratKontrolByIDsrukon(idxdaftar string, id string) (*suratkontrol.G
 		left join data_pegawai dp on dsk."DPJP_surat_kontrol" = dp."id"
 		left join data_ktp dk on dp."KTP" = dk. "id"
 		left join daftar_subspesialis ds on dp."Subspesialis" = ds."id"
-		where dsk."Status_surat_kontrol" = '1' and dkp2."IDXDAFTAR" = ? and dsk."id" = ?`, idxdaftar, id).First(&dataSurKon).Error
+		where dkp2."IDXDAFTAR" = ? and dsk."id" = ? `, idxdaftar, id).First(&dataSurKon).Error
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			errMsg := errors.New("Data tidak ada")
diff --git a/handlers/bpjs/surat_kontrol/surat_kontrol.go b/handlers/bpjs/surat_kontrol/surat_kontrol.go
index ec7a2d3..9704c9a 100644
--- a/handlers/bpjs/surat_kontrol/surat_kontrol.go
+++ b/handlers/bpjs/surat_kontrol/surat_kontrol.go
@@ -199,7 +199,8 @@ func InsertSuratkontrolNew(c *gin.Context) {
 			return
 		}
 
-		parts := strings.SplitN(res.Response.NamaDiagnosa, " - ", 2)
+		NamaDiagnosaString := strings.TrimSpace(res.Response.NamaDiagnosa)
+		parts := strings.SplitN(NamaDiagnosaString, " - ", 2)
 		var kodeICD, diagnosa string
 		if len(parts) == 2 {
 			kodeICD = parts[0]
@@ -208,6 +209,8 @@ func InsertSuratkontrolNew(c *gin.Context) {
 			kodeICD = res.Response.NamaDiagnosa
 			diagnosa = ""
 		}
+		log.Println("kodeICD : ", kodeICD)
+		log.Println("diagnosa : ", diagnosa)
 
 		logTimeEnd := time.Now().Format("2006-01-02 15:04:05")
 		reqInsert := &sk.DataSuratKontrol{