feat : change pdf from hostordernumber to accessnumber

This commit is contained in:
mahdahar 2026-04-17 11:25:22 +07:00
parent f968b0c5e2
commit ab8f4819e7
9 changed files with 9291 additions and 16 deletions

View File

@ -121,7 +121,11 @@ class ReportController extends BaseController
$data['ispdf'] = 1;
$html = view('report/template', $data);
$filename = $accessnumber . ($eng == 1 ? '_eng' : '') . '.pdf';
$filenameBase = trim((string) ($data['hostnumber'] ?? ''));
if ($filenameBase === '') {
$filenameBase = $accessnumber;
}
$filename = $filenameBase . ($eng == 1 ? '_eng' : '') . '.pdf';
$collectionDate = $data['collectionDate'] ?? '';
$hostnumber = $data['hostnumber'] ?? '';
@ -264,7 +268,11 @@ try {
$data['ispdf'] = 1;
$html = view('report/template', $data);
$filename = $accessnumber . ($eng == 1 ? '_eng' : '') . '.pdf';
$filenameBase = trim((string) ($data['hostnumber'] ?? ''));
if ($filenameBase === '') {
$filenameBase = $accessnumber;
}
$filename = $filenameBase . ($eng == 1 ? '_eng' : '') . '.pdf';
$collectionDate = $data['collectionDate'] ?? '';
$hostnumber = $data['hostnumber'] ?? '';

View File

@ -332,7 +332,11 @@ class RequestsController extends BaseController
$data['ispdf'] = 1;
$html = view('report/template', $data);
$filename = $accessnumber . '_eng.pdf';
$filenameBase = trim((string) ($data['hostnumber'] ?? ''));
if ($filenameBase === '') {
$filenameBase = $accessnumber;
}
$filename = $filenameBase . '_eng.pdf';
// Post to spooler
$ch = curl_init();
@ -397,3 +401,4 @@ $payload = [
]);
}
}

View File

@ -24,7 +24,11 @@ class PdfBatchService
$data['ispdf'] = 1;
$html = view('report/template', $data);
$filename = $accessnumber . ($eng == 1 ? '_eng' : '') . '.pdf';
$filenameBase = trim((string) ($data['hostnumber'] ?? ''));
if ($filenameBase === '') {
$filenameBase = $accessnumber;
}
$filename = $filenameBase . ($eng == 1 ? '_eng' : '') . '.pdf';
$collectionDate = $data['collectionDate'] ?? '';
$hostnumber = $data['hostnumber'] ?? '';
@ -129,3 +133,4 @@ class PdfBatchService
return $data['jobId'];
}
}

View File

@ -19,7 +19,11 @@ class PdfHelper
$data['ispdf'] = 1;
$html = view('report/template', $data);
$filename = $accessnumber . ($eng == 1 ? '_eng' : '') . '.pdf';
$filenameBase = trim((string) ($data['hostnumber'] ?? ''));
if ($filenameBase === '') {
$filenameBase = $accessnumber;
}
$filename = $filenameBase . ($eng == 1 ? '_eng' : '') . '.pdf';
return $this->postHtmlToSpooler($html, $filename, $accessnumber);
}
@ -59,3 +63,5 @@ class PdfHelper
return $data['jobId'];
}
}

View File

@ -287,7 +287,7 @@ $canUnval = $userLevel <= 1;
</a>
</li>
<li>
<a :href="'http://glenlis/pdf/' + req.COLLECTIONDATE.split(' ')[0].split('-').join('/') + '/' + req.SP_ACCESSNUMBER + '.pdf'" target="_blank">
<a :href="'http://glenlis/pdf/' + req.COLLECTIONDATE.split(' ')[0].split('-').join('/') + '/' + (req.HOSTORDERNUMBER || req.SP_ACCESSNUMBER) + '.pdf'" target="_blank">
<i class="fa fa-file-pdf mr-2"></i> PDF
</a>
</li>
@ -297,7 +297,7 @@ $canUnval = $userLevel <= 1;
</a>
</li>
<li x-show="req.REPORT_LANG == 1">
<a :href="'http://glenlis/pdf/' + req.COLLECTIONDATE.split(' ')[0].split('-').join('/') + '/' + req.SP_ACCESSNUMBER + '_eng.pdf'" target="_blank">
<a :href="'http://glenlis/pdf/' + req.COLLECTIONDATE.split(' ')[0].split('-').join('/') + '/' + (req.HOSTORDERNUMBER || req.SP_ACCESSNUMBER) + '_eng.pdf'" target="_blank">
<i class="fa fa-file-pdf mr-2"></i> PDF Eng
</a>
</li>
@ -395,3 +395,4 @@ $canUnval = $userLevel <= 1;
</div>
</div>

5987
mapping acc to host.csv Normal file

File diff suppressed because it is too large Load Diff

52
migrate_pdf_filenames.ps1 Normal file
View File

@ -0,0 +1,52 @@
param(
[string]$PdfRoot = 'C:\inetpub\wwwroot\pdf\2026',
[string]$MapCsv = 'C:\inetpub\wwwroot\cmod\mapping acc to host.csv',
[string]$LogCsv = 'C:\inetpub\wwwroot\cmod\pdf_rename_2026_log.csv'
)
$rows = Import-Csv $MapCsv -Delimiter "`t"
$map = @{}
foreach ($r in $rows) {
$acc = ($r.SP_ACCESSNUMBER + '').Trim()
$hostOrder = ($r.HOSTORDERNUMBER + '').Trim()
if ($acc -and $hostOrder) { $map[$acc] = $hostOrder }
}
$files = Get-ChildItem -Path $PdfRoot -Recurse -File -Filter '*.pdf'
$latest = @{}
foreach ($f in $files) {
if ($f.BaseName -notmatch '^(?<acc>.+?)(?<suffix>_eng)?$') { continue }
$acc = $Matches.acc
$suffix = $Matches.suffix
if (-not $map.ContainsKey($acc)) { continue }
$targetName = '{0}{1}.pdf' -f $map[$acc], $suffix
$targetPath = Join-Path $f.DirectoryName $targetName
if (-not $latest.ContainsKey($targetPath) -or $f.LastWriteTime -gt $latest[$targetPath].LastWriteTime) {
$latest[$targetPath] = $f
}
}
$log = foreach ($targetPath in $latest.Keys) {
$src = $latest[$targetPath]
if ($src.BaseName -notmatch '^(?<acc>.+?)(?<suffix>_eng)?$') { continue }
$acc = $Matches.acc
$suffix = $Matches.suffix
$hostOrder = $map[$acc]
$targetName = '{0}{1}.pdf' -f $hostOrder, $suffix
$finalTarget = Join-Path $src.DirectoryName $targetName
try {
if (Test-Path $finalTarget) { Remove-Item -Path $finalTarget -Force }
if ($src.FullName -ne $finalTarget) {
Move-Item -Path $src.FullName -Destination $finalTarget -Force
[pscustomobject]@{Status='RENAMED'; Source=$src.FullName; Target=$finalTarget; AccessNumber=$acc; HostOrderNumber=$hostOrder; Notes=''}
} else {
[pscustomobject]@{Status='UNCHANGED'; Source=$src.FullName; Target=$finalTarget; AccessNumber=$acc; HostOrderNumber=$hostOrder; Notes='Already correct name'}
}
} catch {
[pscustomobject]@{Status='ERROR'; Source=$src.FullName; Target=$finalTarget; AccessNumber=$acc; HostOrderNumber=$hostOrder; Notes=$_.Exception.Message}
}
}
$log | Export-Csv -Path $LogCsv -NoTypeInformation -Encoding UTF8
Write-Host "Done. Log: $LogCsv"

3211
pdf_rename_2026_log.csv Normal file

File diff suppressed because it is too large Load Diff

View File

@ -5,14 +5,14 @@ q400
Q224,24+0
I8,A,001
D10
A10,3,0,3,1,1,N," FARREL CREVIUS SANTOSO, MR "
A10,27,0,2,1,1,N,"M 22Y"
B130,50,0,1,2,8,90,N,"25036388"
A380,27,5,3,1,1,N,"25036388"
A10,80,0,2,1,2,R,"Serum"
A10,150,0,2,1,1,N,"HBSAM"
A10,180,0,1,1,1,N,"LIS : 6033136388"
A10,195,0,1,1,1,N,"HIS : 01260303121"
A190,190,0,2,1,1,N,"31/Mar/2026 03:25"
A10,3,0,3,1,1,N," SIEK LUA, MRS "
A10,27,0,2,1,1,N,"F 37Y"
B130,50,0,1,2,8,90,N,"35037613"
A380,27,5,3,1,1,N,"35037613"
A10,80,0,2,1,2,R,"Urin"
A10,150,0,2,1,1,N,"UL"
A10,180,0,1,1,1,N,"LIS : 6041937613"
A10,195,0,1,1,1,N,"HIS : 01260401262"
A190,190,0,2,1,1,N,"17/Apr/2026 01:21"
P1
]