diff --git a/application/controllers/mockup/resultentrysoothers-cpone-v9/Resultentry.php b/application/controllers/mockup/resultentrysoothers-cpone-v9/Resultentry.php
index 47b2a945..d9efaba6 100644
--- a/application/controllers/mockup/resultentrysoothers-cpone-v9/Resultentry.php
+++ b/application/controllers/mockup/resultentrysoothers-cpone-v9/Resultentry.php
@@ -3237,30 +3237,30 @@ class Resultentry extends MY_Controller
 				$rst['umum_saran'] = $row_saran['xvalue'];
 		}
 		else {
-			$sql = "SELECT COUNT(*) as xcount FROM so_resultentry_fisik_umum_eng WHERE So_ResultEntryFisikUmumSo_ResultEntryID = ? AND So_ResultEntryFisikUmumIsActive = 'Y'";
-			$exist_eng = $this->db_onedev->query($sql, [$prm['re_id']])->row()->xcount;
+			$sql = "SELECT COUNT(*) as xcount FROM so_resultentry_fisik_umum_eng WHERE So_ResultEntryFisikUmumT_OrderHeaderID = ? AND So_ResultEntryFisikUmumIsActive = 'Y'";
+			$exist_eng = $this->db_onedev->query($sql, [$prm['orderid']])->row()->xcount;
 			//echo $this->db_onedev->last_query();
 			//echo $exist_eng;
 			if ($exist_eng == 0) {
-				$sql = "INSERT INTO so_resultentry_fisik_umum_eng (
-					So_ResultEntryFisikUmumSo_ResultEntryID,
-					So_ResultEntryFisikUmumFisikTemplateID,
-					So_ResultEntryFisikUmumDetails,
-					So_ResultEntryFisikUmumCreatedUserID,
-					So_ResultEntryFisikUmumCreated
-				)
-				SELECT So_ResultEntryFisikUmumSo_ResultEntryID,
-				So_ResultEntryFisikUmumFisikTemplateID,
-				So_ResultEntryFisikUmumDetails,
-				?,
-				NOW()
-				FROM so_resultentry_fisik_umum
-				JOIN fisik_template ON So_ResultEntryFisikUmumFisikTemplateID = FisikTemplateID
-				WHERE
-				So_ResultEntryFisikUmumSo_ResultEntryID = ? AND So_ResultEntryFisikUmumIsActive = 'Y' ";
-				//echo $sql;
-
-				$save = $this->db_onedev->query($sql, [$userid, $prm['re_id']]);
+				$sql = "INSERT INTO so_resultentry_fisik_umum_eng (
+					So_ResultEntryFisikUmumT_OrderHeaderID,
+					So_ResultEntryFisikUmumFisikTemplateID,
+					So_ResultEntryFisikUmumDetails,
+					So_ResultEntryFisikUmumCreatedUserID,
+					So_ResultEntryFisikUmumCreated
+				)
+				SELECT So_ResultEntryFisikUmumT_OrderHeaderID,
+				So_ResultEntryFisikUmumFisikTemplateID,
+				So_ResultEntryFisikUmumDetails,
+				?,
+				NOW()
+				FROM so_resultentry_fisik_umum
+				JOIN fisik_template ON So_ResultEntryFisikUmumFisikTemplateID = FisikTemplateID
+				WHERE
+				So_ResultEntryFisikUmumT_OrderHeaderID = ? AND So_ResultEntryFisikUmumIsActive = 'Y' ";
+				//echo $sql;
+
+				$save = $this->db_onedev->query($sql, [$userid, $prm['orderid']]);
 				//echo $this->db_onedev->last_query();
 
 				$sql = "SELECT So_ResultEntryFisikUmumAdditionalID as id, So_ResultEntryFisikUmumAdditionalValue as value
@@ -3297,13 +3297,13 @@ class Resultentry extends MY_Controller
 			$riwayats = [];
 			$fisiks = [];
 			$k3s = [];
-			$sql = "SELECT *
-					FROM so_resultentry_fisik_umum_eng 
-					JOIN fisik_template ON So_ResultEntryFisikUmumFisikTemplateID = FisikTemplateID
-					WHERE
-					So_ResultEntryFisikUmumSo_ResultEntryID = ? AND So_ResultEntryFisikUmumIsActive = 'Y' 
-					ORDER BY FisikTemplateCode ASC";
-			$rows_data = $this->db_onedev->query($sql, [$prm['re_id']])->result_array();
+			$sql = "SELECT *
+					FROM so_resultentry_fisik_umum_eng 
+					JOIN fisik_template ON So_ResultEntryFisikUmumFisikTemplateID = FisikTemplateID
+					WHERE
+					So_ResultEntryFisikUmumT_OrderHeaderID = ? AND So_ResultEntryFisikUmumIsActive = 'Y' 
+					ORDER BY FisikTemplateCode ASC";
+			$rows_data = $this->db_onedev->query($sql, [$prm['orderid']])->result_array();
 			if ($rows_data) {
 				foreach ($rows_data as $key => $value) {
 					$string_json = $value['So_ResultEntryFisikUmumDetails'];