From de682a1a2b332294d3731a6feed5cae481a5387cf6fe20f9c2a443fc242f4e8d Mon Sep 17 00:00:00 2001
From: ahdan15 <ahdan.zeeda.0103@rssa.id>
Date: Thu, 16 Oct 2025 09:29:27 +0700
Subject: [PATCH] penambahan tipe rawat

---
 .../satu_data/surat_kontrol/surat_kontrol.go  | 19 +++++++++++++------
 handlers/bpjs/surat_kontrol/surat_kontrol.go  |  4 +++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/database/satu_data/surat_kontrol/surat_kontrol.go b/database/satu_data/surat_kontrol/surat_kontrol.go
index 8417633..85a18ca 100644
--- a/database/satu_data/surat_kontrol/surat_kontrol.go
+++ b/database/satu_data/surat_kontrol/surat_kontrol.go
@@ -227,7 +227,9 @@ func GetDataSuratKontrolByIDTipe(idxdaftar string, tipe string) (*suratkontrol.G
 		dsk."Tipe_surat_kontrol" as "Tipe_SurKon",
 		dsk."User_created_surat_kontrol" as "User",
 		dsk."Kode_icd",
-		dsk."Diagnosa"
+		dsk."Diagnosa",
+		dsk."Nomor_kartu",
+		dsk."Tipe_rawat"
 		from data_surat_kontrol dsk
 		left join data_kunjungan_pasien dkp2 on dkp2."id" = dsk."Kunjungan_pasien"
 		left join daftar_lokasi_ruang dlr on dsk."Ruangan_surat_kontrol" = dlr."id"
@@ -275,7 +277,8 @@ func GetDataSuratKontrolByIDnomor(idxdaftar string, nomor string) (*suratkontrol
 		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" as "No_kartu"
+		dsk."Nomor_kartu" as "No_kartu",
+		dsk."Tipe_rawat"
 		from data_surat_kontrol dsk
 		left join data_kunjungan_pasien dkp2 on dkp2."id" = dsk."Kunjungan_pasien"
 		left join daftar_lokasi_ruang dlr on dsk."Ruangan_surat_kontrol" = dlr."id"
@@ -323,7 +326,8 @@ func GetDataSuratKontrolnomor(nomor string) (*suratkontrol.GetDataSuratKontrol,
 		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" as "No_kartu"
+		dsk."Nomor_kartu" as "No_kartu",
+		dsk."Tipe_rawat"
 		from data_surat_kontrol dsk
 		left join data_kunjungan_pasien dkp2 on dkp2."id" = dsk."Kunjungan_pasien"
 		left join daftar_lokasi_ruang dlr on dsk."Ruangan_surat_kontrol" = dlr."id"
@@ -373,7 +377,8 @@ func GetDataSuratKontrolByIDsrukon(idxdaftar string, id string) (*suratkontrol.G
 		dsk."User_created_surat_kontrol" as "User",
 		dsk."Kode_icd",
 		dsk."Diagnosa",
-		dsk."Nomor_kartu" as "No_kartu"
+		dsk."Nomor_kartu" as "No_kartu",
+		dsk."Tipe_rawat"
 		from data_surat_kontrol dsk
 		left join data_kunjungan_pasien dkp2 on dkp2."id" = dsk."Kunjungan_pasien"
 		left join daftar_lokasi_ruang dlr on dsk."Ruangan_surat_kontrol" = dlr."id"
@@ -422,7 +427,8 @@ func GetDataSuratKontrolidsurkon(id string) (*suratkontrol.GetDataSuratKontrol,
 		dsk."User_created_surat_kontrol" as "User",
 		dsk."Nomor_kartu" as "No_kartu",
 		dsk."Kode_icd",
-		dsk."Diagnosa"
+		dsk."Diagnosa",
+		dsk."Tipe_rawat"
 		from data_surat_kontrol dsk
 		left join data_kunjungan_pasien dkp2 on dkp2."id" = dsk."Kunjungan_pasien"
 		left join daftar_lokasi_ruang dlr on dsk."Ruangan_surat_kontrol" = dlr."id"
@@ -471,7 +477,8 @@ func GetDataSuratKontrolByID(idxdaftar string) (*suratkontrol.GetDataSuratKontro
 		dkp2."Display_diagnosis_primer_utama" as "Nama_diagnosa",
 		dsk."Tipe_surat_kontrol" as "Tipe_SurKon",
 		dsk."User_created_surat_kontrol" as "User",
-		dsk."Tipe_rawat"
+		dsk."Tipe_rawat",
+		dsk."Nomor_kartu"
 		from data_surat_kontrol dsk
 		left join data_kunjungan_pasien dkp2 on dkp2."id" = dsk."Kunjungan_pasien"
 		left join daftar_lokasi_ruang dlr on dsk."Ruangan_surat_kontrol" = dlr."id"
diff --git a/handlers/bpjs/surat_kontrol/surat_kontrol.go b/handlers/bpjs/surat_kontrol/surat_kontrol.go
index 1d4e606..99bdbc0 100644
--- a/handlers/bpjs/surat_kontrol/surat_kontrol.go
+++ b/handlers/bpjs/surat_kontrol/surat_kontrol.go
@@ -2535,7 +2535,7 @@ func NewGetDataSurKonByID(c *gin.Context) {
 		NomorSEP:          dataSurKon.NomorSEP,
 		NamaPasien:        dataSurKon.NamaPasien,
 		NamaDokter:        namaLengkap,
-		NomorKartu:        "",
+		NomorKartu:        dataSurKon.NomorKartu,
 		Subspesialis:      dataSurKon.Subspesialis,
 		KodePoli:          dataSurKon.KodePoli,
 		KodeDokter:        dataSurKon.KodeDokter,
@@ -2613,6 +2613,7 @@ func GetDataSurKonByNoSurkon(c *gin.Context) {
 		NamaDiagnosa:      dataSurKon.Diagnosa,
 		TipeSurKon:        dataSurKon.TipeSurKon,
 		User:              dataSurKon.User,
+		TipeRawat:         dataSurKon.TipeRawat,
 	}
 	c.JSON(http.StatusOK, resSurKon)
 }
@@ -2675,6 +2676,7 @@ func GetDataSurKonByIDSurkon(c *gin.Context) {
 		NamaDiagnosa:      dataSurKon.Diagnosa,
 		TipeSurKon:        dataSurKon.TipeSurKon,
 		User:              dataSurKon.User,
+		TipeRawat:         dataSurKon.TipeRawat,
 	}
 	c.JSON(http.StatusOK, resSurKon)
 }