mirza.millahsyafiq.0912/api-bpjs-surkon
SHA256
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix query and condition

Browse Source
This commit is contained in:
mirza.millahsyafiq.0912
2024-10-17 10:51:36 +07:00
parent 87d5a964ef
commit d19ec6fe96
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

database/satu_data/surat_kontrol/surat_kontrol.go
+2 -2
View File
@@ -174,7 +174,7 @@ func GetAllDataSuratKontrol(idSurKon string) (*suratkontrol.DataSuratKontrol, er
return dataSurKon, nil
}
func GetDataSurKonByNoRM(req suratkontrol.RequestCariPasien, query string, condition string) ([]*suratkontrol.GetDataSuratKontrol, error) {
func SearchDataSurKon(req suratkontrol.RequestCariPasien, query string, args []interface{}) ([]*suratkontrol.GetDataSuratKontrol, error) {
var dataSurKon []*suratkontrol.GetDataSuratKontrol
query += ` and date(dsk."Tanggal_rencana_kontrol") between ? and ?`
querySelect := `select dsk."id", dsk."Tanggal_cetak_surat_kontrol", dsk."Tanggal_rencana_kontrol",
@@ -206,7 +206,7 @@ func GetDataSurKonByNoRM(req suratkontrol.RequestCariPasien, query string, condi
left join daftar_subspesialis ds on dp."Subspesialis" = ds."id"
where dsk."Status_surat_kontrol" = '1' `
querySelect += query
err := config.SatuDataDB.Debug().Raw(querySelect, condition, req.TanggalAwal, req.TanggalAkhir).Find(&dataSurKon).Error
err := config.SatuDataDB.Debug().Raw(querySelect, args...).Find(&dataSurKon).Error
if err != nil {
log.Println(err)
return nil, err
handlers/bpjs/surat_kontrol/surat_kontrol.go
+9 -4
View File
@@ -551,10 +551,12 @@ func CariPasienTPP(c *gin.Context) {
log.Println("request :", req)
query := ``
var args []interface{}
var data []*sk.GetDataSuratKontrol
if req.NoRM != "" {
query += `and dkp2."NOMR" = ?`
data, err = suratkontrol.GetDataSurKonByNoRM(req, query, req.NoRM)
args = append(args, req.NoRM, req.TanggalAwal, req.TanggalAkhir)
data, err = suratkontrol.SearchDataSurKon(req, query, args)
if err != nil {
log.Println(err)
c.JSON(http.StatusInternalServerError, err)
@@ -562,7 +564,8 @@ func CariPasienTPP(c *gin.Context) {
}
} else if req.NoSEP != "" {
query += `and dkp2."Nomor_sep" = ?`
data, err = suratkontrol.GetDataSurKonByNoRM(req, query, req.NoSEP)
args = append(args, req.NoSEP, req.TanggalAwal, req.TanggalAkhir)
data, err = suratkontrol.SearchDataSurKon(req, query, args)
if err != nil {
log.Println(err)
c.JSON(http.StatusInternalServerError, err)
@@ -570,14 +573,16 @@ func CariPasienTPP(c *gin.Context) {
}
} else if req.PoliKlinik != "" {
query += `and ds."id" = ?`
data, err = suratkontrol.GetDataSurKonByNoRM(req, query, req.PoliKlinik)
args = append(args, req.PoliKlinik, req.TanggalAwal, req.TanggalAkhir)
data, err = suratkontrol.SearchDataSurKon(req, query, args)
if err != nil {
log.Println(err)
c.JSON(http.StatusInternalServerError, err)
return
}
} else {
data, err = suratkontrol.GetDataSurKonByNoRM(req, query, req.PoliKlinik)
args = append(args, req.TanggalAwal, req.TanggalAkhir)
data, err = suratkontrol.SearchDataSurKon(req, query, args)
if err != nil {
log.Println(err)
c.JSON(http.StatusInternalServerError, err)