新增

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

@@ -936,7 +936,6 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
             }
             $inList  = implode(',', $deptIds);
             $adTbl   = (new AdminDept())->getTable();
-<<<<<<< HEAD
             if ($yejiPanel) {
                 /** 业绩看板部门侧栏：仅订单创建人人事部门 ∈ 子树（与「合计业绩」/「接诊诊单」/「复诊」聚合同口径） */
                 $query->whereExists(
@@ -955,12 +954,6 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
                     );
                 });
             }
-=======
-            $poRef = '`' . str_replace('`', '', $poTbl) . '`';
-            $query->whereRaw(
-                YejiStatsLogic::sqlPrescriptionOrderListDeptSubtreeMatchCreatorFirst($poRef, $diagTbl, $adTbl, $inList)
-            );
->>>>>>> master
         }
     }