update specimen dan pengambilan

pkg/database/simrs/mikrobiologi.go

@@ -71,31 +71,53 @@ func (s *DatabaseService) GetDataLabMikro(noLab string) ([]*mikrobiologi.OrderLa
 	return dataMikro, true, nil
 }
 func (s *DatabaseService) GetDataLabMikroSpecimen(noLab string) (*mikrobiologi.OrderLabMikroSpecimen, bool, error) {
-	var dataMikro *mikrobiologi.OrderLabMikroSpecimen
+	var dataMikro mikrobiologi.OrderLabMikroSpecimen
-	querySelect := `select fl."nama_field"
+
-					from t_orderlabmikro olm
+	querySelect := `
-                    left join "m_form_lab" fl on olm."idxform" = fl."form_id"
+        select fl."nama_field"
-                    where olm."nolab" = ? and fl."sub_kelompok" = 'Jenis Spesimen'`
+        from t_orderlabmikro olm
-	errSelect := s.DB.Debug().Raw(querySelect, noLab).Scan(&dataMikro).Error
+            left join "m_form_lab" fl on olm."idxform" = fl."form_id"
-	if errSelect != nil {
+        where olm."nolab" = ? and fl."sub_kelompok" = 'Jenis Spesimen'
-		log.Println(errSelect)
+    `
-		return nil, false, errSelect
+
+	// Cek apakah ada row yang dikembalikan
+	result := s.DB.Raw(querySelect, noLab).Scan(&dataMikro)
+	if result.Error != nil {
+		log.Println(result.Error)
+		return nil, false, result.Error
 	}
-	return dataMikro, true, nil
+
+	if dataMikro.NamaField == "" {
+		return nil, false, nil
+	}
+
+	dataPtr := &dataMikro
+	return dataPtr, true, nil
 }
 
 func (s *DatabaseService) GetDataLabMikroJenisPemeriksaan(noLab string) (*mikrobiologi.OrderLabMikroJenisPemeriksaan, bool, error) {
-	var dataMikro *mikrobiologi.OrderLabMikroJenisPemeriksaan
+	var dataMikro mikrobiologi.OrderLabMikroJenisPemeriksaan
-	querySelect := `select fl."nama_field"
+
-					from t_orderlabmikro olm
+	querySelect := `
-                    left join "m_form_lab" fl on olm."idxform" = fl."form_id"
+        select fl."nama_field"
-                    where olm."nolab" = ? and fl."sub_kelompok" = 'Cara Pengambilan Sampel'`
+        from t_orderlabmikro olm
-	errSelect := s.DB.Debug().Raw(querySelect, noLab).Scan(&dataMikro).Error
+            left join "m_form_lab" fl on olm."idxform" = fl."form_id"
-	if errSelect != nil {
+        where olm."nolab" = ? 
-		log.Println(errSelect)
+          and fl."sub_kelompok" = 'Cara Pengambilan Sampel'
-		return nil, false, errSelect
+    `
+
+	result := s.DB.Raw(querySelect, noLab).Scan(&dataMikro)
+	if result.Error != nil {
+		log.Println(result.Error)
+		return nil, false, result.Error
 	}
-	return dataMikro, true, nil
+
+	if dataMikro.NamaField == "" {
+		return nil, false, nil
+	}
+
+	dataPtr := &dataMikro
+	return dataPtr, true, nil
 }
 
 func (s *DatabaseService) GetDataLabMikroPengambilan(noLab string) ([]*mikrobiologi.OrderLabMikropengambilan, bool, error) {

pkg/handlers/mikrobiologi/mikrobiologi.go

@@ -211,10 +211,21 @@ func SendDataLISMikro(c *gin.Context) {
 			}
 
 			tglString := t.Format("2006-01-02")
-			pengambilan := CaraPengambilan.NamaField
+
-			if pengambilan == "" {
+			var namaSpecimen string
+			if Specimen != nil && Specimen.NamaField != "" {
+				namaSpecimen = Specimen.NamaField
+			} else {
+				namaSpecimen = "-"
+			}
+
+			var pengambilan string
+			if CaraPengambilan != nil && CaraPengambilan.NamaField != "" {
+				pengambilan = CaraPengambilan.NamaField
+			} else {
 				pengambilan = "lain-lain"
 			}
+
 			log.Println("Masuk loop, value:", value)
 			dataLisMikro = &mikrobiologi.RequestLISMikro{
 				TanggalReg:       tglReg,
@@ -237,7 +248,7 @@ func SendDataLISMikro(c *gin.Context) {
 				Diagnosa:         diagnosa,
 				Rujukan:          rujukan,
 				KodeSpesimen:     value.JenisKelompok,
-				NamaSpesimen:     Specimen.NamaField,
+				NamaSpesimen:     namaSpecimen,
 				Pengambilan:      pengambilan,
 				JenisPemeriksaan: value.NamaField,
 			}