tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into origin/production

Browse Source
This commit is contained in:
Server D3 Linksehat
2025-02-25 15:00:22 +07:00
parent 6fdc228b6f 4e3bf6d11e
commit 246fc11438
9 changed files with 117 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
View File

@@ -227,6 +227,8 @@ class RequestLogController extends Controller
'members.member_id as no_polis',
'members.birth_date',
'request_logs.service_code',
'request_logs.specialities_id',
'request_logs.dppj',
DB::raw('
CASE
WHEN request_logs.status = "requested" THEN "requested"
@@ -369,6 +371,8 @@ class RequestLogController extends Controller
'final_log' => 1,
'service_code' =>$request->service_code,
'discharge_date' => $request->discharge_date,
'dppj' => $request->dppj,
'specialities_id' => $request->spescialis_id,
'created_final_by'=> auth()->user()->id,
'created_final_at'=> date('Y-m-d H:i:s'),
]);

1
Modules/HospitalPortal/Routes/api.php
View File

@@ -37,6 +37,7 @@ Route::prefix('v1')->group(function() {
Route::post('verify-code', [AuthController::class, 'verifCode']);
Route::get('service-member/{id}', [AutocompleteController::class, 'serviceCode']);
Route::get('specialis', [AutocompleteController::class, 'specialisList']);
Route::middleware('auth:sanctum')->group(function () {

65
Modules/Internal/Http/Controllers/Api/DrugController.php
View File

@@ -142,8 +142,8 @@ class DrugController extends Controller
public function downloadTemplate()
{
return Helper::responseJson([
'file_name' => "Template - Drugs.xlsx",
"file_url" => url('files/Template - Drugs.xlsx')
'file_name' => "Template1.xlsx",
"file_url" => url('files/Template1.xlsx')
]);
}
public function import(Request $request)
@@ -156,36 +156,37 @@ class DrugController extends Controller
$importedRows = 0;
$failedRows = [];
foreach ($processedData as $row) {
try {
Drug::updateOrCreate([
'code' => $row['code'],
],
[
'name' => $row['name'],
'code' => $row['code'],
'id_setara' => $row['id_setara'],
'code_setara' => $row['code_setara'],
'nama_setara' => $row['nama_setara'],
'multiply_jual' => $row['multiply_jual'],
'generic_name' => $row['generic_name'],
'description' => $row['description'],
'mims_class' => $row['mims_class'],
'indications' => $row['indications'],
'atc_code' => $row['atc_code'],
'segmentation' => $row['segmentation'],
'type' => $row['type'],
'dosage' => $row['dosage'],
'remark' => $row['remark'],
// 'price' => $row['price'],
// 'unit' => $row['unit'],
]
);
$importedRows++;
} catch (\Exception $e) {
dd($e);
$failedRows[] = $row;
if ($processedData){
foreach ($processedData as $row) {
try {
Drug::updateOrCreate([
'code' => $row['code'],
],
[
'name' => $row['name'],
'code' => $row['code'],
'id_setara' => $row['id_setara'],
'code_setara' => $row['code_setara'],
'nama_setara' => $row['nama_setara'],
'multiply_jual' => $row['multiply_jual'],
'generic_name' => $row['generic_name'],
'description' => $row['description'],
'mims_class' => $row['mims_class'],
'indications' => $row['indications'],
'atc_code' => $row['atc_code'],
'segmentation' => $row['segmentation'],
'type' => $row['type'],
'dosage' => $row['dosage'],
'remark' => $row['remark'],
// 'price' => $row['price'],
'unit' => $row['unit'],
]
);
$importedRows++;
} catch (\Exception $e) {
dd($e);
$failedRows[] = $row;
}
}
}

5
Modules/Internal/Transformers/RequestLogShowResource.php
View File

@@ -117,8 +117,7 @@ class RequestLogShowResource extends JsonResource
->get();
}
$memberUsage = Helper::getUsageMember($corporateId, $requestLog['member']['id'], $benefitData);
if(isset($requestLog['specialities_id']))
if($requestLog['specialities_id'])
{
$spesialis = Speciality::query()
->where('id', $requestLog['specialities_id'])
@@ -129,7 +128,7 @@ class RequestLogShowResource extends JsonResource
$name = '-';
}
if (isset($requestLog['specialities_id'])){
if ($requestLog['dppj']){
$dppj = $requestLog['dppj'];
} else {
$dppj = '-';

12
Modules/Linksehat/Http/Controllers/Api/AutocompleteController.php
View File

@@ -6,6 +6,7 @@ use App\Models\OLDLMS\User;
use App\Models\Icd;
use App\Models\Drug;
use App\Models\Unit;
use App\Models\Speciality;
use App\Models\MemberPlan;
use Illuminate\Contracts\Support\Renderable;
use Illuminate\Http\Request;
@@ -197,6 +198,17 @@ class AutocompleteController extends Controller {
return response()->json($manipulatedPlan);
}
public function specialisList(Request $request){
$specialities = Speciality::query()->get();
$manipulatedSpecial = $specialities->map(function ($special) {
return [
'value' => optional($special)->id ,
'label' => optional($special)->name,
];
});
return response()->json($manipulatedSpecial);
}
}