合并master

37870f19 · lujunyi · e1006d33 · 68114a62 · 37870f19 · 37870f19
Commit 37870f19 authored Dec 03, 2024 by lujunyi
6 changed files
--- a/app/Admin/Controllers/AuthController.php
+++ b/app/Admin/Controllers/AuthController.php
@@ -5,7 +5,9 @@
 use App\Models\AdminUsers;
 use App\Services\SmsService;
 use Dcat\Admin\Admin;
+use Dcat\Admin\Form;
 use Dcat\Admin\Http\Controllers\AuthController as BaseAuthController;
+use Dcat\Admin\Http\Repositories\Administrator;
 use Dcat\Admin\Layout\Content;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
@@ -195,6 +197,80 @@ public function getLoginSmsCode(Request $request)
    }
    /**
+     * Model-form for user setting.
+     *
+     * @return Form
+     */
+    protected function settingForm()
+    {
+        return new Form(new Administrator(), function (Form $form) {
+            $form->action(admin_url('auth/setting'));
+            $form->disableCreatingCheck();
+            $form->disableEditingCheck();
+            $form->disableViewCheck();
+            $form->tools(function (Form\Tools $tools) {
+                $tools->disableView();
+                $tools->disableDelete();
+            });
+            $form->display('username', trans('admin.username'));
+            $form->text('name', trans('admin.name'))->required();
+            $form->image('avatar', trans('admin.avatar'))->autoUpload();
+            // $form->password('old_password', trans('admin.old_password'));
+            $form->password('password', trans('admin.password'))
+                ->minLength(5)
+                ->maxLength(20)
+                ->customFormat(function ($v) {
+                    if ($v == $this->password) {
+                        return;
+                    }
+                    return $v;
+                });
+            $form->password('password_confirmation', trans('admin.password_confirmation'))->same('password');
+            $form->ignore(['password_confirmation', 'old_password']);
+            $form->saving(function (Form $form) {
+                if ($form->password && $form->model()->password != $form->password) {
+                    $form->password = bcrypt($form->password);
+                }
+                if (! $form->password) {
+                    $form->deleteInput('password');
+                }
+            });
+            $form->saved(function (Form $form) {
+                return $form
+                    ->response()
+                    ->success(trans('admin.update_succeeded'))
+                    ->redirect('auth/setting');
+            });
+        });
+    }
+    /**
+     * Update user setting.
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function putSetting()
+    {
+        $form = $this->settingForm();
+        // if (! $this->validateCredentialsWhenUpdatingPassword()) {
+        //     $form->responseValidationMessages('old_password', trans('admin.old_password_error'));
+        // }
+        return $form->update(Admin::user()->getKey());
+    }
+    /**
     * 验证短信验证码
     *
     * @param  string  $username

--- a/app/Api/Controllers/DrugController.php
+++ b/app/Api/Controllers/DrugController.php
@@ -65,7 +65,7 @@ public function drugList(Request $request)
            $pharmacy_id = $pharmacy->id;
        }
        $search_input = $request->input('search_input');
-        $drug_type = $request->input('drug_type',0);
+        $drug_type = $request->input('drug_type', 0);
        // $data = PharmacyDrugModel::where('pharmacy_id', $pharmacy_id)
        //     ->whereNotNull('dosage_id')
        //     ->whereHas('drug', function ($query) use ($search_input) {
@@ -78,9 +78,9 @@ public function drugList(Request $request)
        //     ->paginate(10);
        $data = PharmacyDrugModel::where('pharmacy_id', $pharmacy_id)
            // ->whereNotNull('dosage_id')
-            ->whereHas('drug', function ($query) use ($search_input,$drug_type) {
+            ->whereHas('drug', function ($query) use ($search_input, $drug_type) {
                //$query->where('is_rx', DrugModel::RX_TRUE)
-                $query->where('drug_type',$drug_type)->where(function ($subQuery) use ($search_input) {
+                $query->where('drug_type', $drug_type)->where(function ($subQuery) use ($search_input) {
                    if ($search_input) {
                        $subQuery->where('name', 'LIKE', "%{$search_input}%")
                            ->orWhere('code', 'LIKE', "%{$search_input}%");

--- a/app/Api/Controllers/PharmacistController.php
+++ b/app/Api/Controllers/PharmacistController.php
@@ -205,7 +205,6 @@ public function delete(Request $request)
        if (! $pharmacy) {
            return $this->failed('该药店不存在');
        }
        // 判断该药店下是否有几个开启的药师
        $pharmacist = PharmacistModel::where('pharmacy_id', $pharmacy->id)->where('status', 1)->count();
        if ($pharmacist <= 1) {

--- a/app/Api/Controllers/PrescriptionController.php
+++ b/app/Api/Controllers/PrescriptionController.php
@@ -108,7 +108,7 @@ public function create(Request $request)
        $diagnosis_id = $request->input('diagnosis_id');
        $inquirys = $request->input('inquirys'); // [['inquiry_id'=>1, 'answer'=>1]]
        $drugs = $request->input('drugs'); // [['pharmacy_drug_id'=>2, 'num'=>1]]
-        $prescription_type = $request->input('prescription_type',0);
+        $prescription_type = $request->input('prescription_type', 0);
        $pharmacy = null;
        $open_source = 0;
        // 获取当前用户信息,如果是药店则无需传pharmacy_id参数
@@ -428,7 +428,7 @@ public function reject(Request $request)
        return $this->failed('处方作废失败');
    }
-    # 处方单录入
+    // 处方单录入
    public function enter(Request $request)
    {
        $authInfo = auth('api')->user();
@@ -437,13 +437,12 @@ public function enter(Request $request)
        if (! $prescription) {
            return $this->failed('处方单不存在,请传递正确的处方单编号!');
        }
-        # $prescription_type = $request->input('prescription_type');
+        // $prescription_type = $request->input('prescription_type');
-        #
+        //
-        $drugs = $request->input('drugs'); 
+        $drugs = $request->input('drugs');
-        # 中药
+        // 中药
-        if ( $prescription->prescription_type == PrescriptionModel::PRESCRIPTION_TYPE_TCM ) 
+        if ($prescription->prescription_type == PrescriptionModel::PRESCRIPTION_TYPE_TCM) {
-        {
+            // 用药信息 中药:[['pharmacy_drug_id'=>2,'unit'=>'盒','num'=>1]]
-            // 用药信息 中药:[['pharmacy_drug_id'=>2,'unit'=>'盒','num'=>1]] 
            $drug_info = [];
            foreach ($drugs as $drug) {
                $pharmacyDrugQueryInfo = PharmacyDrugModel::with(['drug', 'dosage'])->find($drug['pharmacy_drug_id']);
@@ -453,16 +452,15 @@ public function enter(Request $request)
                    'drug_name' => $pharmacyDrugQueryInfo->drug->name,
                    'spec' => $pharmacyDrugQueryInfo->drug->spec,
                    'unit' => $pharmacyDrugQueryInfo->unit,
-                    # 'dosage_id' => 0, // $pharmacyDrugQueryInfo->dosage_id,
+                    // 'dosage_id' => 0, // $pharmacyDrugQueryInfo->dosage_id,
-                    # 'dosage_desc' => '等待药师录入', // $pharmacyDrugQueryInfo->dosage->dosage_desc,
+                    // 'dosage_desc' => '等待药师录入', // $pharmacyDrugQueryInfo->dosage->dosage_desc,
-                    'num' => $drug['num'],  # 中药为药师录入数量
+                    'num' => $drug['num'],  // 中药为药师录入数量
                ];
            }
            $prescription->doses = $request->input('doses'); // 剂量
            $prescription->drug_info = $drug_info;
-        }else if( intval($prescription->prescription_type) == PrescriptionModel::PRESCRIPTION_TYPE_WM ) # 西药
+        } elseif (intval($prescription->prescription_type) == PrescriptionModel::PRESCRIPTION_TYPE_WM) { // 西药
-        {
            // 用药信息 西药:[['pharmacy_drug_id'=>2,'dosage_id'=>1,'dosage_desc'=>'500ml tid po','num'=>1]]
            $drug_info = [];
            foreach ($drugs as $drug) {
@@ -475,18 +473,14 @@ public function enter(Request $request)
                    'unit' => $pharmacyDrugQueryInfo->unit,
                    'dosage_id' => $drug['dosage_id'] ?? 0, // $pharmacyDrugQueryInfo->dosage_id,
                    'dosage_desc' => $drug['dosage_desc'] ?? '等待药师录入', // $pharmacyDrugQueryInfo->dosage->dosage_desc,
-                    'num' => $drug['num'],  # 中药为药师录入数量
+                    'num' => $drug['num'],  // 中药为药师录入数量
                ];
            }
            $prescription->doses = $request->input('doses'); // 剂量
            $prescription->drug_info = $drug_info;
-        }else{
+        } else {
            return $this->failed('暂不支持该类型处方单录入');
        }
    }
 }
--- a/app/Console/Commands/PrescriptionCommand.php
+++ b/app/Console/Commands/PrescriptionCommand.php
@@ -73,7 +73,6 @@ public function autoPrescriptionGen()
                    $prescriptionInfo->save();
                    // 获取患者信息
                    $patient = PatientModel::where('id', $prescriptionInfo->patient_id)->first();
                    if ($patient == null) {
                        continue;
                    }

--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -13,9 +13,7 @@ class Kernel extends ConsoleKernel
    protected function schedule(Schedule $schedule): void
    {
        // $schedule->command('inspire')->hourly();
        // $schedule->command('mohe:prescription')->everyMinute();
    }
    /**