diff --git a/config/config.go b/config/config.go index 45b870b..bc16253 100644 --- a/config/config.go +++ b/config/config.go @@ -45,7 +45,7 @@ func ConnectDB() { dbSimrs := fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%s sslmode=disable TimeZone=Asia/Jakarta", hostDBsimrs, userNameDBsimrs, passwordDBsimrs, dbNameDBsimrs, portDBsimrs) - DBsimrs, err = gorm.Open(postgres.Open(dbSimrs), &gorm.Config{}) + DB, err = gorm.Open(postgres.Open(dbSimrs), &gorm.Config{}) if err != nil { log.Fatal("Failed to connect to DBsimrs database: ", err) } else { diff --git a/database/satu_data/surat_kontrol/surat_kontrol.go b/database/satu_data/surat_kontrol/surat_kontrol.go index f7ab0c2..d65ebea 100644 --- a/database/satu_data/surat_kontrol/surat_kontrol.go +++ b/database/satu_data/surat_kontrol/surat_kontrol.go @@ -9,15 +9,19 @@ import ( "gorm.io/gorm" ) -func GetAdmission(idxdaftar string) (*suratkontrol.Addmission, *suratkontrol.Addmission) { - var dataAdmission *suratkontrol.Addmission - err := config.DBsimrs.Raw(`select ta."dokterpengirim",ta."id_admission",ta."dokter_penanggungjawab",ta."nosep",mp."nama",mp."noktp" from t_admission ta join m_pasien mp on ta."nomr" = mp."nomr" where ta.id_admission = ? `, idxdaftar).Scan(&dataAdmission) +func GetAdmission(idxdaftar string) (*suratkontrol.Addmission, error) { + var dataAdmission suratkontrol.Addmission + err := config.DB.Raw(`select "dokterpengirim","id_admission","dokter_penanggungjawab","nosep",mp."nama",mp."noktp",mp."jeniskelamin", +"masukrs", mp.noktp,ta."nomr" +from t_admission ta +join m_pasien mp on ta."nomr" = mp."nomr" +where id_admission = ?`, idxdaftar).Scan(&dataAdmission).Error if err != nil { log.Println(err) return nil, nil } log.Println(dataAdmission) - return dataAdmission, nil + return &dataAdmission, nil } func Getdokter(kddokter int) (string, error) { @@ -31,8 +35,8 @@ func Getdokter(kddokter int) (string, error) { func InsertKunjunganPasien(reqInsert *suratkontrol.InsertKunjunganPasien) error { log.Println("Req Insert Database : ", reqInsert) - insertQuery := `insert into "data_kunjungan_pasien" ("id", "IDXDAFTAR","NOMR","Nama_lengkap","NIK","DPJP","Tanggal_masuk","Jam_masuk" - values (?, ?, ?, ?, ?, ?, ?, ?)` + insertQuery := `insert into "data_kunjungan_pasien" ("id", "IDXDAFTAR","NOMR","Nama_lengkap","NIK","DPJP","Tanggal_masuk","Jam_masuk","date_created") + values (?, ?, ?, ?, ?, ?, ?, ?, ?)` err := config.SatuDataDB.Exec(insertQuery, reqInsert.ID, reqInsert.IdxDaftar, @@ -42,6 +46,7 @@ func InsertKunjunganPasien(reqInsert *suratkontrol.InsertKunjunganPasien) error reqInsert.DPJP, reqInsert.TanggalMasuk, reqInsert.JamMasuk, + reqInsert.DateCreated, ).Error if err != nil { log.Println(err) diff --git a/handlers/bpjs/surat_kontrol/surat_kontrol.go b/handlers/bpjs/surat_kontrol/surat_kontrol.go index 79e2ff0..0ea5ac1 100644 --- a/handlers/bpjs/surat_kontrol/surat_kontrol.go +++ b/handlers/bpjs/surat_kontrol/surat_kontrol.go @@ -23,6 +23,34 @@ import ( "github.com/google/uuid" ) +func Coba(c *gin.Context) { + var req sk.IDXDAFTAR + + err := c.Bind(&req) + if err != nil { + log.Println(err) + c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{ + MetaData: sk.MetadataString{ + Code: "203", + Message: err.Error(), + }, + }) + } + log.Println(req) + dataAdmission, erradmission := suratkontrol.GetAdmission(req.IDXDAFTAR) + log.Println("hasillll", dataAdmission) + if erradmission != nil { + c.JSON(http.StatusOK, &sk.ResponseInsertSuratKontrol{ + MetaData: sk.MetadataString{ + Code: "203", + Message: err.Error(), + }, + }) + } + log.Println(err) + c.JSON(http.StatusOK, dataAdmission) +} + func Parse(c *gin.Context) { var req sk.Parse err := c.Bind(&req) @@ -128,6 +156,7 @@ func InsertSuratkontrolNew(c *gin.Context) { return } IdDokter, err := suratkontrol.Getdokter(dataAdmission.DokterPengirim) + log.Println("ID E DOKTER", IdDokter) if err != nil { log.Println(err) c.JSON(http.StatusCreated, &sk.MetadataString{ @@ -149,8 +178,9 @@ func InsertSuratkontrolNew(c *gin.Context) { DPJP: IdDokter, TanggalMasuk: Tanggalmasuk, JamMasuk: Jammasuk, + DateCreated: timeNow, } - log.Println("insertKunjungan:", insertKunjungan) + log.Println("Insert Kunjungan:", insertKunjungan) err = suratkontrol.InsertKunjunganPasien(insertKunjungan) if err != nil { log.Println(err) @@ -158,18 +188,19 @@ func InsertSuratkontrolNew(c *gin.Context) { Code: "201", Message: "Server Pasien Sedang Down", }) + return } kunjunganPasien, err = suratkontrol.GetDataKunjunganPasien(req.IDXDaftar) + log.Println("Kunjungan Pasien ke 2:", kunjunganPasien) if err != nil { log.Println(err) c.JSON(http.StatusCreated, &sk.MetadataString{ Code: "201", Message: "Kunjungan Pasien Kosong", }) + return } - } - } var idRuangan int diff --git a/main.go b/main.go index 5754d38..b90b2b7 100644 --- a/main.go +++ b/main.go @@ -116,7 +116,7 @@ func main() { suratKontrol.PUT("/updatesurkon", suratkontrol.UpdateSuratKontrolnew) suratKontrol.POST("/deletesurkon", suratkontrol.DeleteSuratKontrolNew) suratKontrol.POST("/parse", suratkontrol.Parse) - + suratKontrol.POST("/IDX", suratkontrol.Coba) } iCare := v1.Group("/icare") diff --git a/models/bpjs/surat_kontrol/kunjugan_pasien.go b/models/bpjs/surat_kontrol/kunjugan_pasien.go index 585bf42..e74659e 100644 --- a/models/bpjs/surat_kontrol/kunjugan_pasien.go +++ b/models/bpjs/surat_kontrol/kunjugan_pasien.go @@ -43,4 +43,5 @@ type InsertKunjunganPasien struct { DPJP string `gorm:"column:DPJP" json:"dpjp"` TanggalMasuk string `gorm:"column:Tanggal_masuk" json:"tanggalmasuk"` JamMasuk string `gorm:"column:Jam_masuk" json:"jammasuk"` + DateCreated string `gorm:"column:date_created" json:"date_created"` } diff --git a/models/bpjs/surat_kontrol/surat_kontrol.go b/models/bpjs/surat_kontrol/surat_kontrol.go index e445cd2..462f501 100644 --- a/models/bpjs/surat_kontrol/surat_kontrol.go +++ b/models/bpjs/surat_kontrol/surat_kontrol.go @@ -445,3 +445,7 @@ type Created struct { type Parse struct { Diagnosa string `json:"diagnosa"` } + +type IDXDAFTAR struct { + IDXDAFTAR string `json:"IDXDAFTAR"` +}