first commit

Reviewed-on: #11

Dockerfile

@@ -22,5 +22,5 @@ WORKDIR /root/
 
 COPY --from=builder /app/main .
 COPY --from=builder /app/.env .
-EXPOSE 8080
+EXPOSE 8083
 CMD  ["./main"]

config/config.go

@@ -1,106 +1,106 @@
-package config
-
-import (
-	"bridging-rssa/models/config"
-	"crypto/hmac"
-	"crypto/sha256"
-	"encoding/base64"
-	"encoding/hex"
-	"fmt"
-	"log"
-	"os"
-	"time"
-
-	"gorm.io/driver/postgres"
-	"gorm.io/gorm"
-)
-
-var DB *gorm.DB
-var SatuDataDB *gorm.DB
-var err error
-
-func ConnectDB() {
-	hostSatuData := os.Getenv("SATUDATA_HOST")
-	userNameSatuData := os.Getenv("SATUDATA_USERNAME")
-	passwordSatuData := os.Getenv("SATUDATA_PASSWORD")
-	dbNameSatuData := os.Getenv("SATUDATA_NAME")
-	portSatuData := os.Getenv("SATUDATA_PORT")
-
-	satuData := fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%s sslmode=disable TimeZone=Asia/Jakarta", hostSatuData, userNameSatuData, passwordSatuData, dbNameSatuData, portSatuData)
-
-	SatuDataDB, err = gorm.Open(postgres.Open(satuData), &gorm.Config{})
-	if err != nil {
-		log.Fatal("Failed to connect to Satu Data database: ", err)
-	} else {
-		log.Println("Successfully connected to the database")
-	}
-}
-
-func SetHeader(isIcare bool, cfg config.ConfigBpjs) *config.Header {
-
-	timenow := time.Now().UTC()
-	time := time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC)
-	tstamp := timenow.Unix() - time.Unix()
-
-	cfg.Cons_id = os.Getenv("CONS_ID")
-	cfg.User_key = os.Getenv("USER_KEY")
-	cfg.Secret_key = os.Getenv("SECRET_KEY")
-
-	if isIcare {
-		cfg.User_key = os.Getenv("USER_KEY_ICARE")
-	}
-	secret := []byte(cfg.Secret_key)
-	message := []byte(cfg.Cons_id + "&" + fmt.Sprint(tstamp))
-	hash := hmac.New(sha256.New, secret)
-	hash.Write(message)
-	// to lowercase hexits
-	hex.EncodeToString(hash.Sum(nil))
-	// to base64
-	X_signature := base64.StdEncoding.EncodeToString(hash.Sum(nil))
-
-	header := &config.Header{
-		ConsID:     cfg.Cons_id,
-		SecretKey:  cfg.Secret_key,
-		UserKey:    cfg.User_key,
-		TimeStamp:  fmt.Sprint(tstamp),
-		XSignature: X_signature,
-	}
-
-	return header
-
-}
-
-func SetHeaderDev(cfg config.ConfigBpjs) *config.Header {
-
-	timenow := time.Now().UTC()
-	time := time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC)
-	tstamp := timenow.Unix() - time.Unix()
-
-	cfg.Cons_id = os.Getenv("CONS_ID_DEV")
-	cfg.User_key = os.Getenv("USER_KEY_DEV")
-	cfg.Secret_key = os.Getenv("SECRET_KEY_DEV")
-
-	// cfg.Cons_id = os.Getenv("CONS_ID")
-	// cfg.User_key = os.Getenv("USER_KEY")
-	// cfg.Secret_key = os.Getenv("SECRET_KEY")
-
-	secret := []byte(cfg.Secret_key)
-	message := []byte(cfg.Cons_id + "&" + fmt.Sprint(tstamp))
-	hash := hmac.New(sha256.New, secret)
-	hash.Write(message)
-	// to lowercase hexits
-	hex.EncodeToString(hash.Sum(nil))
-	// to base64
-	X_signature := base64.StdEncoding.EncodeToString(hash.Sum(nil))
-
-	header := &config.Header{
-		ConsID:     cfg.Cons_id,
-		SecretKey:  cfg.Secret_key,
-		UserKey:    cfg.User_key,
-		TimeStamp:  fmt.Sprint(tstamp),
-		XSignature: X_signature,
-	}
-
-	return header
-
-}
+package config
+
+import (
+	"bridging-rssa/models/config"
+	"crypto/hmac"
+	"crypto/sha256"
+	"encoding/base64"
+	"encoding/hex"
+	"fmt"
+	"log"
+	"os"
+	"time"
+
+	"gorm.io/driver/postgres"
+	"gorm.io/gorm"
+)
+
+var DB *gorm.DB
+var SatuDataDB *gorm.DB
+var err error
+
+func ConnectDB() {
+	hostSatuData := os.Getenv("SATUDATA_HOST")
+	userNameSatuData := os.Getenv("SATUDATA_USERNAME")
+	passwordSatuData := os.Getenv("SATUDATA_PASSWORD")
+	dbNameSatuData := os.Getenv("SATUDATA_NAME")
+	portSatuData := os.Getenv("SATUDATA_PORT")
+
+	satuData := fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%s sslmode=disable TimeZone=Asia/Jakarta", hostSatuData, userNameSatuData, passwordSatuData, dbNameSatuData, portSatuData)
+
+	SatuDataDB, err = gorm.Open(postgres.Open(satuData), &gorm.Config{})
+	if err != nil {
+		log.Fatal("Failed to connect to Satu Data database: ", err)
+	} else {
+		log.Println("Successfully connected to the database")
+	}
+}
+
+func SetHeader(isIcare bool, cfg config.ConfigBpjs) *config.Header {
+
+	timenow := time.Now().UTC()
+	time := time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC)
+	tstamp := timenow.Unix() - time.Unix()
+
+	cfg.Cons_id = os.Getenv("CONS_ID")
+	cfg.User_key = os.Getenv("USER_KEY")
+	cfg.Secret_key = os.Getenv("SECRET_KEY")
+
+	if isIcare {
+		cfg.User_key = os.Getenv("USER_KEY_ICARE")
+	}
+	secret := []byte(cfg.Secret_key)
+	message := []byte(cfg.Cons_id + "&" + fmt.Sprint(tstamp))
+	hash := hmac.New(sha256.New, secret)
+	hash.Write(message)
+	// to lowercase hexits
+	hex.EncodeToString(hash.Sum(nil))
+	// to base64
+	X_signature := base64.StdEncoding.EncodeToString(hash.Sum(nil))
+
+	header := &config.Header{
+		ConsID:     cfg.Cons_id,
+		SecretKey:  cfg.Secret_key,
+		UserKey:    cfg.User_key,
+		TimeStamp:  fmt.Sprint(tstamp),
+		XSignature: X_signature,
+	}
+
+	return header
+
+}
+
+func SetHeaderDev(b bool, cfg config.ConfigBpjs) *config.Header {
+
+	timenow := time.Now().UTC()
+	time := time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC)
+	tstamp := timenow.Unix() - time.Unix()
+
+	cfg.Cons_id = os.Getenv("CONS_ID_DEV")
+	cfg.User_key = os.Getenv("USER_KEY_DEV")
+	cfg.Secret_key = os.Getenv("SECRET_KEY_DEV")
+
+	// cfg.Cons_id = os.Getenv("CONS_ID")
+	// cfg.User_key = os.Getenv("USER_KEY")
+	// cfg.Secret_key = os.Getenv("SECRET_KEY")
+
+	secret := []byte(cfg.Secret_key)
+	message := []byte(cfg.Cons_id + "&" + fmt.Sprint(tstamp))
+	hash := hmac.New(sha256.New, secret)
+	hash.Write(message)
+	// to lowercase hexits
+	hex.EncodeToString(hash.Sum(nil))
+	// to base64
+	X_signature := base64.StdEncoding.EncodeToString(hash.Sum(nil))
+
+	header := &config.Header{
+		ConsID:     cfg.Cons_id,
+		SecretKey:  cfg.Secret_key,
+		UserKey:    cfg.User_key,
+		TimeStamp:  fmt.Sprint(tstamp),
+		XSignature: X_signature,
+	}
+
+	return header
+
+}

database/satu_data/dokter/jadwal_dokter.go

@@ -69,9 +69,9 @@ func GetJadwalDokterBySpesialis(hari string, spesialis string) ([]string, error)
 	return listDokter, nil
 }
 
-func GetJadwalDokterBySubpesialis(hari string, subspesialis string) ([]string, error) {
+func GetJadwalDokterBySubpesialis(tanggal string, subspesialis string) ([]string, error) {
 	var listDokter []string
-	errSelect := config.SatuDataDB.Raw(`select "Dokter" from "daftar_jadwal_dokter" where "Nama_hari" = ? and "Sub_spesialis" = ? order by "Sub_spesialis"`, hari, subspesialis).Scan(&listDokter).Error
+	errSelect := config.SatuDataDB.Raw(`select "Dokter" from "data_jadwal_dokter" where "Tanggal_jadwal" = ? and "Sub_spesialis" = ? order by "Sub_spesialis"`, tanggal, subspesialis).Scan(&listDokter).Error
 	if errSelect != nil {
 		log.Printf("Failed get data : %v", errSelect)
 		return nil, errSelect

database/satu_data/log_api/log_api.go

@@ -3,6 +3,7 @@ package logapi
 import (
 	"bridging-rssa/config"
 	logapi "bridging-rssa/models/log_api"
+	"fmt"
 	"log"
 )
 
@@ -30,5 +31,7 @@ func InsertLogAPI(reqInsert *logapi.DataLogAPI) error {
 		log.Println(err)
 		return err
 	}
+	log.Println(err)
+	fmt.Printf("insert log: ", err)
 	return nil
 }

database/satu_data/surat_kontrol/surat_kontrol.go

@@ -333,3 +333,37 @@ func GetNomorSurKon(idPasien string) (string, error) {
 	log.Println("Nomor SurKon :", noSurKon)
 	return noSurKon, nil
 }
+
+func Getdatahistori(norm string, offset, limit string) ([]*suratkontrol.HistoriSurkon, error) {
+	var dataHistoriSurKon []*suratkontrol.HistoriSurkon
+	err := config.SatuDataDB.Raw(`select dkp2."Nama_lengkap",dkp2."Nomor_sep",dsk."id",dkp2."IDXDAFTAR",dsk."Nomor_surat_kontrol",dsk."Tanggal_rencana_kontrol",dsk."Tanggal_cetak_surat_kontrol",
+		ds2."Spesialis",ds."Subspesialis",
+		array(
+			select dgd. "Gelar_depan"
+			from data_pegawai_daftar_gelar_depan dpdgd
+			left join daftar_gelar_depan dgd on dpdgd.daftar_gelar_depan_id = dgd.id where dpdgd.data_pegawai_id = dp.id
+		) AS gelardepan ,
+		dk."Nama_lengkap" as "Nama_lengkap_dokter",
+		array(
+			select dgb. "Gelar_belakang"
+			from data_pegawai_daftar_gelar_belakang dpdgb
+			left join daftar_gelar_belakang dgb on dpdgb.daftar_gelar_belakang_id = dgb.id where dpdgb.data_pegawai_id = dp.id
+		) AS gelarbelakang,	dsk."User_created_surat_kontrol", dsk."User_updated_surat_kontrol",dsk."Tipe_rawat" ,
+		dsk."Status_surat_kontrol"
+		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"
+		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"
+		left join daftar_spesialis ds2 on ds."FK_daftar_spesialis_ID" = ds2."id"
+		where dkp2."NOMR" = ? order by dsk."Tanggal_rencana_kontrol" desc offset ? limit ?`, norm, offset, limit).Scan(&dataHistoriSurKon).Error
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			errMsg := errors.New("data tidak ada")
+			log.Println(errMsg)
+			return nil, errMsg
+		}
+	}
+	return dataHistoriSurKon, nil
+}

docker-compose.yml

@@ -7,7 +7,7 @@ services:
     container_name: api-rssa
     restart: always
     ports:
-      - 8080:8080
+      - 8083:8083
     volumes:
       - .:/app
       - /etc/localtime:/etc/localtime:ro

handlers/bpjs/i_care/i_care.go

@@ -239,7 +239,7 @@ func GetFKTP(c *gin.Context) {
 
 	conf := config.ConfigBpjs{}
 
-	header := cfg.SetHeaderDev(conf)
+	header := cfg.SetHeaderDev(false, conf)
 
 	headers := map[string]string{
 		"X-cons-id":    header.ConsID,

handlers/bpjs/jadwal_dokter/jadwal_dokter.go

@@ -3,6 +3,7 @@ package jadwal_dokter
 import (
 	cfg "bridging-rssa/config"
 	"bridging-rssa/database/satu_data/dokter"
+	"bridging-rssa/database/satu_data/jadwal"
 	log_api "bridging-rssa/database/satu_data/log_api"
 	"bridging-rssa/docs/utils"
 	"bridging-rssa/models/bpjs/jadwal_dokter"
@@ -11,8 +12,6 @@ import (
 	logapi "bridging-rssa/models/log_api"
 	"encoding/json"
 	"fmt"
-	"github.com/google/uuid"
-	"gorm.io/gorm"
 	"log"
 	"net/http"
 	"os"
@@ -20,40 +19,21 @@ import (
 	"strings"
 	"time"
 
+	"github.com/google/uuid"
+	"gorm.io/gorm"
+
 	"github.com/gin-gonic/gin"
 )
 
-func GetJadwalDokter() bool {
+func GetJadwalDokter(c *gin.Context) {
 	baseUrl := os.Getenv("BASEURL_BPJS")
 	endpoint := os.Getenv("ANTREAN_RS")
-	url := baseUrl + endpoint
-	conf := config.ConfigBpjs{}
-
-	header := cfg.SetHeader(false, conf)
-
-	headers := map[string]string{
-		"X-cons-id":   header.ConsID,
-		"X-timestamp": header.TimeStamp,
-		"X-signature": header.XSignature,
-		"user_key":    header.UserKey,
-	}
-
-	errTruncate := dokter.DeleteJadwalDokter()
-	if errTruncate != nil {
-		log.Println(errTruncate)
-		return false
-	}
-
-	errTruncateTemp := dokter.DeleteJadwalDokterTemp()
-	if errTruncateTemp != nil {
-		log.Println(errTruncateTemp)
-		return false
-	}
+	tanggal := c.Param("tanggal")
 
 	// Select from daftar spesialis
 	spesialis, err := dokter.GetSpesialis()
 	if err != nil {
-		return false
+		c.JSON(http.StatusInternalServerError, err)
 	}
 
 	var listIdSpesialis = make(map[string]int)
@@ -63,7 +43,7 @@ func GetJadwalDokter() bool {
 
 	subspesialis, err := dokter.GetSubspesialis()
 	if err != nil {
-		return false
+		c.JSON(http.StatusInternalServerError, err)
 	}
 
 	var listIdSubspesialis = make(map[string]int)
@@ -73,7 +53,7 @@ func GetJadwalDokter() bool {
 
 	listDokter, err := dokter.GetDokter()
 	if err != nil {
-		return false
+		c.JSON(http.StatusInternalServerError, err)
 	}
 
 	var listIddokter = make(map[int]string)
@@ -82,57 +62,107 @@ func GetJadwalDokter() bool {
 	}
 
 	var reqInsert *jadwal_dokter.JadwalDokterSatuData
-
+	var response []*jadwal_dokter.JadwalDokterSatuData
 	for _, value := range spesialis {
-		tanggal := time.Now().Format("2006-01-02")
-		for i := 0; i < 7; i++ {
-			kdPoly := value.Kode
-			res, err := JadwalDokterGetResponse(url, header, kdPoly, tanggal, headers)
-			if err != nil {
-				log.Println("Error making external API request: %v", err)
-				return false
+		conf := config.ConfigBpjs{}
+
+		header := cfg.SetHeader(false, conf)
+
+		headers := map[string]string{
+			"X-cons-id":   header.ConsID,
+			"X-timestamp": header.TimeStamp,
+			"X-signature": header.XSignature,
+			"user_key":    header.UserKey,
+		}
+		kdPoly := value.Kode
+		url := baseUrl + endpoint
+		param := "/jadwaldokter/kodepoli/" + kdPoly + "/tanggal/" + tanggal
+		linkurl := url + param
+		res, err := JadwalDokterGetResponse(linkurl, header, headers)
+		if err != nil {
+			log.Println("Error making external API request: %v", err)
+			c.JSON(http.StatusInternalServerError, err)
+		}
+		log.Println("Tanggal :", tanggal)
+		if res == nil {
+			log.Println("Skip Proses")
+			continue
+		}
+		jadwalLibur, isLibur, errLibur := jadwal.GetJadwalLibur(tanggal)
+		if errLibur != nil {
+			log.Println(errLibur)
+			c.JSON(http.StatusInternalServerError, err)
+		}
+		if isLibur {
+			tanggalTemp, errParseTemp := time.Parse("2006-01-02", tanggal)
+			if errParseTemp != nil {
+				log.Println(errParseTemp)
+				c.JSON(http.StatusInternalServerError, err)
 			}
-			date, errParse := time.Parse("2006-01-02", tanggal)
-			if errParse != nil {
-				return false
+			isLibur = false
+			log.Println(jadwalLibur.NamaLiburPelayanan)
+			tanggalTemp = tanggalTemp.AddDate(0, 0, 7)
+			tanggalTempString := tanggalTemp.Format("2006-01-02")
+			log.Println(tanggalTempString)
+			paramLibur := "/jadwaldokter/kodepoli/" + kdPoly + "/tanggal/" + tanggalTempString
+			linkUrl := url + paramLibur
+			resNew, errRes := JadwalDokterGetResponse(linkUrl, header, headers)
+			if errRes != nil {
+				log.Println("Error making external API request: ", errRes)
+				c.JSON(http.StatusInternalServerError, err)
 			}
-			tanggal = date.AddDate(0, 0, 1).Format("2006-01-02")
-			log.Println("Tanggal :", tanggal)
-			if res == nil {
-				log.Println("Skip Proses")
+			if resNew != nil {
+				for _, v := range resNew.Response {
+					res.Response = append(res.Response, &jadwal_dokter.ListDokter{
+						KodeSubspesialis: v.KodeSubspesialis,
+						Hari:             v.Hari,
+						KapasitasPasien:  v.KapasitasPasien,
+						Libur:            v.Libur,
+						NamaHari:         v.NamaHari,
+						Jadwal:           v.Jadwal,
+						NamaSubspesialis: v.NamaSubspesialis,
+						NamaDokter:       v.NamaDokter,
+						KodePoli:         v.KodePoli,
+						NamaPoli:         v.NamaPoli,
+						KodeDokter:       v.KodeDokter,
+					})
+				}
+			} else {
+				log.Println("Tidak ada data pada tanggal ", tanggalTempString)
 				continue
 			}
-			for _, v := range res.Response {
-				idSpesialis := utils.KodeToIDConverter(v.KodePoli, listIdSpesialis)
-				idSubspesialis := utils.KodeToIDConverter(v.KodeSubspesialis, listIdSubspesialis)
-				idDokter := utils.HfisCodeToIDConverter(v.KodeDokter, listIddokter)
-				reqInsert = &jadwal_dokter.JadwalDokterSatuData{
-					Hari:         v.Hari,
-					NamaHari:     v.NamaHari,
-					Waktu:        v.Jadwal,
-					Dokter:       idDokter,
-					Spesialis:    idSpesialis,
-					SubSpesialis: idSubspesialis,
-					Status:       1, // When available always set to 1
+		}
+		for _, v := range res.Response {
+			idSpesialis := utils.KodeToIDConverter(v.KodePoli, listIdSpesialis)
+			idSubspesialis := utils.KodeToIDConverter(v.KodeSubspesialis, listIdSubspesialis)
+			idDokter := utils.HfisCodeToIDConverter(v.KodeDokter, listIddokter)
+			reqInsert = &jadwal_dokter.JadwalDokterSatuData{
+				Hari:         v.Hari,
+				NamaHari:     v.NamaHari,
+				Waktu:        v.Jadwal,
+				Dokter:       idDokter,
+				Spesialis:    idSpesialis,
+				SubSpesialis: idSubspesialis,
+				Status:       1, // When available always set to 1
+			}
+			if reqInsert.Dokter != "" {
+				errInsert := dokter.InsertJadwalDokter(reqInsert)
+				if errInsert != nil {
+					log.Println(errInsert)
+					c.JSON(http.StatusInternalServerError, err)
 				}
-				if reqInsert.Dokter != "" {
-					errInsert := dokter.InsertJadwalDokter(reqInsert)
-					if errInsert != nil {
-						log.Println(errInsert)
-						return false
-					}
-				} else {
-					reqInsert.Dokter = strconv.Itoa(v.KodeDokter)
-					errInsertTemp := dokter.InsertJadwalDokterTemp(reqInsert)
-					if errInsertTemp != nil {
-						log.Println(errInsertTemp)
-						return false
-					}
+			} else {
+				reqInsert.Dokter = strconv.Itoa(v.KodeDokter)
+				errInsertTemp := dokter.InsertJadwalDokterTemp(reqInsert)
+				if errInsertTemp != nil {
+					log.Println(errInsertTemp)
+					c.JSON(http.StatusInternalServerError, err)
 				}
 			}
+			response = append(response, reqInsert)
 		}
 	}
-	return true
+	c.JSON(http.StatusOK, response)
 }
 
 func GetDokterByDPJP(c *gin.Context) {
@@ -202,25 +232,6 @@ func GetDokterByDPJP(c *gin.Context) {
 	c.JSON(http.StatusOK, res)
 }
 
-func GetSpesialisByDate(c *gin.Context) {
-	tanggal := c.Param("tanggal")
-	date, err := time.Parse("2006-01-02", tanggal)
-	if err != nil {
-		c.JSON(http.StatusInternalServerError, err)
-	}
-	hari := date.Local().Weekday().String()
-	hari = utils.ConvertDay(hari)
-	idSpesialis, err := dokter.GetJadwalDokterByDate(hari)
-	if err != nil {
-		c.JSON(http.StatusInternalServerError, err)
-	}
-	listSpesialis, err := dokter.GetSpesialisByID(idSpesialis)
-	if err != nil {
-		c.JSON(http.StatusInternalServerError, err)
-	}
-	c.JSON(http.StatusOK, listSpesialis)
-}
-
 func GetJadwalSubspesialisByDate(c *gin.Context) {
 	tanggal := c.Param("tanggal")
 	date, err := time.Parse("2006-01-02", tanggal)
@@ -284,24 +295,20 @@ func GetDokterBySpesialis(c *gin.Context) {
 func GetDokterBySubspesialis(c *gin.Context) {
 	subspesialis := c.Param("subspesialis")
 	tanggal := c.Param("tanggal")
-	date, err := time.Parse("2006-01-02", tanggal)
-	if err != nil {
-		c.JSON(http.StatusInternalServerError, err)
-	}
 
 	log.Println("subspesialis: ", subspesialis)
 	log.Println("tanggal: ", tanggal)
 
-	hari := date.Local().Weekday().String()
-	hari = utils.ConvertDay(hari)
-	idDokter, err := dokter.GetJadwalDokterBySubpesialis(hari, subspesialis)
+	idDokter, err := dokter.GetJadwalDokterBySubpesialis(tanggal, subspesialis)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, err)
 	}
+
 	namaDokter, err := dokter.GetNamaLengkapDokter(idDokter)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, err)
 	}
+
 	var resDokter []dktr.ResponseDokterNew
 	idSubspesialis, err := strconv.Atoi(subspesialis)
 	if err != nil {
@@ -336,8 +343,6 @@ func GetDataJadwalDokter() bool {
 	baseUrl := os.Getenv("BASEURL_BPJS")
 	endpoint := os.Getenv("ANTREAN_RS")
 
-	url := baseUrl + endpoint
-	log.Println("url", url)
 	conf := config.ConfigBpjs{}
 
 	spesialis, err := dokter.GetSpesialis()
@@ -399,7 +404,7 @@ func GetDataJadwalDokter() bool {
 			headerString := strings.TrimSuffix(headerStringBuilder.String(), "; ")
 
 			startDate := time.Now()
-			endDate := startDate.AddDate(0, 1, 0)
+			endDate := startDate.AddDate(0, 3, 0)
 			logTimeStart := time.Now().Format("2006-01-02 15:04:05")
 			var res *jadwal_dokter.JadwalDokter
 			var reqLog []*jadwal_dokter.RequestJadwalDokter
@@ -410,7 +415,7 @@ func GetDataJadwalDokter() bool {
 				log.Println("Tanggal :", tanggal)
 				urlReq := url + "/tanggal/" + tanggal
 
-				res, err = JadwalDokterGetResponse(urlReq, header, value.Kode, tanggal, headers)
+				res, err = JadwalDokterGetResponse(urlReq, header, headers)
 				if err != nil {
 					log.Printf("Error making external API request: %v", err)
 					return err
@@ -502,3 +507,167 @@ func GetDataJadwalDokter() bool {
 	log.Println("Berhasil ambil jadwal data dokter")
 	return true
 }
+
+func GetJadwalDokterNew() bool {
+	baseUrl := os.Getenv("BASEURL_BPJS")
+	endpoint := os.Getenv("ANTREAN_RS")
+	url := baseUrl + endpoint
+
+	errTruncate := dokter.DeleteJadwalDokter()
+	if errTruncate != nil {
+		log.Println(errTruncate)
+		return false
+	}
+
+	errTruncateTemp := dokter.DeleteJadwalDokterTemp()
+	if errTruncateTemp != nil {
+		log.Println(errTruncateTemp)
+		return false
+	}
+
+	// Select from daftar spesialis
+	spesialis, err := dokter.GetSpesialis()
+	if err != nil {
+		return false
+	}
+
+	var listIdSpesialis = make(map[string]int)
+	for _, kodeDokter := range spesialis {
+		listIdSpesialis[kodeDokter.Kode] = kodeDokter.ID
+	}
+
+	subspesialis, err := dokter.GetSubspesialis()
+	if err != nil {
+		return false
+	}
+
+	var listIdSubspesialis = make(map[string]int)
+	for _, kodeDokter := range subspesialis {
+		listIdSubspesialis[kodeDokter.Kode] = kodeDokter.ID
+	}
+
+	listDokter, err := dokter.GetDokter()
+	if err != nil {
+		return false
+	}
+
+	var listIddokter = make(map[int]string)
+	for _, kodeDokter := range listDokter {
+		listIddokter[kodeDokter.HfisCode] = kodeDokter.ID
+	}
+
+	var reqInsert *jadwal_dokter.JadwalDokterSatuData
+
+	for _, value := range spesialis {
+
+		tanggal := time.Now().Format("2006-01-02")
+		// tanggal := "2025-04-11"
+		for i := 0; i < 7; i++ {
+			conf := config.ConfigBpjs{}
+
+			header := cfg.SetHeader(false, conf)
+
+			headers := map[string]string{
+				"X-cons-id":   header.ConsID,
+				"X-timestamp": header.TimeStamp,
+				"X-signature": header.XSignature,
+				"user_key":    header.UserKey,
+			}
+			kdPoly := value.Kode
+			param := "/jadwaldokter/kodepoli/" + kdPoly + "/tanggal/" + tanggal
+			linkurl := url + param
+			res, err := JadwalDokterGetResponseApi(linkurl, header, headers)
+			if err != nil {
+				log.Println("Error making external API request: %v", err)
+				return false
+			}
+			date, errParse := time.Parse("2006-01-02", tanggal)
+			if errParse != nil {
+				return false
+			}
+			tanggal = date.AddDate(0, 0, 1).Format("2006-01-02")
+			log.Println("Tanggal :", tanggal)
+			if res == nil {
+				log.Println("Skip Proses")
+				continue
+			}
+			jadwalLibur, isLibur, errLibur := jadwal.GetJadwalLibur(tanggal)
+			if errLibur != nil {
+				log.Println(errLibur)
+				return false
+			}
+			if isLibur {
+				tanggalTemp, errParseTemp := time.Parse("2006-01-02", tanggal)
+				if errParseTemp != nil {
+					log.Println(errParseTemp)
+					return false
+				}
+				isLibur = false
+				for i := 0; i < 7; i++ {
+					log.Println(jadwalLibur.NamaLiburPelayanan)
+					tanggalTemp = tanggalTemp.AddDate(0, 0, 7)
+					tanggalTempString := tanggalTemp.Format("2006-01-02")
+					log.Println(tanggalTempString)
+					paramLibur := "/jadwaldokter/kodepoli/" + kdPoly + "/tanggal/" + tanggalTempString
+					linkUrl := url + paramLibur
+					resNew, errRes := JadwalDokterGetResponseApi(linkUrl, header, headers)
+					if errRes != nil {
+						log.Println("Error making external API request: ", errRes)
+						return false
+					}
+					if resNew != nil {
+						for _, v := range resNew {
+							res = append(res, &jadwal_dokter.ListDokter{
+								KodeSubspesialis: v.KodeSubspesialis,
+								Hari:             v.Hari,
+								KapasitasPasien:  v.KapasitasPasien,
+								Libur:            v.Libur,
+								NamaHari:         v.NamaHari,
+								Jadwal:           v.Jadwal,
+								NamaSubspesialis: v.NamaSubspesialis,
+								NamaDokter:       v.NamaDokter,
+								KodePoli:         v.KodePoli,
+								NamaPoli:         v.NamaPoli,
+								KodeDokter:       v.KodeDokter,
+							})
+						}
+						log.Println("Ada data pada tanggal ", tanggalTempString)
+						break
+					} else {
+						log.Println("Tidak ada data pada tanggal ", tanggalTempString)
+						continue
+					}
+				}
+			}
+			for _, v := range res {
+				idSpesialis := utils.KodeToIDConverter(v.KodePoli, listIdSpesialis)
+				idSubspesialis := utils.KodeToIDConverter(v.KodeSubspesialis, listIdSubspesialis)
+				idDokter := utils.HfisCodeToIDConverter(v.KodeDokter, listIddokter)
+				reqInsert = &jadwal_dokter.JadwalDokterSatuData{
+					Hari:         v.Hari,
+					NamaHari:     v.NamaHari,
+					Waktu:        v.Jadwal,
+					Dokter:       idDokter,
+					Spesialis:    idSpesialis,
+					SubSpesialis: idSubspesialis,
+					Status:       1, // When available always set to 1
+				}
+				if reqInsert.Dokter != "" {
+					errInsert := dokter.InsertJadwalDokter(reqInsert)
+					if errInsert != nil {
+						log.Println(errInsert)
+						return false
+					}
+				} else {
+					reqInsert.Dokter = strconv.Itoa(v.KodeDokter)
+					errInsertTemp := dokter.InsertJadwalDokterTemp(reqInsert)
+					if errInsertTemp != nil {
+						log.Println(errInsertTemp)
+						return false
+					}
+				}
+			}
+		}
+	}
+	return true
+}

handlers/bpjs/jadwal_dokter/response.go

@@ -11,7 +11,7 @@ import (
 	"net/http"
 )
 
-func JadwalDokterGetResponse(url string, header *config.Header, kdPoly string, tanggal string, headers map[string]string) (*jadwal_dokter.JadwalDokter, error) {
+func JadwalDokterGetResponse(url string, header *config.Header, headers map[string]string) (*jadwal_dokter.JadwalDokter, error) {
 	log.Println("URL", url)
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
@@ -72,3 +72,58 @@ func JadwalDokterGetResponse(url string, header *config.Header, kdPoly string, t
 
 	return responses, nil
 }
+
+func JadwalDokterGetResponseApi(url string, header *config.Header, headers map[string]string) ([]*jadwal_dokter.ListDokter, error) {
+	log.Println("URL", url)
+	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		log.Printf("Error creating request: %v", err)
+	}
+
+	for key, value := range headers {
+		req.Header.Set(key, value)
+	}
+
+	log.Println("REQ", req.Header)
+	client := http.Client{}
+	response, err := client.Do(req)
+	if err != nil {
+		log.Printf("Error making external API request: %v", err)
+	}
+	log.Println("RESPONSE: ", response)
+
+	key := header.ConsID + header.SecretKey + header.TimeStamp
+	res, err := io.ReadAll(response.Body)
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	var jadwalDokterRaw jadwal_dokter.JadwalDokterRaw
+	err = json.Unmarshal([]byte(res), &jadwalDokterRaw)
+	if err != nil {
+		log.Printf("Error Unmarshaling: %v", err)
+	}
+
+	if jadwalDokterRaw.MetaData.Code == 201 {
+		log.Println("No Data Found")
+		return nil, nil
+	}
+
+	dataResp, err := docs.StringDecrypt(key, jadwalDokterRaw.Response)
+	if err != nil {
+		log.Printf("Error Decrypt: %v", err)
+	}
+
+	var listDokter []*jadwal_dokter.ListDokter
+
+	log.Println("dataresp: ", dataResp)
+
+	err = json.Unmarshal([]byte(dataResp), &listDokter)
+	if err != nil {
+		log.Printf("Error Decode: %v", err)
+	}
+
+	log.Println("res: ", &listDokter)
+
+	return listDokter, nil
+}

handlers/bpjs/surat_kontrol/surat_kontrol.go

@@ -12,76 +12,24 @@ import (
 	logapi "bridging-rssa/models/log_api"
 	"encoding/json"
 	"fmt"
+	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
 	"log"
 	"net/http"
 	"os"
 	"strings"
 	"time"
-
-	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
 )
 
-func InsertSuratKontrol(c *gin.Context) {
-	baseUrl := os.Getenv("BASEURL_BPJS")
-	endpoint := os.Getenv("SURAT_KONTROL_RS")
+func InsertSuratkontrolNew(c *gin.Context) {
+	baseUrl := os.Getenv("BASEURL_BPJS_DEV")
+	endpoint := os.Getenv("VCLAIM_RS_DEV")
 	param := os.Getenv("INSERT_SURAT_KONTROL")
 	url := baseUrl + endpoint + param
 
-	timeNow := time.Now().Format("2006-01-02 15:04:05")
-
-	var req sk.RequestInsertRencanaKontrol
-
-	err := c.Bind(&req)
-	if err != nil {
-		log.Println(err)
-		c.JSON(http.StatusPreconditionFailed, &sk.ResponseInsertSuratKontrol{
-			MetaData: sk.MetadataString{
-				Code:    "203",
-				Message: err.Error(),
-			},
-		})
-		return
-	}
-
-	jadwalLibur, isLibur, errLibur := jadwal.GetJadwalLibur(req.TglRencanaKontrol)
-	if errLibur != nil {
-		log.Println(errLibur)
-		c.JSON(http.StatusPreconditionFailed, &sk.ResponseInsertSuratKontrol{
-			MetaData: sk.MetadataString{
-				Code:    "203",
-				Message: errLibur.Error(),
-			},
-		})
-		return
-	} else if isLibur {
-		log.Println(jadwalLibur.KeteranganLiburPelayanan)
-		c.JSON(http.StatusPreconditionFailed, &sk.ResponseInsertSuratKontrol{
-			MetaData: sk.MetadataString{
-				Code:    "203",
-				Message: jadwalLibur.NamaLiburPelayanan,
-			},
-		})
-		return
-	}
-
-	reqJson, err := json.Marshal(req)
-	if err != nil {
-		log.Println(err)
-		c.JSON(http.StatusPreconditionFailed, &sk.ResponseInsertSuratKontrol{
-			MetaData: sk.MetadataString{
-				Code:    "203",
-				Message: err.Error(),
-			},
-		})
-		return
-	}
-
-	log.Println("Request: ", string(reqJson))
-
 	conf := config.ConfigBpjs{}
 
-	header := cfg.SetHeader(false, conf)
+	header := cfg.SetHeaderDev(false, conf)
 
 	headers := map[string]string{
 		"X-cons-id":    header.ConsID,
@@ -91,17 +39,20 @@ func InsertSuratKontrol(c *gin.Context) {
 		"Content-Type": "Application/x-www-form-urlencoded",
 	}
 	log.Println("Headers : ", headers)
-
 	var headerStringBuilder strings.Builder
 	for key, value := range headers {
 		headerStringBuilder.WriteString(fmt.Sprintf("%s: %s; ", key, value))
 	}
 	headerString := strings.TrimSuffix(headerStringBuilder.String(), "; ")
 
-	kunjunganPasien, err := suratkontrol.GetDataKunjunganPasien(req.IDXDaftar)
+	uuid := uuid.New().String()
+
+	timeNow := time.Now().Format("2006-01-02 15:04:05")
+	var req sk.RequestInsertRencanaKontrol
+	err := c.Bind(&req)
 	if err != nil {
 		log.Println(err)
-		c.JSON(http.StatusPreconditionFailed, &sk.ResponseInsertSuratKontrol{
+		c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
 			MetaData: sk.MetadataString{
 				Code:    "203",
 				Message: err.Error(),
@@ -110,98 +61,18 @@ func InsertSuratKontrol(c *gin.Context) {
 		return
 	}
 
-	var idRuangan int
-	if kunjunganPasien.Ruangan != 0 {
-		idRuangan = kunjunganPasien.Ruangan
-	} else {
-		idRuangan, err = lokasiruang.GetDaftarLokasiRuang(req.Ruangan)
-		if err != nil {
-			log.Println(err)
-			c.JSON(http.StatusInternalServerError, &sk.ResponseInsertSuratKontrol{
-				MetaData: sk.MetadataString{
-					Code:    "203",
-					Message: err.Error(),
-				},
-			})
-			return
-		}
-	}
-
-	uuid := uuid.New().String()
-	if req.TipeSurKon != "1" {
-		dataSurkon, err := suratkontrol.GetNomorSurKon(kunjunganPasien.ID)
-		if err != nil {
-			log.Println(err)
-			c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
-				MetaData: sk.MetadataString{
-					Code:    "203",
-					Message: err.Error(),
-				},
-			})
-			return
-		}
-
-		noUrut := "001"
-		if dataSurkon != "" {
-			noUrut, err = utils.GetNoUrut(dataSurkon)
-			if err != nil {
-				log.Println(err)
-				c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
-					MetaData: sk.MetadataString{
-						Code:    "203",
-						Message: err.Error(),
-					},
-				})
-				return
-			}
-		}
-
-		noSurKon := "SI/" + req.TipeRawat + "/" + kunjunganPasien.NomorRM + "/" + noUrut
-		reqInsert := &sk.DataSuratKontrol{
-			ID:                uuid,
-			DateCreated:       timeNow,
-			TglCetakSurKon:    timeNow,
-			TglRencanaKontrol: req.TglRencanaKontrol,
-			NomorSurKon:       noSurKon,
-			KunjunganPasien:   kunjunganPasien.ID,
-			RuanganSurKon:     idRuangan,
-			DPJPSurKon:        req.IDDokter,
-			StatusSurKon:      1, // First Insert status always set to 1
-			UserCreatedSurKon: req.User,
-			TipeSurKon:        req.TipeSurKon,
-			TipeRawat:         req.TipeRawat,
-		}
-		err = suratkontrol.InsertDataSuratKontrol(reqInsert)
-		if err != nil {
-			log.Println(err)
-			c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
-				MetaData: sk.MetadataString{
-					Code:    "203",
-					Message: err.Error(),
-				},
-			})
-			return
-		}
-
-		err = suratkontrol.UpdateKunjunganPasien(req)
-		if err != nil {
-			log.Println(err)
-			c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
-				MetaData: sk.MetadataString{
-					Code:    "203",
-					Message: err.Error(),
-				},
-			})
-			return
-		}
+	reqJson, err := json.Marshal(req)
+	if err != nil {
+		log.Println(err)
 		c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
 			MetaData: sk.MetadataString{
-				Code:    "200",
-				Message: "Berhasil Insert Surat Kontrol",
+				Code:    "203",
+				Message: err.Error(),
 			},
 		})
 		return
 	}
+	log.Println("reqJson : ", string(reqJson))
 
 	reqSuratKontrol := &sk.RequestHeaderRencanaKontrol{
 		Request: &sk.ReqInsertRencanaKontrol{
@@ -213,8 +84,10 @@ func InsertSuratKontrol(c *gin.Context) {
 		},
 	}
 	logTimeStart := time.Now().Format("2006-01-02 15:04:05")
-	res, err := PostData(url, header, headers, reqSuratKontrol)
-	if err != nil {
+	res, errData := PostData(url, header, headers, reqSuratKontrol)
+	log.Println("res : ", res)
+	log.Println("error nya  : ", errData)
+	if errData != nil {
 		responJson, err := json.Marshal(res)
 		if err != nil {
 			log.Println(err)
@@ -265,7 +138,7 @@ func InsertSuratKontrol(c *gin.Context) {
 	responJson, err := json.Marshal(res)
 	if err != nil {
 		log.Println(err)
-		c.JSON(http.StatusPreconditionFailed, &sk.ResponseInsertSuratKontrol{
+		c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
 			MetaData: sk.MetadataString{
 				Code:    "203",
 				Message: err.Error(),
@@ -274,51 +147,6 @@ func InsertSuratKontrol(c *gin.Context) {
 		return
 	}
 	logTimeEnd := time.Now().Format("2006-01-02 15:04:05")
-	reqInsert := &sk.DataSuratKontrol{
-		ID:                uuid,
-		DateCreated:       timeNow,
-		TglCetakSurKon:    timeNow,
-		TglRencanaKontrol: res.Response.TglRencanaKontrol,
-		NomorSurKon:       res.Response.NoSuratKontrol,
-		KunjunganPasien:   kunjunganPasien.ID,
-		RuanganSurKon:     idRuangan,
-		DPJPSurKon:        req.IDDokter,
-		StatusSurKon:      1, // First Insert status always set to 1
-		UserCreatedSurKon: req.User,
-		TipeSurKon:        "1",
-		TipeRawat:         req.TipeRawat,
-	}
-
-	err = suratkontrol.InsertDataSuratKontrol(reqInsert)
-	if err != nil {
-		log.Println(err)
-		c.JSON(http.StatusPreconditionFailed, &sk.ResponseInsertSuratKontrol{
-			MetaData: sk.MetadataString{
-				Code:    "203",
-				Message: err.Error(),
-			},
-		})
-		return
-	}
-
-	if req.KodeDiagnosa == "" || req.NamaDiagnosa == "" {
-		diagnosa := strings.Split(res.Response.NamaDiagnosa, " - ")
-		req.KodeDiagnosa = diagnosa[0]
-		req.NamaDiagnosa = diagnosa[1]
-	}
-
-	err = suratkontrol.UpdateKunjunganPasien(req)
-	if err != nil {
-		log.Println(err)
-		c.JSON(http.StatusPreconditionFailed, &sk.ResponseInsertSuratKontrol{
-			MetaData: sk.MetadataString{
-				Code:    "203",
-				Message: err.Error(),
-			},
-		})
-		return
-	}
-
 	reqInsertLog := &logapi.DataLogAPI{
 		ID:              uuid,
 		DateCreated:     logTimeEnd,
@@ -339,7 +167,7 @@ func InsertSuratKontrol(c *gin.Context) {
 	err = log_api.InsertLogAPI(reqInsertLog)
 	if err != nil {
 		log.Println(err)
-		c.JSON(http.StatusPreconditionFailed, &sk.ResponseInsertSuratKontrol{
+		c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
 			MetaData: sk.MetadataString{
 				Code:    "203",
 				Message: err.Error(),
@@ -348,23 +176,402 @@ func InsertSuratKontrol(c *gin.Context) {
 		return
 	}
 
-	response := &sk.ResponseInsertSuratKontrol{
-		MetaData: res.MetaData,
-		Response: sk.ResponseData{
-			NoSuratKontrol:    res.Response.NoSuratKontrol,
-			TglRencanaKontrol: res.Response.TglRencanaKontrol,
-			NamaDokter:        res.Response.NamaDokter,
-			NoKartu:           res.Response.NoKartu,
-			Nama:              res.Response.Nama,
-			Kelamin:           res.Response.Kelamin,
-			TglLahir:          res.Response.TglLahir,
-			NamaDiagnosa:      res.Response.NamaDiagnosa,
-			SubSpesialis:      req.Subspesialis,
-		},
+	kunjunganPasien, err := suratkontrol.GetDataKunjunganPasien(req.IDXDaftar)
+	if err != nil {
+		log.Println(err)
+		c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+			MetaData: sk.MetadataString{
+				Code:    "203",
+				Message: err.Error(),
+			},
+		})
+		return
 	}
 
-	log.Println("Response: ", response)
-	c.JSON(http.StatusOK, response)
+	var idRuangan int
+	if kunjunganPasien.Ruangan != 0 {
+		idRuangan = kunjunganPasien.Ruangan
+	} else {
+		idRuangan, err = lokasiruang.GetDaftarLokasiRuang(req.Ruangan)
+		if err != nil {
+			log.Println(err)
+			c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+				MetaData: sk.MetadataString{
+					Code:    "203",
+					Message: err.Error(),
+				},
+			})
+			return
+		}
+	}
+
+	if req.TipeSurKon != "1" {
+		dataSurkon, err := suratkontrol.GetNomorSurKon(kunjunganPasien.ID)
+		if err != nil {
+			log.Println(err)
+			c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+				MetaData: sk.MetadataString{
+					Code:    "203",
+					Message: err.Error(),
+				},
+			})
+			return
+		}
+
+		noUrut := "001"
+		if dataSurkon != "" {
+			noUrut, err = utils.GetNoUrut(dataSurkon)
+			if err != nil {
+				log.Println(err)
+				c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+					MetaData: sk.MetadataString{
+						Code:    "203",
+						Message: err.Error(),
+					},
+				})
+				return
+			}
+		}
+
+		noSurKon := "SI/" + req.TipeRawat + "/" + req.NoRM + "/" + noUrut
+		reqInsert := &sk.DataSuratKontrol{
+			ID:                uuid,
+			DateCreated:       timeNow,
+			TglCetakSurKon:    timeNow,
+			TglRencanaKontrol: req.TglRencanaKontrol,
+			NomorSurKon:       noSurKon,
+			KunjunganPasien:   kunjunganPasien.ID,
+			RuanganSurKon:     idRuangan,
+			DPJPSurKon:        req.IDDokter,
+			StatusSurKon:      1, // First Insert status always set to 1
+			UserCreatedSurKon: req.User,
+			TipeSurKon:        req.TipeSurKon,
+			TipeRawat:         req.TipeRawat,
+		}
+		err = suratkontrol.InsertDataSuratKontrol(reqInsert)
+		if err != nil {
+			log.Println(err)
+			c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+				MetaData: sk.MetadataString{
+					Code:    "203",
+					Message: err.Error(),
+				},
+			})
+			return
+		}
+
+		err = suratkontrol.UpdateKunjunganPasien(req)
+		if err != nil {
+			log.Println(err)
+			c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+				MetaData: sk.MetadataString{
+					Code:    "203",
+					Message: err.Error(),
+				},
+			})
+			return
+		}
+		c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+			MetaData: sk.MetadataString{
+				Code:    "200",
+				Message: "Berhasil Insert Surat Kontrol",
+			},
+		})
+		return
+	}
+
+}
+
+func InsertSuratKontrol(c *gin.Context) {
+	baseUrl := os.Getenv("BASEURL_BPJS_DEV")
+	endpoint := os.Getenv("VCLAIM_RS_DEV")
+	param := os.Getenv("INSERT_SURAT_KONTROL")
+	url := baseUrl + endpoint + param
+	//timeNow := time.Now().Format("2006-01-02 15:04:05")
+
+	conf := config.ConfigBpjs{}
+
+	header := cfg.SetHeaderDev(false, conf)
+
+	headers := map[string]string{
+		"X-cons-id":    header.ConsID,
+		"X-timestamp":  header.TimeStamp,
+		"X-signature":  header.XSignature,
+		"user_key":     header.UserKey,
+		"Content-Type": "Application/x-www-form-urlencoded",
+	}
+	log.Println("Headers : ", headers)
+	var headerStringBuilder strings.Builder
+	for key, value := range headers {
+		headerStringBuilder.WriteString(fmt.Sprintf("%s: %s; ", key, value))
+	}
+	headerString := strings.TrimSuffix(headerStringBuilder.String(), "; ")
+
+	uuid := uuid.New().String()
+
+	var req sk.RequestInsertRencanaKontrol
+	err := c.Bind(&req)
+	if err != nil {
+		log.Println(err)
+		c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+			MetaData: sk.MetadataString{
+				Code:    "203",
+				Message: err.Error(),
+			},
+		})
+		return
+	}
+	reqJson, err := json.Marshal(req)
+	if err != nil {
+		log.Println(err)
+		c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+			MetaData: sk.MetadataString{
+				Code:    "203",
+				Message: err.Error(),
+			},
+		})
+		return
+	}
+
+	reqSuratKontrol := &sk.RequestHeaderRencanaKontrol{
+		Request: &sk.ReqInsertRencanaKontrol{
+			NoSEP:             req.NoSEP,
+			KodeDokter:        req.KodeHFIS,
+			PoliKontrol:       req.KodePoli,
+			TglRencanaKontrol: req.TglRencanaKontrol,
+			User:              req.User,
+		},
+	}
+	logTimeStart := time.Now().Format("2006-01-02 15:04:05")
+	res, err := PostData(url, header, headers, reqSuratKontrol)
+	log.Println("respon bpjs :")
+	if err != nil {
+		responJson, Marshalerr := json.Marshal(res)
+		log.Println("hasil respon bpjs :")
+		if Marshalerr != nil {
+			log.Println(Marshalerr)
+			log.Println("hasil respon bpjs nothing:")
+			c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+				MetaData: sk.MetadataString{
+					Code:    res.MetaData.Code,
+					Message: res.MetaData.Message,
+				},
+			})
+			return
+		}
+		log.Println("hasil respon bpjs menyimpanan log:")
+		logTimeEnd := time.Now().Format("2006-01-02 15:04:05")
+		reqInsertLog := &logapi.DataLogAPI{
+			ID:              uuid,
+			DateCreated:     logTimeEnd,
+			UserAgent:       req.User,
+			IP:              c.ClientIP(),
+			Parameter:       "BPJS-VClaim-RencanaKontrol",
+			Header:          headerString,
+			Method:          "POST",
+			Url:             url,
+			Request:         reqJson,
+			Respon:          responJson,
+			ResponCode:      res.MetaData.Code,
+			ResponTimeStart: logTimeStart,
+			ResponTimeEnd:   logTimeEnd,
+			Comment:         res.MetaData.Message,
+		}
+
+		errInsert := log_api.InsertLogAPI(reqInsertLog)
+		if errInsert != nil {
+			log.Println(errInsert)
+			c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+				MetaData: sk.MetadataString{
+					Code:    "203",
+					Message: errInsert.Error(),
+				},
+			})
+			return
+		}
+		log.Println(errInsert)
+		c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+			MetaData: sk.MetadataString{
+				Code:    res.MetaData.Code,
+				Message: res.MetaData.Message,
+			},
+		})
+		return
+	}
+	log.Println("ojo di terusno  :")
+	//responJson, err := json.Marshal(res)
+	//if err != nil {
+	//	log.Println(err)
+	//	c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+	//		MetaData: sk.MetadataString{
+	//			Code:    "203",
+	//			Message: err.Error(),
+	//		},
+	//	})
+	//	return
+	//}
+	//logTimeEnd := time.Now().Format("2006-01-02 15:04:05")
+	//reqInsert := &sk.DataSuratKontrol{
+	//	ID:                uuid,
+	//	DateCreated:       timeNow,
+	//	TglCetakSurKon:    timeNow,
+	//	TglRencanaKontrol: res.Response.TglRencanaKontrol,
+	//	NomorSurKon:       res.Response.NoSuratKontrol,
+	//	KunjunganPasien:   kunjunganPasien.ID,
+	//	RuanganSurKon:     idRuangan,
+	//	DPJPSurKon:        req.IDDokter,
+	//	StatusSurKon:      1, // First Insert status always set to 1
+	//	UserCreatedSurKon: req.User,
+	//	TipeSurKon:        "1",
+	//	TipeRawat:         req.TipeRawat,
+	//}
+	//
+	//err = suratkontrol.InsertDataSuratKontrol(reqInsert)
+	//if err != nil {
+	//	log.Println(err)
+	//	c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+	//		MetaData: sk.MetadataString{
+	//			Code:    "203",
+	//			Message: err.Error(),
+	//		},
+	//	})
+	//	return
+	//}
+	//
+	//err = suratkontrol.UpdateKunjunganPasien(req)
+	//if err != nil {
+	//	log.Println(err)
+	//	c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+	//		MetaData: sk.MetadataString{
+	//			Code:    "203",
+	//			Message: err.Error(),
+	//		},
+	//	})
+	//	return
+	//}
+	//
+	//reqInsertLog := &logapi.DataLogAPI{
+	//	ID:              uuid,
+	//	DateCreated:     logTimeEnd,
+	//	UserAgent:       req.User,
+	//	IP:              c.ClientIP(),
+	//	Parameter:       "BPJS-VClaim-RencanaKontrol",
+	//	Header:          headerString,
+	//	Method:          "POST",
+	//	Url:             url,
+	//	Request:         reqJson,
+	//	Respon:          responJson,
+	//	ResponCode:      res.MetaData.Code,
+	//	ResponTimeStart: logTimeStart,
+	//	ResponTimeEnd:   logTimeEnd,
+	//	Comment:         res.MetaData.Message,
+	//}
+	//
+	//err = log_api.InsertLogAPI(reqInsertLog)
+	//if err != nil {
+	//	log.Println(err)
+	//	c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+	//		MetaData: sk.MetadataString{
+	//			Code:    "203",
+	//			Message: err.Error(),
+	//		},
+	//	})
+	//	return
+	//}
+	//
+	//response := &sk.ResponseInsertSuratKontrol{
+	//	MetaData: res.MetaData,
+	//	Response: sk.ResponseData{
+	//		NoSuratKontrol:    res.Response.NoSuratKontrol,
+	//		TglRencanaKontrol: res.Response.TglRencanaKontrol,
+	//		NamaDokter:        res.Response.NamaDokter,
+	//		NoKartu:           res.Response.NoKartu,
+	//		Nama:              res.Response.Nama,
+	//		Kelamin:           res.Response.Kelamin,
+	//		TglLahir:          res.Response.TglLahir,
+	//		NamaDiagnosa:      res.Response.NamaDiagnosa,
+	//		SubSpesialis:      req.Subspesialis,
+	//	},
+	//}
+	//
+	//log.Println("Response: ", response)
+	//c.JSON(http.StatusOK, response)
+
+	//if req.TipeSurKon != "1" {
+	//	dataSurkon, err := suratkontrol.GetNomorSurKon(kunjunganPasien.ID)
+	//	if err != nil {
+	//		log.Println(err)
+	//		c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+	//			MetaData: sk.MetadataString{
+	//				Code:    "203",
+	//				Message: err.Error(),
+	//			},
+	//		})
+	//		return
+	//	}
+	//
+	//	noUrut := "001"
+	//	if dataSurkon != "" {
+	//		noUrut, err = utils.GetNoUrut(dataSurkon)
+	//		if err != nil {
+	//			log.Println(err)
+	//			c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+	//				MetaData: sk.MetadataString{
+	//					Code:    "203",
+	//					Message: err.Error(),
+	//				},
+	//			})
+	//			return
+	//		}
+	//	}
+	//
+	//	noSurKon := "SI/" + req.TipeRawat + "/" + kunjunganPasien.NomorRM + "/" + noUrut
+	//	reqInsert := &sk.DataSuratKontrol{
+	//		ID:                uuid,
+	//		DateCreated:       timeNow,
+	//		TglCetakSurKon:    timeNow,
+	//		TglRencanaKontrol: req.TglRencanaKontrol,
+	//		NomorSurKon:       noSurKon,
+	//		KunjunganPasien:   kunjunganPasien.ID,
+	//		RuanganSurKon:     idRuangan,
+	//		DPJPSurKon:        req.IDDokter,
+	//		StatusSurKon:      1, // First Insert status always set to 1
+	//		UserCreatedSurKon: req.User,
+	//		TipeSurKon:        req.TipeSurKon,
+	//		TipeRawat:         req.TipeRawat,
+	//	}
+	//	err = suratkontrol.InsertDataSuratKontrol(reqInsert)
+	//	if err != nil {
+	//		log.Println(err)
+	//		c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+	//			MetaData: sk.MetadataString{
+	//				Code:    "203",
+	//				Message: err.Error(),
+	//			},
+	//		})
+	//		return
+	//	}
+	//
+	//	err = suratkontrol.UpdateKunjunganPasien(req)
+	//	if err != nil {
+	//		log.Println(err)
+	//		c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+	//			MetaData: sk.MetadataString{
+	//				Code:    "203",
+	//				Message: err.Error(),
+	//			},
+	//		})
+	//		return
+	//	}
+	//	c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+	//		MetaData: sk.MetadataString{
+	//			Code:    "200",
+	//			Message: "Berhasil Insert Surat Kontrol",
+	//		},
+	//	})
+	//	return
+	//}
+
 }
 
 func UpdateSuratKontrol(c *gin.Context) {
@@ -450,6 +657,7 @@ func UpdateSuratKontrol(c *gin.Context) {
 			StatusSurKon:      1, // First Insert status always set to 1
 			TipeSurKon:        req.TipeSurKon,
 			UserUpdatedSurKon: req.User,
+			TipeRawat:         req.TipeRawat,
 		}
 		reqUpdate := &sk.DataSuratKontrol{
 			DateUpdated:       timeNow,
@@ -1196,3 +1404,49 @@ func CariPasienTPP(c *gin.Context) {
 	}
 	c.JSON(http.StatusOK, resSurKon)
 }
+
+func GethistoribyNorm(c *gin.Context) {
+	norm := c.Param("norm")
+	offset := c.Param("offset")
+	limit := c.Param("limit")
+
+	data, err := suratkontrol.Getdatahistori(norm, offset, limit)
+	if err != nil {
+		log.Println(err)
+		c.JSON(http.StatusInternalServerError, &sk.MetadataString{
+			Code:    "",
+			Message: err.Error(),
+		})
+		return
+	}
+
+	var resHisSurKon []*sk.Dataresponse
+	for _, v := range data {
+		gelarDepan := utils.ReplaceGelar(v.GelarDepan)
+		gelarBelakang := utils.ReplaceGelar(v.GelarBelakang)
+		namaLengkap := gelarDepan + " " + v.NamaDokter + " " + gelarBelakang
+		namaLengkap = strings.TrimPrefix(namaLengkap, " ")
+		namaLengkap = strings.TrimSuffix(namaLengkap, " ")
+		dateCetakSurkon, _ := time.Parse(time.RFC3339, v.TanggalCetak)
+		dateCetakSurkonString := dateCetakSurkon.Format("2006-01-02")
+		dateRencanaSurkon, _ := time.Parse(time.RFC3339, v.TanggalRencana)
+		dateRencanaSurkonString := dateRencanaSurkon.Format("2006-01-02")
+		resHisSurKon = append(resHisSurKon, &sk.Dataresponse{
+			NamaPasien:        v.NamaPasien,
+			NoSEP:             v.NoSEP,
+			IdSurkon:          v.IdSurkon,
+			Idxdaftar:         v.Idxdaftar,
+			NomorSuratkontrol: v.NomorSuratkontrol,
+			TanggalRencana:    dateRencanaSurkonString,
+			TanggalCetak:      dateCetakSurkonString,
+			Spesialis:         v.Spesialis,
+			Subspesialis:      v.Subspesialis,
+			NamaLengkap:       namaLengkap,
+			Tiperawat:         v.Tiperawat,
+			UserCreate:        v.UserCreate,
+			UserUpdate:        v.UserUpdate,
+			Status:            v.Status,
+		})
+	}
+	c.JSON(http.StatusOK, resHisSurKon)
+}

main.go

@@ -6,11 +6,11 @@ import (
 	icare "bridging-rssa/handlers/bpjs/i_care"
 	"bridging-rssa/handlers/bpjs/jadwal_dokter"
 	suratkontrol "bridging-rssa/handlers/bpjs/surat_kontrol"
+	"github.com/gin-contrib/cors"
 	"log"
 
 	_ "bridging-rssa/docs"
 
-	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
 	"github.com/joho/godotenv"
 	cron "github.com/robfig/cron/v3"
@@ -33,23 +33,30 @@ func main() {
 	config.ConnectDB()
 
 	r := gin.Default()
-
+	r.Use(cors.New(cors.Config{
+		AllowOrigins:     []string{"*"}, // or specific domains like "http://example.com"
+		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE"},
+		AllowHeaders:     []string{"Origin", "Content-Type"},
+		AllowCredentials: true,
+	}))
 	scheduler := cron.New()
 
 	defer scheduler.Stop()
 
-	//scheduler.AddFunc("0 2 * * *", func() {
-	//	log.Println("=== RUNNING SCHEDULE GET JADWAL DOKTER ===")
-	//	for {
-	//		success := jadwal_dokter.GetJadwalDokter()
-	//		if success {
-	//			log.Println("=== SCHEDULE GET JADWAL DOKTER DONE ===")
-	//			break
-	//		}
-	//	}
-	//})
+	// SCHEDULE HARIAN
+	scheduler.AddFunc("15 2 * * *", func() {
+		log.Println("=== RUNNING SCHEDULE GET JADWAL DOKTER ===")
+		for {
+			success := jadwal_dokter.GetJadwalDokterNew()
+			if success {
+				log.Println("=== SCHEDULE GET JADWAL DOKTER DONE ===")
+				break
+			}
+		}
+	})
 
-	scheduler.AddFunc("10 2 8 * *", func() {
+	//SCHEDULE TIAP 3 BULAN
+	scheduler.AddFunc("20 2 * * 5", func() {
 		log.Println("=== RUNNING SCHEDULE GET JADWAL DOKTER MONTHLY===")
 		for {
 			success := jadwal_dokter.GetDataJadwalDokter()
@@ -69,16 +76,17 @@ func main() {
 		subspesialis.GET("/", bpjs.GetAllSubspesialis)
 	}
 
+	//API UNTUK JADWAL DOKTER
 	jadwalDokter := v1.Group("/jadwaldokter")
 	{
-		// jadwalDokter.GET("/", jadwal_dokter.GetJadwalDokter)
+		jadwalDokter.GET("/date/:tanggal", jadwal_dokter.GetJadwalDokter)
 		jadwalDokter.GET("/dpjp/:dpjp", jadwal_dokter.GetDokterByDPJP)
-		// jadwalDokter.GET("/tanggal/:tanggal", jadwal_dokter.GetSpesialisByDate)
 		jadwalDokter.GET("/tanggal/:tanggal", jadwal_dokter.GetJadwalSubspesialisByDate)
 		jadwalDokter.GET("/tanggal/:tanggal/spesialis/:spesialis", jadwal_dokter.GetDokterBySpesialis)
 		jadwalDokter.GET("/tanggal/:tanggal/subspesialis/:subspesialis", jadwal_dokter.GetDokterBySubspesialis)
 	}
 
+	// API UNTUK SURAT KONTROL
 	suratKontrol := v1.Group("/suratkontrol")
 	{
 		suratKontrol.GET("/offset/:offset/limit/:limit", suratkontrol.GetDataSurKon)
@@ -88,8 +96,10 @@ func main() {
 		suratKontrol.GET("/printSurKon/:idxdaftar/tiperawat/:tiperawat", suratkontrol.PrintSurKon)
 		suratKontrol.POST("/cari", suratkontrol.CariPasienTPP)
 		suratKontrol.POST("/insert", suratkontrol.InsertSuratKontrol)
+		suratKontrol.POST("/insertnew", suratkontrol.InsertSuratkontrolNew)
 		suratKontrol.PUT("/update", suratkontrol.UpdateSuratKontrol)
 		suratKontrol.POST("/delete", suratkontrol.DeleteSuratKontrol)
+		suratKontrol.GET("/norm/:norm/limit/:limit/offset/:offset", suratkontrol.GethistoribyNorm)
 	}
 
 	iCare := v1.Group("/icare")
@@ -101,15 +111,9 @@ func main() {
 	r.POST("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
 	r.PUT("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
 	r.DELETE("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
-	r.Use(cors.New(cors.Config{
-		AllowOrigins:     []string{"*"}, // or specific domains like "http://example.com"
-		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE"},
-		AllowHeaders:     []string{"Origin", "Content-Type"},
-		AllowCredentials: true,
-	}))
 
 	log.Println("JALAN DI PORT : 8080")
-	err = r.Run(":8080")
+	err = r.Run(":8083")
 	if err != nil {
 		log.Fatal(err)
 	}

models/bpjs/surat_kontrol/surat_kontrol.go

@@ -24,6 +24,7 @@ type ReqUpdateRencanaKontrol struct {
 type RequestInsertRencanaKontrol struct {
 	IDXDaftar         string `json:"idxdaftar"`
 	NoSEP             string `json:"noSEP"`
+	NoRM              string `json:"noRM"`
 	KodeHFIS          string `json:"kodeHFIS"`
 	KodePoli          string `json:"kodePoli"`
 	Subspesialis      string `json:"subspesialis"`
@@ -298,3 +299,39 @@ type RequestCariPasien struct {
 	Offset       string `json:"offset"`
 	Limit        string `json:"limit"`
 }
+
+type HistoriSurkon struct {
+	NamaPasien        string `gorm:"column:Nama_lengkap" json:"Nama_pasien"`
+	NoSEP             string `gorm:"column:Nomor_sep" json:"No_SEP"`
+	IdSurkon          string `gorm:"column:id" json:"id"`
+	Idxdaftar         string `gorm:"column:IDXDAFTAR" json:"IDXDAFTAR"`
+	NomorSuratkontrol string `gorm:"column:Nomor_surat_kontrol" json:"Nomor_surat_kontrol"`
+	TanggalRencana    string `gorm:"column:Tanggal_rencana_kontrol" json:"Tanggal_rencana_kontrol"`
+	TanggalCetak      string `gorm:"column:Tanggal_cetak_surat_kontrol" json:"Tanggal_cetak_surat_kontrol"`
+	Spesialis         string `gorm:"column:Spesialis" json:"Spesialis"`
+	Subspesialis      string `gorm:"column:Subspesialis" json:"Subspesialis"`
+	GelarDepan        string `gorm:"column:gelardepan" json:"Gelar_depan"`
+	NamaDokter        string `gorm:"column:Nama_lengkap_dokter" json:"Nama_dokter"`
+	GelarBelakang     string `gorm:"column:gelarbelakang" json:"Gelar_belakang"`
+	Tiperawat         string `gorm:"column:Tipe_rawat" json:"Tipe_rawat"`
+	UserCreate        string `gorm:"column:User_created_surat_kontrol" json:"User_create"`
+	UserUpdate        string `gorm:"column:User_updated_surat_kontrol" json:"User_update"`
+	Status            string `gorm:"column:Status_surat_kontrol" json:"Status_surat_kontrol"`
+}
+
+type Dataresponse struct {
+	NamaPasien        string `json:"Nama_pasien"`
+	NoSEP             string `json:"No_SEP"`
+	IdSurkon          string `json:"id_surkon"`
+	Idxdaftar         string `json:"Idxdaftar"`
+	NomorSuratkontrol string `json:"Nomor_surat_kontrol"`
+	TanggalRencana    string `json:"Tanggal_rencana_kontrol"`
+	TanggalCetak      string `json:"Tanggal_cetak_surat_kontrol"`
+	Spesialis         string `json:"Spesialis"`
+	Subspesialis      string `json:"Subspesialis"`
+	NamaLengkap       string `json:"Dpjp"`
+	Tiperawat         string `json:"Tipe_rawat"`
+	UserCreate        string `json:"User_create"`
+	UserUpdate        string `json:"User_update"`
+	Status            string `json:"Status_surat_kontrol"`
+}