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:
Linksehat Staging Server
2024-02-17 11:28:16 +07:00
parent b8f6532cfb 4b0b68b58d
commit f8021fbd0b
4 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -323,6 +323,7 @@ class RequestLogController extends Controller
public function requestFinalLog(Request $request) public function requestFinalLog(Request $request)
{ {
Helper::setCustomPHPIniSettings();
$data = [ $data = [
'request_logs_id' => $request->request_logs_id, 'request_logs_id' => $request->request_logs_id,
'discharge_date' => $request->discharge_date, 'discharge_date' => $request->discharge_date,

1
Modules/Internal/Http/Controllers/Api/RequestLogController.php
View File

@@ -863,6 +863,7 @@ class RequestLogController extends Controller
public function requestFiles(Request $request, $id) public function requestFiles(Request $request, $id)
{ {
Helper::setCustomPHPIniSettings();
$requestLog = RequestLog::findOrFail($id); $requestLog = RequestLog::findOrFail($id);
if ($request->hasFile('result_files')) { if ($request->hasFile('result_files')) {
foreach ($request->result_files as $file) { foreach ($request->result_files as $file) {

13
Modules/Internal/Services/RequestLogService.php
View File

@@ -168,6 +168,10 @@ class RequestLogService
throw new ImportRowException(__('Provider Required'), 0, null, $row); throw new ImportRowException(__('Provider Required'), 0, null, $row);
} }
if (!$row['record_mode']){
throw new ImportRowException(__('Record Mode Required'), 0, null, $row);
}
// Membuat singkatan dari nama rumah sakit // Membuat singkatan dari nama rumah sakit
// $singkatan = ""; // $singkatan = "";
// $words = explode(' ', $row['organization_id']); // $words = explode(' ', $row['organization_id']);
@@ -278,7 +282,14 @@ class RequestLogService
} }
if ($row['record_mode'] == 1){ if ($row['record_mode'] == 1){
$requestLog = RequestLog::updateOrCreate(["code" => $code], $data); $requestLog = RequestLog::updateOrCreate(
[
'member_id' => $member->id,
'submission_date' => $row['submission_date'],
'organization_id' => $organization_id,
],
$data
);
} else if ($row['record_mode'] == 2) { } else if ($row['record_mode'] == 2) {
$requestLog = RequestLog::updateOrCreate( $requestLog = RequestLog::updateOrCreate(
[ [

2
app/Helpers/Helper.php
View File

@@ -103,7 +103,7 @@ class Helper
} else { } else {
return 'User not found.'; return 'User not found.';
} }
} }
public static function serviceName($code) public static function serviceName($code)