Merge branch 'master' into yeji-5-11

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