update

2025-02-24 16:01:49 +07:00
parent 7ed8acd064
commit 66762055da
8 changed files with 39 additions and 28 deletions
--- a/Modules/HospitalPortal/Http/Controllers/Api/MemberController.php
+++ b/Modules/HospitalPortal/Http/Controllers/Api/MemberController.php
@@ -37,24 +37,27 @@ class MemberController extends Controller
        else
        {
            $members = DB::table('members')
-            ->leftJoin('member_policies', 'member_policies.member_id','=', 'members.member_id')
-            ->leftJoin('persons', 'persons.id', '=', 'members.person_id')
-            ->where('members.member_id', '=', $request->no_polis)
-            ->where('members.birth_date', '=', $request->birth_date)
-            ->select(
-                'members.id',
-                'members.name',
-                'members.member_id',
-                'member_policies.policy_id',
-                'persons.nik',
-                'members.email',
-                'members.birth_date',
-                'members.gender',
-                'members.marital_status',
-                'members.language',
-                'members.race',
-                'members.relation_with_principal')
-            ->first();
+                        ->leftJoin('member_policies', 'member_policies.member_id', '=', 'members.member_id')
+                        ->leftJoin('persons', 'persons.id', '=', 'members.person_id')
+                        ->where('members.member_id', '=', $request->no_polis)
+                        ->where('members.birth_date', '=', $request->birth_date)
+                        ->whereNull('members.deleted_at') // Mengecek apakah deleted_at adalah NULL
+                        ->select(
+                            'members.id',
+                            'members.name',
+                            'members.member_id',
+                            'member_policies.policy_id',
+                            'persons.nik',
+                            'members.email',
+                            'members.birth_date',
+                            'members.gender',
+                            'members.marital_status',
+                            'members.language',
+                            'members.race',
+                            'members.relation_with_principal'
+                        )
+                        ->first(); // Mengambil hasil pertama
+
            if($members)
            {
                $res_data['members'] = $members;
--- a/Modules/Internal/Http/Controllers/Api/DoctorRatingController.php
+++ b/Modules/Internal/Http/Controllers/Api/DoctorRatingController.php
@@ -49,10 +49,11 @@ class DoctorRatingController extends Controller
        $limit = $request->has('per_page') ? $request->input('per_page') : 50;
        $results = DB::connection('oldlms')->table('tx_dokter_rating')
        ->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) {
            $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 . "%");
            });
        })
@@ -72,6 +73,7 @@ class DoctorRatingController extends Controller
                $query->where('tx_dokter_rating.dCreateOn', '<=', $end_date. ' 23:59:59');
            });
        })
+        
        // ->when($request->input('provider') , function ($query, $provider) {
        //     $query->where(function ($query) use ($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.sNotes',
            'tx_dokter_rating.dCreateOn',
+            'tx_dokter_rating.nIDLivechat',
            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
            ")
@@ -109,6 +112,7 @@ class DoctorRatingController extends Controller
            'Rating',
            'Review',
            'Tanggal Konsultasi',
+            'ID Livechat',
        ];
        $style = (new StyleBuilder())
           ->setFontBold()
@@ -124,7 +128,7 @@ class DoctorRatingController extends Controller
        // ============================
        $results = DB::connection('oldlms')->table('tx_dokter_rating')
        ->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) {
            $query->where(function ($query) use ($search) {
                $query->orWhere('tm_users.sFirstname', 'like', "%" . $search . "%");
@@ -162,7 +166,8 @@ class DoctorRatingController extends Controller
            'tx_dokter_rating.dCreateOn',
            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
-            ")
+            "),
+            'tx_dokter_rating.nIDLivechat'
            )
        ->get();
        $no=0;
@@ -176,6 +181,7 @@ class DoctorRatingController extends Controller
                $item->nRating,
                $item->sNotes,
                $item->dCreateOn,
+                $item->nIDLivechat,
            ];
            $style = (new StyleBuilder())
            //->setFontBold()
@@ -194,7 +200,8 @@ class DoctorRatingController extends Controller
            '',
            '',
            '',
-            ''
+            '',
+            '',
        ];
        $style = (new StyleBuilder())
               ->setFontBold()
--- a/Modules/Internal/Http/Controllers/Api/DrugController.php
+++ b/Modules/Internal/Http/Controllers/Api/DrugController.php
@@ -175,7 +175,7 @@ class DrugController extends Controller
                        'dosage' => $row['dosage'],
                        'remark' => $row['remark'],
                        // 'price' => $row['price'],
-                        'unit' => $row['unit'],
+                        // 'unit' => $row['unit'],
                    ]
                    );
                    $importedRows++;
--- a/Modules/Linksehat/Http/Controllers/Api/AutocompleteController.php
+++ b/Modules/Linksehat/Http/Controllers/Api/AutocompleteController.php
@@ -117,6 +117,7 @@ class AutocompleteController extends Controller {
        $drugs = Drug::query()
                    ->where([
                        'atc_code' => $request->provider, // ini untuk menggunakan list obat yang baru
+                        'active' => 1, // ini untuk menggunakan list obat yang baru
                    ])
                    ->get();

--- a/frontend/dashboard/src/pages/CustomerService/FinalLog/Components/DialogConfirmation.tsx
+++ b/frontend/dashboard/src/pages/CustomerService/FinalLog/Components/DialogConfirmation.tsx
@@ -72,7 +72,7 @@ export default function DialogConfirmation({requestLog, setOpenDialog, openDialo
    }

    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);
            alert('Silakan pilih Type Of Member sebelum mengirimkan data.');
        } 
--- a/frontend/dashboard/src/pages/CustomerService/FinalLog/Components/DialogEditFinalLOG.tsx
+++ b/frontend/dashboard/src/pages/CustomerService/FinalLog/Components/DialogEditFinalLOG.tsx
@@ -96,7 +96,7 @@ export default function DialogEditFinalLOG({requestLog, setOpenDialog, openDialo
    

    const handleSubmit = () => {
-        if (formData.type_of_member === "" && requestLog?.corporate_id === 4) {
+        if (formData.type_of_member == "" && requestLog?.corporate_id == 5) {
            setError(true);
            alert('Silakan pilih Type Of Member sebelum mengirimkan data.');
        } 
--- a/frontend/dashboard/src/pages/CustomerService/Request/Components/DialogConfirmation.tsx
+++ b/frontend/dashboard/src/pages/CustomerService/Request/Components/DialogConfirmation.tsx
@@ -58,7 +58,7 @@ export default function DialogConfirmation({requestLog, setOpenDialog, openDialo
    

    const handleSubmit = () => {
-        if (formData.type_of_member === "" && requestLog?.corporate_id === 5) {
+        if (formData.type_of_member == "" && requestLog?.corporate_id == 5) {
            setError(true);
            alert('Silakan pilih Type Of Member sebelum mengirimkan data.');
        } else {
--- a/frontend/dashboard/src/pages/CustomerService/Request/Components/DialogEditInformation.tsx
+++ b/frontend/dashboard/src/pages/CustomerService/Request/Components/DialogEditInformation.tsx
@@ -68,7 +68,7 @@ export default function DialogEditInformation({requestLog, setOpenDialog, openDi
    

    const handleSubmit = () => {
-        if (formData.type_of_member === "" && requestLog?.corporate_id === 5) {
+        if (formData.type_of_member == "" && requestLog?.corporate_id == 5) {
            setError(true);
            alert('Silakan pilih Type Of Member sebelum mengirimkan data.');
        } else if (isReasonSelected && formData.reason !== '') {