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

update

Browse Source
This commit is contained in:
Server D3 Linksehat
2025-02-24 16:01:49 +07:00
parent 7ed8acd064
commit 66762055da
8 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Modules/HospitalPortal/Http/Controllers/Api/MemberController.php
View File

@@ -37,24 +37,27 @@ class MemberController extends Controller
else else
{ {
$members = DB::table('members') $members = DB::table('members')
->leftJoin('member_policies', 'member_policies.member_id','=', 'members.member_id') ->leftJoin('member_policies', 'member_policies.member_id', '=', 'members.member_id')
->leftJoin('persons', 'persons.id', '=', 'members.person_id') ->leftJoin('persons', 'persons.id', '=', 'members.person_id')
->where('members.member_id', '=', $request->no_polis) ->where('members.member_id', '=', $request->no_polis)
->where('members.birth_date', '=', $request->birth_date) ->where('members.birth_date', '=', $request->birth_date)
->select( ->whereNull('members.deleted_at') // Mengecek apakah deleted_at adalah NULL
'members.id', ->select(
'members.name', 'members.id',
'members.member_id', 'members.name',
'member_policies.policy_id', 'members.member_id',
'persons.nik', 'member_policies.policy_id',
'members.email', 'persons.nik',
'members.birth_date', 'members.email',
'members.gender', 'members.birth_date',
'members.marital_status', 'members.gender',
'members.language', 'members.marital_status',
'members.race', 'members.language',
'members.relation_with_principal') 'members.race',
->first(); 'members.relation_with_principal'
)
->first(); // Mengambil hasil pertama
if($members) if($members)
{ {
$res_data['members'] = $members; $res_data['members'] = $members;

17
Modules/Internal/Http/Controllers/Api/DoctorRatingController.php
View File

@@ -49,10 +49,11 @@ class DoctorRatingController extends Controller
$limit = $request->has('per_page') ? $request->input('per_page') : 50; $limit = $request->has('per_page') ? $request->input('per_page') : 50;
$results = DB::connection('oldlms')->table('tx_dokter_rating') $results = DB::connection('oldlms')->table('tx_dokter_rating')
->leftJoin('tm_users', 'tx_dokter_rating.nIDUser', '=', 'tm_users.nID') ->leftJoin('tm_users', 'tx_dokter_rating.nIDUser', '=', 'tm_users.nID')
->leftJoin('tm_dokter', 'tx_dokter_rating.nIDDokter', '=', 'tm_dokter.nID') ->leftJoin('tm_dokter', 'tx_dokter_rating.nIDDokter', '=', 'tm_dokter.nIDUser')
->when($request->input('search'), function ($query, $search) { ->when($request->input('search'), function ($query, $search) {
$query->where(function ($query) use ($search) { $query->where(function ($query) use ($search) {
$query->orWhere('tm_users.sFirstname', 'like', "%" . $search . "%"); $query->orWhere('tm_users.sFirstName', 'like', "%" . $search . "%");
$query->orWhere('tm_users.sLastName', 'like', "%" . $search . "%");
$query->orWhere('tx_dokter_rating.sNotes', 'like', "%" . $search . "%"); $query->orWhere('tx_dokter_rating.sNotes', 'like', "%" . $search . "%");
}); });
}) })
@@ -72,6 +73,7 @@ class DoctorRatingController extends Controller
$query->where('tx_dokter_rating.dCreateOn', '<=', $end_date. ' 23:59:59'); $query->where('tx_dokter_rating.dCreateOn', '<=', $end_date. ' 23:59:59');
}); });
}) })
// ->when($request->input('provider') , function ($query, $provider) { // ->when($request->input('provider') , function ($query, $provider) {
// $query->where(function ($query) use ($provider) { // $query->where(function ($query) use ($provider) {
// $query->where('request_logs.organization_id', '=', $provider); // $query->where('request_logs.organization_id', '=', $provider);
@@ -85,6 +87,7 @@ class DoctorRatingController extends Controller
'tx_dokter_rating.nRating as rating', 'tx_dokter_rating.nRating as rating',
'tx_dokter_rating.sNotes', 'tx_dokter_rating.sNotes',
'tx_dokter_rating.dCreateOn', 'tx_dokter_rating.dCreateOn',
'tx_dokter_rating.nIDLivechat',
DB::connection('oldlms')->raw(" DB::connection('oldlms')->raw("
(SELECT CONCAT(tm_users.sFirstName, ' ', IFNULL(tm_users.sMiddleName, ''), ' ', IFNULL(tm_users.sLastName, '')) FROM tm_users WHERE tm_users.nID = tm_dokter.nIDUser LIMIT 1) AS nama_dokter (SELECT CONCAT(tm_users.sFirstName, ' ', IFNULL(tm_users.sMiddleName, ''), ' ', IFNULL(tm_users.sLastName, '')) FROM tm_users WHERE tm_users.nID = tm_dokter.nIDUser LIMIT 1) AS nama_dokter
") ")
@@ -109,6 +112,7 @@ class DoctorRatingController extends Controller
'Rating', 'Rating',
'Review', 'Review',
'Tanggal Konsultasi', 'Tanggal Konsultasi',
'ID Livechat',
]; ];
$style = (new StyleBuilder()) $style = (new StyleBuilder())
->setFontBold() ->setFontBold()
@@ -124,7 +128,7 @@ class DoctorRatingController extends Controller
// ============================ // ============================
$results = DB::connection('oldlms')->table('tx_dokter_rating') $results = DB::connection('oldlms')->table('tx_dokter_rating')
->leftJoin('tm_users', 'tx_dokter_rating.nIDUser', '=', 'tm_users.nID') ->leftJoin('tm_users', 'tx_dokter_rating.nIDUser', '=', 'tm_users.nID')
->leftJoin('tm_dokter', 'tx_dokter_rating.nIDDokter', '=', 'tm_dokter.nID') ->leftJoin('tm_dokter', 'tx_dokter_rating.nIDDokter', '=', 'tm_dokter.nIDUser')
->when($request->input('search'), function ($query, $search) { ->when($request->input('search'), function ($query, $search) {
$query->where(function ($query) use ($search) { $query->where(function ($query) use ($search) {
$query->orWhere('tm_users.sFirstname', 'like', "%" . $search . "%"); $query->orWhere('tm_users.sFirstname', 'like', "%" . $search . "%");
@@ -162,7 +166,8 @@ class DoctorRatingController extends Controller
'tx_dokter_rating.dCreateOn', 'tx_dokter_rating.dCreateOn',
DB::connection('oldlms')->raw(" DB::connection('oldlms')->raw("
(SELECT CONCAT(tm_users.sFirstName, ' ', IFNULL(tm_users.sMiddleName, ''), ' ', IFNULL(tm_users.sLastName, '')) FROM tm_users WHERE tm_users.nID = tm_dokter.nIDUser LIMIT 1) AS nama_dokter (SELECT CONCAT(tm_users.sFirstName, ' ', IFNULL(tm_users.sMiddleName, ''), ' ', IFNULL(tm_users.sLastName, '')) FROM tm_users WHERE tm_users.nID = tm_dokter.nIDUser LIMIT 1) AS nama_dokter
") "),
'tx_dokter_rating.nIDLivechat'
) )
->get(); ->get();
$no=0; $no=0;
@@ -176,6 +181,7 @@ class DoctorRatingController extends Controller
$item->nRating, $item->nRating,
$item->sNotes, $item->sNotes,
$item->dCreateOn, $item->dCreateOn,
$item->nIDLivechat,
]; ];
$style = (new StyleBuilder()) $style = (new StyleBuilder())
//->setFontBold() //->setFontBold()
@@ -194,7 +200,8 @@ class DoctorRatingController extends Controller
'', '',
'', '',
'', '',
'' '',
'',
]; ];
$style = (new StyleBuilder()) $style = (new StyleBuilder())
->setFontBold() ->setFontBold()

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

@@ -175,7 +175,7 @@ class DrugController extends Controller
'dosage' => $row['dosage'], 'dosage' => $row['dosage'],
'remark' => $row['remark'], 'remark' => $row['remark'],
// 'price' => $row['price'], // 'price' => $row['price'],
'unit' => $row['unit'], // 'unit' => $row['unit'],
] ]
); );
$importedRows++; $importedRows++;

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

@@ -117,6 +117,7 @@ class AutocompleteController extends Controller {
$drugs = Drug::query() $drugs = Drug::query()
->where([ ->where([
'atc_code' => $request->provider, // ini untuk menggunakan list obat yang baru 'atc_code' => $request->provider, // ini untuk menggunakan list obat yang baru
'active' => 1, // ini untuk menggunakan list obat yang baru
]) ])
->get(); ->get();

2
frontend/dashboard/src/pages/CustomerService/FinalLog/Components/DialogConfirmation.tsx
View File

@@ -72,7 +72,7 @@ export default function DialogConfirmation({requestLog, setOpenDialog, openDialo
} }
const handleSubmit = () => { const handleSubmit = () => {
if (formData.type_of_member === "" && requestLog?.corporate_id === 5) { // corporate vale if (formData.type_of_member == "" && requestLog?.corporate_id == 5) { // corporate vale
setError(true); setError(true);
alert('Silakan pilih Type Of Member sebelum mengirimkan data.'); alert('Silakan pilih Type Of Member sebelum mengirimkan data.');
} }

2
frontend/dashboard/src/pages/CustomerService/FinalLog/Components/DialogEditFinalLOG.tsx
View File

@@ -96,7 +96,7 @@ export default function DialogEditFinalLOG({requestLog, setOpenDialog, openDialo
const handleSubmit = () => { const handleSubmit = () => {
if (formData.type_of_member === "" && requestLog?.corporate_id === 4) { if (formData.type_of_member == "" && requestLog?.corporate_id == 5) {
setError(true); setError(true);
alert('Silakan pilih Type Of Member sebelum mengirimkan data.'); alert('Silakan pilih Type Of Member sebelum mengirimkan data.');
} }

2
frontend/dashboard/src/pages/CustomerService/Request/Components/DialogConfirmation.tsx
View File

@@ -58,7 +58,7 @@ export default function DialogConfirmation({requestLog, setOpenDialog, openDialo
const handleSubmit = () => { const handleSubmit = () => {
if (formData.type_of_member === "" && requestLog?.corporate_id === 5) { if (formData.type_of_member == "" && requestLog?.corporate_id == 5) {
setError(true); setError(true);
alert('Silakan pilih Type Of Member sebelum mengirimkan data.'); alert('Silakan pilih Type Of Member sebelum mengirimkan data.');
} else { } else {

2
frontend/dashboard/src/pages/CustomerService/Request/Components/DialogEditInformation.tsx
View File

@@ -68,7 +68,7 @@ export default function DialogEditInformation({requestLog, setOpenDialog, openDi
const handleSubmit = () => { const handleSubmit = () => {
if (formData.type_of_member === "" && requestLog?.corporate_id === 5) { if (formData.type_of_member == "" && requestLog?.corporate_id == 5) {
setError(true); setError(true);
alert('Silakan pilih Type Of Member sebelum mengirimkan data.'); alert('Silakan pilih Type Of Member sebelum mengirimkan data.');
} else if (isReasonSelected && formData.reason !== '') { } else if (isReasonSelected && formData.reason !== '') {