1

app/Controller/CallBackController.php

@@ -1321,7 +1321,7 @@ class CallBackController extends AbstractController
 
             // 获取检测订单数据
             $params = array();
-            $params['detection_no'] = "D547019667026825217";
+            $params['detection_no'] = "D547725550262296576";
             $order_detection = OrderDetection::getOne($params);
             if (empty($order_detection)){
                 return $this->detectionResultFailReturn("非法订单");
@@ -1359,7 +1359,7 @@ class CallBackController extends AbstractController
             // 检测家庭成员是否存在
             $params = array();
             $params['family_id'] = $order_detection['family_id'];
-            $params['patient_id'] = $order_detection['user_id'];
+            $params['patient_id'] = $order_detection['patient_id'];
             $patient_family = PatientFamily::getOne($params);
             if (empty($patient_family)) {
                 return $this->detectionResultFailReturn("患者信息错误");
@@ -1368,15 +1368,6 @@ class CallBackController extends AbstractController
             Db::beginTransaction();
 
             try {
-                // 修改检测状态
-                $data = array();
-                $data['detection_status'] = 4;
-                $data['detection_time'] = date('Y-m-d H:i:s',time());
-
-                $params = array();
-                $params['order_detection_id'] = $order_detection['order_detection_id'];
-                OrderDetection::editOrderDetection($params,$data);
-
                 $generator = $this->container->get(IdGeneratorInterface::class);
 
                 // 创建问诊订单
@@ -1425,6 +1416,16 @@ class CallBackController extends AbstractController
                     return $this->detectionResultFailReturn("问诊订单病例创建失败");
                 }
 
+                // 修改检测状态
+                $data = array();
+                $data['detection_status'] = 4;
+                $data['detection_time'] = date('Y-m-d H:i:s',time());
+                $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];// 订单-问诊id
+
+                $params = array();
+                $params['order_detection_id'] = $order_detection['order_detection_id'];
+                OrderDetection::editOrderDetection($params,$data);
+
                 // 添加自动完成队列
                 $time = 1000 * 60 * 60 * 24 * 3;
 
@@ -1451,7 +1452,7 @@ class CallBackController extends AbstractController
                 );
 
                 Db::commit();
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 Db::rollBack();
                 return $this->detectionResultFailReturn($e->getMessage());
             }
@@ -1466,15 +1467,17 @@ class CallBackController extends AbstractController
                     $order_detection_case['detection_disease_class_names']
                 );
 
-                // 患者-通知患者报告生成结果
+                // 患者-新报告生成通知
+                $MessagePush = new MessagePush($order_detection['user_id']);
+                $MessagePush->patientDetectionResultNotice($order_detection['order_detection_id']);
 
                 // 医生-发送检测报告短信
-            }catch (\Exception $e){
+            }catch (\Throwable $e){
                 Log::getInstance("detectionResult")->error($e->getMessage());
             }
 
             return $this->detectionResultSuccessReturn();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return $this->detectionResultFailReturn("异常：" . $e->getMessage());
         }
     }