update

2026-03-11 14:19:37 +07:00
parent 3eb845b503
commit e03381c6aa
2 changed files with 50 additions and 44 deletions
@@ -976,43 +976,48 @@ class ReportController extends Controller
 			->pluck('id')
 			->toArray();

-		if (count($printableIds) === 0) {
-			return response()->json([
-				'status' => 'error',
-				'message' => 'Semua data yang dipilih sudah pernah dicetak.'
-			], 422);
-		}
+			if (count($printableIds) === 0) {
+				return response()->json([
+					'status' => 'error',
+					'message' => 'Semua data yang dipilih sudah pernah dicetak.'
+				], 422);
+			}

-		$rowsToPrint = Periksa::whereIn('id', $printableIds)
-			->orderBy('id', 'ASC')
-			->get()
-			->map(function ($row) {
-				$petugas = trim(($row->nmppdsmiddle2 ?? '').' '.($row->nmppdsjunior2 ?? ''));
-				return [
-					'id' => $row->id,
-					'noregister' => $row->noregister ?? '',
-					'nmpasien' => $row->nmpasien ?? '',
-					'nofoto' => $row->nofoto ?? '',
-					'asalpasien' => $row->asalpasien ?? '',
-					'daftar' => $row->daftar ?? '',
-					'reques' => $row->reques ?? '',
-					'kd_spesimen' => $row->kd_spesimen ?? '',
-					'nm_spesimen' => $row->nm_spesimen ?? '',
-					'status' => $row->status ?? '',
-					'tgldraft' => $row->tgldraft ?? '',
-					'petugas' => $petugas,
-				];
-			})
-			->values()
-			->toArray();
+			if (count($printableIds) > 0) {
+				Periksa::whereIn('id', $printableIds)->update([
+					'ppdsjunior2'   => $userId,
+					'nmppdsjunior2' => $userNama,
+					'updated_at'    => date('Y-m-d H:i:s'),
+				]);
+			}

-		if (count($printableIds) > 0) {
-			Periksa::whereIn('id', $printableIds)->update([
-				'ppdsjunior2'   => $userId,
-				'nmppdsjunior2' => $userNama,
-				'updated_at'    => date('Y-m-d H:i:s'),
-			]);
-		}
+			// Ambil data setelah update supaya payload cetak (petugas) sesuai yang tampil di tabel
+			$rowsToPrint = Periksa::whereIn('id', $printableIds)
+				->orderBy('id', 'ASC')
+				->get()
+				->map(function ($row) {
+					$petugas = trim(($row->nmppdsmiddle2 ?? '').' '.($row->nmppdsjunior2 ?? ''));
+					$status = trim((string)($row->status ?? ''));
+					if ($status === '') {
+						$status = '-';
+					}
+					return [
+						'id' => $row->id,
+						'noregister' => $row->noregister ?? '',
+						'nmpasien' => $row->nmpasien ?? '',
+						'nofoto' => $row->nofoto ?? '',
+						'asalpasien' => $row->asalpasien ?? '',
+						'daftar' => $row->daftar ?? '',
+						'reques' => $row->reques ?? '',
+						'kd_spesimen' => $row->kd_spesimen ?? '',
+						'nm_spesimen' => $row->nm_spesimen ?? '',
+						'status' => $status,
+						'tgldraft' => $row->tgldraft ?? '',
+						'petugas' => $petugas,
+					];
+				})
+				->values()
+				->toArray();

 		$history = RekapPenerimaanSamplePrintHistory::create([
 			'tanggal' => $tanggal,