update bugs fix

This commit is contained in:
Linksehat Staging Server
2024-01-12 14:19:17 +07:00
parent bb63e3c0c0
commit d1465ae554
4 changed files with 71 additions and 69 deletions

View File

@@ -42,7 +42,7 @@ class DailyMonitoringController extends Controller
->leftJoin('members', 'request_logs.member_id', '=', 'members.id')
->leftJoin('member_plans', 'request_logs.member_id', '=', 'member_plans.member_id')
->leftJoin('organizations', 'organizations.id', '=', 'request_logs.organization_id')
->select('members.member_id','members.name','member_plans.start AS startdate','member_plans.end AS enddate', 'request_logs.submission_date as addmision_date', 'organizations.name as provider' )
->select('members.member_id','members.name','members.members_effective_date AS startdate','members.members_expire_date AS enddate', 'request_logs.submission_date as addmision_date', 'organizations.name as provider' )
->where('request_logs.service_code', 'IP')
->where('request_logs.status_final_log', 'approved')
->groupBy('request_logs.member_id')
@@ -118,7 +118,7 @@ class DailyMonitoringController extends Controller
public function AddDetailMonitoringList(Request $request, $claim_code)
{
$request->merge(['claim_code' => $claim_code]);
// validation rule
$validator = Validator::make($request->all(),[
'claim_code' => 'required|exists:claim_requests,code',
@@ -145,7 +145,7 @@ class DailyMonitoringController extends Controller
->select('id')
->where('code', $claim_code)
->first();
// get claim
$claim = DB::table('claims')
->select('id')
@@ -219,7 +219,7 @@ class DailyMonitoringController extends Controller
public function AddDetailMonitoringListRequestLog(Request $request, $request_code)
{
$request->merge(['request_code' => $request_code]);
// validation rule
$validator = Validator::make($request->all(),[
'request_code' => 'required|exists:request_logs,code',
@@ -319,7 +319,7 @@ class DailyMonitoringController extends Controller
'extension' => $extension,
'path' => $path,
]);
}
}
if ($request->medical_action_letter){
@@ -337,7 +337,7 @@ class DailyMonitoringController extends Controller
'extension' => $extension,
'path' => $path,
]);
// $file->storeAs($this->path_for_store, $fileName);
}
}
@@ -356,7 +356,7 @@ class DailyMonitoringController extends Controller
'extension' => $extension,
'path' => $path,
]);
// $file->storeAs($this->path_for_store, $fileName);
}
}
@@ -389,10 +389,10 @@ class DailyMonitoringController extends Controller
$request_log = DB::table('request_logs')
->where('code', $request_code)
->update([
'discharge_date' => now(),
'discharge_date' => now(),
'updated_by' => auth()->user()->id,
'updated_at' => now()
]);
]);
if ($request_log) {
return response()->json([
'error' => false,

View File

@@ -32,6 +32,7 @@ use App\Models\FilesMcu;
use Illuminate\Support\Facades\DB;
use App\Models\Member;
use Modules\Internal\Services\RequestLogService;
use App\Services\RequestLogService as AppRequestLogService;
class RequestLogController extends Controller
{
@@ -42,9 +43,9 @@ class RequestLogController extends Controller
* @return Renderable
*/
public function __construct(RequestLogService $requestLogService)
public function __construct()
{
$this->requestLogService = $requestLogService;
$this->requestLogService = New RequestLogService;
}
public function index(Request $request)
@@ -115,7 +116,7 @@ class RequestLogController extends Controller
){
DB::beginTransaction();
try {
$newRequestLog = RequestLogService::storeRequestLog(
$newRequestLog = AppRequestLogService::storeRequestLog(
row: [],
code: $code,
member: $member,
@@ -138,7 +139,7 @@ class RequestLogController extends Controller
} else {
DB::beginTransaction();
try {
$newRequestLog = RequestLogService::storeRequestLog(
$newRequestLog = AppRequestLogService::storeRequestLog(
row: [],
code: $code,
member: $member,
@@ -459,7 +460,7 @@ class RequestLogController extends Controller
$file_name = now()->getPreciseTimestamp(3) . '-' . $request->file('file')->getClientOriginalName();
$file = $request->file('file')->storeAs('temp', $file_name);
$reader = ReaderEntityFactory::createXLSXReader(Storage::path('temp/' . $file_name));
$reader->open(Storage::path('temp/' . $file_name));