diff --git a/backend/main.go b/backend/main.go
index 691ed4c..51b2349 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -653,26 +653,67 @@ func connect() {
 
 		case "get-printdetails-electrical":
 			var result2, result3, result4, result5, result6, result7, result8 string
+			// array := []string{}
+			// array2 := []string{}
+			// array3 := []string{}
+			// array4 := []string{}
+			// array5 := []string{}
+			// array6 := []string{}
+			// array7 := []string{}
+			// array8 := []string{}
+
+			err := db.QueryRow(`SELECT DISTINCT IFNULL(el.electricalNo, '') AS result, IFNULL(op.opDate, '') AS result2, IFNULL(el.locationofinstallation, '') AS result3, IFNULL(occ.occupancy, '') AS result4, IFNULL(u.occupancyoruse, '') AS result5, IFNULL(el.noofUnits, '') AS result6, IFNULL(e.employeename, '') AS result7, IF(cu.firstName IS NULL OR cu.firstName = '', cu.lastName, CONCAT(cu.firstName, ' ', IF(cu.middleInitial IS NULL OR cu.middleInitial = '', '', CONCAT(cu.middleInitial, '. ')), cu.lastName) ) AS result8 
+                          FROM electrical el, electrical_orderofpayment_new op, ref_occupancy occ, ref_elec_occupancy u, customer cu, employee e 
+                          WHERE el.customerid = cu.customerid AND el.ref_elec_occupancyid = u.ref_elec_occupancyid AND u.ref_occupancyid = occ.ref_occupancyid AND op.assessedbyid = e.employeeid 
+                          AND el.electricalid = op.electricalid AND op.is_approve = 0 AND op.for_approval = 1 AND op.is_release = 0 AND is_paid = 0 AND popstransmitted = 0 AND el.electricalid = ?`, data).Scan(&result, &result2, &result3, &result4, &result5, &result6, &result7, &result8)
+			if err != nil {
+				c.AbortWithError(http.StatusBadRequest, err)
+				c.String(http.StatusBadRequest, err.Error())
+				return
+			}
+			// for results.Next() {
+			// 	err = results.Scan(&result, &result2, &result3, &result4, &result5, &result6, &result7, &result8)
+			// 	if err != nil {
+			// 		c.AbortWithError(http.StatusBadRequest, err)
+			// 		c.String(http.StatusBadRequest, err.Error())
+			// 		return
+			// 	}
+			// 	array = append(array, result)
+			// 	array2 = append(array2, result2)
+			// 	array3 = append(array3, result3)
+			// 	array4 = append(array4, result4)
+			// 	array5 = append(array5, result5)
+			// 	array6 = append(array6, result6)
+			// 	array7 = append(array7, result7)
+			// 	array8 = append(array8, result8)
+			// }
+			c.JSON(http.StatusOK, gin.H{
+				"result":  result,
+				"result2": result2,
+				"result3": result3,
+				"result4": result4,
+				"result5": result5,
+				"result6": result6,
+				"result7": result7,
+				"result8": result8,
+			})
+
+		case "get-printdetailsfees-electrical":
+			var result2, result3 string
 			array := []string{}
 			array2 := []string{}
 			array3 := []string{}
-			array4 := []string{}
-			array5 := []string{}
-			array6 := []string{}
-			array7 := []string{}
-			array8 := []string{}
 
-			results, err := db.Query(`SELECT DISTINCT IFNULL(el.electricalNo, '') AS result, IFNULL(op.opDate, '') AS result2, IFNULL(el.locationofinstallation, '') AS result3, IFNULL(occ.occupancy, '') AS result4, IFNULL(u.occupancyoruse, '') AS result5, IFNULL(el.noofUnits, '') AS result6, IFNULL(e.employeename, '') AS result7, IF(cu.firstName IS NULL OR cu.firstName = '', cu.lastName, CONCAT(cu.firstName, ' ', IF(cu.middleInitial IS NULL OR cu.middleInitial = '', '', CONCAT(cu.middleInitial, '. ')), cu.lastName) ) AS result8 
-                          FROM electrical el, electrical_orderofpayment_new op, ref_occupancy occ, ref_elec_occupancy u, customer cu, employee e 
-                          WHERE el.customerid = cu.customerid AND el.ref_elec_occupancyid = u.ref_elec_occupancyid AND u.ref_occupancyid = occ.ref_occupancyid AND op.assessedbyid = e.employeeid 
-                          AND el.electricalid = op.electricalid AND op.is_approve = 0 AND op.for_approval = 1 AND op.is_release = 0 AND is_paid = 0 AND popstransmitted = 0 AND el.electricalid = ?`, data)
+			results, err := db.Query(`SELECT IFNULL(ref.accountdescription, '') AS result, IFNULL(ref.accountcode, '') AS result2, IFNULL(op.amount, '') AS result3 FROM electrical_orderofpayment_new op, ref_bldgcomputationsheet ref, electrical el 
+                                WHERE op.is_approve = 0 AND op.for_approval = 1 AND op.is_release = 0 AND op.is_paid = 0 AND op.popstransmitted = 0 AND op.is_delete <> 1 AND op.ref_bldgcomputationsheetid = ref.ref_bldgcomputationsheetid 
+                                AND el.electricalid = op.electricalid AND op.electricalid = ?`, data)
 			if err != nil {
 				c.AbortWithError(http.StatusBadRequest, err)
 				c.String(http.StatusBadRequest, err.Error())
 				return
 			}
 			for results.Next() {
-				err = results.Scan(&result, &result2, &result3, &result4, &result5, &result6, &result7, &result8)
+				err = results.Scan(&result, &result2, &result3)
 				if err != nil {
 					c.AbortWithError(http.StatusBadRequest, err)
 					c.String(http.StatusBadRequest, err.Error())
@@ -681,21 +722,11 @@ func connect() {
 				array = append(array, result)
 				array2 = append(array2, result2)
 				array3 = append(array3, result3)
-				array4 = append(array4, result4)
-				array5 = append(array5, result5)
-				array6 = append(array6, result6)
-				array7 = append(array7, result7)
-				array8 = append(array8, result8)
 			}
 			c.JSON(http.StatusOK, gin.H{
 				"result":  array,
 				"result2": array2,
 				"result3": array3,
-				"result4": array4,
-				"result5": array5,
-				"result6": array6,
-				"result7": array7,
-				"result8": array8,
 			})
 
 		}