From 510881b52eb01cebf0e8e38db5dc066dc7629c10 Mon Sep 17 00:00:00 2001
From: xianyi <thefangyi@gmail.com>
Date: Tue, 27 Jan 2026 15:29:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=A0=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/exam/ExamAddonPanel.tsx  | 8 +++++++-
 src/components/exam/ExamDetailPanel.tsx | 8 +++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/exam/ExamAddonPanel.tsx b/src/components/exam/ExamAddonPanel.tsx
index 98d81e3..9766b22 100644
--- a/src/components/exam/ExamAddonPanel.tsx
+++ b/src/components/exam/ExamAddonPanel.tsx
@@ -811,7 +811,13 @@ export const ExamAddonPanel = ({ client, onGoToSign }: ExamAddonPanelProps) => {
           if (combinationItemCode === null || combinationItemCode === undefined) {
             return null;
           }
-          const combinationItemPrice = parseFloat(item.currentPrice || item.originalPrice || '0');
+          let combinationItemPrice = parseFloat(item.currentPrice || item.originalPrice || '0');
+
+          // 如果自定义结算审核通过，传申请后的均价（按项平摊）
+          if (customSettlementStatus?.apply_status === 3 && typeof customSettlementStatus.final_settlement_price === 'number') {
+            combinationItemPrice = customSettlementStatus.final_settlement_price / selectedItems.length;
+          }
+
           return {
             combination_item_code: String(combinationItemCode),
             combination_item_price: combinationItemPrice,
diff --git a/src/components/exam/ExamDetailPanel.tsx b/src/components/exam/ExamDetailPanel.tsx
index 1ca72a4..1a2afee 100644
--- a/src/components/exam/ExamDetailPanel.tsx
+++ b/src/components/exam/ExamDetailPanel.tsx
@@ -344,9 +344,9 @@ export const ExamDetailPanel = ({
           </div>
           <div className='col-span-2'>
             预约备注：
-            <div className='text-gray-900 max-h-12 overflow-y-auto custom-scroll inline-block align-top'>
+            <span className='text-gray-900'>
               {loading ? '' : ((client['appointmentRemarks' as keyof ExamClient] as string | null | undefined) || '—')}
-            </div>
+            </span>
           </div>
           <div className='col-span-2'>
             加项内容：<span className='text-gray-900'>{addonSummary as string}</span>
@@ -406,6 +406,4 @@ export const ExamDetailPanel = ({
       </div>
     </div>
   );
-};
-
-
+};
\ No newline at end of file