修复bug

2026-05-08 10:49:32 +08:00
parent 8c640abb26
commit 43110e015d
6 changed files with 169 additions and 36 deletions
@@ -15,6 +15,7 @@ use app\common\model\tcm\PrescriptionOrderLog;
 use app\common\model\tcm\PrescriptionOrderPayOrder;
 use app\common\model\doctor\Appointment;
 use app\common\model\auth\Admin;
+use app\common\service\DataScope\DataScopeService;
 use app\common\service\ExpressTrackService;
 use app\common\service\gancao\GancaoScmRecipelService;
 use think\facade\Config;
@@ -136,6 +137,30 @@ class PrescriptionOrderLogic
        return $cid === $adminId;
    }

+    /**
+     * 与 PrescriptionOrderLists 数据域一致：创建人或关联诊单医助属于当前账号可见 admin 集合
+     */
+    private static function orderWithinDataScopeOwners(PrescriptionOrder $row, int $adminId, array $adminInfo): bool
+    {
+        if (!DataScopeService::isEnabled()) {
+            return false;
+        }
+        $ids = DataScopeService::getVisibleAdminIds($adminId, $adminInfo);
+        if ($ids === null || $ids === []) {
+            return false;
+        }
+        if (in_array((int) $row->creator_id, $ids, true)) {
+            return true;
+        }
+        $did = (int) $row->diagnosis_id;
+        if ($did <= 0) {
+            return false;
+        }
+        $da = (int) Diagnosis::where('id', $did)->whereNull('delete_time')->value('assistant_id');
+
+        return $da > 0 && in_array($da, $ids, true);
+    }
+
    /**
     * @param PrescriptionOrder $row
     */
@@ -147,8 +172,20 @@ class PrescriptionOrderLogic
        if ((int) $row->creator_id === $adminId) {
            return true;
        }
+        $did = (int) $row->diagnosis_id;
+        if ($did > 0) {
+            $da = (int) Diagnosis::where('id', $did)->whereNull('delete_time')->value('assistant_id');
+            if ($da === $adminId) {
+                return true;
+            }
+        }
        if (self::canViewOrdersForOwnPrescription($adminInfo)) {
-            return self::isPrescriptionOrderPrescriber((int) $row->prescription_id, $adminId);
+            if (self::isPrescriptionOrderPrescriber((int) $row->prescription_id, $adminId)) {
+                return true;
+            }
+        }
+        if (self::orderWithinDataScopeOwners($row, $adminId, $adminInfo)) {
+            return true;
        }

        return false;