更新

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

@@ -25,6 +25,7 @@ use app\common\model\tcm\PrescriptionOrderPayOrder;
 use app\common\model\ExpressTracking;
 use app\common\service\gancao\GancaoScmRecipelService;
 use app\common\service\pharmacy\EjPharmacyClient;
+use app\common\service\tcm\RevisitVisitSlotService;
 use think\facade\Config;
 use think\facade\Db;
 use think\db\Query;
@@ -1464,7 +1465,9 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
     }
 
     /**
-     * 诊单编辑-业务订单 tab：标注全局诊次及是否计入复诊接诊率（与 RevisitRateLogic 同口径）
+     * 诊单编辑-业务订单 tab：标注全局诊次及是否计入复诊接诊率（与 RevisitRateLogic 同口径）。
+     * 诊次口径单点在 RevisitVisitSlotService：有效订单序列（fetchOrderSeqRows，一次 SQL 覆盖全部诊单，消除逐诊单 N+1）
+     * + 诊单偏移（fetchRevisitSlotStartOffsetMap / resolveRevisitSlotStartOffset 钳 0~20）；global_visit_seq / counts_for_revisit_rate 规则不变。
      *
      * @param array<int, array<string, mixed>> $lists
      */
@@ -1490,26 +1493,23 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
             return;
         }
 
-        $offsetRows = Diagnosis::whereIn('id', $diagIdList)
-            ->whereNull('delete_time')
-            ->column('revisit_slot_start_offset', 'id');
-        $offsetMap = [];
-        foreach ($offsetRows as $id => $offset) {
-            $offsetMap[(int) $id] = max(0, min(20, (int) $offset));
-        }
+        $offsetMap = RevisitVisitSlotService::fetchRevisitSlotStartOffsetMap($diagIdList);
 
-        /** @var array<int, int> $seqByOrderId order_id => global seq within diagnosis */
+        /** @var array<int, int> $seqByOrderId order_id => 诊单内实单全局序号 */
         $seqByOrderId = [];
-        foreach ($diagIdList as $did) {
-            $q = PrescriptionOrder::where('diagnosis_id', $did)->whereNull('delete_time');
-            YejiStatsLogic::applyPrescriptionOrderNotCancelledForPerformanceQuery($q, '');
-            $orderIds = $q
-                ->order(['create_time' => 'asc', 'id' => 'asc'])
-                ->column('id');
+        foreach (array_chunk($diagIdList, 2000) as $chunk) {
+            // 已按 (diagnosis_id, create_time, id) 升序，同一诊单连续
+            $orderRows = RevisitVisitSlotService::fetchOrderSeqRows($chunk, ['o.id', 'o.diagnosis_id']);
+            $curDid = 0;
             $seq = 0;
-            foreach ($orderIds as $oid) {
+            foreach ($orderRows as $r) {
+                $did = (int) ($r['diagnosis_id'] ?? 0);
+                if ($did !== $curDid) {
+                    $curDid = $did;
+                    $seq = 0;
+                }
                 $seq++;
-                $seqByOrderId[(int) $oid] = $seq;
+                $seqByOrderId[(int) ($r['id'] ?? 0)] = $seq;
             }
         }
 
@@ -1517,7 +1517,7 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
             $oid = (int) ($row['id'] ?? 0);
             $did = (int) ($row['diagnosis_id'] ?? 0);
             $seq = (int) ($seqByOrderId[$oid] ?? 0);
-            $offset = (int) ($offsetMap[$did] ?? 0);
+            $offset = RevisitVisitSlotService::resolveRevisitSlotStartOffset($did, $offsetMap);
             $effectiveSlot = $seq > 0 ? $seq + $offset : 0;
             $row['global_visit_seq'] = $effectiveSlot > 0 ? $effectiveSlot : null;
             $row['raw_visit_seq'] = $seq > 0 ? $seq : null;