From 3e4039efb0d573aba9bbf827adbb5e7960f109c6 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 20 May 2026 15:40:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/tcm-prescription/index.vue | 1382 +++++++++++++----
 .../src/views/consumer/prescription/index.vue |  569 +++++--
 .../src/views/consumer/prescription/list.vue  |   26 +
 .../consumer/prescription/order_list.vue      |  268 +++-
 .../consumer/prescription/order_list_h5.vue   |   57 +-
 .../http/middleware/AuthMiddleware.php        |   33 +
 .../lists/tcm/PrescriptionLibraryLists.php    |   14 +-
 .../logic/tcm/PrescriptionLibraryLogic.php    |   59 +
 .../adminapi/logic/tcm/PrescriptionLogic.php  |   33 +
 .../logic/tcm/PrescriptionOrderLogic.php      |   25 +-
 .../tcm/PrescriptionLibraryValidate.php       |    6 +-
 .../validate/tcm/PrescriptionValidate.php     |    4 +-
 .../app/command/GancaoSyncLogisticsRoute.php  |   38 +-
 server/app/common/model/tcm/Prescription.php  |    2 +-
 .../common/service/ExpressTrackService.php    |  164 +-
 .../common/service/ExpressTrackingService.php |  202 ++-
 .../gancao/GancaoLogisticsRouteService.php    |  100 +-
 .../create_prescription_library.sql           |    1 +
 .../add_prescription_aux_usage.sql            |    3 +
 .../add_prescription_library_formula_type.sql |    3 +
 .../add_prescription_library_lists_menu.sql   |   50 +
 21 files changed, 2507 insertions(+), 532 deletions(-)
 create mode 100644 server/sql/1.9.20260520/add_prescription_aux_usage.sql
 create mode 100644 server/sql/1.9.20260520/add_prescription_library_formula_type.sql
 create mode 100644 server/sql/1.9.20260520/add_prescription_library_lists_menu.sql

diff --git a/admin/src/components/tcm-prescription/index.vue b/admin/src/components/tcm-prescription/index.vue
index ec7ae650..4a6aba21 100644
--- a/admin/src/components/tcm-prescription/index.vue
+++ b/admin/src/components/tcm-prescription/index.vue
@@ -85,20 +85,24 @@
                                     <span class="rp-toolbar__abbr">(RP)</span>
                                 </h3>
                                 <p class="rp-toolbar__meta">
-                                    共 <strong>{{ formData.herbs.length }}</strong> 味药材 · 可手动添加、从处方库或粘贴药方批量录入（药品库同名匹配）
+                                    共 <strong>{{ formData.herbs.length }}</strong> 味（主方 {{ mainHerbCount }} / 辅方
+                                    {{ auxHerbCount }}）· 可手动添加、从处方库或粘贴药方批量录入
                                 </p>
                             </div>
                         </div>
                         <div class="rp-toolbar__actions" role="toolbar" aria-label="处方药材快捷操作">
-                            <el-button type="primary" size="small" :icon="CirclePlus" @click="handleAddHerb">
-                                添加中药
+                            <el-button type="primary" size="small" :icon="CirclePlus" @click="handleAddHerb('主方')">
+                                添加主方
+                            </el-button>
+                            <el-button type="primary" plain size="small" @click="handleAddHerb('辅方')">
+                                添加辅方
                             </el-button>
                             <el-button
                                 type="primary"
                                 plain
                                 size="small"
                                 :icon="CollectionTag"
-                                @click="showLibraryDialog = true"
+                                @click="openLibraryDialog"
                             >
                                 从处方库导入
                             </el-button>
@@ -119,35 +123,77 @@
                             <span class="ml-2 text-gray-500">元</span>
                         </el-form-item>
                     </div>
-                    <div class="herbs-editor-grid">
-                        <div
-                            v-for="(herb, index) in formData.herbs"
-                            :key="'herb-' + index"
-                            class="herb-editor-card"
-                            :class="{ 'herb-editor-card--dup': isDuplicateHerbName(index) }"
-                        >
-                            <div class="herb-editor-card__title">中药 {{ index + 1 }}</div>
-                            <MedicineNameSelect v-model="herb.name" class="herb-editor-card__select" />
+                    <div class="herb-formula-block">
+                        <div class="herb-formula-block__head">
+                            <el-tag type="primary" size="small">主方</el-tag>
+                        </div>
+                        <div class="herbs-editor-grid">
                             <div
-                                v-if="isDuplicateHerbName(index)"
-                                class="herb-editor-card__dup-hint text-amber-600 text-xs mb-1"
+                                v-for="row in mainHerbRows"
+                                :key="'main-' + row.index"
+                                class="herb-editor-card"
+                                :class="{ 'herb-editor-card--dup': isDuplicateHerbName(row.index) }"
                             >
-                                该药名与其他行重复，请合并剂量或删除多余行
+                                <div class="herb-editor-card__title">主方 {{ row.index + 1 }}</div>
+                                <MedicineNameSelect v-model="formData.herbs[row.index].name" class="herb-editor-card__select" />
+                                <div
+                                    v-if="isDuplicateHerbName(row.index)"
+                                    class="herb-editor-card__dup-hint text-amber-600 text-xs mb-1"
+                                >
+                                    该药名与其他行重复，请合并剂量或删除多余行
+                                </div>
+                                <div class="herb-editor-card__row">
+                                    <el-input-number
+                                        v-model="formData.herbs[row.index].dosage"
+                                        :min="0.1"
+                                        :step="1"
+                                        :precision="1"
+                                        placeholder="剂量(克)"
+                                        class="herb-editor-card__dose"
+                                    />
+                                    <span class="text-gray-500 shrink-0">克</span>
+                                    <el-button type="danger" size="small" link @click="handleRemoveHerb(row.index)">
+                                        删除
+                                    </el-button>
+                                </div>
                             </div>
-                            <div class="herb-editor-card__row">
-                                <el-input-number
-                                    v-model="herb.dosage"
-                                    :min="0.1"
-                                    :step="1"
-                                    :precision="1"
-                                    placeholder="剂量(克)"
-                                    class="herb-editor-card__dose"
-                                />
-                                <span class="text-gray-500 shrink-0">克</span>
-                                <el-button type="danger" size="small" link @click="handleRemoveHerb(index)">
-                                    删除
-                                </el-button>
+                        </div>
+                    </div>
+                    <div class="herb-formula-block mt-4">
+                        <div class="herb-formula-block__head">
+                            <el-tag type="warning" size="small">辅方</el-tag>
+                        </div>
+                        <div class="herbs-editor-grid">
+                            <div
+                                v-for="row in auxHerbRows"
+                                :key="'aux-' + row.index"
+                                class="herb-editor-card"
+                                :class="{ 'herb-editor-card--dup': isDuplicateHerbName(row.index) }"
+                            >
+                                <div class="herb-editor-card__title">辅方</div>
+                                <MedicineNameSelect v-model="formData.herbs[row.index].name" class="herb-editor-card__select" />
+                                <div
+                                    v-if="isDuplicateHerbName(row.index)"
+                                    class="herb-editor-card__dup-hint text-amber-600 text-xs mb-1"
+                                >
+                                    该药名与其他行重复，请合并剂量或删除多余行
+                                </div>
+                                <div class="herb-editor-card__row">
+                                    <el-input-number
+                                        v-model="formData.herbs[row.index].dosage"
+                                        :min="0.1"
+                                        :step="1"
+                                        :precision="1"
+                                        placeholder="剂量(克)"
+                                        class="herb-editor-card__dose"
+                                    />
+                                    <span class="text-gray-500 shrink-0">克</span>
+                                    <el-button type="danger" size="small" link @click="handleRemoveHerb(row.index)">
+                                        删除
+                                    </el-button>
+                                </div>
                             </div>
+                            <p v-if="!auxHerbRows.length" class="text-sm text-gray-400 py-2">暂无辅方药材</p>
                         </div>
                     </div>
                 </div>
@@ -169,6 +215,9 @@
                             </el-form-item>
                         </el-col>
                         
+                        <el-col :span="24">
+                            <div class="usage-formula-title usage-formula-title--main">主方用法</div>
+                        </el-col>
                         <!-- 用量字段 -->
                         <el-col :span="8">
                             <el-form-item label="用量" prop="dosage_amount">
@@ -266,6 +315,96 @@
                                 <el-input-number v-model="formData.times_per_day" :min="1" :max="6" class="!w-full" placeholder="每天服用次数" />
                             </el-form-item>
                         </el-col>
+
+                        <template v-if="auxHerbRows.length > 0">
+                            <el-col :span="24">
+                                <div class="usage-formula-title usage-formula-title--aux">辅方用法</div>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="用量">
+                                    <el-select
+                                        v-if="formData.prescription_type === '浓缩水丸'"
+                                        v-model="formData.aux_usage.dosage_amount"
+                                        placeholder="请选择用量"
+                                        class="!w-full"
+                                    >
+                                        <el-option v-for="n in 10" :key="n" :label="n + 'g'" :value="n" />
+                                    </el-select>
+                                    <el-select
+                                        v-else-if="formData.prescription_type === '饮片'"
+                                        v-model="formData.aux_usage.dosage_amount"
+                                        placeholder="请选择用量"
+                                        class="!w-full"
+                                    >
+                                        <el-option label="50ml" :value="50" />
+                                        <el-option label="100ml" :value="100" />
+                                        <el-option label="120ml" :value="120" />
+                                        <el-option label="150ml" :value="150" />
+                                        <el-option label="180ml" :value="180" />
+                                        <el-option label="200ml" :value="200" />
+                                        <el-option label="250ml" :value="250" />
+                                    </el-select>
+                                    <el-input-number
+                                        v-else
+                                        v-model="formData.aux_usage.dosage_amount"
+                                        :min="0"
+                                        :precision="2"
+                                        class="!w-full"
+                                    />
+                                </el-form-item>
+                            </el-col>
+                            <el-col v-if="formData.prescription_type === '浓缩水丸'" :span="8">
+                                <el-form-item label=" " label-width="12px">
+                                    <el-select
+                                        v-model="formData.aux_usage.dosage_bag_count"
+                                        placeholder="请选择袋数"
+                                        class="!w-[120px]"
+                                    >
+                                        <el-option label="1袋" :value="1" />
+                                        <el-option label="2袋" :value="2" />
+                                        <el-option label="3袋" :value="3" />
+                                        <el-option label="4袋" :value="4" />
+                                        <el-option label="5袋" :value="5" />
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                            <el-col v-if="formData.prescription_type === '饮片'" :span="8">
+                                <el-form-item label="是否代煎">
+                                    <el-radio-group v-model="formData.aux_usage.need_decoction">
+                                        <el-radio :label="true">代煎</el-radio>
+                                        <el-radio :label="false">不代煎</el-radio>
+                                    </el-radio-group>
+                                </el-form-item>
+                            </el-col>
+                            <el-col v-if="formData.prescription_type === '饮片'" :span="8">
+                                <el-form-item label="每贴出包数">
+                                    <el-select v-model="formData.aux_usage.bags_per_dose" placeholder="请选择" class="!w-full">
+                                        <el-option v-for="n in 9" :key="n" :label="n + '包'" :value="n" />
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="每天几次">
+                                    <el-input-number
+                                        v-model="formData.aux_usage.times_per_day"
+                                        :min="1"
+                                        :max="6"
+                                        class="!w-full"
+                                        placeholder="每天服用次数"
+                                    />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="服用天数">
+                                    <el-input-number
+                                        v-model="formData.aux_usage.usage_days"
+                                        :min="1"
+                                        :max="365"
+                                        class="!w-full"
+                                    />
+                                </el-form-item>
+                            </el-col>
+                        </template>
                         <!-- <el-col :span="8">
                             <el-form-item label="剂数" prop="dose_count">
                                 <el-input-number v-model="formData.dose_count" :min="1" :max="999" class="!w-full" />
@@ -378,108 +517,167 @@
 
         </div>
 
-        <div v-else class="prescription-preview">
+        <div v-else class="rx-wrap">
+            <div class="rx-toolbar">
+                <el-tag v-if="savedPrescription.void_status === 1" type="danger" size="small">已作废</el-tag>
+                <el-tag v-else-if="approvedPreviewOnly" type="success" size="small">已通过</el-tag>
+                <el-tag
+                    v-else-if="Number(savedPrescription.audit_status) === 0"
+                    type="warning"
+                    size="small"
+                >待审核</el-tag>
+                <el-tag v-else-if="Number(savedPrescription.audit_status) === 2" type="danger" size="small">已驳回</el-tag>
+                <div class="flex-1" />
+            </div>
+
+            <div v-if="savedPrescription.void_status === 1" class="rx-status rx-status-danger">
+                作废人：{{ savedPrescription.void_by_name || '—' }}，作废时间：{{ formatVoidTime(savedPrescription.void_time) }}
+            </div>
+            <div
+                v-else-if="Number(savedPrescription.audit_status) === 2"
+                class="rx-status rx-status-danger"
+            >
+                <div class="font-medium">处方审核：已驳回</div>
+                <div v-if="savedPrescription.audit_remark" class="mt-1">驳回意见：{{ savedPrescription.audit_remark }}</div>
+            </div>
+
             <div class="prescription-preview-content">
-            <div ref="prescriptionPrintRef" class="prescription-print">
-                <div class="prescription-header">
-                    <h2 class="prescription-title">{{ templateConfig.stationName }}处方笺</h2>
-                    <div class="prescription-type">
-                        <el-tag v-if="savedPrescription.void_status === 1" type="danger" size="small">已作废</el-tag>
-                        <el-tag
-                            v-else-if="approvedPreviewOnly"
-                            type="success"
-                            size="small"
-                            class="mr-1"
-                        >已通过</el-tag>
-                        <el-tag
-                            v-else-if="Number(savedPrescription.audit_status) === 0"
-                            type="warning"
-                            size="small"
-                            class="mr-1"
-                        >待审核</el-tag>
-                        <template v-if="savedPrescription.void_status !== 1">
-                            <div>普通处方</div>
-                            <div class="text-sm">当日有效</div>
+            <div v-if="savedPrescription" ref="prescriptionPrintRef" class="rx-paper">
+                <div class="rx-notice">
+                    <span class="rx-notice-text">
+                        服药前请核对姓名、电话、医生等信息以及服法、医嘱等要点
+                    </span>
+                    <span class="rx-notice-meta">
+                        <span>日期：{{ rxDateText }}</span>
+                        <span>编号：{{ rxSerialText }}</span>
+                    </span>
+                </div>
+
+                <div class="rx-info">
+                    <div class="rx-info-row">
+                        <div class="rx-info-cell">
+                            <span class="rx-key">姓名</span>
+                            <span class="rx-val">{{ savedPrescription.patient_name || '—' }}</span>
+                        </div>
+                        <div class="rx-info-cell">
+                            <span class="rx-key">性别</span>
+                            <span class="rx-val">{{ slipGenderLabel(savedPrescription.gender) }}</span>
+                        </div>
+                        <div class="rx-info-cell">
+                            <span class="rx-key">年龄</span>
+                            <span class="rx-val">{{ slipAgeText(savedPrescription.age) }}</span>
+                        </div>
+                        <div class="rx-info-cell">
+                            <span class="rx-key">电话</span>
+                            <span class="rx-val">{{ savedPrescription.phone || '—' }}</span>
+                        </div>
+                    </div>
+                    <div class="rx-info-row rx-info-row-full">
+                        <div class="rx-info-cell">
+                            <span class="rx-key">门诊号</span>
+                            <span class="rx-val">{{ savedPrescription.visit_no || '—' }}</span>
+                        </div>
+                    </div>
+                    <div v-if="savedPrescription.pulse || savedPrescription.tongue" class="rx-info-row rx-info-row-full">
+                        <div v-if="savedPrescription.pulse" class="rx-info-cell">
+                            <span class="rx-key">面象</span>
+                            <span class="rx-val">{{ savedPrescription.pulse }}</span>
+                        </div>
+                        <div v-if="savedPrescription.tongue" class="rx-info-cell">
+                            <span class="rx-key">舌象</span>
+                            <span class="rx-val">{{ savedPrescription.tongue }}</span>
+                        </div>
+                    </div>
+                    <div class="rx-info-row rx-info-row-full">
+                        <div class="rx-info-cell">
+                            <span class="rx-key">临床诊断</span>
+                            <span class="rx-val">{{ savedPrescription.clinical_diagnosis || '—' }}</span>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="rx-rp">
+                    <div class="rx-watermark">药房联</div>
+                    <div class="rx-rp-head">
+                        <div class="rx-rp-label">Rp.</div>
+                        <div class="rx-rp-cols-head">
+                            <div class="rx-rp-col-head">
+                                <span>用药 (单剂)</span>
+                                <span>总量</span>
+                            </div>
+                            <div class="rx-rp-col-head">
+                                <span>用药 (单剂)</span>
+                                <span>总量</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="rx-herbs">
+                        <template v-if="savedMainHerbs.length">
+                            <div class="rx-herb-section-label">主方</div>
+                            <div
+                                v-for="(h, i) in savedMainHerbs"
+                                :key="'main-' + i"
+                                class="rx-herb-cell"
+                            >
+                                <span class="rx-herb-name">{{ h.name }} ({{ h.dosage }}克)</span>
+                                <span class="rx-herb-total">{{ rxHerbTotal(h.dosage) }}克</span>
+                            </div>
+                        </template>
+                        <template v-if="savedAuxHerbs.length">
+                            <div class="rx-herb-section-label rx-herb-section-label--aux">辅方</div>
+                            <div
+                                v-for="(h, i) in savedAuxHerbs"
+                                :key="'aux-' + i"
+                                class="rx-herb-cell"
+                            >
+                                <span class="rx-herb-name">{{ h.name }} ({{ h.dosage }}克)</span>
+                                <span class="rx-herb-total">{{ rxHerbTotal(h.dosage) }}克</span>
+                            </div>
                         </template>
                     </div>
                 </div>
-                <div v-if="savedPrescription.void_status === 1" class="prescription-void-info">
-                    作废人：{{ savedPrescription.void_by_name || '—' }}，作废时间：{{ formatVoidTime(savedPrescription.void_time) }}
-                </div>
-                <div class="prescription-info">
-                    <div class="info-row">
-                        <span class="info-item"><em>日期</em>{{ savedPrescription.prescription_date }}</span>
-                        <span class="info-item"><em>电话</em>{{ savedPrescription.phone }}</span>
-                        <span class="info-item"><em>门诊号</em>{{ savedPrescription.visit_no }}</span>
-                    </div>
-                    <div class="info-row">
-                        <span class="info-item"><em>姓名</em>{{ savedPrescription.patient_name }}</span>
-                        <span class="info-item"><em>性别</em>{{ savedPrescription.gender_desc }}</span>
-                        <span class="info-item"><em>年龄</em>{{ savedPrescription.age != null ? savedPrescription.age + '岁' : '—' }}</span>
-                       
-                    </div>
-                    <div class="info-row">
-                        <span class="info-item" v-if="savedPrescription.pulse"><em>面象</em>{{ savedPrescription.pulse || '—' }}</span>
-                        <span class="info-item" v-if="savedPrescription.tongue"><em>舌象</em>{{ savedPrescription.tongue || '—' }}</span>
-                     
-                    </div>
-                    <div class="info-row info-row-full">
-                        <span class="info-item"><em>临床诊断</em>{{ savedPrescription.clinical_diagnosis }}</span>
-                    </div>
-                </div>
-                <div class="prescription-rp">
-                    <div class="rp-label">RP</div>
-                    <div class="herbs-grid">
-                        <div
-                            v-for="(h, i) in savedPrescription.herbs"
-                            :key="i"
-                            class="herb-cell"
-                        >
-                            {{ h.name }} {{ h.dosage }}克
-                        </div>
-                    </div>
-                </div>
-                <div class="prescription-disclaimer" v-if="templateConfig.showDisclaimer">
-                    {{ templateConfig.disclaimer }}
-                </div>
-                <div class="prescription-footer">
-                    <div class="footer-left">
-                        <div class="footer-dosage">
-                            服用{{ savedPrescription.usage_days || savedPrescription.dose_count }}天{{ savedPrescription.times_per_day ? '，每天' + savedPrescription.times_per_day + '次' : '' }}{{ savedDosageDescText ? '，' + savedDosageDescText : '' }}, {{ savedPrescription.prescription_type }}
-                            {{ savedPrescription.usage_instruction }}
 
-                        </div>
-                         <div class="footer-dosage">
-                           服用时间: {{ savedPrescription.usage_time ?'  '  + savedPrescription.usage_time : '' }}
-                           <text style="margin-left: 20px;"></text>服用方式:   {{ savedPrescription.usage_way ? ' ' + savedPrescription.usage_way : '' }}
-                        </div>
-                       
-                        <div v-if="savedPrescription.dietary_taboo && savedPrescription.dietary_taboo.length" class="footer-dietary">
-                            忌口：{{ Array.isArray(savedPrescription.dietary_taboo) ? savedPrescription.dietary_taboo.join('、') : savedPrescription.dietary_taboo }}
-                        </div>
-                        <div v-if="savedPrescription.usage_notes" class="footer-notes">
-                            {{ savedPrescription.usage_notes }}
-                        </div>
-                        <!-- <div class="footer-amount">金额 {{ savedPrescription.amount }}</div> -->
-                    </div>
-                    <div class="footer-right footer-sign">
-                        <span class="signature-cell">
-                            医师
-                            <img
-                                v-if="savedPrescription.doctor_signature"
-                                :src="savedPrescription.doctor_signature"
-                                alt="医师签名"
-                                class="doctor-signature-img"
-                            />
-                            <span v-else>{{ savedPrescription.doctor_name || '医师' }}</span>
-                        </span>
-                        <!-- <span>核对发药</span> -->
-                    </div>
+                <div class="rx-text">
+                    <p>主方服法：{{ rxUsageText }}</p>
+                    <p v-if="savedAuxUsageText">辅方服法：{{ savedAuxUsageText }}</p>
+                    <p v-if="rxAdviceText">医嘱：{{ rxAdviceText }}</p>
+                    <p v-if="rxRemarkText">备注：{{ rxRemarkText }}</p>
+                    <p v-if="savedPrescription.dietary_taboo && savedPrescription.dietary_taboo.length">
+                        忌口：{{ Array.isArray(savedPrescription.dietary_taboo) ? savedPrescription.dietary_taboo.join('、') : savedPrescription.dietary_taboo }}
+                    </p>
+                    <p v-if="rxPharmacyRemarkText" class="rx-text-warn">药房备注：{{ rxPharmacyRemarkText }}</p>
+                    <p v-if="rxOutPelletText && savedPrescription.prescription_type !== '饮片'" class="rx-text-warn">
+                        出丸：{{ rxOutPelletText }}
+                    </p>
                 </div>
-                
-                <div class="prescription-area">
-                    <div >成都双流甄养堂互联网医院有限公司 联系方式：4001667339</div>
-                    <div >地址 ：四川省成都市双流区黄甲街道黄龙大道二段280号</div>
+
+                <div class="rx-bottom">
+                    <div class="rx-bot-row rx-bot-row-1">
+                        <div class="rx-bot-cell rx-bot-stack rx-bot-doctor">
+                            <div class="rx-bot-label">医师</div>
+                            <div class="rx-bot-doctor-body">
+                                <img
+                                    v-if="savedPrescription.doctor_signature"
+                                    :src="savedPrescription.doctor_signature"
+                                    alt="医师签名"
+                                    class="rx-bot-sign-img"
+                                />
+                                <div class="rx-bot-doctor-name">{{ savedPrescription.doctor_name || '—' }}</div>
+                            </div>
+                        </div>
+                        <div class="rx-bot-cell rx-bot-meta">
+                            <span class="rx-bot-meta-key">类型:</span>
+                            <span class="rx-bot-meta-val">{{ rxTypeText }}</span>
+                        </div>
+                        <div class="rx-bot-cell rx-bot-meta">
+                            <span class="rx-bot-meta-key">天数:</span>
+                            <span class="rx-bot-meta-val">{{ savedPrescription.dose_count || '—' }}剂</span>
+                        </div>
+                        <div class="rx-bot-cell rx-bot-meta">
+                            <span class="rx-bot-meta-key">单剂量:</span>
+                            <span class="rx-bot-meta-val">{{ rxPerDoseAmount }}克</span>
+                        </div>
+                    </div>
                 </div>
             </div>
 
@@ -583,6 +781,20 @@
                 </div>
             </div>
             </div>
+
+            <div
+                v-if="savedPrescription && (savedPrescription.audit_by_name || savedPrescription.audit_remark)"
+                class="rx-audit"
+            >
+                <div v-if="savedPrescription.audit_by_name">
+                    审核人：{{ savedPrescription.audit_by_name }}
+                    <span v-if="savedPrescription.audit_time" class="ml-2 text-gray-400">
+                        {{ formatAuditTime(savedPrescription.audit_time) }}
+                    </span>
+                </div>
+                <div v-if="savedPrescription.audit_remark" class="mt-1">审核意见：{{ savedPrescription.audit_remark }}</div>
+            </div>
+
             <div class="flex justify-end gap-2 mt-4">
                 <el-button @click="handleDownloadImage">
                     <el-icon><Download /></el-icon>
@@ -630,9 +842,10 @@
         width="800px"
         :close-on-click-modal="false"
     >
-        <div class="mb-4">
+        <div class="mb-4 flex gap-3">
             <el-input
                 v-model="librarySearchName"
+                class="flex-1"
                 placeholder="请输入处方名称搜索"
                 clearable
                 @keyup.enter="searchLibrary"
@@ -642,6 +855,24 @@
                     <el-button :icon="Search" @click="searchLibrary" />
                 </template>
             </el-input>
+            <el-select
+                v-model="librarySearchFormulaType"
+                placeholder="处方类型"
+                clearable
+                class="w-[140px]"
+                @change="searchLibrary"
+            >
+                <el-option label="全部" value="" />
+                <el-option label="主方" value="主方" />
+                <el-option label="辅方" value="辅方" />
+            </el-select>
+        </div>
+        <div class="mb-3 flex flex-wrap items-center gap-x-4 gap-y-2">
+            <span class="text-sm text-gray-600 shrink-0">导入方式</span>
+            <el-radio-group v-model="libraryImportMode">
+                <el-radio label="replace">覆盖同类型药材</el-radio>
+                <el-radio label="append">追加到末尾</el-radio>
+            </el-radio-group>
         </div>
 
         <el-table
@@ -652,6 +883,13 @@
             style="cursor: pointer"
         >
             <el-table-column label="处方名称" prop="prescription_name" min-width="150" show-overflow-tooltip />
+            <el-table-column label="处方类型" width="90">
+                <template #default="{ row }">
+                    <el-tag :type="row.formula_type === '辅方' ? 'warning' : 'primary'" size="small">
+                        {{ row.formula_type || '主方' }}
+                    </el-tag>
+                </template>
+            </el-table-column>
             <el-table-column label="药材数量" width="100">
                 <template #default="{ row }">
                     {{ row.herbs?.length || 0 }}味
@@ -665,6 +903,13 @@
                     <span v-else class="text-gray-400">暂无药材</span>
                 </template>
             </el-table-column>
+            <el-table-column label="是否公开" width="110">
+                <template #default="{ row }">
+                    <el-tag :type="row.is_public ? 'success' : 'info'" size="small">
+                        {{ row.is_public ? '所有人可见' : '仅自己可见' }}
+                    </el-tag>
+                </template>
+            </el-table-column>
             <el-table-column label="创建人" prop="creator_name" width="100" />
             <el-table-column label="操作" width="100" fixed="right">
                 <template #default="{ row }">
@@ -710,9 +955,10 @@
         <div class="mt-3 flex flex-wrap items-center gap-x-4 gap-y-2">
             <span class="text-sm text-gray-600 shrink-0">导入方式</span>
             <el-radio-group v-model="pasteRecipeImportMode">
-                <el-radio label="replace">覆盖现有药材</el-radio>
-                <el-radio label="append">追加到末尾</el-radio>
+                <el-radio label="replace">覆盖主方药材</el-radio>
+                <el-radio label="append">追加到主方末尾</el-radio>
             </el-radio-group>
+            <span class="text-xs text-gray-500">（粘贴导入至主方，保留已有辅方）</span>
         </div>
         <template #footer>
             <el-button @click="showPasteRecipeDialog = false">取消</el-button>
@@ -737,9 +983,114 @@ import useAppStore from '@/stores/modules/app'
 import { CirclePlus, CollectionTag, Download, Document, EditPen } from '@element-plus/icons-vue'
 import { Search } from '@element-plus/icons-vue'
 
+type FormulaType = '主方' | '辅方'
+
 interface Herb {
     name: string
     dosage: number
+    formula_type?: FormulaType
+}
+
+type AuxUsageForm = {
+    dosage_amount?: number
+    dosage_bag_count: number
+    need_decoction: boolean
+    bags_per_dose: number
+    times_per_day: number
+    usage_days: number
+}
+
+function normalizeFormulaType(v: unknown): FormulaType {
+    return v === '辅方' ? '辅方' : '主方'
+}
+
+function normalizeHerbRow(raw: any): Herb {
+    return {
+        name: String(raw?.name ?? '').trim(),
+        dosage: Number(raw?.dosage) || 0,
+        formula_type: normalizeFormulaType(raw?.formula_type)
+    }
+}
+
+function defaultAuxUsage(prescriptionType = '浓缩水丸'): AuxUsageForm {
+    if (prescriptionType === '饮片') {
+        return {
+            dosage_amount: 50,
+            dosage_bag_count: 1,
+            need_decoction: false,
+            bags_per_dose: 1,
+            times_per_day: 3,
+            usage_days: 7
+        }
+    }
+    if (prescriptionType === '浓缩水丸') {
+        return {
+            dosage_amount: 5,
+            dosage_bag_count: 1,
+            need_decoction: false,
+            bags_per_dose: 1,
+            times_per_day: 3,
+            usage_days: 7
+        }
+    }
+    return {
+        dosage_amount: 1,
+        dosage_bag_count: 1,
+        need_decoction: false,
+        bags_per_dose: 1,
+        times_per_day: 3,
+        usage_days: 7
+    }
+}
+
+function normalizeAuxUsageForm(raw: unknown, prescriptionType: string): AuxUsageForm {
+    const base = defaultAuxUsage(prescriptionType)
+    if (!raw || typeof raw !== 'object') return { ...base }
+    const o = raw as Record<string, unknown>
+    return {
+        dosage_amount:
+            o.dosage_amount !== null && o.dosage_amount !== undefined && o.dosage_amount !== ''
+                ? Number(o.dosage_amount)
+                : base.dosage_amount,
+        dosage_bag_count: o.dosage_bag_count != null ? Number(o.dosage_bag_count) || 1 : base.dosage_bag_count,
+        need_decoction: o.need_decoction === 1 || o.need_decoction === true,
+        bags_per_dose: o.bags_per_dose != null ? Number(o.bags_per_dose) || 1 : base.bags_per_dose,
+        times_per_day: o.times_per_day != null ? Number(o.times_per_day) || 3 : base.times_per_day,
+        usage_days: o.usage_days != null ? Number(o.usage_days) || 7 : base.usage_days
+    }
+}
+
+function buildUsageSegmentText(
+    usage: {
+        prescription_type?: string
+        dosage_amount?: number | null
+        dosage_unit?: string
+        dosage_bag_count?: number
+        times_per_day?: number
+        usage_way?: string
+        usage_time?: string
+    },
+    fallbackWay?: string,
+    fallbackTime?: string
+): string {
+    const pt = usage.prescription_type || '浓缩水丸'
+    const times = Number(usage.times_per_day) > 0 ? Number(usage.times_per_day) : 3
+    const amount = usage.dosage_amount != null ? Number(usage.dosage_amount) : 10
+    const unit = usage.dosage_unit || (pt === '饮片' ? 'ml' : 'g')
+    const usageWay = usage.usage_way || fallbackWay || '温水送服'
+    const usageTime = usage.usage_time || fallbackTime || ''
+    const seg: string[] = []
+    seg.push(`每天${times}次`)
+    if (pt === '浓缩水丸') {
+        const bags = Number(usage.dosage_bag_count) > 0 ? Number(usage.dosage_bag_count) : 1
+        seg.push(`一次${bags}袋`)
+        seg.push(`每袋${amount}${unit}`)
+    } else {
+        seg.push(`一次${amount}${unit}`)
+    }
+    seg.push(usageWay)
+    if (usageTime) seg.push(usageTime)
+    return seg.join(', ')
 }
 
 interface PrescriptionForm {
@@ -779,6 +1130,7 @@ interface PrescriptionForm {
     doctor_name: string
     doctor_signature: string
     is_shared: number
+    aux_usage: AuxUsageForm
 }
 
 const emit = defineEmits(['success'])
@@ -813,18 +1165,193 @@ const hasPrescriptionOrderBlockVoid = computed(() => {
 
 const drawerTitle = computed(() => (approvedPreviewOnly.value ? '查看处方' : '中医处方单'))
 
-/** 处方笺底部"用量/袋数"展示文案：浓缩水丸显示"一次X袋（每袋Yg）"，其它类型显示"一次Yg" */
-const savedDosageDescText = computed(() => {
+const savedMainHerbs = computed(() => {
+    const list = savedPrescription.value?.herbs
+    if (!Array.isArray(list)) return []
+    return list.filter((h: Herb) => normalizeFormulaType(h?.formula_type) === '主方')
+})
+
+const savedAuxHerbs = computed(() => {
+    const list = savedPrescription.value?.herbs
+    if (!Array.isArray(list)) return []
+    return list.filter((h: Herb) => normalizeFormulaType(h?.formula_type) === '辅方')
+})
+
+const savedAuxUsageText = computed(() => {
     const v = savedPrescription.value
-    if (!v) return ''
-    if (v.dosage_amount == null || v.dosage_amount === '') return ''
-    const amount = Number(v.dosage_amount)
-    const unit = v.dosage_unit || 'g'
-    if ((v.prescription_type || '浓缩水丸') === '浓缩水丸') {
-        const bags = Number(v.dosage_bag_count) > 0 ? Number(v.dosage_bag_count) : 1
-        return `一次${bags}袋（每袋${amount}${unit}）`
+    if (!v || !savedAuxHerbs.value.length) return ''
+    const aux = normalizeAuxUsageForm(v.aux_usage, v.prescription_type || '浓缩水丸')
+    return buildUsageSegmentText(
+        {
+            prescription_type: v.prescription_type,
+            dosage_amount: aux.dosage_amount,
+            dosage_unit: v.dosage_unit,
+            dosage_bag_count: aux.dosage_bag_count,
+            times_per_day: aux.times_per_day,
+            usage_way: v.usage_way,
+            usage_time: v.usage_time
+        },
+        v.usage_way,
+        v.usage_time
+    )
+})
+
+const savedSlipHerbsList = computed(() => {
+    const h = savedPrescription.value?.herbs
+    return Array.isArray(h) ? h : []
+})
+
+const padRxN = (n: number) => String(n).padStart(2, '0')
+
+const rxDateText = computed(() => {
+    const v = savedPrescription.value as any
+    if (!v) return '—'
+    const ts = v.create_time ?? v.update_time ?? null
+    if (ts) {
+        const t = String(ts).length === 10 ? Number(ts) * 1000 : Number(ts)
+        const d = new Date(t)
+        if (!isNaN(d.getTime())) {
+            return `${d.getFullYear()}-${padRxN(d.getMonth() + 1)}-${padRxN(d.getDate())} ${padRxN(d.getHours())}:${padRxN(d.getMinutes())}`
+        }
     }
-    return `一次${amount}${unit}`
+    return v.prescription_date || '—'
+})
+
+const rxSerialText = computed(() => {
+    const v = savedPrescription.value as any
+    if (!v) return '—'
+    const sn = String(v.sn ?? '').trim()
+    if (sn) return sn
+    const vn = String(v.visit_no ?? '').trim()
+    if (vn) return vn
+    return v.id ? `G${v.id}` : '—'
+})
+
+const rxDoseCount = computed(() => {
+    const n = Number(savedPrescription.value?.dose_count)
+    return Number.isFinite(n) && n > 0 ? n : 1
+})
+
+const rxPerDoseAmount = computed(() => {
+    const sum = savedSlipHerbsList.value.reduce((acc: number, h: any) => acc + (Number(h?.dosage) || 0), 0)
+    return formatRxNum(sum)
+})
+
+const rxHerbTotal = (dosage: number | string) => {
+    const d = Number(dosage) || 0
+    return formatRxNum(d * rxDoseCount.value)
+}
+
+const rxTypeText = computed(() => {
+    const v = savedPrescription.value as any
+    if (!v) return '—'
+    const t = v.prescription_type || '浓缩水丸'
+    if (t === '饮片') return '饮片'
+    return /丸|散|膏|片/.test(t) ? `浓缩丸-${t}` : t
+})
+
+const rxUsageText = computed(() => {
+    const v = savedPrescription.value as any
+    if (!v) return '—'
+    if (v.usage_text) return v.usage_text
+    return buildUsageSegmentText(v)
+})
+
+const rxAdviceText = computed(() => {
+    const v = savedPrescription.value as any
+    if (!v) return ''
+    return v.medical_advice || ''
+})
+
+const rxRemarkText = computed(() => {
+    const v = savedPrescription.value as any
+    if (!v) return ''
+    const parts: string[] = []
+    parts.push(`共${savedSlipHerbsList.value.length}味药`)
+    if (v.usage_notes) parts.push(String(v.usage_notes))
+    if (v.remark) parts.push(String(v.remark))
+    return parts.join(' ')
+})
+
+const rxPharmacyRemarkText = computed(() => {
+    const v = savedPrescription.value as any
+    if (!v) return ''
+    return v.pharmacy_remark || v.pharmacy_note || ''
+})
+
+const rxOutPelletText = computed(() => {
+    const v = savedPrescription.value as any
+    if (!v) return ''
+    const out = computeRxOutPellet(v)
+    return out ? `${out}克` : ''
+})
+
+function computeRxOutPellet(v: any): string {
+    if (!v) return ''
+    if ((v.prescription_type || '浓缩水丸') === '浓缩水丸') {
+        const days = Number(v.usage_days ?? v.dose_count)
+        const times = Number(v.times_per_day)
+        const doseG = Number(v.dosage_amount)
+        const bags = Number(v.dosage_bag_count) > 0 ? Number(v.dosage_bag_count) : 1
+        if (
+            Number.isFinite(days) &&
+            Number.isFinite(times) &&
+            Number.isFinite(doseG) &&
+            days > 0 &&
+            times > 0 &&
+            doseG > 0
+        ) {
+            return formatRxNum(days * times * doseG * bags)
+        }
+    }
+    const explicit = v.out_pellet || v.total_weight
+    if (explicit && Number(explicit) > 0) return formatRxNum(Number(explicit))
+    const list = savedSlipHerbsList.value
+    if (!list.length) return ''
+    const perDose = list.reduce((acc: number, h: any) => acc + (Number(h?.dosage) || 0), 0)
+    return formatRxNum(perDose * rxDoseCount.value)
+}
+
+function formatRxNum(n: number): string {
+    if (!isFinite(n)) return '0'
+    return Number.isInteger(n) ? String(n) : n.toFixed(2).replace(/\.?0+$/, '')
+}
+
+function slipGenderLabel(g: unknown) {
+    if (g === 1 || g === '1') return '男'
+    if (g === 0 || g === '0') return '女'
+    return savedPrescription.value?.gender_desc || '—'
+}
+
+function slipAgeText(age: unknown) {
+    if (age === null || age === undefined || age === '') return '—'
+    return `${age}岁`
+}
+
+function formatAuditTime(ts: number | null | undefined) {
+    if (!ts) return ''
+    const d = new Date(ts * 1000)
+    return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')} ${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}`
+}
+
+const mainHerbRows = computed(() =>
+    formData.herbs
+        .map((herb, index) => ({ herb, index }))
+        .filter(({ herb }) => normalizeFormulaType(herb.formula_type) === '主方')
+)
+
+const auxHerbRows = computed(() =>
+    formData.herbs
+        .map((herb, index) => ({ herb, index }))
+        .filter(({ herb }) => normalizeFormulaType(herb.formula_type) === '辅方')
+)
+
+const mainHerbCount = computed(() => mainHerbRows.value.length)
+const auxHerbCount = computed(() => auxHerbRows.value.length)
+
+const libraryDoctorId = computed(() => {
+    const uid = Number(userStore.userInfo?.id)
+    return uid > 0 ? uid : 0
 })
 
 // 处方库相关
@@ -832,6 +1359,8 @@ const showLibraryDialog = ref(false)
 const libraryLoading = ref(false)
 const libraryList = ref<any[]>([])
 const librarySearchName = ref('')
+const librarySearchFormulaType = ref('')
+const libraryImportMode = ref<'replace' | 'append'>('replace')
 
 // 防止重复打开
 const isOpening = ref(false)
@@ -975,7 +1504,7 @@ async function handlePasteRecipeImport() {
                 skippedNames.push(row.name.trim())
                 continue
             }
-            resolved.push({ name, dosage: row.dosage })
+            resolved.push({ name, dosage: row.dosage, formula_type: '主方' })
         }
         const skippedUnique = [...new Set(skippedNames.filter(Boolean))]
         if (resolved.length === 0) {
@@ -987,7 +1516,8 @@ async function handlePasteRecipeImport() {
             return
         }
         if (pasteRecipeImportMode.value === 'replace') {
-            formData.herbs = resolved
+            const auxKept = formData.herbs.filter((h) => normalizeFormulaType(h.formula_type) === '辅方')
+            formData.herbs = [...auxKept, ...resolved]
         } else {
             formData.herbs.push(...resolved)
         }
@@ -1054,7 +1584,8 @@ const formData = reactive<PrescriptionForm>({
     amount: 0,
     doctor_name: '',
     doctor_signature: '',
-    is_shared: 0
+    is_shared: 0,
+    aux_usage: defaultAuxUsage('浓缩水丸')
 })
 
 const userStore = useUserStore()
@@ -1245,6 +1776,8 @@ const open = async (data: any, options?: { templateId?: number; stationName?: st
         formData.is_shared = 0
         formData.need_decoction = false
         formData.bags_per_dose = 1
+        formData.times_per_day = 2
+        Object.assign(formData.aux_usage, defaultAuxUsage('浓缩水丸'))
 
         savedPrescription.value = null
         visible.value = true
@@ -1401,8 +1934,8 @@ function findDuplicateHerbNames(): string[] {
     return [...map.entries()].filter(([, c]) => c > 1).map(([name]) => name)
 }
 
-const handleAddHerb = () => {
-    formData.herbs.push({ name: '', dosage: 6 })
+const handleAddHerb = (formulaType: FormulaType = '主方') => {
+    formData.herbs.push({ name: '', dosage: 6, formula_type: formulaType })
 }
 
 const handleRemoveHerb = (index: number) => {
@@ -1411,13 +1944,21 @@ const handleRemoveHerb = (index: number) => {
 
 // 处方库相关方法
 const loadLibraryList = async () => {
+    const doctorId = libraryDoctorId.value
+    if (!doctorId) {
+        feedback.msgWarning('无法确定开方医师，无法加载处方库')
+        libraryList.value = []
+        libraryTotal.value = 0
+        return
+    }
     libraryLoading.value = true
     try {
         const res = await prescriptionLibraryLists({
             page_no: libraryPage.value,
             page_size: libraryPageSize.value,
             prescription_name: librarySearchName.value,
-            is_public: ''
+            formula_type: librarySearchFormulaType.value,
+            prescribing_creator_id: doctorId
         })
         libraryList.value = res.lists || []
         libraryTotal.value = res.count || 0
@@ -1434,6 +1975,14 @@ const searchLibrary = () => {
     loadLibraryList()
 }
 
+const openLibraryDialog = () => {
+    if (!libraryDoctorId.value) {
+        feedback.msgWarning('无法确定开方医师，无法从处方库导入')
+        return
+    }
+    showLibraryDialog.value = true
+}
+
 const handleSelectLibrary = (row: any) => {
     // 点击行也可以导入
     handleImportLibrary(row)
@@ -1445,22 +1994,40 @@ const handleImportLibrary = (row: any) => {
         return
     }
 
-    // 深拷贝药材数据并导入
-    const importedHerbs = JSON.parse(JSON.stringify(row.herbs))
-    formData.herbs = importedHerbs
-
-    if (findDuplicateHerbNames().length) {
-        feedback.msgWarning('导入的处方中存在重复药名，请合并剂量或删除多余行')
+    const formulaType = normalizeFormulaType(row.formula_type)
+    const imported = (JSON.parse(JSON.stringify(row.herbs)) as any[]).map((h) => ({
+        ...normalizeHerbRow(h),
+        formula_type: formulaType
+    }))
+    if (libraryImportMode.value === 'replace') {
+        const kept = formData.herbs.filter((h) => normalizeFormulaType(h.formula_type) !== formulaType)
+        formData.herbs = [...kept, ...imported]
+    } else {
+        formData.herbs.push(...imported)
     }
 
-    feedback.msgSuccess(`已导入处方「${row.prescription_name}」，共${importedHerbs.length}味药材`)
+    const modeHint = libraryImportMode.value === 'append' ? '（已追加）' : ''
+    if (findDuplicateHerbNames().length) {
+        feedback.msgWarning(
+            `已导入处方「${row.prescription_name}」${modeHint}，共${imported.length}味药材。存在重复药名，请合并剂量或删除多余行`
+        )
+    } else {
+        feedback.msgSuccess(`已导入处方「${row.prescription_name}」${modeHint}，共${imported.length}味药材`)
+    }
     showLibraryDialog.value = false
 }
 
 // 监听处方库弹窗打开，自动加载数据
 watch(showLibraryDialog, (newVal) => {
     if (newVal) {
+        if (!libraryDoctorId.value) {
+            feedback.msgWarning('无法确定开方医师，无法从处方库导入')
+            showLibraryDialog.value = false
+            return
+        }
         librarySearchName.value = ''
+        librarySearchFormulaType.value = ''
+        libraryImportMode.value = 'replace'
         libraryPage.value = 1
         loadLibraryList()
     }
@@ -1487,6 +2054,7 @@ watch(() => formData.prescription_type, (newType) => {
         formData.need_decoction = false
         formData.bags_per_dose = 1
     }
+    Object.assign(formData.aux_usage, defaultAuxUsage(newType))
 })
 
 const handleSave = async () => {
@@ -1538,7 +2106,8 @@ const handleSave = async () => {
             pulse_condition: formData.pulse_condition,
             clinical_diagnosis: formData.clinical_diagnosis,
             case_record: formData.case_record,
-            herbs: formData.herbs,
+            herbs: formData.herbs.map((h) => normalizeHerbRow(h)),
+            aux_usage: auxHerbRows.value.length > 0 ? { ...formData.aux_usage } : null,
             dose_count: formData.dose_count,
             dose_unit: formData.dose_unit,
             dosage_amount: formData.dosage_amount,
@@ -1658,6 +2227,7 @@ const handleNewPrescription = async () => {
         formData.doctor_signature = ''
         formData.is_shared = 0
         formData.herbs = []
+        Object.assign(formData.aux_usage, defaultAuxUsage(formData.prescription_type || '浓缩水丸'))
         // 新建处方时重新获取病历（旧处方可能没有 case_record）
         formData.case_record = saved.case_record && Object.keys(saved.case_record).length > 0
             ? saved.case_record
@@ -1887,6 +2457,26 @@ defineExpose({
             }
         }
 
+        .herb-formula-block__head {
+            display: flex;
+            align-items: center;
+            flex-wrap: wrap;
+            gap: 8px;
+            margin-bottom: 8px;
+        }
+
+        .usage-formula-title {
+            font-size: 13px;
+            font-weight: 600;
+            margin: 8px 0 4px;
+            color: #409eff;
+        }
+
+        .usage-formula-title--aux {
+            color: #e6a23c;
+            margin-top: 12px;
+        }
+
         .herbs-editor-grid {
             display: grid;
             grid-template-columns: repeat(4, minmax(0, 1fr));
@@ -1951,170 +2541,358 @@ defineExpose({
     }
 }
 
-.prescription-print {
-    width: 148mm;
-    min-height: 210mm;
-    padding: 20px;
+/* 处方笺（A4 药房联）— 与 consumer/prescription/index.vue 查看样式一致 */
+.rx-wrap {
+    min-height: 160px;
+    background: #f5f6f8;
+    padding: 12px;
+    margin: -20px;
+}
+
+.rx-toolbar {
+    display: flex;
+    align-items: center;
+    gap: 8px;
     background: #fff;
-    font-size: 14px;
-    color: #333;
+    border: 1px solid var(--el-border-color-lighter);
+    border-radius: 6px;
+    padding: 8px 12px;
+    margin-bottom: 10px;
+
+    .flex-1 {
+        flex: 1;
+    }
+}
+
+.rx-status {
+    margin-bottom: 10px;
+    padding: 8px 12px;
+    border-radius: 4px;
+    font-size: 13px;
+    line-height: 1.6;
+}
+
+.rx-status-danger {
+    background: #fef0f0;
+    color: #b91c1c;
+    border: 1px solid #fecaca;
+}
+
+.rx-paper {
+    width: 210mm;
+    min-height: 297mm;
     margin: 0 auto;
+    background: #fff;
+    box-sizing: border-box;
+    padding: 8mm 10mm;
+    color: #1f1f1f;
+    font-size: 13px;
+    line-height: 1.5;
+    font-family: 'Microsoft YaHei', 'PingFang SC', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+    box-shadow: 0 0 0 1px #d6d6d6, 0 6px 24px rgba(0, 0, 0, 0.06);
+    overflow: visible;
+}
+
+.rx-notice {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    background: #f3f4f6;
+    border: 1px solid #e5e7eb;
+    padding: 6px 10px;
+    border-radius: 2px;
+    font-size: 12px;
+    color: #1f1f1f;
+    margin-bottom: 6px;
+
+    .rx-notice-text {
+        flex: 1;
+    }
+
+    .rx-notice-meta {
+        display: inline-flex;
+        gap: 24px;
+        white-space: nowrap;
+    }
+}
+
+.rx-info {
+    border: 1px solid #c8c8c8;
+    border-bottom: none;
+}
+
+.rx-info-row {
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
+    border-bottom: 1px solid #c8c8c8;
+}
+
+.rx-info-row-full {
+    grid-template-columns: 1fr;
+}
+
+.rx-info-cell {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    padding: 6px 10px;
+    font-size: 13px;
+    border-right: 1px solid #c8c8c8;
+    min-height: 32px;
+
+    &:last-child {
+        border-right: none;
+    }
+
+    .rx-key {
+        color: #1f1f1f;
+        flex-shrink: 0;
+    }
+
+    .rx-val {
+        flex: 1;
+        min-width: 0;
+        word-break: break-all;
+    }
+}
+
+.rx-rp {
+    position: relative;
+    border-left: 1px solid #c8c8c8;
+    border-right: 1px solid #c8c8c8;
+    padding: 8px 10px 16px;
+    overflow: hidden;
+    box-sizing: border-box;
+    width: 100%;
+}
+
+.rx-watermark {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 88px;
+    font-weight: 700;
+    color: rgba(0, 0, 0, 0.06);
+    transform: rotate(-22deg);
+    letter-spacing: 0.18em;
+    pointer-events: none;
+    user-select: none;
+    z-index: 0;
+}
+
+.rx-rp-head {
+    display: grid;
+    grid-template-columns: 36px 1fr;
+    align-items: end;
+    column-gap: 8px;
+    padding-bottom: 4px;
+    border-bottom: 1px solid #d4d4d4;
+    margin-bottom: 6px;
+    position: relative;
+    z-index: 1;
+    width: 100%;
+    box-sizing: border-box;
+}
+
+.rx-rp-label {
+    font-size: 16px;
+    font-weight: 700;
+    color: #1f1f1f;
+    line-height: 1;
+}
+
+.rx-rp-cols-head {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    column-gap: 24px;
+    width: 100%;
+    box-sizing: border-box;
+    min-width: 0;
+}
+
+.rx-rp-col-head {
+    display: grid;
+    grid-template-columns: 1fr 64px;
+    column-gap: 8px;
+    font-size: 13px;
+    color: #1f1f1f;
+    min-width: 0;
+
+    & > span:last-child {
+        text-align: right;
+    }
+}
+
+.rx-herbs {
+    padding-left: 44px;
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    column-gap: 24px;
+    row-gap: 6px;
+    position: relative;
+    z-index: 1;
+    width: 100%;
+    box-sizing: border-box;
+}
+
+.rx-herb-section-label {
+    grid-column: 1 / -1;
+    font-size: 12px;
+    font-weight: 600;
+    color: #409eff;
+    line-height: 1.4;
+}
+
+.rx-herb-section-label--aux {
+    color: #e6a23c;
+    margin-top: 4px;
+}
+
+.rx-herb-cell {
+    display: grid;
+    grid-template-columns: 1fr 64px;
+    column-gap: 8px;
+    font-size: 13px;
+    line-height: 1.85;
+    min-width: 0;
+}
+
+.rx-herb-name {
+    color: #1f1f1f;
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.rx-herb-total {
+    color: #1f1f1f;
+    text-align: right;
+    font-variant-numeric: tabular-nums;
+    white-space: nowrap;
+}
+
+.rx-text {
+    border: 1px solid #c8c8c8;
+    border-top: none;
+    padding: 10px 12px;
+    font-size: 13px;
+    line-height: 1.85;
+
+    p {
+        margin: 0;
+    }
+
+    .rx-text-warn {
+        color: #d72424;
+        font-weight: 600;
+    }
+}
+
+.rx-bottom {
+    border: 1px solid #c8c8c8;
+    border-top: none;
+}
+
+.rx-bot-row {
+    display: grid;
+    border-bottom: 1px solid #c8c8c8;
+
+    &:last-child {
+        border-bottom: none;
+    }
+}
+
+.rx-bot-row-1 {
+    grid-template-columns: 1.4fr 0.6fr 0.6fr 0.6fr;
+    min-height: 70px;
+}
+
+.rx-bot-cell {
+    border-right: 1px solid #c8c8c8;
+    padding: 6px 10px;
+    font-size: 12px;
+    color: #1f1f1f;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: flex-start;
+    min-height: 32px;
     box-sizing: border-box;
 
-    .prescription-header {
+    &:last-child {
+        border-right: none;
+    }
+}
+
+.rx-bot-stack {
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: flex-start;
+}
+
+.rx-bot-label {
+    font-size: 13px;
+    color: #1f1f1f;
+    margin-bottom: 4px;
+}
+
+.rx-bot-doctor {
+    .rx-bot-doctor-body {
+        flex: 1;
         display: flex;
-        justify-content: space-between;
-        align-items: flex-start;
-        position: relative;
-        margin-bottom: 12px;
-        padding-bottom: 12px;
-        border-bottom: 1px solid #ddd;
-
-        .prescription-title {
-            flex: 1;
-            text-align: center;
-            font-size: 20px;
-            font-weight: 600;
-            margin: 0;
-        }
-
-        .prescription-type {
-            position: absolute;
-            right: 0;
-            top: 0;
-        }
-    }
-
-    .prescription-void-info {
-        font-size: 13px;
-        color: var(--el-color-danger);
-        margin-bottom: 12px;
-        padding: 8px 12px;
-        background: #fef0f0;
-        border-radius: 4px;
-
-        .prescription-title {
-            font-size: 20px;
-            font-weight: 600;
-            margin: 0;
-        }
-
-        .prescription-type {
-            text-align: right;
-            font-size: 14px;
-        }
-    }
-
-    .prescription-info {
-        margin-bottom: 16px;
-        padding: 12px 0;
-        border-bottom: 1px solid #eee;
-    }
-
-    .info-row {
-        display: flex;
-        margin-bottom: 10px;
-
-        &:last-child {
-            margin-bottom: 0;
-        }
-
-        .info-item {
-            flex: 1;
-            min-width: 0;
-        }
-    }
-
-    .info-row-full {
-        .info-item {
-            flex: 1;
-            min-width: 100%;
-        }
-    }
-
-    .info-item {
-        display: inline-flex;
-        align-items: baseline;
+        align-items: center;
         gap: 6px;
-        font-size: 14px;
-
-        em {
-            font-style: normal;
-            color: #909399;
-            min-width: 56px;
-        }
+        min-height: 36px;
     }
 
-    .prescription-rp {
-        margin: 16px 0;
-        padding: 12px;
-        border: 1px solid #eee;
-
-        .rp-label {
-            font-weight: 600;
-            margin-bottom: 8px;
-        }
-
-        .herbs-grid {
-            display: grid;
-            grid-template-columns: repeat(3, 1fr);
-            gap: 8px 16px;
-        }
-
-        .herb-cell {
-            white-space: nowrap;
-        }
+    .rx-bot-doctor-name {
+        font-size: 13px;
+        color: #1f1f1f;
     }
 
-    .prescription-disclaimer {
-        text-align: center;
-        color: #e6a23c;
-        font-size: 12px;
-        margin: 12px 0;
-        height: 300px;
+    .rx-bot-sign-img {
+        max-height: 40px;
+        max-width: 110px;
+        object-fit: contain;
+    }
+}
+
+.rx-bot-meta {
+    flex-wrap: nowrap;
+
+    .rx-bot-meta-key {
+        color: #1f1f1f;
+        margin-right: 6px;
+        white-space: nowrap;
+        flex-shrink: 0;
+        line-height: 1.4;
     }
 
-    .prescription-area {
-        border-top: 1px dashed #ddd;
-        padding-top: 12px;
-        margin-top: 10px;
+    .rx-bot-meta-val {
+        font-weight: 500;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        min-width: 0;
+        line-height: 1.4;
     }
-    .prescription-footer {
-        margin-top: 16px;
-        padding-top: 12px;
-        border-top: 1px dashed #ddd;
-        display: flex;
-        justify-content: space-between;
-        align-items: flex-start;
-        gap: 24px;
+}
 
-        .footer-left {
-            .footer-dosage,
-            .footer-amount {
-                margin-bottom: 4px;
-            }
-        }
-
-        .footer-right.footer-sign {
-            text-align: right;
-            display: flex;
-            align-items: center;
-            gap: 24px;
-        }
-
-        .signature-cell {
-            display: inline-flex;
-            align-items: center;
-            gap: 8px;
-        }
-
-        .doctor-signature-img {
-            height: 28px;
-            max-width: 100px;
-            object-fit: contain;
-            vertical-align: middle;
-        }
-    }
+.rx-audit {
+    margin-top: 12px;
+    padding: 8px 12px;
+    background: #fafafa;
+    border: 1px dashed #d4d4d4;
+    color: #6b7280;
+    font-size: 12px;
+    line-height: 1.6;
+    border-radius: 4px;
 }
 
 .prescription-preview-content {
diff --git a/admin/src/views/consumer/prescription/index.vue b/admin/src/views/consumer/prescription/index.vue
index 1276666a..e467f8dc 100644
--- a/admin/src/views/consumer/prescription/index.vue
+++ b/admin/src/views/consumer/prescription/index.vue
@@ -407,20 +407,35 @@
                         </div>
 
                         <div class="rx-herbs">
-                            <div
-                                v-for="(h, i) in slipHerbsList"
-                                :key="i"
-                                class="rx-herb-cell"
-                            >
-                                <span class="rx-herb-name">{{ h.name }} ({{ h.dosage }}克)</span>
-                                <span class="rx-herb-total">{{ rxHerbTotal(h.dosage) }}克</span>
-                            </div>
+                            <template v-if="slipMainHerbs.length">
+                                <div class="rx-herb-section-label">主方</div>
+                                <div
+                                    v-for="(h, i) in slipMainHerbs"
+                                    :key="'main-' + i"
+                                    class="rx-herb-cell"
+                                >
+                                    <span class="rx-herb-name">{{ h.name }} ({{ h.dosage }}克)</span>
+                                    <span class="rx-herb-total">{{ rxHerbTotal(h.dosage) }}克</span>
+                                </div>
+                            </template>
+                            <template v-if="slipAuxHerbs.length">
+                                <div class="rx-herb-section-label rx-herb-section-label--aux">辅方</div>
+                                <div
+                                    v-for="(h, i) in slipAuxHerbs"
+                                    :key="'aux-' + i"
+                                    class="rx-herb-cell"
+                                >
+                                    <span class="rx-herb-name">{{ h.name }} ({{ h.dosage }}克)</span>
+                                    <span class="rx-herb-total">{{ rxHerbTotal(h.dosage) }}克</span>
+                                </div>
+                            </template>
                         </div>
                     </div>
 
                     <!-- 服法 / 医嘱 / 备注 / 药房备注 / 出丸 -->
                     <div class="rx-text">
-                        <p>服法：{{ rxUsageText }}</p>
+                        <p>主方服法：{{ rxUsageText }}</p>
+                        <p v-if="rxAuxUsageText">辅方服法：{{ rxAuxUsageText }}</p>
                         <p v-if="rxAdviceText">医嘱：{{ rxAdviceText }}</p>
                         <p v-if="rxRemarkText">备注：{{ rxRemarkText }}</p>
                         <p v-if="rxPharmacyRemarkText" class="rx-text-warn">
@@ -649,53 +664,87 @@
                 <el-form-item label="药材配方" prop="herbs" required>
                     <div class="w-full">
                         <div class="flex flex-wrap items-center gap-2">
-                            <el-button type="primary" size="small" @click="addHerb">
-                                添加药材
-                            </el-button>
-                            <el-button type="success" size="small" @click="openLibraryDialog">
+                            <el-button
+                                type="success"
+                                size="small"
+                                v-perms="['cf.prescription/add', 'cf.prescription/edit', 'tcm.prescriptionLibrary/lists']"
+                                @click="openLibraryDialog"
+                            >
                                 从处方库导入
                             </el-button>
-                        </div>
-                        <div class="mt-2">
                             <el-button type="warning" size="small" plain :icon="EditPen" @click="openPasteRecipeDialog">
                                 导入药方
                             </el-button>
-                            <span class="text-xs text-gray-500 ml-2 align-middle">
-                                粘贴文本解析药名与剂量；须与药品库名称完全一致才录入
+                            <span class="text-xs text-gray-500">
+                                粘贴文本解析药名与剂量；须与药品库名称完全一致才录入（导入至主方）
                             </span>
                         </div>
-                        <el-table :data="editForm.herbs" class="mt-2" border>
-                            <el-table-column label="序号" type="index" width="60" />
-                            <el-table-column label="药材名称" min-width="220">
-                                <template #default="{ row }">
-                                    <MedicineNameSelect v-model="row.name" class="w-full" />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="剂量(克)" min-width="120">
-                                <template #default="{ row, $index }">
-                                    <el-input-number
-                                        v-model="row.dosage"
-                                        :min="0"
-                                        :precision="1"
-                                        :step="0.5"
-                                        placeholder="剂量"
-                                        class="w-full"
-                                    />
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="操作" width="80">
-                                <template #default="{ $index }">
-                                    <el-button
-                                        type="danger"
-                                        link
-                                        @click="removeHerb($index)"
-                                    >
-                                        删除
-                                    </el-button>
-                                </template>
-                            </el-table-column>
-                           
-                        </el-table>
+
+                        <div class="herb-formula-block mt-3">
+                            <div class="herb-formula-block__head">
+                                <el-tag type="primary" size="small">主方</el-tag>
+                                <el-button type="primary" size="small" @click="addHerb('主方')">添加主方药材</el-button>
+                            </div>
+                            <el-table :data="mainHerbRows" class="mt-2" border empty-text="暂无主方药材">
+                                <el-table-column label="序号" type="index" width="60" />
+                                <el-table-column label="药材名称" min-width="220">
+                                    <template #default="{ row }">
+                                        <MedicineNameSelect v-model="editForm.herbs[row.index].name" class="w-full" />
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="剂量(克)" min-width="120">
+                                    <template #default="{ row }">
+                                        <el-input-number
+                                            v-model="editForm.herbs[row.index].dosage"
+                                            :min="0"
+                                            :precision="1"
+                                            :step="0.5"
+                                            placeholder="剂量"
+                                            class="w-full"
+                                        />
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="操作" width="80">
+                                    <template #default="{ row }">
+                                        <el-button type="danger" link @click="removeHerb(row.index)">删除</el-button>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
+
+                        <div class="herb-formula-block mt-4">
+                            <div class="herb-formula-block__head">
+                                <el-tag type="warning" size="small">辅方</el-tag>
+                                <el-button type="primary" size="small" plain @click="addHerb('辅方')">
+                                    添加辅方药材
+                                </el-button>
+                            </div>
+                            <el-table :data="auxHerbRows" class="mt-2" border empty-text="暂无辅方药材">
+                                <el-table-column label="序号" type="index" width="60" />
+                                <el-table-column label="药材名称" min-width="220">
+                                    <template #default="{ row }">
+                                        <MedicineNameSelect v-model="editForm.herbs[row.index].name" class="w-full" />
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="剂量(克)" min-width="120">
+                                    <template #default="{ row }">
+                                        <el-input-number
+                                            v-model="editForm.herbs[row.index].dosage"
+                                            :min="0"
+                                            :precision="1"
+                                            :step="0.5"
+                                            placeholder="剂量"
+                                            class="w-full"
+                                        />
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="操作" width="80">
+                                    <template #default="{ row }">
+                                        <el-button type="danger" link @click="removeHerb(row.index)">删除</el-button>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
                         <el-alert
                             v-if="editMode === 'edit'"
                             type="warning"
@@ -778,8 +827,10 @@
                         <el-option label="汤剂" value="汤剂" />
                     </el-select>
                 </el-form-item>  </el-col>
-                    
-                    <!-- 用量字段 -->
+                </el-row>
+
+                <div class="usage-formula-title usage-formula-title--main">主方用法</div>
+                <el-row :gutter="20">
                     <el-col :span="8">
                         <el-form-item label="用量" prop="dosage_amount">
                             <!-- 浓缩水丸：1-10g 下拉选择 -->
@@ -881,6 +932,97 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
+
+                <template v-if="auxHerbRows.length > 0">
+                    <div class="usage-formula-title usage-formula-title--aux">辅方用法</div>
+                    <el-row :gutter="20">
+                    <el-col :span="8">
+                        <el-form-item label="用量">
+                            <el-select
+                                v-if="editForm.prescription_type === '浓缩水丸'"
+                                v-model="editForm.aux_usage.dosage_amount"
+                                placeholder="请选择用量"
+                                class="w-full"
+                            >
+                                <el-option v-for="n in 10" :key="n" :label="n + 'g'" :value="n" />
+                            </el-select>
+                            <el-select
+                                v-else-if="editForm.prescription_type === '饮片'"
+                                v-model="editForm.aux_usage.dosage_amount"
+                                placeholder="请选择用量"
+                                class="w-full"
+                            >
+                                <el-option label="50ml" :value="50" />
+                                <el-option label="100ml" :value="100" />
+                                <el-option label="120ml" :value="120" />
+                                <el-option label="150ml" :value="150" />
+                                <el-option label="180ml" :value="180" />
+                                <el-option label="200ml" :value="200" />
+                                <el-option label="250ml" :value="250" />
+                            </el-select>
+                            <el-input-number
+                                v-else
+                                v-model="editForm.aux_usage.dosage_amount"
+                                :min="0"
+                                :precision="2"
+                                class="w-full"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col v-if="editForm.prescription_type === '浓缩水丸'" :span="8">
+                        <el-form-item label=" " label-width="12px">
+                            <el-select
+                                v-model="editForm.aux_usage.dosage_bag_count"
+                                placeholder="请选择袋数"
+                                class="w-[120px]"
+                            >
+                                <el-option label="1袋" :value="1" />
+                                <el-option label="2袋" :value="2" />
+                                <el-option label="3袋" :value="3" />
+                                <el-option label="4袋" :value="4" />
+                                <el-option label="5袋" :value="5" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col v-if="editForm.prescription_type === '饮片'" :span="8">
+                        <el-form-item label="是否代煎">
+                            <el-radio-group v-model="editForm.aux_usage.need_decoction">
+                                <el-radio :label="true">代煎</el-radio>
+                                <el-radio :label="false">不代煎</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                    <el-col v-if="editForm.prescription_type === '饮片'" :span="8">
+                        <el-form-item label="每贴出包数">
+                            <el-select v-model="editForm.aux_usage.bags_per_dose" placeholder="请选择" class="w-full">
+                                <el-option v-for="n in 9" :key="n" :label="n + '包'" :value="n" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="每天几次">
+                            <el-input-number
+                                v-model="editForm.aux_usage.times_per_day"
+                                :min="1"
+                                :max="6"
+                                class="!w-full"
+                                placeholder="每天服用次数"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="服用天数">
+                            <el-input-number
+                                v-model="editForm.aux_usage.usage_days"
+                                :min="1"
+                                :max="365"
+                                placeholder="服用天数"
+                                class="w-full"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    </el-row>
+                </template>
                 
                 <el-form-item label="用法" prop="usage_instruction">
                     <el-input
@@ -1365,16 +1507,17 @@
             </template>
         </el-dialog>
 
-        <!-- 从处方库导入（与诊间 tcm-prescription 一致，按当前处方开方医师 creator_id 筛选） -->
+        <!-- 从处方库导入：当前开方医师的全部模板 + 所有人可见的公共模板 -->
         <el-dialog
             v-model="showLibraryDialog"
             title="从处方库导入"
             width="800px"
             :close-on-click-modal="false"
         >
-            <div class="mb-4">
+            <div class="mb-4 flex gap-3">
                 <el-input
                     v-model="librarySearchName"
+                    class="flex-1"
                     placeholder="请输入处方名称搜索"
                     clearable
                     @keyup.enter="searchLibrary"
@@ -1384,6 +1527,24 @@
                         <el-button :icon="Search" @click="searchLibrary" />
                     </template>
                 </el-input>
+                <el-select
+                    v-model="librarySearchFormulaType"
+                    placeholder="处方类型"
+                    clearable
+                    class="w-[140px]"
+                    @change="searchLibrary"
+                >
+                    <el-option label="全部" value="" />
+                    <el-option label="主方" value="主方" />
+                    <el-option label="辅方" value="辅方" />
+                </el-select>
+            </div>
+            <div class="mb-3 flex flex-wrap items-center gap-x-4 gap-y-2">
+                <span class="text-sm text-gray-600 shrink-0">导入方式</span>
+                <el-radio-group v-model="libraryImportMode">
+                    <el-radio label="replace">覆盖现有药材</el-radio>
+                    <el-radio label="append">追加到末尾</el-radio>
+                </el-radio-group>
             </div>
 
             <el-table
@@ -1394,6 +1555,13 @@
                 @row-click="handleSelectLibraryRow"
             >
                 <el-table-column label="处方名称" prop="prescription_name" min-width="150" show-overflow-tooltip />
+                <el-table-column label="处方类型" width="90">
+                    <template #default="{ row }">
+                        <el-tag :type="row.formula_type === '辅方' ? 'warning' : 'primary'" size="small">
+                            {{ row.formula_type || '主方' }}
+                        </el-tag>
+                    </template>
+                </el-table-column>
                 <el-table-column label="药材数量" width="100">
                     <template #default="{ row }">
                         {{ row.herbs?.length || 0 }}味
@@ -1407,6 +1575,13 @@
                         <span v-else class="text-gray-400">暂无药材</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="是否公开" width="110">
+                    <template #default="{ row }">
+                        <el-tag :type="row.is_public ? 'success' : 'info'" size="small">
+                            {{ row.is_public ? '所有人可见' : '仅自己可见' }}
+                        </el-tag>
+                    </template>
+                </el-table-column>
                 <el-table-column label="创建人" prop="creator_name" width="100" />
                 <el-table-column label="操作" width="100" fixed="right">
                     <template #default="{ row }">
@@ -1522,6 +1697,119 @@ import jsPDF from 'jspdf'
 
 const TcmDiagnosisEditView = defineAsyncComponent(() => import('@/views/tcm/diagnosis/edit.vue'))
 
+type FormulaType = '主方' | '辅方'
+type HerbRow = { name: string; dosage: number; formula_type: FormulaType }
+
+type AuxUsageForm = {
+    dosage_amount?: number
+    dosage_bag_count: number
+    need_decoction: boolean
+    bags_per_dose: number
+    times_per_day: number
+    usage_days: number
+}
+
+function defaultAuxUsage(prescriptionType = '浓缩水丸'): AuxUsageForm {
+    if (prescriptionType === '饮片') {
+        return {
+            dosage_amount: 50,
+            dosage_bag_count: 1,
+            need_decoction: false,
+            bags_per_dose: 1,
+            times_per_day: 3,
+            usage_days: 7
+        }
+    }
+    if (prescriptionType === '浓缩水丸') {
+        return {
+            dosage_amount: 5,
+            dosage_bag_count: 1,
+            need_decoction: false,
+            bags_per_dose: 1,
+            times_per_day: 3,
+            usage_days: 7
+        }
+    }
+    return {
+        dosage_amount: 1,
+        dosage_bag_count: 1,
+        need_decoction: false,
+        bags_per_dose: 1,
+        times_per_day: 3,
+        usage_days: 7
+    }
+}
+
+function normalizeAuxUsageForm(raw: unknown, prescriptionType: string): AuxUsageForm {
+    const base = defaultAuxUsage(prescriptionType)
+    if (!raw || typeof raw !== 'object') return { ...base }
+    const o = raw as Record<string, unknown>
+    return {
+        dosage_amount:
+            o.dosage_amount !== null && o.dosage_amount !== undefined && o.dosage_amount !== ''
+                ? Number(o.dosage_amount)
+                : base.dosage_amount,
+        dosage_bag_count: o.dosage_bag_count != null ? Number(o.dosage_bag_count) || 1 : base.dosage_bag_count,
+        need_decoction: o.need_decoction === 1 || o.need_decoction === true,
+        bags_per_dose: o.bags_per_dose != null ? Number(o.bags_per_dose) || 1 : base.bags_per_dose,
+        times_per_day: o.times_per_day != null ? Number(o.times_per_day) || 3 : base.times_per_day,
+        usage_days: o.usage_days != null ? Number(o.usage_days) || 7 : base.usage_days
+    }
+}
+
+function buildUsageSegmentText(
+    usage: {
+        prescription_type?: string
+        dosage_amount?: number | null
+        dosage_unit?: string
+        dosage_bag_count?: number
+        times_per_day?: number
+        usage_way?: string
+        usage_time?: string
+    },
+    fallbackWay?: string,
+    fallbackTime?: string
+): string {
+    const pt = usage.prescription_type || '浓缩水丸'
+    const times = Number(usage.times_per_day) > 0 ? Number(usage.times_per_day) : 3
+    const amount = usage.dosage_amount != null ? Number(usage.dosage_amount) : 10
+    const unit = usage.dosage_unit || (pt === '饮片' ? 'ml' : 'g')
+    const usageWay = usage.usage_way || fallbackWay || '温水送服'
+    const usageTime = usage.usage_time || fallbackTime || ''
+    const seg: string[] = []
+    seg.push(`每天${times}次`)
+    if (pt === '浓缩水丸') {
+        const bags = Number(usage.dosage_bag_count) > 0 ? Number(usage.dosage_bag_count) : 1
+        seg.push(`一次${bags}袋`)
+        seg.push(`每袋${amount}${unit}`)
+    } else {
+        seg.push(`一次${amount}${unit}`)
+    }
+    seg.push(usageWay)
+    if (usageTime) seg.push(usageTime)
+    return seg.join(', ')
+}
+
+function normalizeFormulaType(v: unknown): FormulaType {
+    return v === '辅方' ? '辅方' : '主方'
+}
+
+function normalizeHerbRow(raw: any): HerbRow {
+    return {
+        name: String(raw?.name ?? '').trim(),
+        dosage: Number(raw?.dosage) || 0,
+        formula_type: normalizeFormulaType(raw?.formula_type)
+    }
+}
+
+function normalizeSlipHerbs(raw: unknown): HerbRow[] {
+    if (!raw) return []
+    if (Array.isArray(raw)) {
+        return raw.map((x: any) => normalizeHerbRow(x))
+    }
+    return []
+}
+
 /** 与 server/config/project.php prescription_audit_roles 保持一致 */
 const PRESCRIPTION_AUDIT_ROLE_IDS = [0, 3]
 
@@ -1923,7 +2211,13 @@ const createOrderHerbSummary = computed(() => {
     const row = createOrderPrescription.value
     const herbs = normalizeSlipHerbs(row?.herbs)
     if (!herbs.length) return '暂无药材明细'
-    const s = herbs.map((h) => `${h.name} ${h.dosage}g`).join('、')
+    const main = herbs.filter((h) => normalizeFormulaType(h.formula_type) === '主方')
+    const aux = herbs.filter((h) => normalizeFormulaType(h.formula_type) === '辅方')
+    const fmt = (list: HerbRow[]) => list.map((h) => `${h.name} ${h.dosage}g`).join('、')
+    const parts: string[] = []
+    if (main.length) parts.push(`主方：${fmt(main)}`)
+    if (aux.length) parts.push(`辅方：${fmt(aux)}`)
+    const s = parts.join('；')
     return s.length > 120 ? `${s.slice(0, 120)}…` : s
 })
 
@@ -2163,9 +2457,27 @@ const editReviveHint = computed(() => {
 
 const slipHerbsList = computed(() => {
     const h = slipView.value?.herbs
-    return Array.isArray(h) ? h : []
+    return Array.isArray(h) ? (h as HerbRow[]) : []
 })
 
+const slipMainHerbs = computed(() =>
+    slipHerbsList.value.filter((h) => normalizeFormulaType(h.formula_type) === '主方')
+)
+const slipAuxHerbs = computed(() =>
+    slipHerbsList.value.filter((h) => normalizeFormulaType(h.formula_type) === '辅方')
+)
+
+const mainHerbRows = computed(() =>
+    editForm.herbs
+        .map((herb, index) => ({ herb, index }))
+        .filter(({ herb }) => normalizeFormulaType(herb.formula_type) === '主方')
+)
+const auxHerbRows = computed(() =>
+    editForm.herbs
+        .map((herb, index) => ({ herb, index }))
+        .filter(({ herb }) => normalizeFormulaType(herb.formula_type) === '辅方')
+)
+
 const slipDietaryText = computed(() => {
     const d = slipView.value?.dietary_taboo
     if (Array.isArray(d)) return d.filter(Boolean).join('、')
@@ -2251,23 +2563,26 @@ const rxUsageText = computed(() => {
     const v = slipView.value as any
     if (!v) return '—'
     if (v.usage_text) return v.usage_text
-    const times = Number(v.times_per_day) > 0 ? Number(v.times_per_day) : 3
-    const amount = v.dosage_amount != null ? Number(v.dosage_amount) : 10
-    const unit = v.dosage_unit || 'g'
-    const usageWay = v.usage_way || '温水送服'
-    const usageTime = v.usage_time || ''
-    const seg: string[] = []
-    seg.push(`每天${times}次`)
-    if ((v.prescription_type || '浓缩水丸') === '浓缩水丸') {
-        const bags = Number(v.dosage_bag_count) > 0 ? Number(v.dosage_bag_count) : 1
-        seg.push(`一次${bags}袋`)
-        seg.push(`每袋${amount}${unit}`)
-    } else {
-        seg.push(`一次${amount}${unit}`)
-    }
-    seg.push(usageWay)
-    if (usageTime) seg.push(usageTime)
-    return seg.join(', ')
+    return buildUsageSegmentText(v)
+})
+
+const rxAuxUsageText = computed(() => {
+    const v = slipView.value as any
+    if (!v || !slipAuxHerbs.value.length) return ''
+    const aux = normalizeAuxUsageForm(v.aux_usage, v.prescription_type || '浓缩水丸')
+    return buildUsageSegmentText(
+        {
+            prescription_type: v.prescription_type,
+            dosage_amount: aux.dosage_amount,
+            dosage_unit: v.dosage_unit,
+            dosage_bag_count: aux.dosage_bag_count,
+            times_per_day: aux.times_per_day,
+            usage_way: v.usage_way,
+            usage_time: v.usage_time
+        },
+        v.usage_way,
+        v.usage_time
+    )
 })
 
 const rxAdviceText = computed(() => {
@@ -2462,7 +2777,7 @@ const editForm = reactive({
     pulse: '',
     pulse_condition: '',
     clinical_diagnosis: '',
-    herbs: [] as Array<{ name: string; dosage: number }>,
+    herbs: [] as HerbRow[],
     dose_count: 7,
     dose_unit: '剂',
     usage_days: 7,
@@ -2488,7 +2803,8 @@ const editForm = reactive({
     /** 列表带入：业务订单「处方审核」驳回（消费者处方本身可能仍为已通过） */
     business_prescription_audit_rejected: 0,
     business_prescription_audit_remark: '',
-    times_per_day: 2
+    times_per_day: 2,
+    aux_usage: defaultAuxUsage('浓缩水丸')
 })
 
 /** 编辑页：关联业务订单上的服用天数、医助备注（与处方提示一致） */
@@ -2579,6 +2895,7 @@ watch(() => editForm.prescription_type, (newType) => {
         editForm.need_decoction = false
         editForm.bags_per_dose = 1
     }
+    Object.assign(editForm.aux_usage, defaultAuxUsage(newType))
 })
 
 // 表单验证规则
@@ -2807,15 +3124,15 @@ function slipAgeText(age: unknown) {
     return `${age}岁`
 }
 
-function normalizeSlipHerbs(raw: unknown): Array<{ name: string; dosage: number }> {
-    if (!raw) return []
-    if (Array.isArray(raw)) {
-        return raw.map((x: any) => ({
-            name: String(x?.name ?? '').trim(),
-            dosage: Number(x?.dosage) || 0
-        }))
+function herbValidationLabel(globalIndex: number): string {
+    const herb = editForm.herbs[globalIndex]
+    if (!herb) return `第${globalIndex + 1}味`
+    const ft = normalizeFormulaType(herb.formula_type)
+    let n = 0
+    for (let i = 0; i <= globalIndex; i++) {
+        if (normalizeFormulaType(editForm.herbs[i]?.formula_type) === ft) n++
     }
-    return []
+    return `${ft}第${n}味`
 }
 
 function listRxOrderWarnings(row: any): string[] {
@@ -3038,6 +3355,8 @@ const showLibraryDialog = ref(false)
 const libraryLoading = ref(false)
 const libraryList = ref<any[]>([])
 const librarySearchName = ref('')
+const librarySearchFormulaType = ref('')
+const libraryImportMode = ref<'replace' | 'append'>('replace')
 const libraryPage = ref(1)
 const libraryPageSize = ref(15)
 const libraryTotal = ref(0)
@@ -3082,8 +3401,8 @@ const loadLibraryList = async () => {
             page_no: libraryPage.value,
             page_size: libraryPageSize.value,
             prescription_name: librarySearchName.value,
-            is_public: '',
-            creator_id: doctorId
+            formula_type: librarySearchFormulaType.value,
+            prescribing_creator_id: doctorId
         })
         libraryList.value = res?.lists || []
         libraryTotal.value = res?.count || 0
@@ -3118,18 +3437,33 @@ const handleImportLibrary = (row: any) => {
         feedback.msgWarning('该处方没有药材信息')
         return
     }
-    const imported = JSON.parse(JSON.stringify(row.herbs)) as Array<{ name: string; dosage: number }>
-    editForm.herbs = imported
+    const formulaType = normalizeFormulaType(row.formula_type)
+    const imported = (JSON.parse(JSON.stringify(row.herbs)) as any[]).map((h) => ({
+        ...normalizeHerbRow(h),
+        formula_type: formulaType
+    }))
+    if (libraryImportMode.value === 'replace') {
+        const kept = editForm.herbs.filter((h) => normalizeFormulaType(h.formula_type) !== formulaType)
+        editForm.herbs = [...kept, ...imported]
+    } else {
+        editForm.herbs.push(...imported)
+    }
+    const modeHint = libraryImportMode.value === 'append' ? '（已追加）' : ''
     if (findDuplicateHerbNamesLocal().length) {
-        feedback.msgWarning('导入的处方中存在重复药名，请合并剂量或删除多余行')
+        feedback.msgWarning(
+            `已导入处方「${row.prescription_name}」${modeHint}，共${imported.length}味药材。存在重复药名，请合并剂量或删除多余行`
+        )
+    } else {
+        feedback.msgSuccess(`已导入处方「${row.prescription_name}」${modeHint}，共${imported.length}味药材`)
     }
-    feedback.msgSuccess(`已导入处方「${row.prescription_name}」，共${imported.length}味药材`)
     showLibraryDialog.value = false
 }
 
 watch(showLibraryDialog, (open) => {
     if (open) {
         librarySearchName.value = ''
+        librarySearchFormulaType.value = ''
+        libraryImportMode.value = 'replace'
         libraryPage.value = 1
         loadLibraryList()
     }
@@ -3261,7 +3595,7 @@ async function handlePasteRecipeImport() {
     }
     pasteRecipeImportLoading.value = true
     try {
-        const resolved: Array<{ name: string; dosage: number }> = []
+        const resolved: HerbRow[] = []
         const skippedNames: string[] = []
         for (const row of parsed) {
             const name = await resolvePasteHerbNameFromLibrary(row.name)
@@ -3269,7 +3603,7 @@ async function handlePasteRecipeImport() {
                 skippedNames.push(row.name.trim())
                 continue
             }
-            resolved.push({ name, dosage: row.dosage })
+            resolved.push({ name, dosage: row.dosage, formula_type: '主方' })
         }
         const skippedUnique = [...new Set(skippedNames.filter(Boolean))]
         if (resolved.length === 0) {
@@ -3281,7 +3615,8 @@ async function handlePasteRecipeImport() {
             return
         }
         if (pasteRecipeImportMode.value === 'replace') {
-            editForm.herbs = resolved
+            const auxKept = editForm.herbs.filter((h) => normalizeFormulaType(h.formula_type) === '辅方')
+            editForm.herbs = [...auxKept, ...resolved]
         } else {
             editForm.herbs.push(...resolved)
         }
@@ -3306,11 +3641,12 @@ async function handlePasteRecipeImport() {
     }
 }
 
-// 添加药材
-const addHerb = () => {
+// 添加药材（主方 / 辅方）
+const addHerb = (formulaType: FormulaType = '主方') => {
     editForm.herbs.push({
         name: '',
-        dosage: 0
+        dosage: 0,
+        formula_type: formulaType
     })
 }
 
@@ -3360,6 +3696,8 @@ const resetForm = () => {
     editForm.is_system_auto = 0
     editForm.business_prescription_audit_rejected = 0
     editForm.business_prescription_audit_remark = ''
+    editForm.times_per_day = 2
+    Object.assign(editForm.aux_usage, defaultAuxUsage('浓缩水丸'))
     clearRxLinkedOrderHint()
 }
 
@@ -3458,7 +3796,7 @@ const handleEdit = async (row: any) => {
     editForm.pulse = src.pulse || ''
     editForm.pulse_condition = src.pulse_condition || ''
     editForm.clinical_diagnosis = src.clinical_diagnosis || ''
-    editForm.herbs = src.herbs ? JSON.parse(JSON.stringify(src.herbs)) : []
+    editForm.herbs = src.herbs ? (src.herbs as any[]).map((h) => normalizeHerbRow(h)) : []
     editForm.dose_count = src.dose_count ?? 7
     editForm.dose_unit = src.dose_unit || '剂'
     editForm.usage_days = src.usage_days ?? 7
@@ -3483,6 +3821,10 @@ const handleEdit = async (row: any) => {
     editForm.is_system_auto = Number(src.is_system_auto) === 1 ? 1 : 0
     editForm.business_prescription_audit_rejected = Number(src.business_prescription_audit_rejected) === 1 ? 1 : 0
     editForm.business_prescription_audit_remark = String(src.business_prescription_audit_remark || '')
+    Object.assign(
+        editForm.aux_usage,
+        normalizeAuxUsageForm(src.aux_usage, editForm.prescription_type)
+    )
     
     // 数据加载完成，重新启用watch
     // 使用 setTimeout 确保所有数据都已经渲染完成
@@ -3517,12 +3859,13 @@ const handleSubmit = async () => {
     
     for (let i = 0; i < editForm.herbs.length; i++) {
         const herb = editForm.herbs[i]
+        const label = herbValidationLabel(i)
         if (!herb.name || !herb.name.trim()) {
-            feedback.msgError(`第${i + 1}味药材名称不能为空`)
+            feedback.msgError(`${label}药材名称不能为空`)
             return
         }
         if (!herb.dosage || herb.dosage <= 0) {
-            feedback.msgError(`第${i + 1}味药材剂量必须大于0`)
+            feedback.msgError(`${label}药材剂量必须大于0`)
             return
         }
     }
@@ -3946,6 +4289,38 @@ onMounted(async () => {
     box-sizing: border-box;
 }
 
+.rx-herb-section-label {
+    grid-column: 1 / -1;
+    font-size: 12px;
+    font-weight: 600;
+    color: #409eff;
+    line-height: 1.4;
+}
+
+.rx-herb-section-label--aux {
+    color: #e6a23c;
+    margin-top: 4px;
+}
+
+.herb-formula-block__head {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 8px;
+}
+
+.usage-formula-title {
+    font-size: 13px;
+    font-weight: 600;
+    margin: 8px 0 4px;
+    color: #409eff;
+}
+
+.usage-formula-title--aux {
+    color: #e6a23c;
+    margin-top: 12px;
+}
+
 .rx-herb-cell {
     display: grid;
     grid-template-columns: 1fr 64px;
diff --git a/admin/src/views/consumer/prescription/list.vue b/admin/src/views/consumer/prescription/list.vue
index ee9984d5..184c1125 100644
--- a/admin/src/views/consumer/prescription/list.vue
+++ b/admin/src/views/consumer/prescription/list.vue
@@ -11,6 +11,13 @@
                         @keyup.enter="resetPage"
                     />
                 </el-form-item>
+                <el-form-item class="w-[200px]" label="处方类型">
+                    <el-select v-model="formData.formula_type" placeholder="全部" clearable>
+                        <el-option label="全部" :value="''" />
+                        <el-option label="主方" value="主方" />
+                        <el-option label="辅方" value="辅方" />
+                    </el-select>
+                </el-form-item>
                 <el-form-item class="w-[200px]" label="是否公开">
                     <el-select v-model="formData.is_public" placeholder="全部" clearable>
                         <el-option label="全部" :value="''" />
@@ -37,6 +44,13 @@
                 <el-table :data="pager.lists" size="large">
                     <el-table-column label="ID" prop="id" min-width="60" />
                     <el-table-column label="处方名称" prop="prescription_name" min-width="200" show-overflow-tooltip />
+                    <el-table-column label="处方类型" min-width="100">
+                        <template #default="{ row }">
+                            <el-tag :type="row.formula_type === '辅方' ? 'warning' : 'primary'" size="small">
+                                {{ row.formula_type || '主方' }}
+                            </el-tag>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="药材数量" min-width="100">
                         <template #default="{ row }">
                             {{ row.herbs?.length || 0 }}味
@@ -114,6 +128,13 @@
                         show-word-limit
                     />
                 </el-form-item>
+
+                <el-form-item label="处方类型" prop="formula_type">
+                    <el-radio-group v-model="editForm.formula_type">
+                        <el-radio value="主方">主方</el-radio>
+                        <el-radio value="辅方">辅方</el-radio>
+                    </el-radio-group>
+                </el-form-item>
                 
                 <el-form-item label="药材配方" prop="herbs" required>
                     <div class="w-full">
@@ -200,6 +221,7 @@ import MedicineNameSelect from '@/components/medicine-name-select/index.vue'
 // 表单数据
 const formData = reactive({
     prescription_name: '',
+    formula_type: '',
     is_public: ''
 })
 
@@ -212,6 +234,7 @@ const formRef = ref<FormInstance>()
 const editForm = reactive({
     id: 0,
     prescription_name: '',
+    formula_type: '主方',
     herbs: [] as Array<{ name: string; dosage: number }>,
     is_public: 0
 })
@@ -267,6 +290,7 @@ const removeHerb = (index: number) => {
 const resetForm = () => {
     editForm.id = 0
     editForm.prescription_name = ''
+    editForm.formula_type = '主方'
     editForm.herbs = []
     editForm.is_public = 0
 }
@@ -283,6 +307,7 @@ const handleView = (row: any) => {
     editMode.value = 'view'
     editForm.id = row.id
     editForm.prescription_name = row.prescription_name || ''
+    editForm.formula_type = row.formula_type || '主方'
     editForm.herbs = row.herbs ? JSON.parse(JSON.stringify(row.herbs)) : []
     editForm.is_public = row.is_public ?? 0
     showEdit.value = true
@@ -293,6 +318,7 @@ const handleEdit = (row: any) => {
     editMode.value = 'edit'
     editForm.id = row.id
     editForm.prescription_name = row.prescription_name || ''
+    editForm.formula_type = row.formula_type || '主方'
     editForm.herbs = row.herbs ? JSON.parse(JSON.stringify(row.herbs)) : []
     editForm.is_public = row.is_public ?? 0
     showEdit.value = true
diff --git a/admin/src/views/consumer/prescription/order_list.vue b/admin/src/views/consumer/prescription/order_list.vue
index 843115d2..b4702da3 100644
--- a/admin/src/views/consumer/prescription/order_list.vue
+++ b/admin/src/views/consumer/prescription/order_list.vue
@@ -1236,6 +1236,7 @@
                     <template #header>
                         <div class="flex items-center gap-2 flex-wrap">
                             <span class="font-medium text-[15px]">物流轨迹</span>
+                            <span class="text-xs text-gray-400 font-mono">{{ detailData.tracking_number }}</span>
                             <el-tag
                                 v-if="detailLogisticsUrgent.show"
                                 type="danger"
@@ -2375,17 +2376,43 @@
                             </div>
                         </div>
                         <div class="rx-herbs">
-                            <div v-for="(h, i) in slipHerbsList" :key="i" class="rx-herb-cell">
-                                <span class="rx-herb-name" v-if="prescriptionTabType === 'internal'">{{ h.name }} ({{ h.dosage }}克)</span>
-                                <span class="rx-herb-name" v-else>{{ h.name }}</span>
-                                <span class="rx-herb-total" v-if="prescriptionTabType === 'internal'">{{ rxHerbTotal(h.dosage) }}克</span>
-                                <span class="rx-herb-total" v-else>{{ h.dosage }}克</span>
-                            </div>
+                            <template v-if="prescriptionTabType === 'internal'">
+                                <template v-if="slipMainHerbs.length">
+                                    <div class="rx-herb-section-label">主方</div>
+                                    <div
+                                        v-for="(h, i) in slipMainHerbs"
+                                        :key="'main-' + i"
+                                        class="rx-herb-cell"
+                                    >
+                                        <span class="rx-herb-name">{{ h.name }} ({{ h.dosage }}克)</span>
+                                        <span class="rx-herb-total">{{ rxHerbTotal(h.dosage) }}克</span>
+                                    </div>
+                                </template>
+                                <template v-if="slipAuxHerbs.length">
+                                    <div class="rx-herb-section-label rx-herb-section-label--aux">辅方</div>
+                                    <div
+                                        v-for="(h, i) in slipAuxHerbs"
+                                        :key="'aux-' + i"
+                                        class="rx-herb-cell"
+                                    >
+                                        <span class="rx-herb-name">{{ h.name }} ({{ h.dosage }}克)</span>
+                                        <span class="rx-herb-total">{{ rxHerbTotal(h.dosage) }}克</span>
+                                    </div>
+                                </template>
+                            </template>
+                            <template v-else>
+                                <div v-for="(h, i) in slipHerbsList" :key="i" class="rx-herb-cell">
+                                    <span class="rx-herb-name">{{ h.name }}</span>
+                                    <span class="rx-herb-total">{{ h.dosage }}克</span>
+                                </div>
+                            </template>
                         </div>
                     </div>
 
                     <div class="rx-text">
-                        <p>服法：{{ rxUsageText }}</p>
+                        <p v-if="prescriptionTabType === 'internal'">主方服法：{{ rxUsageText }}</p>
+                        <p v-else>服法：{{ rxUsageText }}</p>
+                        <p v-if="prescriptionTabType === 'internal' && rxAuxUsageText">辅方服法：{{ rxAuxUsageText }}</p>
                         <p v-if="rxAdviceText">医嘱：{{ rxAdviceText }}</p>
                         <p v-if="rxRemarkText">备注：{{ rxRemarkText }}</p>
                         <p v-if="rxPharmacyRemarkText" class="rx-text-warn">
@@ -3777,6 +3804,40 @@ const logisticsTraceLoading = ref(false)
 const logisticsTracePayload = ref<Record<string, any> | null>(null)
 /** 顺丰/快递100：与运单一致的收件手机后四位（可覆盖订单收货手机） */
 const logisticsTracePhoneTail = ref('')
+/** 物流轨迹请求序号：同手机多运单或快速切换订单时，丢弃过期的异步响应 */
+let logisticsTraceRequestSeq = 0
+
+type LogisticsTraceRequestContext = {
+    requestSeq: number
+    orderId: number
+    trackingNumber: string
+}
+
+function bumpLogisticsTraceRequestToken() {
+    logisticsTraceRequestSeq += 1
+    logisticsTracePayload.value = null
+}
+
+function isCurrentLogisticsTraceContext(ctx: LogisticsTraceRequestContext): boolean {
+    if (ctx.requestSeq !== logisticsTraceRequestSeq) return false
+    if (Number(detailData.value?.id) !== ctx.orderId) return false
+    return String(detailData.value?.tracking_number || '').trim() === ctx.trackingNumber
+}
+
+function parseLogisticsTracePayload(
+    res: unknown,
+    expectedTrackingNumber: string,
+    expectedOrderId: number
+): Record<string, any> | null {
+    const raw = (res as { data?: unknown })?.data ?? res
+    if (!raw || typeof raw !== 'object') return null
+    const payload = raw as Record<string, any>
+    const respNum = String(payload.tracking_number || '').trim()
+    if (respNum && respNum !== expectedTrackingNumber) return null
+    const respOrderId = Number(payload.order_id)
+    if (respOrderId > 0 && respOrderId !== expectedOrderId) return null
+    return payload
+}
 
 const detailLogs = ref<any[]>([])
 const updateAmountVisible = ref(false)
@@ -3942,24 +4003,33 @@ function expressCompanyLabel(v: unknown) {
 }
 
 async function fetchLogisticsTrace() {
-    const id = Number(detailData.value?.id)
-    if (!id) return
+    const orderId = Number(detailData.value?.id)
+    const trackingNumber = String(detailData.value?.tracking_number || '').trim()
+    if (!orderId || !trackingNumber) return
+
+    const requestSeq = ++logisticsTraceRequestSeq
+    const ctx: LogisticsTraceRequestContext = { requestSeq, orderId, trackingNumber }
+
     logisticsTraceLoading.value = true
     try {
         const digits = String(logisticsTracePhoneTail.value || '').replace(/\D/g, '')
         const params: { id: number; express_company?: string; phone_tail?: string } = {
-            id,
+            id: orderId,
             express_company: detailLogisticsExpress.value
         }
         if (digits.length >= 4) {
             params.phone_tail = digits
         }
         const res: any = await prescriptionOrderLogisticsTrace(params)
-        logisticsTracePayload.value = (res?.data ?? res) as Record<string, any>
+        if (!isCurrentLogisticsTraceContext(ctx)) return
+        logisticsTracePayload.value = parseLogisticsTracePayload(res, trackingNumber, orderId)
     } catch {
+        if (!isCurrentLogisticsTraceContext(ctx)) return
         logisticsTracePayload.value = null
     } finally {
-        logisticsTraceLoading.value = false
+        if (isCurrentLogisticsTraceContext(ctx)) {
+            logisticsTraceLoading.value = false
+        }
     }
 }
 
@@ -4085,7 +4155,7 @@ async function openDetail(id: number) {
     // 修复 Bug：显式彻底清空缓存，防止前一次弹窗的数据残留
     detailData.value = null
     detailUnlinkedPayOrders.value = []
-    logisticsTracePayload.value = null
+    bumpLogisticsTraceRequestToken()
     detailLogisticsExpress.value = 'auto'
     logisticsTracePhoneTail.value = ''
     detailLogs.value = []
@@ -4928,35 +4998,47 @@ const completeOrderDialogVisible = ref(false)
 const completeOrderId = ref(0)
 const completeFulfillmentStatus = ref<number>(3)
 const completeOrderSubmitting = ref(false)
+let completeOrderLogisticsRequestSeq = 0
 
 function onCompleteOrderDialogClosed() {
     completeOrderId.value = 0
+    completeOrderLogisticsRequestSeq += 1
     completeOrderLogisticsPayload.value = null
     completeOrderLogisticsLoading.value = false
 }
 
 async function fetchCompleteOrderLogisticsForDialog(row: {
     id: number
+    tracking_number?: unknown
     express_company?: unknown
     recipient_phone?: unknown
 }) {
+    const orderId = Number(row.id)
+    const trackingNumber = String(row.tracking_number || '').trim()
+    if (!orderId || !trackingNumber) return
+
+    const requestSeq = ++completeOrderLogisticsRequestSeq
     completeOrderLogisticsLoading.value = true
     completeOrderLogisticsPayload.value = null
     try {
         const digits = String(row.recipient_phone || '').replace(/\D/g, '')
         const params: { id: number; express_company?: string; phone_tail?: string } = {
-            id: row.id,
+            id: orderId,
             express_company: String(row.express_company || 'auto') || 'auto'
         }
         if (digits.length >= 4) {
             params.phone_tail = digits
         }
         const res: any = await prescriptionOrderLogisticsTrace(params)
-        completeOrderLogisticsPayload.value = (res?.data ?? res) as Record<string, any>
+        if (requestSeq !== completeOrderLogisticsRequestSeq || completeOrderId.value !== orderId) return
+        completeOrderLogisticsPayload.value = parseLogisticsTracePayload(res, trackingNumber, orderId)
     } catch {
+        if (requestSeq !== completeOrderLogisticsRequestSeq || completeOrderId.value !== orderId) return
         completeOrderLogisticsPayload.value = null
     } finally {
-        completeOrderLogisticsLoading.value = false
+        if (requestSeq === completeOrderLogisticsRequestSeq && completeOrderId.value === orderId) {
+            completeOrderLogisticsLoading.value = false
+        }
     }
 }
 
@@ -5219,12 +5301,116 @@ const prescriptionTabType = ref('internal')
 const prescriptionSlipPrintRef = ref<HTMLElement | null>(null)
 const prescriptionSlipExporting = ref(false)
 
+type SlipFormulaType = '主方' | '辅方'
+
+type SlipAuxUsageForm = {
+    dosage_amount?: number
+    dosage_bag_count: number
+    need_decoction: boolean
+    bags_per_dose: number
+    times_per_day: number
+    usage_days: number
+}
+
+function normalizeSlipFormulaType(v: unknown): SlipFormulaType {
+    return v === '辅方' ? '辅方' : '主方'
+}
+
+function defaultSlipAuxUsage(prescriptionType = '浓缩水丸'): SlipAuxUsageForm {
+    if (prescriptionType === '饮片') {
+        return {
+            dosage_amount: 50,
+            dosage_bag_count: 1,
+            need_decoction: false,
+            bags_per_dose: 1,
+            times_per_day: 3,
+            usage_days: 7
+        }
+    }
+    if (prescriptionType === '浓缩水丸') {
+        return {
+            dosage_amount: 5,
+            dosage_bag_count: 1,
+            need_decoction: false,
+            bags_per_dose: 1,
+            times_per_day: 3,
+            usage_days: 7
+        }
+    }
+    return {
+        dosage_amount: 1,
+        dosage_bag_count: 1,
+        need_decoction: false,
+        bags_per_dose: 1,
+        times_per_day: 3,
+        usage_days: 7
+    }
+}
+
+function normalizeSlipAuxUsageForm(raw: unknown, prescriptionType: string): SlipAuxUsageForm {
+    const base = defaultSlipAuxUsage(prescriptionType)
+    if (!raw || typeof raw !== 'object') return { ...base }
+    const o = raw as Record<string, unknown>
+    return {
+        dosage_amount:
+            o.dosage_amount !== null && o.dosage_amount !== undefined && o.dosage_amount !== ''
+                ? Number(o.dosage_amount)
+                : base.dosage_amount,
+        dosage_bag_count: o.dosage_bag_count != null ? Number(o.dosage_bag_count) || 1 : base.dosage_bag_count,
+        need_decoction: o.need_decoction === 1 || o.need_decoction === true,
+        bags_per_dose: o.bags_per_dose != null ? Number(o.bags_per_dose) || 1 : base.bags_per_dose,
+        times_per_day: o.times_per_day != null ? Number(o.times_per_day) || 3 : base.times_per_day,
+        usage_days: o.usage_days != null ? Number(o.usage_days) || 7 : base.usage_days
+    }
+}
+
+function buildSlipUsageSegmentText(
+    usage: {
+        prescription_type?: string
+        dosage_amount?: number | null
+        dosage_unit?: string
+        dosage_bag_count?: number
+        times_per_day?: number
+        usage_way?: string
+        usage_time?: string
+    },
+    fallbackWay?: string,
+    fallbackTime?: string
+): string {
+    const pt = usage.prescription_type || '浓缩水丸'
+    const times = Number(usage.times_per_day) > 0 ? Number(usage.times_per_day) : 3
+    const amount = usage.dosage_amount != null ? Number(usage.dosage_amount) : 10
+    const unit = usage.dosage_unit || (pt === '饮片' ? 'ml' : 'g')
+    const usageWay = usage.usage_way || fallbackWay || '温水送服'
+    const usageTime = usage.usage_time || fallbackTime || ''
+    const seg: string[] = []
+    seg.push(`每天${times}次`)
+    if (pt === '浓缩水丸') {
+        const bags = Number(usage.dosage_bag_count) > 0 ? Number(usage.dosage_bag_count) : 1
+        seg.push(`一次${bags}袋`)
+        seg.push(`每袋${amount}${unit}`)
+    } else {
+        seg.push(`一次${amount}${unit}`)
+    }
+    seg.push(usageWay)
+    if (usageTime) seg.push(usageTime)
+    return seg.join(', ')
+}
+
 // 处方单辅助函数
 const slipHerbsList = computed(() => {
     const h = prescriptionViewData.value?.herbs
     return Array.isArray(h) ? h : []
 })
 
+const slipMainHerbs = computed(() =>
+    slipHerbsList.value.filter((h: any) => normalizeSlipFormulaType(h?.formula_type) === '主方')
+)
+
+const slipAuxHerbs = computed(() =>
+    slipHerbsList.value.filter((h: any) => normalizeSlipFormulaType(h?.formula_type) === '辅方')
+)
+
 const slipDietaryText = computed(() => {
     const d = prescriptionViewData.value?.dietary_taboo
     if (Array.isArray(d)) return d.filter(Boolean).join('、')
@@ -5351,23 +5537,26 @@ const rxUsageText = computed(() => {
     const v = prescriptionViewData.value as any
     if (!v) return '—'
     if (v.usage_text) return v.usage_text
-    const times = Number(v.times_per_day) > 0 ? Number(v.times_per_day) : 3
-    const amount = v.dosage_amount != null ? Number(v.dosage_amount) : 10
-    const unit = v.dosage_unit || 'g'
-    const usageWay = v.usage_way || '温水送服'
-    const usageTime = v.usage_time || ''
-    const seg: string[] = []
-    seg.push(`每天${times}次`)
-    if ((v.prescription_type || '浓缩水丸') === '浓缩水丸') {
-        const bags = Number(v.dosage_bag_count) > 0 ? Number(v.dosage_bag_count) : 1
-        seg.push(`一次${bags}袋`)
-        seg.push(`每袋${amount}${unit}`)
-    } else {
-        seg.push(`一次${amount}${unit}`)
-    }
-    seg.push(usageWay)
-    if (usageTime) seg.push(usageTime)
-    return seg.join(', ')
+    return buildSlipUsageSegmentText(v)
+})
+
+const rxAuxUsageText = computed(() => {
+    const v = prescriptionViewData.value as any
+    if (!v || !slipAuxHerbs.value.length) return ''
+    const aux = normalizeSlipAuxUsageForm(v.aux_usage, v.prescription_type || '浓缩水丸')
+    return buildSlipUsageSegmentText(
+        {
+            prescription_type: v.prescription_type,
+            dosage_amount: aux.dosage_amount,
+            dosage_unit: v.dosage_unit,
+            dosage_bag_count: aux.dosage_bag_count,
+            times_per_day: aux.times_per_day,
+            usage_way: v.usage_way,
+            usage_time: v.usage_time
+        },
+        v.usage_way,
+        v.usage_time
+    )
 })
 
 /** 出丸：优先用 slipPillGrams（每袋用量×袋数×每天次数×服用天数），否则按药材总量×剂数 */
@@ -6170,6 +6359,19 @@ async function downloadPrescriptionSlipPdf() {
     box-sizing: border-box;
 }
 
+.rx-herb-section-label {
+    grid-column: 1 / -1;
+    font-size: 12px;
+    font-weight: 600;
+    color: #409eff;
+    line-height: 1.4;
+}
+
+.rx-herb-section-label--aux {
+    color: #e6a23c;
+    margin-top: 4px;
+}
+
 .rx-herb-cell {
     display: grid;
     grid-template-columns: 1fr 64px;
diff --git a/admin/src/views/consumer/prescription/order_list_h5.vue b/admin/src/views/consumer/prescription/order_list_h5.vue
index f071c6de..19a91c8f 100644
--- a/admin/src/views/consumer/prescription/order_list_h5.vue
+++ b/admin/src/views/consumer/prescription/order_list_h5.vue
@@ -3406,6 +3406,40 @@ const logisticsTraceLoading = ref(false)
 const logisticsTracePayload = ref<Record<string, any> | null>(null)
 /** 顺丰/快递100：与运单一致的收件手机后四位（可覆盖订单收货手机） */
 const logisticsTracePhoneTail = ref('')
+/** 物流轨迹请求序号：同手机多运单或快速切换订单时，丢弃过期的异步响应 */
+let logisticsTraceRequestSeq = 0
+
+type LogisticsTraceRequestContext = {
+    requestSeq: number
+    orderId: number
+    trackingNumber: string
+}
+
+function bumpLogisticsTraceRequestToken() {
+    logisticsTraceRequestSeq += 1
+    logisticsTracePayload.value = null
+}
+
+function isCurrentLogisticsTraceContext(ctx: LogisticsTraceRequestContext): boolean {
+    if (ctx.requestSeq !== logisticsTraceRequestSeq) return false
+    if (Number(detailData.value?.id) !== ctx.orderId) return false
+    return String(detailData.value?.tracking_number || '').trim() === ctx.trackingNumber
+}
+
+function parseLogisticsTracePayload(
+    res: unknown,
+    expectedTrackingNumber: string,
+    expectedOrderId: number
+): Record<string, any> | null {
+    const raw = (res as { data?: unknown })?.data ?? res
+    if (!raw || typeof raw !== 'object') return null
+    const payload = raw as Record<string, any>
+    const respNum = String(payload.tracking_number || '').trim()
+    if (respNum && respNum !== expectedTrackingNumber) return null
+    const respOrderId = Number(payload.order_id)
+    if (respOrderId > 0 && respOrderId !== expectedOrderId) return null
+    return payload
+}
 
 const detailLogs = ref<any[]>([])
 const updateAmountVisible = ref(false)
@@ -3500,24 +3534,33 @@ function expressCompanyLabel(v: unknown) {
 }
 
 async function fetchLogisticsTrace() {
-    const id = Number(detailData.value?.id)
-    if (!id) return
+    const orderId = Number(detailData.value?.id)
+    const trackingNumber = String(detailData.value?.tracking_number || '').trim()
+    if (!orderId || !trackingNumber) return
+
+    const requestSeq = ++logisticsTraceRequestSeq
+    const ctx: LogisticsTraceRequestContext = { requestSeq, orderId, trackingNumber }
+
     logisticsTraceLoading.value = true
     try {
         const digits = String(logisticsTracePhoneTail.value || '').replace(/\D/g, '')
         const params: { id: number; express_company?: string; phone_tail?: string } = {
-            id,
+            id: orderId,
             express_company: detailLogisticsExpress.value
         }
         if (digits.length >= 4) {
             params.phone_tail = digits
         }
         const res: any = await prescriptionOrderLogisticsTrace(params)
-        logisticsTracePayload.value = (res?.data ?? res) as Record<string, any>
+        if (!isCurrentLogisticsTraceContext(ctx)) return
+        logisticsTracePayload.value = parseLogisticsTracePayload(res, trackingNumber, orderId)
     } catch {
+        if (!isCurrentLogisticsTraceContext(ctx)) return
         logisticsTracePayload.value = null
     } finally {
-        logisticsTraceLoading.value = false
+        if (isCurrentLogisticsTraceContext(ctx)) {
+            logisticsTraceLoading.value = false
+        }
     }
 }
 
@@ -3643,7 +3686,7 @@ async function openDetail(id: number) {
     // 修复 Bug：显式彻底清空缓存，防止前一次弹窗的数据残留
     detailData.value = null
     detailUnlinkedPayOrders.value = []
-    logisticsTracePayload.value = null
+    bumpLogisticsTraceRequestToken()
     detailLogisticsExpress.value = 'auto'
     logisticsTracePhoneTail.value = ''
     detailLogs.value = []
@@ -3659,7 +3702,7 @@ async function openDetail(id: number) {
             const dig = String(d.recipient_phone || '').replace(/\D/g, '')
             logisticsTracePhoneTail.value = dig.length >= 4 ? dig : ''
             if (String(d.tracking_number || '').trim()) {
-                fetchLogisticsTrace()
+                void fetchLogisticsTrace()
             }
             fetchLogs(id)
             
diff --git a/server/app/adminapi/http/middleware/AuthMiddleware.php b/server/app/adminapi/http/middleware/AuthMiddleware.php
index 968a2f63..8d726638 100755
--- a/server/app/adminapi/http/middleware/AuthMiddleware.php
+++ b/server/app/adminapi/http/middleware/AuthMiddleware.php
@@ -132,9 +132,42 @@ class AuthMiddleware
             return true;
         }
 
+        // 处方库列表：消费者开方页/处方库页导入共用，复用开方或处方库菜单权限
+        if ($accessUri === 'tcm.prescriptionlibrary/lists'
+            && $this->matchPrescriptionLibraryListsPermission($adminUris)) {
+            return true;
+        }
+
         return false;
     }
 
+    /**
+     * 处方库 lists：与开方、处方库维护菜单权限互通（避免开方页「从处方库导入」403）
+     */
+    private function matchPrescriptionLibraryListsPermission(array $adminUris): bool
+    {
+        $aliases = [
+            'tcm.prescriptionlibrary/lists',
+            'tcm.prescription/lists',
+            'tcm.prescription/add',
+            'tcm.prescription/edit',
+            'tcm.prescription/detail',
+            'cf.prescription/lists',
+            'cf.prescription/add',
+            'cf.prescription/edit',
+            'cf.prescription/read',
+            'cf.prescription/del',
+            'cf.prescription/audit',
+            'wcf.prescription/lists',
+            'wcf.prescription/read',
+            'wcf.prescription/add',
+            'wcf.prescription/edit',
+            'wcf.prescription/delete',
+        ];
+
+        return count(array_intersect($aliases, $adminUris)) > 0;
+    }
+
     /**
      * 面诊进度专用：auth.admin/lists、doctor.appointment/lists + progress_board=1，不校验菜单权限
      */
diff --git a/server/app/adminapi/lists/tcm/PrescriptionLibraryLists.php b/server/app/adminapi/lists/tcm/PrescriptionLibraryLists.php
index f9a54621..d237e290 100755
--- a/server/app/adminapi/lists/tcm/PrescriptionLibraryLists.php
+++ b/server/app/adminapi/lists/tcm/PrescriptionLibraryLists.php
@@ -21,7 +21,7 @@ class PrescriptionLibraryLists extends BaseAdminDataLists implements ListsSearch
     {
         return [
             '%like%' => ['prescription_name'],
-            '=' => ['is_public', 'creator_id']
+            '=' => ['is_public', 'creator_id', 'formula_type']
         ];
     }
 
@@ -34,6 +34,16 @@ class PrescriptionLibraryLists extends BaseAdminDataLists implements ListsSearch
             return $query;
         }
 
+        // 开方页导入专用参数（勿与搜索项 creator_id 混用，否则无法 OR 出他人公开模板）
+        $prescribingCreatorId = (int) ($this->params['prescribing_creator_id'] ?? 0);
+        if ($prescribingCreatorId > 0
+            && PrescriptionLibraryLogic::canListLibraryForCreator($this->adminId, $this->adminInfo, $prescribingCreatorId)) {
+            return $query->where(function ($q) use ($prescribingCreatorId) {
+                $q->where('creator_id', $prescribingCreatorId)
+                    ->whereOr('is_public', 1);
+            });
+        }
+
         return $query->where(function ($q) {
             $q->where('creator_id', $this->adminId)
                 ->whereOr('is_public', 1);
@@ -46,7 +56,7 @@ class PrescriptionLibraryLists extends BaseAdminDataLists implements ListsSearch
     public function lists(): array
     {
         $field = [
-            'id', 'prescription_name', 'herbs', 'is_public',
+            'id', 'prescription_name', 'formula_type', 'herbs', 'is_public',
             'creator_id', 'creator_name', 'create_time', 'update_time'
         ];
 
diff --git a/server/app/adminapi/logic/tcm/PrescriptionLibraryLogic.php b/server/app/adminapi/logic/tcm/PrescriptionLibraryLogic.php
index 0a7a6d66..0441173d 100755
--- a/server/app/adminapi/logic/tcm/PrescriptionLibraryLogic.php
+++ b/server/app/adminapi/logic/tcm/PrescriptionLibraryLogic.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace app\adminapi\logic\tcm;
 
+use app\common\cache\AdminAuthCache;
 use app\common\logic\BaseLogic;
 use app\common\model\auth\AdminRole;
 use app\common\model\tcm\PrescriptionLibrary;
@@ -33,12 +34,64 @@ class PrescriptionLibraryLogic extends BaseLogic
         return count(array_intersect($myRoles, $allowRoles)) > 0;
     }
 
+    /**
+     * @notes 是否具备消费者/诊间开方相关菜单权限（用于处方库列表鉴权别名）
+     */
+    public static function hasPrescriptionOperatePermission(int $adminId): bool
+    {
+        $cache = new AdminAuthCache($adminId);
+        $uris = $cache->getAdminUri() ?? [];
+        $normalized = array_map(static fn ($item) => strtolower((string) $item), $uris);
+        $allowed = [
+            'tcm.prescription/lists',
+            'tcm.prescription/add',
+            'tcm.prescription/edit',
+            'tcm.prescription/detail',
+            'cf.prescription/lists',
+            'cf.prescription/add',
+            'cf.prescription/edit',
+            'cf.prescription/read',
+            'cf.prescription/del',
+            'cf.prescription/audit',
+            'wcf.prescription/lists',
+            'wcf.prescription/read',
+            'wcf.prescription/add',
+            'wcf.prescription/edit',
+            'wcf.prescription/delete',
+            'tcm.prescriptionlibrary/lists',
+        ];
+
+        return count(array_intersect($allowed, $normalized)) > 0;
+    }
+
+    /**
+     * @notes 开方页按医师 creator_id 拉取处方库：本人 / 超管角色 / 有开方菜单权限（医助代开方）
+     */
+    public static function canListLibraryForCreator(int $adminId, array $adminInfo, int $targetCreatorId): bool
+    {
+        if ($targetCreatorId <= 0) {
+            return false;
+        }
+        if ($targetCreatorId === $adminId) {
+            return true;
+        }
+        if (self::canManageAllPrescriptions($adminId, $adminInfo)) {
+            return true;
+        }
+
+        return self::hasPrescriptionOperatePermission($adminId);
+    }
+
     /**
      * @notes 添加处方库
      */
     public static function add(array $params): ?int
     {
         try {
+            $params['formula_type'] = in_array($params['formula_type'] ?? '', ['主方', '辅方'], true)
+                ? $params['formula_type']
+                : '主方';
+
             // 处理药材数据
             if (isset($params['herbs']) && is_array($params['herbs'])) {
                 $params['herbs'] = json_encode($params['herbs'], JSON_UNESCAPED_UNICODE);
@@ -69,6 +122,12 @@ class PrescriptionLibraryLogic extends BaseLogic
                 return false;
             }
 
+            if (isset($params['formula_type'])) {
+                $params['formula_type'] = in_array($params['formula_type'], ['主方', '辅方'], true)
+                    ? $params['formula_type']
+                    : '主方';
+            }
+
             // 处理药材数据
             if (isset($params['herbs']) && is_array($params['herbs'])) {
                 $params['herbs'] = json_encode($params['herbs'], JSON_UNESCAPED_UNICODE);
diff --git a/server/app/adminapi/logic/tcm/PrescriptionLogic.php b/server/app/adminapi/logic/tcm/PrescriptionLogic.php
index e4212c1d..81e4f855 100755
--- a/server/app/adminapi/logic/tcm/PrescriptionLogic.php
+++ b/server/app/adminapi/logic/tcm/PrescriptionLogic.php
@@ -159,6 +159,35 @@ class PrescriptionLogic
         return $ts ? date('Y-m-d', $ts) : date('Y-m-d');
     }
 
+    /**
+     * @notes 辅方用法 JSON（与主方 dosage/times/days 字段结构一致）
+     */
+    private static function normalizeAuxUsage(array $params): ?array
+    {
+        $raw = $params['aux_usage'] ?? null;
+        if ($raw === null || $raw === '' || $raw === []) {
+            return null;
+        }
+        if (is_string($raw)) {
+            $decoded = json_decode($raw, true);
+            $raw = is_array($decoded) ? $decoded : null;
+        }
+        if (!is_array($raw)) {
+            return null;
+        }
+
+        return [
+            'dosage_amount' => isset($raw['dosage_amount']) && $raw['dosage_amount'] !== ''
+                ? (float) $raw['dosage_amount']
+                : null,
+            'dosage_bag_count' => self::normalizeDosageBagCount($raw['dosage_bag_count'] ?? 1),
+            'need_decoction' => (int) ($raw['need_decoction'] ?? 0),
+            'bags_per_dose' => isset($raw['bags_per_dose']) ? (int) $raw['bags_per_dose'] : 1,
+            'times_per_day' => (int) ($raw['times_per_day'] ?? 3),
+            'usage_days' => (int) ($raw['usage_days'] ?? 7),
+        ];
+    }
+
     private static function normalizeDosageBagCount($raw): int
     {
         $count = (int) $raw;
@@ -273,6 +302,7 @@ class PrescriptionLogic
             'dose_unit' => $params['dose_unit'] ?? '剂',
             'usage_days' => (int)($params['usage_days'] ?? 7),
             'times_per_day' => (int)($params['times_per_day'] ?? 2),
+            'aux_usage' => self::normalizeAuxUsage($params),
             'usage_instruction' => $params['usage_instruction'] ?? '水煎服一日二次',
             'usage_time' => $params['usage_time'] ?? '饭前',
             'usage_way' => $params['usage_way'] ?? '温水送服',
@@ -398,6 +428,9 @@ class PrescriptionLogic
                 'dose_unit' => $params['dose_unit'] ?? $prescription->dose_unit,
                 'usage_days' => (int)($params['usage_days'] ?? $prescription->usage_days),
                 'times_per_day' => (int)($params['times_per_day'] ?? $prescription->times_per_day ?? 2),
+                'aux_usage' => array_key_exists('aux_usage', $params)
+                    ? self::normalizeAuxUsage($params)
+                    : $prescription->aux_usage,
                 'usage_instruction' => $params['usage_instruction'] ?? $prescription->usage_instruction,
                 'usage_time' => $params['usage_time'] ?? $prescription->usage_time,
                 'usage_way' => $params['usage_way'] ?? $prescription->usage_way,
diff --git a/server/app/adminapi/logic/tcm/PrescriptionOrderLogic.php b/server/app/adminapi/logic/tcm/PrescriptionOrderLogic.php
index 59c34e3f..c35f56cc 100755
--- a/server/app/adminapi/logic/tcm/PrescriptionOrderLogic.php
+++ b/server/app/adminapi/logic/tcm/PrescriptionOrderLogic.php
@@ -1413,6 +1413,7 @@ class PrescriptionOrderLogic
         
         $payload['official_urls'] = ExpressTrackService::officialUrls($num);
         $payload['tracking_number'] = $num;
+        $payload['order_id'] = $id;
         $payload['express_company_used'] = $ec;
 
         return $payload;
@@ -2556,7 +2557,7 @@ class PrescriptionOrderLogic
     }
 
     /**
-     * 导出用：诊单医助在 admin_dept 中的部门路径（多部门「；」、路径内「 / 」）
+     * 导出用：管理员在 admin_dept 中的部门路径（多部门「；」、路径内「 / 」；业务订单导出取 creator_id）
      */
     public static function formatAssistantDeptPathForExport(int $assistantAdminId): string
     {
@@ -2846,21 +2847,21 @@ class PrescriptionOrderLogic
                 $item['export_patient_gender'] = $g === 1 ? '男' : '女';
                 $item['export_patient_age'] = (string) ($dg['age'] ?? '');
                 $item['export_patient_phone'] = (string) ($dg['phone'] ?? '');
-                $rxAst = \is_array($rx) ? (int) ($rx['assistant_id'] ?? 0) : 0;
-                $diagAst = (int) ($dg['assistant_id'] ?? 0);
-                $astId = self::resolveAssistantAdminIdForPrescriptionOrderRow($rxAst, $diagAst);
-                if ($astId > 0) {
-                    if (!isset($assistantDeptCache[$astId])) {
-                        $assistantDeptCache[$astId] = self::formatAssistantDeptPathForExport($astId);
-                    }
-                    $item['export_assistant_dept'] = $assistantDeptCache[$astId];
-                } else {
-                    $item['export_assistant_dept'] = '';
-                }
             } else {
                 $item['export_patient_gender'] = '';
                 $item['export_patient_age'] = '';
                 $item['export_patient_phone'] = '';
+            }
+
+            // 导出「医助名字 / 医助部门」：与详情 order_creator 一致，按业务订单 creator_id（非诊单二诊 assistant_id）
+            $creatorId = (int) ($item['creator_id'] ?? 0);
+            $item['assistant_name'] = (string) ($item['creator_name'] ?? '');
+            if ($creatorId > 0) {
+                if (!isset($assistantDeptCache[$creatorId])) {
+                    $assistantDeptCache[$creatorId] = self::formatAssistantDeptPathForExport($creatorId);
+                }
+                $item['export_assistant_dept'] = $assistantDeptCache[$creatorId];
+            } else {
                 $item['export_assistant_dept'] = '';
             }
 
diff --git a/server/app/adminapi/validate/tcm/PrescriptionLibraryValidate.php b/server/app/adminapi/validate/tcm/PrescriptionLibraryValidate.php
index 3d7eb1d2..1384ba30 100755
--- a/server/app/adminapi/validate/tcm/PrescriptionLibraryValidate.php
+++ b/server/app/adminapi/validate/tcm/PrescriptionLibraryValidate.php
@@ -14,6 +14,7 @@ class PrescriptionLibraryValidate extends BaseValidate
     protected $rule = [
         'id' => 'require|number',
         'prescription_name' => 'require|max:100',
+        'formula_type' => 'in:主方,辅方',
         'herbs' => 'require|array',
         'is_public' => 'in:0,1'
     ];
@@ -23,6 +24,7 @@ class PrescriptionLibraryValidate extends BaseValidate
         'id.number' => '处方ID必须为数字',
         'prescription_name.require' => '处方名称不能为空',
         'prescription_name.max' => '处方名称最多100个字符',
+        'formula_type.in' => '处方类型只能是主方或辅方',
         'herbs.require' => '药材列表不能为空',
         'herbs.array' => '药材列表格式错误',
         'is_public.in' => '是否公开参数错误'
@@ -33,7 +35,7 @@ class PrescriptionLibraryValidate extends BaseValidate
      */
     public function sceneAdd()
     {
-        return $this->only(['prescription_name', 'herbs', 'is_public']);
+        return $this->only(['prescription_name', 'formula_type', 'herbs', 'is_public']);
     }
 
     /**
@@ -41,7 +43,7 @@ class PrescriptionLibraryValidate extends BaseValidate
      */
     public function sceneEdit()
     {
-        return $this->only(['id', 'prescription_name', 'herbs', 'is_public']);
+        return $this->only(['id', 'prescription_name', 'formula_type', 'herbs', 'is_public']);
     }
 
     /**
diff --git a/server/app/adminapi/validate/tcm/PrescriptionValidate.php b/server/app/adminapi/validate/tcm/PrescriptionValidate.php
index 3ae41479..7bfbb756 100755
--- a/server/app/adminapi/validate/tcm/PrescriptionValidate.php
+++ b/server/app/adminapi/validate/tcm/PrescriptionValidate.php
@@ -41,7 +41,7 @@ class PrescriptionValidate extends BaseValidate
             'patient_name', 'gender', 'age',
             'visit_no', 'prescription_date', 'tongue', 'tongue_image', 'pulse',
             'pulse_condition', 'clinical_diagnosis', 'herbs', 'dose_count', 'dose_unit',
-            'usage_days', 'times_per_day', 'usage_instruction', 'usage_time', 'usage_way', 'dietary_taboo',
+            'usage_days', 'times_per_day', 'aux_usage', 'usage_instruction', 'usage_time', 'usage_way', 'dietary_taboo',
             'usage_notes', 'doctor_name', 'is_shared', 'visible_role_ids',
             'diagnosis_id', 'appointment_id', 'audit_status',
         ]);
@@ -54,7 +54,7 @@ class PrescriptionValidate extends BaseValidate
             'patient_name', 'gender', 'age',
             'visit_no', 'prescription_date', 'tongue', 'tongue_image', 'pulse',
             'pulse_condition', 'clinical_diagnosis', 'herbs', 'dose_count', 'dose_unit',
-            'usage_days', 'times_per_day', 'usage_instruction', 'usage_time', 'usage_way', 'dietary_taboo',
+            'usage_days', 'times_per_day', 'aux_usage', 'usage_instruction', 'usage_time', 'usage_way', 'dietary_taboo',
             'usage_notes', 'doctor_name', 'is_shared', 'visible_role_ids', 'diagnosis_id',
         ]);
     }
diff --git a/server/app/command/GancaoSyncLogisticsRoute.php b/server/app/command/GancaoSyncLogisticsRoute.php
index a365ff0d..c2d64ae2 100755
--- a/server/app/command/GancaoSyncLogisticsRoute.php
+++ b/server/app/command/GancaoSyncLogisticsRoute.php
@@ -24,6 +24,7 @@ use think\console\Output;
  *   php think gancao:sync-logistics                  默认拉 100 单
  *   php think gancao:sync-logistics --limit=200      自定义拉取上限
  *   php think gancao:sync-logistics --order-id=123   只跑指定订单
+ *   php think gancao:sync-logistics -t SF1234567890  按快递单号走快递100 查询并落库
  *   php think gancao:sync-logistics --detail         打印每单详细
  *
  * 建议 crontab（每 30 分钟执行一次）：
@@ -40,6 +41,7 @@ class GancaoSyncLogisticsRoute extends Command
             ->setDescription('同步甘草订单的物流路由（GET_TASK_ROUTE_LIST）到本地物流追踪表')
             ->addOption('limit', 'l', Option::VALUE_OPTIONAL, '本次最多处理多少条订单', 100)
             ->addOption('order-id', null, Option::VALUE_OPTIONAL, '只同步指定 prescription_order.id', null)
+            ->addOption('tracking-number', 't', Option::VALUE_REQUIRED, '按快递单号走快递100 查询并落库')
             ->addOption('detail', 'd', Option::VALUE_NONE, '打印每单详细结果');
     }
 
@@ -48,26 +50,43 @@ class GancaoSyncLogisticsRoute extends Command
         $limit = max(1, (int) $input->getOption('limit'));
         $onlyOrderId = $input->getOption('order-id');
         $onlyOrderId = $onlyOrderId !== null ? (int) $onlyOrderId : null;
+        $trackingNumber = trim((string) $input->getOption('tracking-number'));
         $verbose = (bool) $input->getOption('detail');
 
+        if ($trackingNumber !== '' && $onlyOrderId !== null) {
+            $output->error('请勿同时使用 --tracking-number 与 --order-id');
+            return 1;
+        }
+
         $output->writeln('========================================');
-        $output->writeln('甘草物流路由同步');
+        $output->writeln($trackingNumber !== '' ? '快递100 物流查询' : '甘草物流路由同步');
         $output->writeln('========================================');
 
-        if (!GancaoScmRecipelService::isConfigured()) {
+        if ($trackingNumber === '' && !GancaoScmRecipelService::isConfigured()) {
             $output->error('甘草 SCM 未配置：' . GancaoScmRecipelService::whyNotConfigured());
             return 1;
         }
 
         $start = microtime(true);
-        $output->writeln('开始同步...（limit=' . $limit . ($onlyOrderId ? ', order_id=' . $onlyOrderId : '') . '）');
+        if ($trackingNumber !== '') {
+            $output->writeln('开始查询...（快递100，tracking_number=' . $trackingNumber . '）');
+        } else {
+            $output->writeln('开始同步...（limit=' . $limit . ($onlyOrderId ? ', order_id=' . $onlyOrderId : '') . '）');
+        }
 
         try {
-            $stats = GancaoLogisticsRouteService::syncBatch($limit, $onlyOrderId);
-            $recon = ExpressTrackingService::reconcileAssistantReleaseForShippedPrescriptionOrders(200);
-            $stats['reconcile_cleared'] = (int) ($recon['cleared'] ?? 0);
-            $stats['reconcile_scanned'] = (int) ($recon['scanned'] ?? 0);
-            $stats['reconcile_lines'] = $recon['lines'] ?? [];
+            if ($trackingNumber !== '') {
+                $stats = ExpressTrackingService::queryKuaidiByTrackingNumber($trackingNumber);
+                $stats['reconcile_cleared'] = 0;
+                $stats['reconcile_scanned'] = 0;
+                $stats['reconcile_lines'] = [];
+            } else {
+                $stats = GancaoLogisticsRouteService::syncBatch($limit, $onlyOrderId);
+                $recon = ExpressTrackingService::reconcileAssistantReleaseForShippedPrescriptionOrders(2000);
+                $stats['reconcile_cleared'] = (int) ($recon['cleared'] ?? 0);
+                $stats['reconcile_scanned'] = (int) ($recon['scanned'] ?? 0);
+                $stats['reconcile_lines'] = $recon['lines'] ?? [];
+            }
         } catch (\Throwable $e) {
             $output->error('同步异常：' . $e->getMessage());
             return 1;
@@ -81,7 +100,7 @@ class GancaoSyncLogisticsRoute extends Command
             foreach ($stats['details'] as $row) {
                 $tag = !empty($row['success']) ? '[OK]' : '[FAIL]';
                 $line = sprintf(
-                    '%s order_id=%s order_no=%s app_order_no=%s tn=%s state=%s traces=+%s msg=%s',
+                    '%s order_id=%s order_no=%s app_order_no=%s tn=%s state=%s traces=+%s source=%s msg=%s',
                     $tag,
                     $row['order_id'] ?? '',
                     $row['order_no'] ?? '',
@@ -89,6 +108,7 @@ class GancaoSyncLogisticsRoute extends Command
                     $row['tracking_number'] ?? '',
                     $row['state'] ?? '',
                     $row['traces'] ?? 0,
+                    $row['source'] ?? '',
                     $row['message'] ?? ''
                 );
                 $output->writeln($line);
diff --git a/server/app/common/model/tcm/Prescription.php b/server/app/common/model/tcm/Prescription.php
index 32803f02..5de778c3 100755
--- a/server/app/common/model/tcm/Prescription.php
+++ b/server/app/common/model/tcm/Prescription.php
@@ -18,7 +18,7 @@ class Prescription extends BaseModel
     protected $deleteTime = 'delete_time';
     protected $dateFormat = false;
 
-    protected $json = ['herbs', 'case_record'];
+    protected $json = ['herbs', 'case_record', 'aux_usage'];
     protected $jsonAssoc = true;
 
     // 字段类型转换
diff --git a/server/app/common/service/ExpressTrackService.php b/server/app/common/service/ExpressTrackService.php
index ac246672..c16d50b7 100755
--- a/server/app/common/service/ExpressTrackService.php
+++ b/server/app/common/service/ExpressTrackService.php
@@ -45,6 +45,7 @@ class ExpressTrackService
         $carrier = $resolved['carrier'];
         $kuaidiCom = $resolved['kuaidi_com'];
         $label = $resolved['label'];
+        $comCandidates = self::kuaidiComCandidates($kuaidiCom, $num);
 
         $officialUrl = self::buildOfficialUrl($carrier, $num);
 
@@ -75,6 +76,74 @@ class ExpressTrackService
             return $out;
         }
 
+        $lastFail = null;
+        foreach ($comCandidates as $tryCom) {
+            $tryOut = self::queryKuaidiOnce($cfg, $tryCom, $num, $phoneForKuaidi, $carrier, $label);
+            if (!empty($tryOut['traces']) || ($tryOut['state'] ?? '') !== '') {
+                return $tryOut;
+            }
+            $lastFail = $tryOut;
+        }
+
+        return $lastFail ?? $out;
+    }
+
+    /**
+     * 根据运单号形态纠正承运商（避免 express_tracking 误存 sf 导致京东单查不出）
+     */
+    public static function normalizeExpressCompanyCode(string $trackingNumber, string $storedCompany = 'auto'): string
+    {
+        $byNumber = self::detectCarrierFromNumber($trackingNumber);
+        if ($byNumber === null) {
+            $ec = strtolower(trim($storedCompany));
+
+            return in_array($ec, ['sf', 'jd', 'jt', 'jtexpress', 'auto'], true) ? $ec : 'auto';
+        }
+
+        $ec = strtolower(trim($storedCompany));
+        $byEc = self::carrierFromExpressCode($ec);
+        if ($byEc !== null && $byEc['carrier'] !== $byNumber['carrier']) {
+            return $byNumber['carrier'];
+        }
+
+        return $byNumber['carrier'];
+    }
+
+    /**
+     * @param array<string, mixed> $cfg
+     * @return array{
+     *   carrier: string,
+     *   carrier_label: string,
+     *   kuaidi_com: string,
+     *   traces: list<array{time:string,context:string}>,
+     *   state: string,
+     *   state_text: string,
+     *   source: string,
+     *   hint: string,
+     *   official_url: string
+     * }
+     */
+    private static function queryKuaidiOnce(
+        array $cfg,
+        string $kuaidiCom,
+        string $num,
+        string $phoneForKuaidi,
+        string $carrier,
+        string $label
+    ): array {
+        $officialUrl = self::buildOfficialUrl($carrier, $num);
+        $out = [
+            'carrier' => $carrier,
+            'carrier_label' => $label,
+            'kuaidi_com' => $kuaidiCom,
+            'traces' => [],
+            'state' => '',
+            'state_text' => '',
+            'source' => 'kuaidi100',
+            'hint' => '',
+            'official_url' => $officialUrl,
+        ];
+
         $paramArr = [
             'com' => $kuaidiCom,
             'num' => $num,
@@ -98,7 +167,7 @@ class ExpressTrackService
         $raw = self::httpPostForm($url, $postBody);
         if ($raw === null || $raw === '') {
             $out['hint'] = '快递100接口无响应，请稍后重试或使用官网查询';
-            Log::warning('ExpressTrackService kuaidi100 empty response', ['num' => $num]);
+            Log::warning('ExpressTrackService kuaidi100 empty response', ['num' => $num, 'com' => $kuaidiCom]);
 
             return $out;
         }
@@ -106,7 +175,7 @@ class ExpressTrackService
         $json = json_decode($raw, true);
         if (!is_array($json)) {
             $out['hint'] = '快递100返回异常，请使用官网查询';
-            Log::warning('ExpressTrackService kuaidi100 invalid json', ['raw' => mb_substr($raw, 0, 500)]);
+            Log::warning('ExpressTrackService kuaidi100 invalid json', ['raw' => mb_substr($raw, 0, 500), 'com' => $kuaidiCom]);
 
             return $out;
         }
@@ -114,19 +183,16 @@ class ExpressTrackService
         if (isset($json['result']) && $json['result'] === false) {
             $msg = (string) ($json['message'] ?? '查询失败');
             $returnCode = (string) ($json['returnCode'] ?? '');
-            
-            // 特殊处理"找不到对应公司"错误
             if ($msg === '找不到对应公司' || $returnCode === '400') {
                 $out['hint'] = '快递100暂不支持该快递公司或编码错误，请使用下方官网链接查询';
             } else {
                 $out['hint'] = $msg;
             }
-            
             Log::info('ExpressTrackService kuaidi100 business fail', [
                 'message' => $msg,
                 'returnCode' => $returnCode,
                 'num' => $num,
-                'com' => $kuaidiCom
+                'com' => $kuaidiCom,
             ]);
 
             return $out;
@@ -138,7 +204,7 @@ class ExpressTrackService
         }
         if (($json['message'] ?? '') !== 'ok' && $data === []) {
             $out['hint'] = (string) ($json['message'] ?? '未查到轨迹');
-            Log::info('ExpressTrackService kuaidi100 no data', ['json' => $json]);
+            Log::info('ExpressTrackService kuaidi100 no data', ['json' => $json, 'com' => $kuaidiCom]);
 
             return $out;
         }
@@ -159,12 +225,35 @@ class ExpressTrackService
         $out['traces'] = $traces;
         $out['state'] = (string) ($json['state'] ?? '');
         $out['state_text'] = self::stateText($out['state']);
-        $out['source'] = 'kuaidi100';
         $out['hint'] = $traces === [] ? '暂无轨迹节点，单号可能尚未揽收' : '';
 
         return $out;
     }
 
+    /**
+     * @return list<string>
+     */
+    private static function kuaidiComCandidates(string $primaryCom, string $num): array
+    {
+        $list = [$primaryCom];
+        $byNumber = self::detectCarrierFromNumber($num);
+        if ($byNumber !== null && !in_array($byNumber['kuaidi_com'], $list, true)) {
+            $list[] = $byNumber['kuaidi_com'];
+        }
+        if (preg_match('/^JDVE/i', strtoupper($num)) && !in_array('jd', $list, true)) {
+            $list[] = 'jd';
+        }
+        if (preg_match('/^(JD|JDV|JDK|JDEX)/i', strtoupper($num))) {
+            foreach (['jingdong', 'jd'] as $c) {
+                if (!in_array($c, $list, true)) {
+                    $list[] = $c;
+                }
+            }
+        }
+
+        return array_values(array_unique(array_filter($list, static fn ($c) => $c !== '' && $c !== 'auto')));
+    }
+
     /**
      * 快递100「phone」入参：有手动覆盖且不少于 4 位时用覆盖；否则用订单收货号码。
      * 对 11 位及以上数字取后 11 位作为手机号（去掉可能的前缀符号位）。
@@ -191,32 +280,75 @@ class ExpressTrackService
     }
 
     /**
-     * @return array{carrier: string, kuaidi_com: string, label: string}
+     * @return array{carrier: string, kuaidi_com: string, label: string}|null
      */
-    private static function resolveCarrier(string $expressCompany, string $num): array
+    private static function carrierFromExpressCode(string $expressCompany): ?array
     {
         $ec = strtolower(trim($expressCompany));
-        if ($ec === 'sf') {
+        if ($ec === 'sf' || $ec === 'shunfeng') {
             return ['carrier' => 'sf', 'kuaidi_com' => self::KUAIDI_COM_SF, 'label' => '顺丰速运'];
         }
-        if ($ec === 'jd') {
+        if ($ec === 'jd' || $ec === 'jingdong') {
             return ['carrier' => 'jd', 'kuaidi_com' => self::KUAIDI_COM_JD, 'label' => '京东快递'];
         }
         if ($ec === 'jt' || $ec === 'jtexpress') {
             return ['carrier' => 'jt', 'kuaidi_com' => self::KUAIDI_COM_JT, 'label' => '极兔速递'];
         }
 
-        $u = strtoupper($num);
-        if (preg_match('/^SF\d/i', $num)) {
+        return null;
+    }
+
+    /**
+     * @return array{carrier: string, kuaidi_com: string, label: string}|null
+     */
+    private static function detectCarrierFromNumber(string $num): ?array
+    {
+        $n = trim($num);
+        if ($n === '') {
+            return null;
+        }
+        $u = strtoupper($n);
+        if (preg_match('/^SF\d/i', $n)) {
             return ['carrier' => 'sf', 'kuaidi_com' => self::KUAIDI_COM_SF, 'label' => '顺丰速运（单号识别）'];
         }
-        if (preg_match('/^(JD|JDV|JDK|JDEX|JD[A-Z0-9])/i', $u)) {
+        if (preg_match('/^JDVE/i', $u)) {
             return ['carrier' => 'jd', 'kuaidi_com' => self::KUAIDI_COM_JD, 'label' => '京东快递（单号识别）'];
         }
-        if (preg_match('/^JT\d{13}$/i', $num)) {
+        if (preg_match('/^(JDK|JDV|JDEX)/i', $u) || preg_match('/^JD[A-Z0-9]{10,}/i', $u)) {
+            return ['carrier' => 'jd', 'kuaidi_com' => self::KUAIDI_COM_JD, 'label' => '京东物流（单号识别）'];
+        }
+        if (preg_match('/^JT\d{13}$/i', $n)) {
             return ['carrier' => 'jt', 'kuaidi_com' => self::KUAIDI_COM_JT, 'label' => '极兔速递（单号识别）'];
         }
 
+        return null;
+    }
+
+    /**
+     * @return array{carrier: string, kuaidi_com: string, label: string}
+     */
+    private static function resolveCarrier(string $expressCompany, string $num): array
+    {
+        $byNumber = self::detectCarrierFromNumber($num);
+        $byEc = self::carrierFromExpressCode($expressCompany);
+
+        if ($byNumber !== null && $byEc !== null && $byEc['carrier'] !== $byNumber['carrier']) {
+            Log::info('ExpressTrackService carrier mismatch, prefer tracking number', [
+                'express_company' => $expressCompany,
+                'tracking_number' => $num,
+                'stored_carrier' => $byEc['carrier'],
+                'detected_carrier' => $byNumber['carrier'],
+            ]);
+
+            return $byNumber;
+        }
+        if ($byEc !== null) {
+            return $byEc;
+        }
+        if ($byNumber !== null) {
+            return $byNumber;
+        }
+
         return ['carrier' => 'auto', 'kuaidi_com' => 'auto', 'label' => '自动识别'];
     }
 
diff --git a/server/app/common/service/ExpressTrackingService.php b/server/app/common/service/ExpressTrackingService.php
index a1b6f5ef..a4838063 100755
--- a/server/app/common/service/ExpressTrackingService.php
+++ b/server/app/common/service/ExpressTrackingService.php
@@ -59,7 +59,10 @@ class ExpressTrackingService
 
         $tracking->order_id = (int) ($params['order_id'] ?? 0);
         $tracking->order_type = (string) ($params['order_type'] ?? 'prescription');
-        $tracking->express_company = (string) ($params['express_company'] ?? 'auto');
+        $tracking->express_company = ExpressTrackService::normalizeExpressCompanyCode(
+            $trackingNumber,
+            (string) ($params['express_company'] ?? 'auto')
+        );
         $tracking->recipient_phone = (string) ($params['recipient_phone'] ?? '');
         $tracking->recipient_name = (string) ($params['recipient_name'] ?? '');
         $tracking->recipient_address = (string) ($params['recipient_address'] ?? '');
@@ -78,6 +81,177 @@ class ExpressTrackingService
         return $tracking;
     }
 
+    /**
+     * 按快递单号走快递100 查询并落库（CLI：gancao:sync-logistics -t）
+     *
+     * @return array{total:int, success:int, failed:int, skipped:int, assistant_cleared:int, assistant_lines:list<string>, details:array<int, array<string,mixed>>}
+     */
+    public static function queryKuaidiByTrackingNumber(string $trackingNumber): array
+    {
+        $stats = [
+            'total' => 0,
+            'success' => 0,
+            'failed' => 0,
+            'skipped' => 0,
+            'assistant_cleared' => 0,
+            'assistant_skipped_assign_log' => 0,
+            'assistant_lines' => [],
+            'details' => [],
+        ];
+
+        $tn = trim($trackingNumber);
+        if ($tn === '') {
+            $stats['failed'] = 1;
+            $stats['details'][] = [
+                'success' => false,
+                'tracking_number' => '',
+                'message' => '快递单号不能为空',
+            ];
+
+            return $stats;
+        }
+
+        $tracking = self::resolveTrackingByNumber($tn);
+        if (!$tracking) {
+            $stats['failed'] = 1;
+            $stats['details'][] = [
+                'success' => false,
+                'tracking_number' => $tn,
+                'message' => '未找到该快递单号对应的业务订单或物流追踪记录',
+            ];
+
+            return $stats;
+        }
+
+        $stats['total'] = 1;
+        self::backfillRecipientPhoneFromPrescriptionOrder($tracking);
+        self::syncTrackingExpressCompanyFromNumber($tracking);
+
+        try {
+            $result = self::queryAndUpdate((int) $tracking->id, false);
+            $ok = self::isKuaidiQuerySuccessful($result);
+            $detail = [
+                'order_id' => (int) $tracking->order_id,
+                'tracking_number' => (string) $tracking->tracking_number,
+                'success' => $ok,
+                'message' => trim((string) ($result['hint'] ?? '')) ?: 'ok',
+                'traces' => count($result['traces'] ?? []),
+                'state' => (string) ($result['state_text'] ?? $tracking->current_state_text ?? ''),
+                'source' => (string) ($result['source'] ?? ''),
+            ];
+            if ($ok) {
+                $stats['success'] = 1;
+            } else {
+                $stats['failed'] = 1;
+            }
+            $stats['details'][] = $detail;
+        } catch (\Throwable $e) {
+            $stats['failed'] = 1;
+            $stats['details'][] = [
+                'order_id' => (int) $tracking->order_id,
+                'tracking_number' => (string) $tracking->tracking_number,
+                'success' => false,
+                'message' => '异常：' . $e->getMessage(),
+            ];
+            Log::error('queryKuaidiByTrackingNumber failed', [
+                'tracking_number' => $tn,
+                'error' => $e->getMessage(),
+            ]);
+        }
+
+        return $stats;
+    }
+
+    /**
+     * 确保 express_tracking 存在（不发起查询）
+     */
+    private static function resolveTrackingByNumber(string $trackingNumber): ?ExpressTracking
+    {
+        $tn = trim($trackingNumber);
+        if ($tn === '') {
+            return null;
+        }
+
+        $tracking = ExpressTracking::whereRaw('TRIM(`tracking_number`) = ?', [$tn])
+            ->whereNull('delete_time')
+            ->find();
+
+        $order = PrescriptionOrder::whereNull('delete_time')
+            ->whereRaw('TRIM(`tracking_number`) = ?', [$tn])
+            ->order('id', 'desc')
+            ->find();
+
+        if ($tracking && $order) {
+            $dirty = false;
+            if ((int) $tracking->order_id !== (int) $order->id) {
+                $tracking->order_id = (int) $order->id;
+                $dirty = true;
+            }
+            if (trim((string) ($tracking->recipient_phone ?? '')) === '') {
+                $tracking->recipient_phone = (string) ($order->recipient_phone ?? '');
+                $dirty = true;
+            }
+            if ($dirty) {
+                $tracking->update_time = time();
+                $tracking->save();
+            }
+
+            return $tracking;
+        }
+
+        if ($tracking) {
+            self::backfillRecipientPhoneFromPrescriptionOrder($tracking);
+
+            return $tracking;
+        }
+
+        if (!$order) {
+            return null;
+        }
+
+        $now = time();
+        $tracking = new ExpressTracking();
+        $tracking->tracking_number = mb_substr($tn, 0, 80);
+        $tracking->create_time = $now;
+        $tracking->order_id = (int) $order->id;
+        $tracking->order_type = 'prescription';
+        $tracking->express_company = ExpressTrackService::normalizeExpressCompanyCode(
+            $tn,
+            (string) ($order->express_company ?? 'auto')
+        );
+        $tracking->recipient_phone = (string) ($order->recipient_phone ?? '');
+        $tracking->recipient_name = (string) ($order->recipient_name ?? '');
+        $tracking->recipient_address = (string) ($order->shipping_address ?? '');
+        $tracking->next_update_time = $now;
+        $tracking->update_time = $now;
+        $tracking->save();
+
+        return $tracking;
+    }
+
+    /**
+     * @param array<string, mixed>|null $result
+     */
+    private static function isKuaidiQuerySuccessful(?array $result): bool
+    {
+        if (!is_array($result)) {
+            return false;
+        }
+        $source = (string) ($result['source'] ?? '');
+        if ($source !== 'kuaidi100') {
+            return false;
+        }
+        $hint = trim((string) ($result['hint'] ?? ''));
+        if ($hint === '') {
+            return true;
+        }
+        if (str_contains($hint, '暂无轨迹')) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * 查询并更新物流信息
      *
@@ -96,13 +270,14 @@ class ExpressTrackingService
         }
 
         self::backfillRecipientPhoneFromPrescriptionOrder($tracking);
+        self::syncTrackingExpressCompanyFromNumber($tracking);
 
         $startTime = microtime(true);
 
         // 调用快递100查询（顺丰等单号需带收件人手机号后四位，见 ExpressTrackService）
         $result = ExpressTrackService::query(
-            $tracking->express_company,
-            $tracking->tracking_number,
+            (string) $tracking->express_company,
+            (string) $tracking->tracking_number,
             (string) $tracking->recipient_phone
         );
 
@@ -547,6 +722,27 @@ class ExpressTrackingService
         }
     }
 
+    /**
+     * 运单号与 express_company 不一致时按单号纠正（如京东单误存 sf）
+     */
+    private static function syncTrackingExpressCompanyFromNumber(ExpressTracking $tracking): void
+    {
+        $num = trim((string) $tracking->tracking_number);
+        if ($num === '') {
+            return;
+        }
+        $normalized = ExpressTrackService::normalizeExpressCompanyCode(
+            $num,
+            (string) ($tracking->express_company ?? 'auto')
+        );
+        if ($normalized === (string) $tracking->express_company) {
+            return;
+        }
+        $tracking->express_company = $normalized;
+        $tracking->update_time = time();
+        $tracking->save();
+    }
+
     /**
      * 保存轨迹明细
      */
diff --git a/server/app/common/service/gancao/GancaoLogisticsRouteService.php b/server/app/common/service/gancao/GancaoLogisticsRouteService.php
index c0e945e7..d23438c9 100755
--- a/server/app/common/service/gancao/GancaoLogisticsRouteService.php
+++ b/server/app/common/service/gancao/GancaoLogisticsRouteService.php
@@ -470,54 +470,62 @@ final class GancaoLogisticsRouteService
 
         $orders = $q->order('id', 'desc')->limit($limit)->select();
         foreach ($orders as $order) {
-            $stats['total']++;
-            try {
-                $r = self::syncOne($order);
-                $detail = [
-                    'order_id' => (int) $order->id,
-                    'order_no' => (string) $order->order_no,
-                    'app_order_no' => (string) $order->gancao_reciperl_order_no,
-                    'tracking_number' => (string) $order->tracking_number,
-                    'success' => $r['success'],
-                    'message' => $r['message'],
-                    'traces' => $r['traces_count'],
-                    'state' => $r['state'],
-                ];
-                if ($r['success']) {
-                    $stats['success']++;
-                    if (!empty($r['assistant_sync']) && is_array($r['assistant_sync'])) {
-                        $sync = $r['assistant_sync'];
-                        $act = (string) ($sync['action'] ?? '');
-                        if ($act === 'cleared') {
-                            $stats['assistant_cleared']++;
-                            $stats['assistant_lines'][] = sprintf(
-                                '[移除医助+指派日志][甘草路由] 诊单=%d 业务订单=%d 运单=%s 原医助ID=%s 履约状态=%d',
-                                (int) ($sync['diagnosis_id'] ?? 0),
-                                (int) ($sync['prescription_order_id'] ?? 0),
-                                (string) ($sync['tracking_number'] ?? ''),
-                                (string) ($sync['former_assistant_id'] ?? ''),
-                                (int) ($sync['fulfillment_status'] ?? 0)
-                            );
-                        }
-                    }
-                } else {
-                    $stats['failed']++;
-                }
-                $stats['details'][] = $detail;
-            } catch (\Throwable $e) {
-                $stats['failed']++;
-                $stats['details'][] = [
-                    'order_id' => (int) $order->id,
-                    'success' => false,
-                    'message' => '异常：' . $e->getMessage(),
-                ];
-                Log::error('Gancao route sync exception: ' . $e->getMessage(), [
-                    'order_id' => (int) $order->id,
-                    'trace' => $e->getTraceAsString(),
-                ]);
-            }
+            self::appendSyncOneResult($stats, $order);
         }
 
         return $stats;
     }
+
+    /**
+     * @param array{total:int, success:int, failed:int, skipped:int, assistant_cleared:int, assistant_skipped_assign_log:int, assistant_lines:list<string>, details:array<int, array<string,mixed>>} $stats
+     */
+    private static function appendSyncOneResult(array &$stats, PrescriptionOrder $order): void
+    {
+        $stats['total']++;
+        try {
+            $r = self::syncOne($order);
+            $detail = [
+                'order_id' => (int) $order->id,
+                'order_no' => (string) $order->order_no,
+                'app_order_no' => (string) $order->gancao_reciperl_order_no,
+                'tracking_number' => (string) $order->tracking_number,
+                'success' => $r['success'],
+                'message' => $r['message'],
+                'traces' => $r['traces_count'],
+                'state' => $r['state'],
+            ];
+            if ($r['success']) {
+                $stats['success']++;
+                if (!empty($r['assistant_sync']) && is_array($r['assistant_sync'])) {
+                    $sync = $r['assistant_sync'];
+                    $act = (string) ($sync['action'] ?? '');
+                    if ($act === 'cleared') {
+                        $stats['assistant_cleared']++;
+                        $stats['assistant_lines'][] = sprintf(
+                            '[移除医助+指派日志][甘草路由] 诊单=%d 业务订单=%d 运单=%s 原医助ID=%s 履约状态=%d',
+                            (int) ($sync['diagnosis_id'] ?? 0),
+                            (int) ($sync['prescription_order_id'] ?? 0),
+                            (string) ($sync['tracking_number'] ?? ''),
+                            (string) ($sync['former_assistant_id'] ?? ''),
+                            (int) ($sync['fulfillment_status'] ?? 0)
+                        );
+                    }
+                }
+            } else {
+                $stats['failed']++;
+            }
+            $stats['details'][] = $detail;
+        } catch (\Throwable $e) {
+            $stats['failed']++;
+            $stats['details'][] = [
+                'order_id' => (int) $order->id,
+                'success' => false,
+                'message' => '异常：' . $e->getMessage(),
+            ];
+            Log::error('Gancao route sync exception: ' . $e->getMessage(), [
+                'order_id' => (int) $order->id,
+                'trace' => $e->getTraceAsString(),
+            ]);
+        }
+    }
 }
diff --git a/server/database/migrations/create_prescription_library.sql b/server/database/migrations/create_prescription_library.sql
index 2aae533a..19001842 100755
--- a/server/database/migrations/create_prescription_library.sql
+++ b/server/database/migrations/create_prescription_library.sql
@@ -2,6 +2,7 @@
 CREATE TABLE IF NOT EXISTS `zyt_prescription_library` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
   `prescription_name` varchar(100) NOT NULL DEFAULT '' COMMENT '处方名称',
+  `formula_type` varchar(20) NOT NULL DEFAULT '主方' COMMENT '处方类型：主方、辅方',
   `herbs` text COMMENT '药材列表JSON：[{name, dosage}]',
   `is_public` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否公开：0-仅自己可见 1-所有人可见',
   `creator_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '创建人ID',
diff --git a/server/sql/1.9.20260520/add_prescription_aux_usage.sql b/server/sql/1.9.20260520/add_prescription_aux_usage.sql
new file mode 100644
index 00000000..760aaaac
--- /dev/null
+++ b/server/sql/1.9.20260520/add_prescription_aux_usage.sql
@@ -0,0 +1,3 @@
+-- 处方：辅方用法（用量、袋数、代煎、每天几次、服用天数等）
+ALTER TABLE `zyt_tcm_prescription`
+    ADD COLUMN `aux_usage` json DEFAULT NULL COMMENT '辅方用法JSON' AFTER `times_per_day`;
diff --git a/server/sql/1.9.20260520/add_prescription_library_formula_type.sql b/server/sql/1.9.20260520/add_prescription_library_formula_type.sql
new file mode 100644
index 00000000..f53bcfdb
--- /dev/null
+++ b/server/sql/1.9.20260520/add_prescription_library_formula_type.sql
@@ -0,0 +1,3 @@
+-- 处方库：处方类型（主方/辅方）
+ALTER TABLE `zyt_prescription_library`
+    ADD COLUMN `formula_type` varchar(20) NOT NULL DEFAULT '主方' COMMENT '处方类型：主方、辅方' AFTER `prescription_name`;
diff --git a/server/sql/1.9.20260520/add_prescription_library_lists_menu.sql b/server/sql/1.9.20260520/add_prescription_library_lists_menu.sql
new file mode 100644
index 00000000..c1d9e117
--- /dev/null
+++ b/server/sql/1.9.20260520/add_prescription_library_lists_menu.sql
@@ -0,0 +1,50 @@
+-- 消费者开方页「从处方库导入」：补充 tcm.prescriptionLibrary/lists 接口权限
+-- 执行后需在「权限管理」为相关角色勾选，或依赖 AuthMiddleware 别名（见 PrescriptionLibraryLogic）
+
+SET @cf_rx_menu_id := (
+    SELECT id FROM zyt_system_menu
+    WHERE type = 'C'
+      AND (
+          component = 'consumer/prescription/index'
+          OR component LIKE '%consumer/prescription/index%'
+      )
+    LIMIT 1
+);
+
+INSERT INTO zyt_system_menu (
+    pid, type, name, icon, sort, perms, paths, component,
+    selected, params, is_cache, is_show, is_disable, create_time, update_time
+)
+SELECT
+    @cf_rx_menu_id, 'A', '处方库列表(开方导入)', '', 54,
+    'tcm.prescriptionLibrary/lists', '', '',
+    '', '', 0, 1, 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()
+FROM DUAL
+WHERE @cf_rx_menu_id IS NOT NULL
+  AND NOT EXISTS (SELECT 1 FROM zyt_system_menu WHERE perms = 'tcm.prescriptionLibrary/lists');
+
+SET @wcf_rx_menu_id := (
+    SELECT id FROM zyt_system_menu
+    WHERE type = 'C'
+      AND (
+          component = 'consumer/prescription/list'
+          OR component LIKE '%consumer/prescription/list%'
+      )
+    LIMIT 1
+);
+
+INSERT INTO zyt_system_menu (
+    pid, type, name, icon, sort, perms, paths, component,
+    selected, params, is_cache, is_show, is_disable, create_time, update_time
+)
+SELECT
+    @wcf_rx_menu_id, 'A', '处方库列表(开方导入)', '', 54,
+    'tcm.prescriptionLibrary/lists', '', '',
+    '', '', 0, 1, 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()
+FROM DUAL
+WHERE @wcf_rx_menu_id IS NOT NULL
+  AND NOT EXISTS (
+      SELECT 1 FROM zyt_system_menu
+      WHERE perms = 'tcm.prescriptionLibrary/lists'
+        AND pid = @wcf_rx_menu_id
+  );