diff --git a/handlers/bpjs/surat_kontrol/surat_kontrol.go b/handlers/bpjs/surat_kontrol/surat_kontrol.go
index 8a451f1..64e98c5 100644
--- a/handlers/bpjs/surat_kontrol/surat_kontrol.go
+++ b/handlers/bpjs/surat_kontrol/surat_kontrol.go
@@ -740,6 +740,20 @@ func InsertSuratKontrol(c *gin.Context) {
 		})
 		return
 	}
+
+	NamaDiagnosaString := strings.TrimSpace(res.Response.NamaDiagnosa)
+	parts := strings.SplitN(NamaDiagnosaString, " - ", 2)
+	var kodeICD, diagnosa string
+	if len(parts) == 2 {
+		kodeICD = parts[0]
+		diagnosa = parts[1]
+	} else {
+		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{
 		ID:                uuid,
@@ -754,6 +768,8 @@ func InsertSuratKontrol(c *gin.Context) {
 		UserCreatedSurKon: req.User,
 		TipeSurKon:        req.TipeSurKon,
 		TipeRawat:         req.TipeRawat,
+		KodeIcd:           kodeICD,
+		Diagnosa:          diagnosa,
 	}
 
 	err = suratkontrol.InsertDataSuratKontrol(reqInsert)
@@ -1058,6 +1074,18 @@ func UpdateSuratKontrol(c *gin.Context) {
 		})
 		return
 	}
+	NamaDiagnosaString := strings.TrimSpace(res.Response.NamaDiagnosa)
+	parts := strings.SplitN(NamaDiagnosaString, " - ", 2)
+	var kodeICD, diagnosa string
+	if len(parts) == 2 {
+		kodeICD = parts[0]
+		diagnosa = parts[1]
+	} else {
+		kodeICD = res.Response.NamaDiagnosa
+		diagnosa = ""
+	}
+	log.Println("kodeICD : ", kodeICD)
+	log.Println("diagnosa : ", diagnosa)
 
 	reqInsert := &sk.DataSuratKontrol{
 		ID:                uuid,
@@ -1071,6 +1099,8 @@ func UpdateSuratKontrol(c *gin.Context) {
 		StatusSurKon:      1, // Insert status always set to 1
 		TipeSurKon:        "1",
 		UserUpdatedSurKon: req.User,
+		KodeIcd:           kodeICD,
+		Diagnosa:          diagnosa,
 	}
 
 	if reqInsert.DPJPSurKon == "" {