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

@@ -70,7 +70,7 @@ func SetHeader(isIcare bool, cfg config.ConfigBpjs) *config.Header {
 
 }
 
-func SetHeaderDev(cfg config.ConfigBpjs) *config.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)

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

@@ -336,7 +336,7 @@ func GetNomorSurKon(idPasien string) (string, error) {
 
 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."Nomor_surat_kontrol",dsk."Tanggal_rencana_kontrol",dsk."Tanggal_cetak_surat_kontrol",
+	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"

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

@@ -295,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()
+	idDokter, err := dokter.GetJadwalDokterBySubpesialis(tanggal, subspesialis)
-	hari = utils.ConvertDay(hari)
-	idDokter, err := dokter.GetJadwalDokterBySubpesialis(hari, 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 {

handlers/bpjs/surat_kontrol/surat_kontrol.go

@@ -12,26 +12,43 @@ 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) {
+func InsertSuratkontrolNew(c *gin.Context) {
-	baseUrl := os.Getenv("BASEURL_BPJS")
+	baseUrl := os.Getenv("BASEURL_BPJS_DEV")
-	endpoint := os.Getenv("SURAT_KONTROL_RS")
+	endpoint := os.Getenv("VCLAIM_RS_DEV")
 	param := os.Getenv("INSERT_SURAT_KONTROL")
 	url := baseUrl + endpoint + param
 
+	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()
+
 	timeNow := time.Now().Format("2006-01-02 15:04:05")
-
 	var req sk.RequestInsertRencanaKontrol
-
 	err := c.Bind(&req)
 	if err != nil {
 		log.Println(err)
@@ -43,28 +60,6 @@ func InsertSuratKontrol(c *gin.Context) {
 		})
 		return
 	}
-	log.Println(req)
-
-	jadwalLibur, isLibur, errLibur := jadwal.GetJadwalLibur(req.TglRencanaKontrol)
-	if errLibur != nil {
-		log.Println(errLibur)
-		c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
-			MetaData: sk.MetadataString{
-				Code:    "203",
-				Message: errLibur.Error(),
-			},
-		})
-		return
-	} else if isLibur {
-		log.Println(jadwalLibur.KeteranganLiburPelayanan)
-		c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
-			MetaData: sk.MetadataString{
-				Code:    "203",
-				Message: jadwalLibur.NamaLiburPelayanan,
-			},
-		})
-		return
-	}
 
 	reqJson, err := json.Marshal(req)
 	if err != nil {
@@ -77,27 +72,109 @@ func InsertSuratKontrol(c *gin.Context) {
 		})
 		return
 	}
+	log.Println("reqJson : ", string(reqJson))
 
-	log.Println("Request: ", string(reqJson))
+	reqSuratKontrol := &sk.RequestHeaderRencanaKontrol{
-
+		Request: &sk.ReqInsertRencanaKontrol{
-	conf := config.ConfigBpjs{}
+			NoSEP:             req.NoSEP,
-
+			KodeDokter:        req.KodeHFIS,
-	header := cfg.SetHeader(false, conf)
+			PoliKontrol:       req.KodePoli,
-
+			TglRencanaKontrol: req.TglRencanaKontrol,
-	headers := map[string]string{
+			User:              req.User,
-		"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)
+	logTimeStart := time.Now().Format("2006-01-02 15:04:05")
+	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)
+			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")
+		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,
+		}
 
-	var headerStringBuilder strings.Builder
+		err = log_api.InsertLogAPI(reqInsertLog)
-	for key, value := range headers {
+		if err != nil {
-		headerStringBuilder.WriteString(fmt.Sprintf("%s: %s; ", key, value))
+			log.Println(err)
+			c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+				MetaData: sk.MetadataString{
+					Code:    "203",
+					Message: err.Error(),
+				},
+			})
+			return
+		}
+		log.Println(err)
+		c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+			MetaData: res.MetaData,
+		})
+		return
+	}
+
+	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")
+	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
 	}
-	headerString := strings.TrimSuffix(headerStringBuilder.String(), "; ")
 
 	kunjunganPasien, err := suratkontrol.GetDataKunjunganPasien(req.IDXDaftar)
 	if err != nil {
@@ -128,7 +205,6 @@ func InsertSuratKontrol(c *gin.Context) {
 		}
 	}
 
-	uuid := uuid.New().String()
 	if req.TipeSurKon != "1" {
 		dataSurkon, err := suratkontrol.GetNomorSurKon(kunjunganPasien.ID)
 		if err != nil {
@@ -157,7 +233,7 @@ func InsertSuratKontrol(c *gin.Context) {
 			}
 		}
 
-		noSurKon := "SI/" + req.TipeRawat + "/" + kunjunganPasien.NomorRM + "/" + noUrut
+		noSurKon := "SI/" + req.TipeRawat + "/" + req.NoRM + "/" + noUrut
 		reqInsert := &sk.DataSuratKontrol{
 			ID:                uuid,
 			DateCreated:       timeNow,
@@ -204,6 +280,59 @@ func InsertSuratKontrol(c *gin.Context) {
 		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,
@@ -215,18 +344,22 @@ func InsertSuratKontrol(c *gin.Context) {
 	}
 	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, err := json.Marshal(res)
+		responJson, Marshalerr := json.Marshal(res)
-		if err != nil {
+		log.Println("hasil respon bpjs :")
-			log.Println(err)
+		if Marshalerr != nil {
+			log.Println(Marshalerr)
+			log.Println("hasil respon bpjs nothing:")
 			c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
 				MetaData: sk.MetadataString{
-					Code:    "203",
+					Code:    res.MetaData.Code,
-					Message: err.Error(),
+					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,
@@ -245,127 +378,200 @@ func InsertSuratKontrol(c *gin.Context) {
 			Comment:         res.MetaData.Message,
 		}
 
-		err = log_api.InsertLogAPI(reqInsertLog)
+		errInsert := log_api.InsertLogAPI(reqInsertLog)
-		if err != nil {
+		if errInsert != nil {
-			log.Println(err)
+			log.Println(errInsert)
 			c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
 				MetaData: sk.MetadataString{
 					Code:    "203",
-					Message: err.Error(),
+					Message: errInsert.Error(),
 				},
 			})
 			return
 		}
-		log.Println(err)
+		log.Println(errInsert)
-		c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
-			MetaData: res.MetaData,
-		})
-		return
-	}
-
-	responJson, err := json.Marshal(res)
-	if err != nil {
-		log.Println(err)
 		c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
 			MetaData: sk.MetadataString{
-				Code:    "203",
+				Code:    res.MetaData.Code,
-				Message: err.Error(),
+				Message: res.MetaData.Message,
 			},
 		})
 		return
 	}
-	logTimeEnd := time.Now().Format("2006-01-02 15:04:05")
+	log.Println("ojo di terusno  :")
-	reqInsert := &sk.DataSuratKontrol{
+	//responJson, err := json.Marshal(res)
-		ID:                uuid,
+	//if err != nil {
-		DateCreated:       timeNow,
+	//	log.Println(err)
-		TglCetakSurKon:    timeNow,
+	//	c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
-		TglRencanaKontrol: res.Response.TglRencanaKontrol,
+	//		MetaData: sk.MetadataString{
-		NomorSurKon:       res.Response.NoSuratKontrol,
+	//			Code:    "203",
-		KunjunganPasien:   kunjunganPasien.ID,
+	//			Message: err.Error(),
-		RuanganSurKon:     idRuangan,
+	//		},
-		DPJPSurKon:        req.IDDokter,
+	//	})
-		StatusSurKon:      1, // First Insert status always set to 1
+	//	return
-		UserCreatedSurKon: req.User,
+	//}
-		TipeSurKon:        "1",
+	//logTimeEnd := time.Now().Format("2006-01-02 15:04:05")
-		TipeRawat:         req.TipeRawat,
+	//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)
 
-	err = suratkontrol.InsertDataSuratKontrol(reqInsert)
+	//if req.TipeSurKon != "1" {
-	if err != nil {
+	//	dataSurkon, err := suratkontrol.GetNomorSurKon(kunjunganPasien.ID)
-		log.Println(err)
+	//	if err != nil {
-		c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
+	//		log.Println(err)
-			MetaData: sk.MetadataString{
+	//		c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{
-				Code:    "203",
+	//			MetaData: sk.MetadataString{
-				Message: err.Error(),
+	//				Code:    "203",
-			},
+	//				Message: err.Error(),
-		})
+	//			},
-		return
+	//		})
-	}
+	//		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
+	//}
 
-	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.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)
 }
 
 func UpdateSuratKontrol(c *gin.Context) {
@@ -1203,6 +1409,7 @@ 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)
@@ -1212,6 +1419,7 @@ func GethistoribyNorm(c *gin.Context) {
 		})
 		return
 	}
+
 	var resHisSurKon []*sk.Dataresponse
 	for _, v := range data {
 		gelarDepan := utils.ReplaceGelar(v.GelarDepan)
@@ -1226,6 +1434,8 @@ func GethistoribyNorm(c *gin.Context) {
 		resHisSurKon = append(resHisSurKon, &sk.Dataresponse{
 			NamaPasien:        v.NamaPasien,
 			NoSEP:             v.NoSEP,
+			IdSurkon:          v.IdSurkon,
+			Idxdaftar:         v.Idxdaftar,
 			NomorSuratkontrol: v.NomorSuratkontrol,
 			TanggalRencana:    dateRencanaSurkonString,
 			TanggalCetak:      dateCetakSurkonString,

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,7 +33,12 @@ 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()
@@ -91,6 +96,7 @@ 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)
@@ -105,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"`
@@ -302,6 +303,8 @@ type RequestCariPasien struct {
 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"`
@@ -319,6 +322,8 @@ type HistoriSurkon struct {
 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"`