d_s_bisht/devsofttech_hms_ci4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Respect formulation in duplicate medicine report groups

Browse Source
This commit is contained in:
DevSoftTech Server 2026-04-17 09:53:02 +05:30
parent 07916f3baf
commit 058debb593
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Models/OpdMedicineModel.php
View File

@ -116,6 +116,11 @@ class OpdMedicineModel
return ''; return '';
} }
$normalizedFormulation = $this->normalizeMedicineName($formulation);
if ($normalizedFormulation !== '') {
$base .= '::f:' . $normalizedFormulation;
}
$strength = $this->extractStrengthSignature($name, $formulation); $strength = $this->extractStrengthSignature($name, $formulation);
if ($strength === '') { if ($strength === '') {
return $base; return $base;
@ -184,9 +189,15 @@ class OpdMedicineModel
} }
if (! isset($groups[$norm])) { if (! isset($groups[$norm])) {
$displayName = trim((string) ($row['item_name'] ?? ''));
$displayFormulation = trim((string) ($row['formulation'] ?? ''));
if ($displayFormulation !== '') {
$displayName .= ' (' . $displayFormulation . ')';
}
$groups[$norm] = [ $groups[$norm] = [
'normalized_name' => $norm, 'normalized_name' => $norm,
'display_name' => (string) ($row['item_name'] ?? ''), 'display_name' => $displayName,
'rows' => [], 'rows' => [],
]; ];
} }