diff --git a/app/Models/PatVisit/PatVisitModel.php b/app/Models/PatVisit/PatVisitModel.php
index 9e9a95c..6bdde49 100644
--- a/app/Models/PatVisit/PatVisitModel.php
+++ b/app/Models/PatVisit/PatVisitModel.php
@@ -1,8 +1,10 @@
 <?php
 
 namespace App\Models\PatVisit;
-use App\Models\CounterModel;
 use App\Models\BaseModel;
+use App\Models\CounterModel;
+use App\Models\PatVisit\PatDiagModel;
+use App\Models\PatVisit\PatVisitADTModel;
 
 class PatVisitModel extends BaseModel {
 	protected $table      = 'patvisit';
@@ -18,39 +20,44 @@ class PatVisitModel extends BaseModel {
 	protected $visnum_prefix = "DV";
 
 	public function show($PVID) {
-		$rows = $this->join('patdiag pd', 'pd.InternalPVID=patvisit.InternalPVID', 'left')
-			->join('patvisitadt pva', 'pva.InternalPVID=patvisit.InternalPVID', 'left')
+		$rows = $this->select("*, patvisit.CreateDate as PVCreateDate, patdiag.CreateDate as PDCreateDate, patvisitadt.CreateDate as PVACreateDate")
+			->join('patdiag', 'patdiag.InternalPVID=patvisit.InternalPVID', 'left')
+			->join('patvisitadt', 'patvisitadt.InternalPVID=patvisit.InternalPVID', 'left')
 			->where('patvisit.PVID',$PVID)->findAll();
 		return $rows;
 	}
 
 	public function showByPatient($InternalPID) {
-		$rows = $this
-			->join('patdiag pd', 'pd.InternalPVID=patvisit.InternalPVID', 'left')
-			->join('patvisitadt pva', 'pd.InternalPVID=pva.InternalPVID', 'left')
-			->join('location l', 'l.LocationID=pva.LocationID', 'left')
+		$rows = $this->select("*, patvisit.CreateDate as PVCreateDate, patdiag.CreateDate as PDCreateDate, patvisitadt.CreateDate as PVACreateDate")
+			->join('patdiag', 'patdiag.InternalPVID=patvisit.InternalPVID', 'left')
+			->join('patvisitadt', 'patvisitadt.InternalPVID=patvisit.InternalPVID', 'left')
+			->join('location', 'location.LocationID=patvisitadt.LocationID', 'left')
 			->where('patvisit.InternalPID',$InternalPID)->findAll();
 		return $rows;
 	}
 
 	public function createPatVisit($input) {
 		$db = \Config\Database::connect();
+    $modelPD = new PatDiagModel();
+    $modelPVA = new PatVisitADTModel();
 		try{
 			$db->transStart();
 			if (!isset($input['PVID']) || $input['PVID']=='') {
-				$counter = new CounterModel();
-        $input['PVID'] = $this->visnum_prefix .$counter->use(2);
+				$modelCounter = new CounterModel();
+        $input['PVID'] = $this->visnum_prefix .$modelCounter->use(2);
 			}
 			
 			$InternalPVID = $this->insert($input, true);
 			
 			if(!empty($input['PatDiag'])) { 
 				$input['PatDiag']['InternalPVID'] = $InternalPVID;
-				$db->table('patdiag')->insert($input['PatDiag']); 
+				//$db->table('patdiag')->insert($input['PatDiag']); 
+				$modelPD->insert($input['PatDiag']); 
 			}
 			if(!empty($input['PatVisitADT'])) {
 				$input['PatVisitADT']['InternalPVID'] = $InternalPVID;
-				$db->table('patvisitadt')->insert($input['PatVisitADT']); 
+				//$db->table('patvisitadt')->insert($input['PatVisitADT']); 
+				$modelPVA->insert($input['PatVisitADT']); 
 			}
 			
 			$db->transComplete();
diff --git a/app/Models/Patient/PatientModel.php b/app/Models/Patient/PatientModel.php
index acb37ca..7dceb31 100644
--- a/app/Models/Patient/PatientModel.php
+++ b/app/Models/Patient/PatientModel.php
@@ -7,8 +7,6 @@ use App\Models\Patient\PatAttModel;
 use App\Models\Patient\PatComModel;
 use App\Models\Patient\PatIdtModel;
 
-use CodeIgniter\Database\RawSql;
-
 class PatientModel extends BaseModel {
   protected $table      = 'patient';
   protected $primaryKey = 'InternalPID';