Merge branch '20260511-long'

server/app/adminapi/controller/order/OrderController.php

@@ -557,6 +557,24 @@ class OrderController extends BaseAdminController
         }
     }
 
+    public function setExempt()
+    {
+        $id = (int) $this->request->post('id', 0);
+        $isExempt = (int) $this->request->post('is_exempt', 0);
+        if ($id <= 0) {
+            return $this->fail('参数错误');
+        }
+        if (!in_array($isExempt, [0, 1], true)) {
+            return $this->fail('is_exempt 值无效');
+        }
+        $result = OrderLogic::setExempt($id, $isExempt);
+        if (!$result) {
+            return $this->fail(OrderLogic::getError());
+        }
+        $this->logOrderAction($id, 'set_exempt', $isExempt === 1 ? '设置豁免权' : '取消豁免权');
+        return $this->success($isExempt === 1 ? '已设置豁免权' : '已取消豁免权');
+    }
+
     private function logOrderAction(int $orderId, string $action, string $summary = ''): void
     {
         OrderActionLogLogic::record($orderId, (int) $this->adminId, $this->adminInfo, $action, $summary);

server/app/adminapi/controller/tcm/DiagnosisController.php

@@ -117,6 +117,7 @@ class DiagnosisController extends BaseAdminController
 
         $params = (new DiagnosisValidate())->goCheck('id');
         $result = DiagnosisLogic::detail($params);
+        DiagnosisLogic::markAssignRead((int) ($params['id'] ?? 0), $this->adminId);
         return $this->data($result);
     }
 
@@ -135,7 +136,7 @@ class DiagnosisController extends BaseAdminController
         if (empty($result)) {
             return $this->fail(DiagnosisLogic::getError() ?: '诊单不存在或无权访问');
         }
-
+        DiagnosisLogic::markAssignRead((int) ($params['id'] ?? 0), $this->adminId);
         return $this->data($result);
     }
 

server/app/adminapi/lists/tcm/DiagnosisLists.php

@@ -177,14 +177,14 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
         $isCompletedTab = !$pendingWideSearch && isset($this->params['completed_appointment']) && (string) $this->params['completed_appointment'] === '1';
         if ($isCompletedTab) {
             $maxCompletedAptExpr = '(SELECT MAX(CONCAT(apt.appointment_date, \' \', IFNULL(NULLIF(TRIM(apt.appointment_time), \'\'), \'00:00:00\'))) FROM ' . $aptTbl . ' apt WHERE apt.patient_id = ' . $diagTbl . '.id AND apt.status = 3' . $minAptDateCond . ')';
-            $orderRaw              = 'IFNULL(' . $maxCompletedAptExpr . ", '1970-01-01 00:00:00') DESC, {$diagTbl}.id DESC";
+            $orderRaw              = $diagTbl . '.assign_read_at IS NULL DESC, IFNULL(' . $maxCompletedAptExpr . ", '1970-01-01 00:00:00') DESC, {$diagTbl}.id DESC";
         } else {
-            $orderRaw = 'CASE IFNULL(' . $minAptStatusExpr . ', 999) WHEN 4 THEN 1 WHEN 1 THEN 2 WHEN 3 THEN 3 ELSE 4 END ASC, IFNULL(' . $minAptExpr . ", '9999-12-31 23:59:59') ASC, {$diagTbl}.id DESC";
+            $orderRaw = $diagTbl . '.assign_read_at IS NULL DESC, CASE IFNULL(' . $minAptStatusExpr . ', 999) WHEN 4 THEN 1 WHEN 1 THEN 2 WHEN 3 THEN 3 ELSE 4 END ASC, IFNULL(' . $minAptExpr . ", '9999-12-31 23:59:59') ASC, {$diagTbl}.id DESC";
         }
 
         $lists = $query
             ->with(['DiagnosisViewRecord'])
-            ->field(['id', 'patient_id', 'patient_name', 'id_card', 'phone', 'gender', 'age', 'diagnosis_date', 'diagnosis_type', 'syndrome_type', 'assistant_id', 'status', 'create_time', 'update_time'])
+            ->field(['id', 'patient_id', 'patient_name', 'id_card', 'phone', 'gender', 'age', 'diagnosis_date', 'diagnosis_type', 'syndrome_type', 'assistant_id', 'assign_read_at', 'status', 'create_time', 'update_time'])
             ->append(['gender_desc', 'status_desc', 'diagnosis_date_text'])
             ->orderRaw($orderRaw)
             ->limit($this->limitOffset, $this->limitLength)

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();