审方接口bug修复

app/Api/Controllers/PharmacyController.php

@@ -10,6 +10,7 @@
 use App\Models\PrescriptionModel;
 use App\Models\PrescriptionModel;
 use App\Models\User;
 use App\Models\User;
 use Carbon\Carbon;
 use Carbon\Carbon;
+use DateTime;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 
 
 // 药店控制器
 // 药店控制器
@@ -79,8 +80,8 @@ public function correction(Request $request)
     public function prescription(Request $request)
     public function prescription(Request $request)
     {
     {
         $id = $request->input('id');
         $id = $request->input('id');
-        if (empty($id) || ! filter_var($id, FILTER_VALIDATE_INT)) {
-            return $this->failed('ID 不能为空且必须为整数');
+        if (empty($id)) {
+            return $this->failed('ID 不能为空');
         }
         }
         $authInfo = auth('api')->user();
         $authInfo = auth('api')->user();
         $Pharmacy = PharmacyModel::where('user_id', $authInfo->id)->first();
         $Pharmacy = PharmacyModel::where('user_id', $authInfo->id)->first();
@@ -88,18 +89,20 @@ public function prescription(Request $request)
             return $this->failed('药店信息不存在');
             return $this->failed('药店信息不存在');
         }
         }
         $prescription = PrescriptionModel::where('id', $id)->where('pharmacy_id', $Pharmacy->id)->where('status', PrescriptionModel::PRESCRIPTION_STATUS_REVIEWING)->first();
         $prescription = PrescriptionModel::where('id', $id)->where('pharmacy_id', $Pharmacy->id)->where('status', PrescriptionModel::PRESCRIPTION_STATUS_REVIEWING)->first();
-        if ($prescription) {
-            return $this->failed('该处方已审核');
+        if (! $prescription) {
+            return $this->failed('请传递正确的处方单');
         }
         }
         $prescription->status = PrescriptionModel::PRESCRIPTION_STATUS_SUCCESS;
         $prescription->status = PrescriptionModel::PRESCRIPTION_STATUS_SUCCESS;
         if ($prescription->save()) {
         if ($prescription->save()) {
             $patient_id = $prescription->patient_id;
             $patient_id = $prescription->patient_id;
             $patient = PatientModel::where('id', $patient_id)->first();
             $patient = PatientModel::where('id', $patient_id)->first();
             // 增加审方日志
             // 增加审方日志
+            $dateTime = new DateTime($prescription->created_at);
+            $dateTime->modify('+5 minutes');
             $pharmacistLog = new PrescriptionLogModel;
             $pharmacistLog = new PrescriptionLogModel;
             $pharmacistLog->pharmacy_id = $prescription->pharmacy_id;
             $pharmacistLog->pharmacy_id = $prescription->pharmacy_id;
             $pharmacistLog->pharmacy_name = $prescription->pharmacy_name;
             $pharmacistLog->pharmacy_name = $prescription->pharmacy_name;
-            $currentTime = Carbon::now()->toDateTimeString();
+            $currentTime = $dateTime->format('Y-m-d H:i:s');
             $pharmacistLog->log_info = $prescription->pharmacist_name.'在'.$currentTime.'为'.$prescription->patient_name.'（'.$patient->mobile.'）审方(处方单编号：'.$prescription->id.')';
             $pharmacistLog->log_info = $prescription->pharmacist_name.'在'.$currentTime.'为'.$prescription->patient_name.'（'.$patient->mobile.'）审方(处方单编号：'.$prescription->id.')';
             $pharmacistLog->save();
             $pharmacistLog->save();