Merge branch '20260511-long'

server/app/adminapi/logic/order/OrderLogic.php

@@ -1213,7 +1213,7 @@ class OrderLogic
         }
 
         $rows = $q
-            ->field(['id', 'order_no', 'order_type', 'amount', 'status', 'create_time', 'creator_id', 'remark'])
+            ->field(['id', 'order_no', 'order_type', 'amount', 'status', 'create_time', 'creator_id', 'remark', 'is_exempt'])
             ->order('id', 'desc')
             ->select()
             ->toArray();
@@ -1400,4 +1400,16 @@ class OrderLogic
             'errors' => $errors,
         ];
     }
+
+    public static function setExempt(int $id, int $isExempt): bool
+    {
+        $order = Order::find($id);
+        if (!$order) {
+            self::setError('订单不存在');
+            return false;
+        }
+        $order->is_exempt = $isExempt;
+        $order->save();
+        return true;
+    }
 }

server/app/adminapi/logic/tcm/DiagnosisLogic.php

@@ -535,6 +535,19 @@ class DiagnosisLogic extends BaseLogic
         return 0;
     }
 
+    public static function markAssignRead(int $diagnosisId, int $adminId): void
+    {
+        if ($diagnosisId <= 0 || $adminId <= 0) {
+            return;
+        }
+        Db::name('tcm_diagnosis')
+            ->where('id', $diagnosisId)
+            ->where('assistant_id', $adminId)
+            ->whereNull('assign_read_at')
+            ->whereNull('delete_time')
+            ->update(['assign_read_at' => time()]);
+    }
+
     /**
      * @notes 指派医助（每次成功更新写入一条操作记录，批量指派为多次接口调用各记一条）。
      *        **原医助**：优先诊单 `assistant_id`；若为 0 且本次为指派到某人，则从**最近一条**指派日志推断（覆盖发货释放后库为 0、业务上仍有「前任」医助的情况）。
@@ -588,7 +601,10 @@ class DiagnosisLogic extends BaseLogic
                 Db::name('tcm_diagnosis')
                     ->where('id', $id)
                     ->whereNull('delete_time')
-                    ->update(['assistant_id' => $toAssistantId]);
+                    ->update([
+                        'assistant_id' => $toAssistantId,
+                        'assign_read_at' => $toAssistantId > 0 ? null : 0,
+                    ]);
 
                 $req = request();
                 $admin = $req->adminInfo ?? [];

server/app/adminapi/logic/tcm/PrescriptionOrderLogic.php

@@ -324,7 +324,16 @@ class PrescriptionOrderLogic
         if ($payOrderIds === []) {
             return '未关联支付单，关联支付单总金额须大于等于定金门槛 ¥' . $min;
         }
-        
+
+        // 豁免权：关联的支付单中有豁免单则跳过金额校验
+        $hasExempt = Order::whereIn('id', $payOrderIds)
+            ->whereNull('delete_time')
+            ->where('is_exempt', 1)
+            ->count();
+        if ($hasExempt > 0) {
+            return null;
+        }
+
         // 检查关联支付单的总金额
         $rows = Order::whereIn('id', $payOrderIds)->whereNull('delete_time')->column('amount', 'id');
         $totalAmount = 0.0;
@@ -504,7 +513,7 @@ class PrescriptionOrderLogic
             return [];
         }
         $rows = Order::whereIn('id', $ids)->whereNull('delete_time')
-            ->field(['id', 'order_no', 'order_type', 'amount', 'status', 'create_time', 'creator_id', 'remark'])
+            ->field(['id', 'order_no', 'order_type', 'amount', 'status', 'create_time', 'creator_id', 'remark', 'is_exempt'])
             ->order('id', 'asc')
             ->select()
             ->toArray();