Merge branch 'master' into develop

app/Api/Controllers/PrescriptionController.php

@@ -120,7 +120,7 @@ public function create(Request $request)
             $pharmacy_id = $pharmacy->id;
             $pharmacy_id = $pharmacy->id;
             $open_source = 1;
             $open_source = 1;
         } elseif ($authInfo->last_login_type == User::LOGIN_TYPE_USER) {
         } elseif ($authInfo->last_login_type == User::LOGIN_TYPE_USER) {
-            return $this->failed('用户端暂时无法开处方');
+            return $this->failed('请登入药店端,用户端暂时无法开处方!');
             $pharmacy = PharmacyModel::find($pharmacy_id);
             $pharmacy = PharmacyModel::find($pharmacy_id);
             if (! $pharmacy) {
             if (! $pharmacy) {
                 return $this->failed('请退出后重新登录!');
                 return $this->failed('请退出后重新登录!');

resources/views/admin/prescription-print.blade.php

@@ -3,7 +3,7 @@
         <input type="text" class="form-control" id="prescription_no" placeholder="请输入处方编号" style="width: 200px;">
         <input type="text" class="form-control" id="prescription_no" placeholder="请输入处方编号" style="width: 200px;">
         <div class="input-group-append">
         <div class="input-group-append">
             <div class="form-check" style="margin-left: 10px;">
             <div class="form-check" style="margin-left: 10px;">
-                <input type="checkbox" class="form-check-input" id="is_eseal" name="is_eseal">
+                <input type="checkbox" class="form-check-input" id="is_eseal" name="is_eseal" checked>
                 <label class="form-check-label" for="is_eseal">带电子印章</label>
                 <label class="form-check-label" for="is_eseal">带电子印章</label>
             </div>
             </div>
             <button class="btn btn-primary" type="button" id="search-btn" style="margin-left: 10px;">
             <button class="btn btn-primary" type="button" id="search-btn" style="margin-left: 10px;">