From cf0765b92fcd4bc0f78f78cdba27baaaa15b3e55 Mon Sep 17 00:00:00 2001
From: ahdan15 <ahdan.zeeda.0103@rssa.id>
Date: Tue, 5 Aug 2025 09:53:39 +0700
Subject: [PATCH] perubahan terbaru

---
 internal/database/database.go                 | 3 ---
 internal/server/server.go                     | 2 +-
 pkg/database/simrs/mikrobiologi.go            | 2 +-
 pkg/handlers/mikrobiologi/mikrobiologi.go     | 6 ++++--
 pkg/handlers/mikrobiologi/response.go         | 2 +-
 pkg/models/simrs/mikrobiologi/mikrobiologi.go | 4 ++++
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/internal/database/database.go b/internal/database/database.go
index 62a3214..52dcfdc 100644
--- a/internal/database/database.go
+++ b/internal/database/database.go
@@ -63,9 +63,6 @@ func New() Services {
 		log.Println("Successfully connected to the database SatuData")
 	}
 
-	mongoURI := fmt.Sprintf("mongodb://%s:%s@%s:%s/%s?authSource=admin",
-		user, pass, host, port, database)
-
 	dbInstance = &service{
 		simrsDB:    SimrsDB,
 		satuDataDB: satuDataDB,
diff --git a/internal/server/server.go b/internal/server/server.go
index 0d295a3..c066fb1 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -15,7 +15,7 @@ import (
 type Server struct {
 	port int
 
-	db database.Service
+	db database.Services
 }
 
 func NewServer() *http.Server {
diff --git a/pkg/database/simrs/mikrobiologi.go b/pkg/database/simrs/mikrobiologi.go
index b26c77f..4d1a859 100644
--- a/pkg/database/simrs/mikrobiologi.go
+++ b/pkg/database/simrs/mikrobiologi.go
@@ -59,7 +59,7 @@ func (s *DatabaseService) GetDataMikroBiologiByNoMR(req *mikrobiologi.RequestPas
 
 func (s *DatabaseService) GetDataLabMikro(noLab string) ([]*mikrobiologi.OrderLabMikro, bool, error) {
 	var dataMikro []*mikrobiologi.OrderLabMikro
-	querySelect := `select olm."idxordermikro", olm."jenis_pemeriksaan"
+	querySelect := `select olm."idxordermikro", olm."jenis_pemeriksaan", fl."nama_field" , fl."jenis_kelompok"
 					from t_orderlabmikro olm
                     left join "m_form_lab" fl on olm."idxform" = fl."form_id"
                     where olm."nolab" = ? and fl."sub_kelompok" = 'Jenis Pemeriksaan'`
diff --git a/pkg/handlers/mikrobiologi/mikrobiologi.go b/pkg/handlers/mikrobiologi/mikrobiologi.go
index d69e62d..da92494 100644
--- a/pkg/handlers/mikrobiologi/mikrobiologi.go
+++ b/pkg/handlers/mikrobiologi/mikrobiologi.go
@@ -121,10 +121,10 @@ func SendDataLISMikro(c *gin.Context) {
 				Asuransi:      caraBayar,
 				Klinis:        "",
 				KodeSpesimen:  dataMikroMain.StatusSpesimen,
-				NamaSpesimen:  dataMikroMain.Spesimen,
+				NamaSpesimen:  value.JenisKelompok,
 				Pengambilan:   "",
 			}
-
+			log.Println("Sebelum masuk LIS", dataLisMikro)
 			resMikro, errMikro := SendLisMikro(dataLisMikro)
 			if errMikro != nil {
 				log.Println(errMikro)
@@ -139,6 +139,8 @@ func SendDataLISMikro(c *gin.Context) {
 			reqUpdate := &mikrobiologi.ReqUpdateLisMikro{
 				IdxOrderMikro: value.IdxOrderMikro,
 				NoLokal:       resMikro.Message,
+				Kode:          value.JenisKelompok,
+				Spesimen:      value.NamaField,
 			}
 			errUpdate := simrsDB.UpdateLabMikro(reqUpdate)
 			if errUpdate != nil {
diff --git a/pkg/handlers/mikrobiologi/response.go b/pkg/handlers/mikrobiologi/response.go
index 82f0f5b..0c84bda 100644
--- a/pkg/handlers/mikrobiologi/response.go
+++ b/pkg/handlers/mikrobiologi/response.go
@@ -46,7 +46,7 @@ func SendLisMikro(request *mikrobiologi.RequestLISMikro) (*mikrobiologi.Response
 		return nil, err
 	}
 
-	log.Println(response)
+	log.Println("dari LIS", response)
 
 	res, err := io.ReadAll(response.Body)
 	if err != nil {
diff --git a/pkg/models/simrs/mikrobiologi/mikrobiologi.go b/pkg/models/simrs/mikrobiologi/mikrobiologi.go
index fad06de..dbba94f 100644
--- a/pkg/models/simrs/mikrobiologi/mikrobiologi.go
+++ b/pkg/models/simrs/mikrobiologi/mikrobiologi.go
@@ -129,6 +129,8 @@ type OrderLabMikroMain struct {
 type OrderLabMikro struct {
 	IdxOrderMikro   string `gorm:"column:idxordermikro" json:"idxordermikro"`
 	NamaPemeriksaan string `gorm:"column:nama_pemeriksaan" json:"nama_pemeriksaan"`
+	NamaField       string `gorm:"column:nama_field" json:"nama_field"`
+	JenisKelompok   string `gorm:"column:jenis_kelompok" json:"jenis_kelompok"`
 }
 
 type Response struct {
@@ -149,6 +151,8 @@ type ResponseLISMikro struct {
 type ReqUpdateLisMikro struct {
 	IdxOrderMikro string `gorm:"column:idxordermikro" json:"idxordermikro"`
 	NoLokal       string `gorm:"column:no_lokal" json:"no_lokal"`
+	Kode          string `gorm:"column:jenis_kelompok" json:"jenis_kelompok"`
+	Spesimen      string `gorm:"column:nama_field" json:"nama_field"`
 }
 
 type RequestBatalMikro struct {