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

app/Api/Controllers/DrugController.php

@@ -125,7 +125,7 @@ public function drugLimit(Request $request)
             $drugInfos = $prescription->drug_info ?? [];
             $drugInfos = $prescription->drug_info ?? [];
             foreach ($drugInfos as $drugInfo) {
             foreach ($drugInfos as $drugInfo) {
                 $drugId = $drugInfo['drug_id'];
                 $drugId = $drugInfo['drug_id'];
-                $drugCounts[$drugId] = ($drugCounts[$drugId] ?? 0) + $drugInfo['num'];
+                $drugCounts[$drugId] = ($drugCounts[$drugId] ?? 0) + intval($drugInfo['num']);
             }
             }
         }
         }
 
 

app/Api/Controllers/PharmacistController.php

@@ -152,14 +152,14 @@ public function update(Request $request)
         }
         }
         $practicing_license = $request->input('practicing_license');
         $practicing_license = $request->input('practicing_license');
         $practicing_license_path = '';
         $practicing_license_path = '';
-        if( !empty($practicing_license) ){
+        if (! empty($practicing_license)) {
             $practicing_licenses = parse_url($practicing_license);
             $practicing_licenses = parse_url($practicing_license);
             $practicing_license_path = $practicing_licenses['path'] ?? '';
             $practicing_license_path = $practicing_licenses['path'] ?? '';
         }
         }
 
 
         $physician_license = $request->input('physician_license');
         $physician_license = $request->input('physician_license');
         $physician_license_path = '';
         $physician_license_path = '';
-        if( !empty($physician_license) ){
+        if (! empty($physician_license)) {
             $physician_licenses = parse_url($physician_license);
             $physician_licenses = parse_url($physician_license);
             $physician_license_path = $physician_licenses['path'] ?? '';
             $physician_license_path = $physician_licenses['path'] ?? '';
         }
         }