patvisit

app/Config/Routes.php

@@ -30,6 +30,7 @@ $routes->get('/api/patient/check', 'Patient::patientCheck');
 //$routes->get('/api/patvisit', 'Patient::index');
 $routes->post('/api/patvisit', 'PatVisit::create');
 $routes->get('/api/patvisit/(:num)', 'PatVisit::show/$1');
+$routes->get('/api/patvisit/patient/(:num)', 'PatVisit::showByPatient/$1');
 $routes->delete('/api/patvisit', 'PatVisit::delete');
 $routes->patch('/api/patvisit', 'PatVisit::update');
 

app/Controllers/Contact.php

@@ -208,7 +208,7 @@ class Contact extends Controller {
 
     private function prepareContactDetailData(array $input): array {
         $data = [
-            "Code" => $input['Code'] ?? null,
+            "ContactCode" => $input['ContactCode'] ?? null,
             "ContactEmail" => $input['ContactEmail'] ?? null,
             "OccupationID" => $input['OccupationID'] ?? null,
             "JobTitle" => $input['JobTitle'] ?? null,

app/Controllers/PatVisit.php

@@ -12,48 +12,27 @@ class PatVisit extends Controller {
 		$this->db = \Config\Database::connect();
 	}
 
-	private function preparePatVisitData(array $input): array {
-		$data = [
-			"PVID" => $input['PVID'] ?? null,
-			"InternalPID" => $input['InternalPID'] ?? null,
-			"EpisodeID" => $input['EpisodeID'] ?? null
-		];
-
-		if(!empty($input['InternalPVID'])) { $data["InternalPVID"] = $input["InternalPVID"]; }
-
-		return $data;
-	}
-
-	private function preparePatDiagData(array $input): array {
-		$data = [
-			"InternalPVID" => $input['InternalPVID'] ?? null,
-			"InternalPID" => $input['InternalPID'] ?? null,
-			"DiagCode" => $input['DiagCode'] ?? null,
-			"Diagnosis" => $input['Diagnosis'] ?? null
-		];
-
-		return $data;
-	}
-
-	private function preparePatVisitAdtData(array $input): array {
-		$data = [
-			"InternalPVID" => $input['InternalPVID'] ?? null,
-			"InternalPID" => $input['InternalPID'] ?? null,
-			"ADTCode" => $input['ADTCode'] ?? null,
-			"LocationID" => $input['LocationID'] ?? null,
-			"AttDoc" => $input['AttDoc'] ?? null,
-			"RefDoc" => $input['RefDoc'] ?? null,
-			"AdmDoc" => $input['AdmDoc'] ?? null,
-			"CnsDoc" => $input['CnsDoc'] ?? null
-		];
-
-		return $data;
-	}
-
 	public function show($PVID = null) {
 		try {
 			$row = $this->db->table('patvisit pv')
-				->join('patdiag pd', 'pd.InternalPVID=pv.Internal.PVID', 'left')
+				->join('patdiag pd', 'pd.InternalPVID=pv.InternalPVID', 'left')
+				->join('patvisitadt pva', 'pd.InternalPVID=pva.InternalPVID', 'left')
+				->get()->getResultArray();
+			
+			return $this->respond([
+				'status' => 'success',
+				'message'=> "data found",
+				'data'   => $row,
+			], 200);
+		} catch (\Exception $e) {
+			return $this->failServerError('Something went wrong '.$e->getMessage());
+		}
+	}
+
+	public function showByPatient($InternalPID = null) {
+		try {
+			$row = $this->db->table('patvisit pv')
+				->join('patdiag pd', 'pd.InternalPVID=pv.InternalPVID', 'left')
 				->join('patvisitadt pva', 'pd.InternalPVID=pva.InternalPVID', 'left')
 				->get()->getResultArray();
 			
@@ -74,9 +53,9 @@ class PatVisit extends Controller {
 			
 			if (!$input["InternalPVID"] || !is_numeric($input["InternalPVID"])) { return $this->respond(['status' => 'error', 'message' => 'Invalid or missing ID'], 400); }
 			$InternalPVID = $input["InternalPVID"];
-			$dataPatVisit = preparePatVisitData($input);
+			$dataPatVisit = $this->preparePatVisitData($input);
-			$dataPatDiag = preparePatDiagData($input);
+			$dataPatDiag = $this->preparePatDiagData($input);
-			$dataPatVisitAdt = preparePatVisitAdtData($input);
+			$dataPatVisitAdt = $this->preparePatVisitAdtData($input);
 
 			$this->db->transStart();
 			$this->db->table('patvisit')->where('InternalPVID', $InternalPVID)->update($dataPatVisit);
@@ -115,15 +94,21 @@ class PatVisit extends Controller {
 			$input = $this->request->getJSON(true);
 			if (!$input) { return $this->respond(['status' => 'error', 'message' => 'Invalid JSON input'], 400); }
 			
-			$InternalPVID = $input["InternalPVID"];
+			$dataPatVisit = $this->preparePatVisitData($input);
-			$dataPatVisit = preparePatVisitData($input);
+			$dataPatDiag = $this->preparePatDiagData($input);
-			$dataPatDiag = preparePatDiagData($input);
+			$dataPatVisitAdt = $this->preparePatVisitAdtData($input);
-			$dataPatVisitAdt = preparePatVisitAdtData($input);
 
 			$this->db->transStart();
 			$this->db->table('patvisit')->insert($dataPatVisit);
-			if(!empty($dataPatDiag)) { $this->db->table('patdiag')->insert($dataPatDiag); }
+			$newInternalPVID = $this->db->insertID();
-			if(!empty($dataPatVisitAdt)) {$this->db->table('patvisitadt')->insert($dataPatVisitAdt); }
+			if(!empty($dataPatDiag)) { 
+				$dataPatDiag['InternalPVID'] = $newInternalPVID;
+				$this->db->table('patdiag')->insert($dataPatDiag); 
+			}
+			if(!empty($dataPatVisitAdt)) {
+				$dataPatVisitAdt['InternalPVID'] = $newInternalPVID;
+				$this->db->table('patvisitadt')->insert($dataPatVisitAdt); 
+			}
 			
 			$dbError = $this->db->error();
 
@@ -131,7 +116,7 @@ class PatVisit extends Controller {
 
 			if (!empty($dbError['message'])) {
 				$this->db->transRollback();
-				return $this->failServerError('Update failed: ' . $dbError['message']);
+				return $this->failServerError('create failed: ' . $dbError['message']);
 			}
 			
 
@@ -151,4 +136,41 @@ class PatVisit extends Controller {
 			return $this->failServerError('Something went wrong: ' . $e->getMessage());
 		}
 	}
+
+	private function preparePatVisitData(array $input): array {
+		$data = [
+			"PVID" => $input['PVID'] ?? null,
+			"InternalPID" => $input['InternalPID'] ?? null,
+			"EpisodeID" => $input['EpisodeID'] ?? null
+		];
+
+		if(!empty($input['InternalPVID'])) { $data["InternalPVID"] = $input["InternalPVID"]; }
+
+		return $data;
+	}
+
+	private function preparePatDiagData(array $input): array {
+		$data = [
+			"InternalPVID" => $input['InternalPVID'] ?? null,
+			"InternalPID" => $input['InternalPID'] ?? null,
+			"DiagCode" => $input['DiagCode'] ?? null,
+			"Diagnosis" => $input['Diagnosis'] ?? null
+		];
+
+		return $data;
+	}
+
+	private function preparePatVisitAdtData(array $input): array {
+		$data = [
+			"InternalPVID" => $input['InternalPVID'] ?? null,
+			"ADTCode" => $input['ADTCode'] ?? null,
+			"LocationID" => $input['LocationID'] ?? null,
+			"AttDoc" => $input['AttDoc'] ?? null,
+			"RefDoc" => $input['RefDoc'] ?? null,
+			"AdmDoc" => $input['AdmDoc'] ?? null,
+			"CnsDoc" => $input['CnsDoc'] ?? null
+		];
+
+		return $data;
+	}
 }

app/Database/Migrations/2025-09-09-155526_Pat_Visit.php

@@ -12,7 +12,7 @@ class CreatePVTables extends Migration {
       'InternalPVID'=> ['type' => 'INT', 'constraint' => 11, 'unsigned' => true, 'auto_increment' => true],
       'PVID'    => ['type' => 'VARCHAR', 'constraint' => 20, 'null' => true],
       'InternalPID' => ['type' => 'INT', 'constraint' => 11, 'null' => true],
-      'Episode'   => ['type' => 'VARCHAR', 'constraint' => 255, 'null' => true],
+      'EpisodeID'   => ['type' => 'VARCHAR', 'constraint' => 255, 'null' => true],
       'EndDate'   => ['type' => 'DATETIME', 'null' => true],
       'ArchivedDate'=> ['type' => 'DATETIME', 'null' => true],
       'DelDate'   => ['type' => 'DATETIME', 'null' => true],  
@@ -42,7 +42,7 @@ class CreatePVTables extends Migration {
       'ADTCode'    => ['type' => 'VARCHAR', 'constraint' => 255, 'null' => true],
       'LocationID'  => ['type' => 'INT', 'constraint' => 11, 'null' => true],
       'AttDoc'    => ['type' => 'INT', 'constraint' => 11, 'null' => true],
-      'ReffDoc'   => ['type' => 'INT', 'constraint' => 11, 'null' => true],
+      'RefDoc'   => ['type' => 'INT', 'constraint' => 11, 'null' => true],
       'AdmDoc'    => ['type' => 'INT', 'constraint' => 11, 'null' => true],
       'CnsDoc'    => ['type' => 'INT', 'constraint' => 11, 'null' => true],
       'EndDate'   => ['type' => 'DATETIME', 'null' => true],

app/Database/Migrations/2025-09-12-011643_Contact.php

@@ -29,16 +29,16 @@ class CreateContactTable extends Migration {
 
         // ContactDetail
         $this->forge->addField([
-            'ContactDetID'     => [ 'type' => 'INT', 'constraint' => 11, 'unsigned' => true, 'auto_increment' => true ],
+            'ContactDetID' => [ 'type' => 'INT', 'constraint' => 11, 'unsigned' => true, 'auto_increment' => true ],
-            'ContactID'        => [ 'type' => 'INT', 'constraint' => 11 ],
+            'ContactID' => [ 'type' => 'INT', 'constraint' => 11 ],
-            'SiteID'           => [ 'type' => 'INT', 'constraint' => 11, 'null' => true ],
+            'SiteID' => [ 'type' => 'INT', 'constraint' => 11, 'null' => true ],
-            'Code' => [ 'type' => 'varchar', 'constraint' => 11, 'null' => false ],
+            'ContactCode' => [ 'type' => 'varchar', 'constraint' => 11, 'null' => false ],
-            'ContactEmail'     => [ 'type' => 'VARCHAR', 'constraint' => 150, 'null' => true ],
+            'ContactEmail' => [ 'type' => 'VARCHAR', 'constraint' => 150, 'null' => true ],
-            'OccupationID'     => [ 'type' => 'VARCHAR', 'constraint' => 50, 'null' => true ],
+            'OccupationID' => [ 'type' => 'VARCHAR', 'constraint' => 50, 'null' => true ],
-            'JobTitle'         => [ 'type' => 'VARCHAR', 'constraint' => 100, 'null' => true ],
+            'JobTitle' => [ 'type' => 'VARCHAR', 'constraint' => 100, 'null' => true ],
-            'Department'       => [ 'type' => 'VARCHAR', 'constraint' => 100, 'null' => true ],
+            'Department' => [ 'type' => 'VARCHAR', 'constraint' => 100, 'null' => true ],
             'ContactStartDate' => [ 'type' => 'DATE', 'null' => true ],
-            'ContactEndDate'   => [ 'type' => 'DATE', 'null' => true ],
+            'ContactEndDate' => [ 'type' => 'DATE', 'null' => true ],
         ]);
         $this->forge->addKey('ContactDetID', true);
         $this->forge->createTable('contactdetail');