1

app/Controller/TestController.php

@@ -18,6 +18,7 @@ use App\Model\UserDoctor;
 use App\Services\ImService;
 use App\Services\MessagePush;
 use App\Services\OrderPrescriptionService;
+use App\Services\PatientOrderService;
 use App\Services\UserDoctorService;
 use App\Utils\Log;
 use Extend\Alibaba\Oss;
@@ -577,6 +578,16 @@ class TestController extends AbstractController
     }
 
     public function test_11(){
+        $PatientOrderService = new PatientOrderService();
+        $order_inquiry_id = $PatientOrderService->getNotFinishedOrderInquiry(4,"501764342039097344");
+        dump($order_inquiry_id);
+        dump(!empty($order_inquiry_id));
+        if (!empty($order_inquiry_id)) {
+            return 111;
+            return fail(HttpEnumCode::HTTP_ERROR, "当前患者存在进行中的问诊订单");
+        }
+
+        die;
         $order_prescription_id = "501751534291394561";
 
         // 获取处方数据

app/Model/OrderInquiry.php

@@ -133,6 +133,7 @@ class OrderInquiry extends Model
         return self::where($params)->orderBy('created_at','desc')->first($fields);
     }
 
+//    public static function
     /**
      * 获取医生某一时间段接诊订单分页数据
      * 已结束

app/Services/OrderPrescriptionService.php

@@ -596,22 +596,24 @@ class OrderPrescriptionService extends BaseService
             $wg->done();
         });
 
+        // 获取处方关联疾病数据
+        $order_prescription_id = $order_prescription['order_prescription_id'];
+        co(function () use ($wg,&$order_prescription_icd,$order_prescription_id) {
+            $params = array();
+            $params['order_prescription_id'] = $order_prescription_id;
+            $order_prescription_icd = OrderPrescriptionIcd::getList($params);
+
+            // 计数器减一
+            $wg->done();
+        });
+
+
         if (empty($user)) {
             throw new BusinessException("用户数据错误");
         }
-
-        // 获取家庭成员-基本信息
-        $params = array();
-        $params['family_id'] = $order_inquiry['family_id'];
-        $patient_family = PatientFamily::getOne($params);
         if (empty($patient_family)) {
             throw new BusinessException("用户家庭成员错误");
         }
-
-        // 获取处方关联疾病数据
-        $params = array();
-        $params['order_prescription_id'] = $order_prescription['order_prescription_id'];
-        $order_prescription_icd = OrderPrescriptionIcd::getList($params);
         if (empty($order_prescription_icd)) {
             throw new BusinessException("处方疾病数据错误");
         }