Merge branch 'develop' of http://git.imohe.com/zhaozengyu/tzt-admin into develop

app/Admin/Controllers/DrugController.php

@@ -137,7 +137,7 @@ protected function form()
                 $form->switch('is_foreign');
                 $form->switch('is_foreign');
                 $form->switch('is_rx');
                 $form->switch('is_rx');
                 $form->switch('is_si');
                 $form->switch('is_si');
-                $array = range(0, 10);
+                $array = range(0, 100);
                 $limitOption = array_combine($array, $array);
                 $limitOption = array_combine($array, $array);
                 $form->select('limit_buy_7')->placeholder('请选择限购数量')->options($limitOption)->help('限购数量')->required()->default(0);
                 $form->select('limit_buy_7')->placeholder('请选择限购数量')->options($limitOption)->help('限购数量')->required()->default(0);
                 $form->multipleSelect('tag', '标签')
                 $form->multipleSelect('tag', '标签')

app/Admin/Renderable/DrugTable.php

@@ -44,7 +44,7 @@ public function grid(): Grid
             });
             });
 
 
             // 行按钮控制
             // 行按钮控制
-            $grid->paginate(10);
+            $grid->paginate(100);
             $grid->disableActions();
             $grid->disableActions();
         });
         });
     }
     }

app/Api/Controllers/PrescriptionController.php

@@ -152,18 +152,21 @@ public function create(Request $request)
         // 问诊问题
         // 问诊问题
         $inquiry_info = [];
         $inquiry_info = [];
         $is_abnormal = 0; // 是否异常处方单，只有一个问题回答是就是异常
         $is_abnormal = 0; // 是否异常处方单，只有一个问题回答是就是异常
+        // Log::info('inquirys：'.json_encode($inquirys));
         foreach ($inquirys as $inquiry) {
         foreach ($inquirys as $inquiry) {
+            $answer = intval($inquiry['answer']);
             $inquiry = InquiryModel::find($inquiry['inquiry_id']);
             $inquiry = InquiryModel::find($inquiry['inquiry_id']);
             $inquiry_info[] = [
             $inquiry_info[] = [
                 'inquiry_id' => $inquiry['inquiry_id'],
                 'inquiry_id' => $inquiry['inquiry_id'],
                 'question' => $inquiry->question,
                 'question' => $inquiry->question,
-                'answer' => $inquiry['answer'] == 1 ? 1 : 0, // [1 => '是', 0 => '否']
+                'answer' =>  $answer === 1 ? 1 : 0, // [1 => '是', 0 => '否']
             ];
             ];
             // 检查是否有一个answer是1
             // 检查是否有一个answer是1
             if ($inquiry['answer'] == 1) {
             if ($inquiry['answer'] == 1) {
                 $is_abnormal = 1; // 如果有一个answer是1，设置$is_abnormal为1
                 $is_abnormal = 1; // 如果有一个answer是1，设置$is_abnormal为1
             }
             }
         }
         }
+        // Log::info('inquiry_info'.json_encode($inquiry_info));
         $prescription->inquiry_info = $inquiry_info;
         $prescription->inquiry_info = $inquiry_info;
         // 用药信息
         // 用药信息
         $drug_info = [];
         $drug_info = [];

app/Models/DoctorModel.php

@@ -52,8 +52,8 @@ class DoctorModel extends Model
     // 性别-文字映射
     // 性别-文字映射
     const DOCTOR_TYPE_MAP = [
     const DOCTOR_TYPE_MAP = [
         self::DOCTOR_TYPE_ALL => '全部',
         self::DOCTOR_TYPE_ALL => '全部',
-        self::DOCTOR_TYPE_WM => '西药',
-        self::DOCTOR_TYPE_TCM => '中药',
+        self::DOCTOR_TYPE_WM => '西医',
+        self::DOCTOR_TYPE_TCM => '中医',
     ];
     ];
 
 
     // 医师所属于的用户,一对一
     // 医师所属于的用户,一对一