dwi_vendor/lis
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Dwi Swandhana
2026-07-22 09:07:43 +07:00
parent 92dc35396b
commit 9e4774bd5e
22 changed files with 2272 additions and 850 deletions
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

htdocs/app/Http/Controllers/MobileApiController.php
+120
View File
@@ -386,6 +386,7 @@ class MobileApiController extends Controller
'preliminary' => 'Preliminary Results',
'Permohonan Verifikasi' => 'Expertise Saved (Un Verified)',
'Permohonan Verifikasi Preliminary' => 'Otor Maldi (Un Verified)',
'statuspewarnaanlsg' => $this->resolvePeriksaHierarchyStatus($row->status, 'Pewarnaan Langsung'),
default => 'Pemeriksaan awal',
};
@@ -424,6 +425,7 @@ class MobileApiController extends Controller
'preliminary' => 'Preliminary Results',
'Permohonan Verifikasi' => 'Kirim ke SPV',
'Permohonan Verifikasi Preliminary' => 'Kirim Preliminary ke SPV',
'statuspewarnaanlsg' => 'Pewarnaan Langsung',
default => 'Draft',
},
'verifikasi' => in_array($action, ['verifikasi', 'preliminary'], true) ? 'Accepted' : '',
@@ -435,6 +437,7 @@ class MobileApiController extends Controller
'preliminary' => 'Preliminary Results Saved',
'Permohonan Verifikasi' => 'Permohonan Verifikasi Terkirim',
'Permohonan Verifikasi Preliminary' => 'Permohonan Verifikasi Preliminary Terkirim',
'statuspewarnaanlsg' => 'Pewarnaan Langsung tersimpan',
default => 'Draft Expertise Saved',
},
'item' => $this->examinationPayload($row->fresh()),
@@ -958,6 +961,123 @@ class MobileApiController extends Controller
};
}
protected function resolvePeriksaHierarchyStatus($currentStatus, $proposedStatus): string
{
$currentStatus = trim((string) $currentStatus);
$proposedStatus = trim((string) $proposedStatus);
if ($proposedStatus === '') {
return $currentStatus;
}
$currentRank = $this->periksaHierarchyStatusRank($currentStatus);
$proposedRank = $this->periksaHierarchyStatusRank($proposedStatus);
if ($currentStatus === '') {
return $proposedStatus;
}
if ($proposedRank === null) {
return $currentRank === null ? $proposedStatus : $currentStatus;
}
if ($currentRank === null || $proposedRank >= $currentRank) {
return $proposedStatus;
}
return $currentStatus;
}
protected function periksaHierarchyStatusRank($status): ?int
{
$normalized = $this->normalizePeriksaStatus($status);
if ($normalized === '') {
return null;
}
if ($normalized === 'penerimaan sampel') {
return 1;
}
if (in_array($normalized, ['pemeriksaan awal', 'pemeriksaan sampel', 'proses analisis sampel'], true)) {
return 2;
}
if (str_starts_with($normalized, 'data bd di terima') || str_starts_with($normalized, 'data bd diterima')) {
return 3;
}
if ($normalized === 'pewarnaan langsung') {
return 4;
}
if ($this->isProsesingKoloniMediaStatus($normalized)) {
return 5;
}
if (str_starts_with($normalized, 'data malditof diterima') || str_starts_with($normalized, 'data malditof di terima')) {
return 6;
}
if (str_starts_with($normalized, 'otor maldi (un verified)')) {
return 7;
}
if (str_starts_with($normalized, 'preliminary results')) {
return 8;
}
if (str_starts_with($normalized, 'data vitek di terima') || str_starts_with($normalized, 'data vitek diterima')) {
return 9;
}
if (str_starts_with($normalized, 'id/ast pending result') || $normalized === 'sedang id+ast') {
return 10;
}
if (str_starts_with($normalized, 'expertise saved (un verified)')
|| in_array($normalized, ['expertise', 'selesai', 'final result'], true)) {
return 11;
}
return null;
}
protected function normalizePeriksaStatus($status): string
{
$status = strtolower(trim((string) $status));
$status = str_replace(['_', '-'], ' ', $status);
$status = preg_replace('/\s+/', ' ', $status);
return trim($status);
}
protected function isProsesingKoloniMediaStatus(string $normalizedStatus): bool
{
$exactStatuses = [
'tidak ada pertumbuhan',
'tidak lanjut identifikasi',
'tidak tindak lanjut identifikasi',
'inkubasi lanjutan',
'sub kultur',
'menunggu kultur yg lain',
'menunggu kultur yang lain',
'proses identifikasi dan uji kepekaan',
'sedang malditof',
'pertumbuhan primer',
];
if (in_array($normalizedStatus, $exactStatuses, true)) {
return true;
}
return str_starts_with($normalizedStatus, 'prosesing koloni media')
|| str_starts_with($normalizedStatus, 'processing koloni media')
|| str_starts_with($normalizedStatus, 'proses identifikasi')
|| str_starts_with($normalizedStatus, 'proses uji kepekaan');
}
public function earlyWarning(Request $request)
{
$this->requireUser($request);
htdocs/resources/views/cetak/ekspertisecci.blade.php
+1 -1
View File
@@ -104,7 +104,7 @@
if (trim($rows->komponen) == 'bakteri') {$bakteri = $rows->isidata; }
}
}
if ($periksa->kd_spesimen == 'KULTUR JMR'){
if ($periksa->kd_spesimen == 'KULTUR JMR' OR $periksa->kd_spesimen == 'JAMUR'){
$teksmikroorganisme = 'Jamur yang ditemukan : ';
} else {
$teksmikroorganisme = 'Bakteri yang ditemukan : ';
htdocs/resources/views/cetak/ekspertisedefault.blade.php
+1 -1
View File
@@ -94,7 +94,7 @@
$namakuman = '';
$namakuman1 = '';
$namakuman2 = '';
if ($periksa->kd_spesimen == 'KULTUR JMR'){
if ($periksa->kd_spesimen == 'KULTUR JMR' OR $periksa->kd_spesimen == 'JAMUR'){
$teksmikroorganisme = 'Jamur yang ditemukan : ';
} else {
$teksmikroorganisme = 'Bakteri yang ditemukan : ';
htdocs/resources/views/cetak/ekspertisekultur.blade.php
+1 -1
View File
@@ -353,7 +353,7 @@
$namakuman = '';
$namakuman1 = '';
$namakuman2 = '';
if ($periksa->kd_spesimen == 'KULTUR JMR'){
if ($periksa->kd_spesimen == 'KULTUR JMR' OR $periksa->kd_spesimen == 'JAMUR'){
$teksmikroorganisme = 'Jamur yang ditemukan : ';
} else {
$teksmikroorganisme = 'Bakteri yang ditemukan : ';
htdocs/resources/views/cetak/ekspertisepcrcovid.blade.php
+1 -1
View File
@@ -196,7 +196,7 @@
</table>
@php
$cekketerangan = explode('/table', $keterangan);
if ($periksa->kd_spesimen == 'KULTUR JMR'){
if ($periksa->kd_spesimen == 'KULTUR JMR' OR $periksa->kd_spesimen == 'JAMUR'){
$teksmikroorganisme = 'Jamur yang ditemukan : ';
} else {
$teksmikroorganisme = 'Bakteri yang ditemukan : ';
htdocs/resources/views/cetak/ekspertisepl.blade.php
+1 -1
View File
@@ -333,7 +333,7 @@
$namakuman = '';
$namakuman1 = '';
$namakuman2 = '';
if ($periksa->kd_spesimen == 'KULTUR JMR'){
if ($periksa->kd_spesimen == 'KULTUR JMR' OR $periksa->kd_spesimen == 'JAMUR'){
$teksmikroorganisme = 'Jamur yang ditemukan : ';
} else {
$teksmikroorganisme = 'Bakteri yang ditemukan : ';
htdocs/resources/views/cetak/ekspertisevl.blade.php
+1 -1
View File
@@ -178,7 +178,7 @@
$namakuman = '';
$namakuman1 = '';
$namakuman2 = '';
if ($periksa->kd_spesimen == 'KULTUR JMR'){
if ($periksa->kd_spesimen == 'KULTUR JMR' OR $periksa->kd_spesimen == 'JAMUR'){
$teksmikroorganisme = 'Jamur yang ditemukan : ';
} else {
$teksmikroorganisme = 'Bakteri yang ditemukan : ';
htdocs/resources/views/cetak/igmiggletospira.blade.php
+1 -1
View File
@@ -100,7 +100,7 @@
if (trim($rows->komponen) == 'iggigm_interpretasi') {$iggigm_interpretasi = $rows->isidata; }
}
}
if ($periksa->kd_spesimen == 'KULTUR JMR'){
if ($periksa->kd_spesimen == 'KULTUR JMR' OR $periksa->kd_spesimen == 'JAMUR'){
$teksmikroorganisme = 'Jamur yang ditemukan : ';
} else {
$teksmikroorganisme = 'Bakteri yang ditemukan : ';