Merge remote-tracking branch 'origin/#23/BE-Setup-Database' into #23/BE-Setup-Database

query/apotek/find_apotek.go

@@ -77,7 +77,7 @@ func FindDetailResepByNoAntrian(no_antrian int)([]pharmacystation.DetailObat, er
 		return nil, err
 	}
 
-	rows, err := db.DB.Query("SELECT o.nama_obat,  o.satuan, lo.jumlah, lo.dosis, lo.keterangan, lo.tanggal_kadaluarsa FROM nota n "+
+	rows, err := db.DB.Query("SELECT o.nama_obat,  o.satuan, lo.jumlah, lo.dosis, lo.keterangan, lo.aturan_pakai FROM nota n "+
 		"INNER JOIN resep r ON n.resep_id = r.resep_id "+
 		"INNER JOIN list_obat lo ON lo.resep_id = r.resep_id "+
 		"INNER JOIN obat o ON lo.obat_id = o.obat_id "+
@@ -89,7 +89,7 @@ func FindDetailResepByNoAntrian(no_antrian int)([]pharmacystation.DetailObat, er
 
 	for rows.Next() {
 		var detail pharmacystation.DetailObat
-		err := rows.Scan(&detail.Obat.NamaObat, &detail.Obat.Satuan, &detail.ListObat.Jumlah, &detail.ListObat.Dosis, &detail.ListObat.Keterangan, &detail.ListObat.TanggalKadaluarsa)
+		err := rows.Scan(&detail.Obat.NamaObat, &detail.Obat.Satuan, &detail.ListObat.Jumlah, &detail.ListObat.Dosis, &detail.ListObat.Keterangan, &detail.ListObat.AturanPakai)
 		if err != nil {
 			return nil, err
 		}

query/obat/patch_obat.go

@@ -46,7 +46,7 @@ func PatchStockObatByName(nama string, stock int) error {
 }
 
 
-func PatchHargaObatById(id int, harga int) error {
+func PatchHargaObatById(id int, harga int64) error {
 	val, err := db.DB.Exec(
 		`UPDATE obat SET
 			harga = $1
@@ -66,7 +66,7 @@ func PatchHargaObatById(id int, harga int) error {
 	return nil
 }
 
-func PatchHargaObatByName(nama string, harga int) error {
+func PatchHargaObatByName(nama string, harga int64) error {
 	val, err := db.DB.Exec(
 		`UPDATE obat SET
 			harga = $1