-
主方服法：{{ rxUsageText }}
+
主服法：{{ rxUsageText }}
服法：{{ rxUsageText }}
-
辅方服法：{{ rxAuxUsageText }}
+
辅服法：{{ rxAuxUsageText }}
医嘱：{{ rxAdviceText }}
备注：{{ rxRemarkText }}
@@ -2688,9 +2748,39 @@ function openDiagnosisPatientDetailFromOrder() {
/** 诊间医助角色（与 DiagnosisLists 等一致） */
const TCM_ASSISTANT_ROLE_ID = 2
+/** 下单角色（与 server/config/project.php prescription_order_placer_role_ids 一致） */
+const ORDER_PLACER_ROLE_ID = 6
+/** 拥有以下角色时可按任意审核人筛选（与 prescription_order_placer_exempt_role_ids 一致） */
+const ORDER_PLACER_EXEMPT_ROLE_IDS = [3, 8]
/** 与 server/config/project.php prescription_audit_roles 默认一致，可处方审核的角色 */
const PRESCRIPTION_AUDIT_ROLE_IDS = [0, 3, 6]
+/** 「下单」角色：下单人筛选仅允许查本人审核过的订单 */
+const isOrderPlacerAuditFilterRestricted = computed(() => {
+ const u = userStore.userInfo
+ if (!u || Number(u.root) === 1) return false
+ const ids = Array.isArray(u.role_ids) ? u.role_ids.map((n: unknown) => Number(n)) : []
+ if (!ids.includes(ORDER_PLACER_ROLE_ID)) return false
+ return !ORDER_PLACER_EXEMPT_ROLE_IDS.some((rid) => ids.includes(rid))
+})
+
+/** 超管 / 经理 / 管理员：可按任意下单人筛选 */
+const canSearchAnyAuditAdmin = computed(() => {
+ const u = userStore.userInfo
+ if (!u) return false
+ if (Number(u.root) === 1) return true
+ const ids = Array.isArray(u.role_ids) ? u.role_ids.map((n: unknown) => Number(n)) : []
+ return ORDER_PLACER_EXEMPT_ROLE_IDS.some((rid) => ids.includes(rid))
+})
+
+/** 是否展示「下单人」筛选（下单角色 + 经理/管理员/超管） */
+const showAuditAdminFilter = computed(
+ () => isOrderPlacerAuditFilterRestricted.value || canSearchAnyAuditAdmin.value
+)
+
+/** 下单人下拉（lists extend.audit_admin_options，下单角色用户） */
+const auditAdminOptions = ref>([])
+
/**
* 是否展示「处方审核」筛选：纯医助（含角色 2 且不具备处方审核角色）仅能用「支付单审核」筛选
*/
@@ -2928,7 +3018,9 @@ const queryParams = reactive({
/** 服务渠道：'' 不限；'0' 未指派（库内 '' 或 '0'） */
service_channel: '' as '' | '0',
/** 列表排除履约已取消(4)：重点看板「待处方审核」等用 */
- exclude_fulfillment_cancelled: 0 as number
+ exclude_fulfillment_cancelled: 0 as number,
+ /** 下单人（关联操作日志 audit_rx_* / audit_pay_*） */
+ audit_admin_id: '' as number | ''
})
const rxAuditTabs = [
@@ -3041,6 +3133,11 @@ function normalizePrescriptionOrderListQuery(params: Record): R
}
if (!p.order_no) delete p.order_no
if (!String(p.patient_keyword || '').trim()) delete p.patient_keyword
+ if (p.audit_admin_id === '' || p.audit_admin_id === undefined || p.audit_admin_id === null) {
+ delete p.audit_admin_id
+ } else {
+ p.audit_admin_id = Number(p.audit_admin_id)
+ }
if (!String(p.express_keyword || '').trim()) delete p.express_keyword
if (!p.express_company || p.express_company === '') delete p.express_company
if (p.service_channel === '' || p.service_channel === undefined || p.service_channel === null) {
@@ -3076,6 +3173,24 @@ const { pager, getLists, resetPage, resetParams } = usePaging({
params: queryParams
})
+watch(
+ () => (pager.extend as Record | undefined)?.audit_admin_options,
+ (raw) => {
+ if (!Array.isArray(raw)) return
+ auditAdminOptions.value = raw
+ .map((r: unknown) => {
+ if (r == null || typeof r !== 'object') return null
+ const row = r as Record
+ const id = Number(row.id)
+ const name = String(row.name ?? '').trim()
+ if (!Number.isFinite(id) || id <= 0 || name === '') return null
+ return { id, name }
+ })
+ .filter((x): x is { id: number; name: string } => x != null)
+ },
+ { immediate: true }
+)
+
/** 业绩看板等入口：URL 携带创建区间、诊单医助部门 / 医助 id */
function applyRouteQueryToPrescriptionOrderList() {
const q = route.query
@@ -3267,6 +3382,7 @@ function handleReset() {
queryParams.payment_slip_audit_status = ''
queryParams.supply_mode = ''
queryParams.service_channel = ''
+ queryParams.audit_admin_id = ''
queryParams.exclude_fulfillment_cancelled = 0
resetParams()
}
@@ -3784,6 +3900,20 @@ const detailLinkedAppointmentChannelText = computed(() => {
const detailRxHerbs = computed(() => normalizeSlipHerbs(detailPrescription.value?.herbs))
+/** 详情：是否含辅方药材（用于决定是否展示辅方用量 / 用法） */
+const detailHasAuxHerbs = computed(() => {
+ const herbs = detailPrescription.value?.herbs
+ if (!Array.isArray(herbs)) return false
+ return herbs.some((h: any) => normalizeSlipFormulaType(h?.formula_type) === '辅方')
+})
+
+/** 详情：辅方用法（aux_usage JSON 经规范化后的对象，与处方类型一致） */
+const detailAuxUsage = computed(() => {
+ const rx = detailPrescription.value as any
+ if (!rx) return null
+ return normalizeSlipAuxUsageForm(rx.aux_usage, rx.prescription_type || '浓缩水丸')
+})
+
/** false=无权限；true/缺省兼容旧接口（旧版未下发该字段时仍展示药材） */
const detailHerbsVisible = computed(() => detailData.value?.prescription_detail_herbs_visible !== false)
@@ -5499,6 +5629,22 @@ const slipPillGrams = computed(() => {
return days * times * doseG * bags
})
+/** 辅方出丸克数：仅含辅方药材且为浓缩水丸时计算；公式同主方，用 aux_usage 字段 */
+const slipAuxPillGrams = computed(() => {
+ const d = prescriptionViewData.value as any
+ if (!d || (d.prescription_type || '浓缩水丸') !== '浓缩水丸') return null
+ if (!slipAuxHerbs.value.length) return null
+ const aux = normalizeSlipAuxUsageForm(d.aux_usage, d.prescription_type || '浓缩水丸')
+ /** 辅方疗程优先用业务订单 medication_days（与主方共享一次配药周期），缺省回退辅方 usage_days */
+ const days = Number(d.medication_days ?? aux.usage_days)
+ const times = Number(aux.times_per_day)
+ const doseG = Number(aux.dosage_amount)
+ const bags = Number(aux.dosage_bag_count) > 0 ? Number(aux.dosage_bag_count) : 1
+ if (!Number.isFinite(days) || !Number.isFinite(times) || !Number.isFinite(doseG)) return null
+ if (days <= 0 || times <= 0 || doseG <= 0) return null
+ return days * times * doseG * bags
+})
+
/* ============================================================
* A4 处方笺（药房联）相关计算 —— 与 consumer/prescription/index.vue 保持一致
* ============================================================ */
@@ -5612,10 +5758,14 @@ const rxAuxUsageText = computed(() => {
)
})
-/** 出丸：优先用 slipPillGrams（每袋用量×袋数×每天次数×服用天数），否则按药材总量×剂数 */
+/** 出丸：优先用 slipPillGrams / slipAuxPillGrams（含辅方时相加），否则按药材总量×剂数 */
const rxOutPelletGrams = computed(() => {
- const pill = slipPillGrams.value
- if (typeof pill === 'number' && isFinite(pill) && pill > 0) return formatNum(pill)
+ const main = slipPillGrams.value
+ const aux = slipAuxPillGrams.value
+ const mainNum = typeof main === 'number' && isFinite(main) && main > 0 ? main : 0
+ const auxNum = typeof aux === 'number' && isFinite(aux) && aux > 0 ? aux : 0
+ const sum = mainNum + auxNum
+ if (sum > 0) return formatNum(sum)
const v = prescriptionViewData.value as any
if (!v) return ''
const explicit = v.out_pellet || v.total_weight
@@ -5651,7 +5801,17 @@ const rxPharmacyRemarkText = computed(() => {
const rxOutPelletText = computed(() => {
const out = rxOutPelletGrams.value
- return out ? `${out}克` : ''
+ if (!out) return ''
+ /** 含辅方时附带「主方 X克 + 辅方 Y克」明细，便于药房核对 */
+ const main = slipPillGrams.value
+ const aux = slipAuxPillGrams.value
+ if (
+ typeof main === 'number' && isFinite(main) && main > 0 &&
+ typeof aux === 'number' && isFinite(aux) && aux > 0
+ ) {
+ return `${out}克（主方 ${formatNum(main)}克 + 辅方 ${formatNum(aux)}克）`
+ }
+ return `${out}克`
})
function formatNum(n: number): string {
diff --git a/admin/src/views/consumer/prescription/order_list_h5.vue b/admin/src/views/consumer/prescription/order_list_h5.vue
index b8ccbc0e..403e43f9 100644
--- a/admin/src/views/consumer/prescription/order_list_h5.vue
+++ b/admin/src/views/consumer/prescription/order_list_h5.vue
@@ -234,6 +234,22 @@
@keyup.enter="resetPage"
/>
+
+
+
+
+
{
+ const u = userStore.userInfo
+ if (!u || Number(u.root) === 1) return false
+ const ids = Array.isArray(u.role_ids) ? u.role_ids.map((n: unknown) => Number(n)) : []
+ if (!ids.includes(ORDER_PLACER_ROLE_ID)) return false
+ return !ORDER_PLACER_EXEMPT_ROLE_IDS.some((rid) => ids.includes(rid))
+})
+
+/** 超管 / 经理 / 管理员：可按任意下单人筛选 */
+const canSearchAnyAuditAdmin = computed(() => {
+ const u = userStore.userInfo
+ if (!u) return false
+ if (Number(u.root) === 1) return true
+ const ids = Array.isArray(u.role_ids) ? u.role_ids.map((n: unknown) => Number(n)) : []
+ return ORDER_PLACER_EXEMPT_ROLE_IDS.some((rid) => ids.includes(rid))
+})
+
+/** 是否展示「下单人」筛选（下单角色 + 经理/管理员/超管） */
+const showAuditAdminFilter = computed(
+ () => isOrderPlacerAuditFilterRestricted.value || canSearchAnyAuditAdmin.value
+)
+
+/** 下单人下拉（lists extend.audit_admin_options，下单角色用户） */
+const auditAdminOptions = ref>([])
+
/**
* 是否展示「处方审核」筛选：纯医助（含角色 2 且不具备处方审核角色）仅能用「支付单审核」筛选
*/
@@ -2673,7 +2719,9 @@ const queryParams = reactive({
prescription_audit_status: '' as number | '',
payment_slip_audit_status: '' as number | '',
/** 供货方式：甘草（已传甘草药方单号）/ 自营（无甘草单号） */
- supply_mode: '' as '' | 'gancao' | 'self'
+ supply_mode: '' as '' | 'gancao' | 'self',
+ /** 下单人（关联操作日志 audit_rx_* / audit_pay_*） */
+ audit_admin_id: '' as number | ''
})
const rxAuditTabs = [
@@ -2767,6 +2815,11 @@ async function fetchLists(params: Record) {
}
if (!p.order_no) delete p.order_no
if (!String(p.patient_keyword || '').trim()) delete p.patient_keyword
+ if (p.audit_admin_id === '' || p.audit_admin_id === undefined || p.audit_admin_id === null) {
+ delete p.audit_admin_id
+ } else {
+ p.audit_admin_id = Number(p.audit_admin_id)
+ }
if (!String(p.express_keyword || '').trim()) delete p.express_keyword
if (!p.express_company || p.express_company === '') delete p.express_company
if (!String(p.start_time || '').trim() || !String(p.end_time || '').trim()) {
@@ -2789,6 +2842,24 @@ const { pager, getLists, resetPage, resetParams } = usePaging({
params: queryParams
})
+watch(
+ () => (pager.extend as Record | undefined)?.audit_admin_options,
+ (raw) => {
+ if (!Array.isArray(raw)) return
+ auditAdminOptions.value = raw
+ .map((r: unknown) => {
+ if (r == null || typeof r !== 'object') return null
+ const row = r as Record
+ const id = Number(row.id)
+ const name = String(row.name ?? '').trim()
+ if (!Number.isFinite(id) || id <= 0 || name === '') return null
+ return { id, name }
+ })
+ .filter((x): x is { id: number; name: string } => x != null)
+ },
+ { immediate: true }
+)
+
/** 选医助部门后，医助下拉仅显示该部门及子部门成员（与后台含子级一致） */
const filteredAssistantOptions = computed(() => {
const deptRaw = queryParams.assistant_dept_id
@@ -2950,6 +3021,7 @@ function handleReset() {
queryParams.prescription_audit_status = ''
queryParams.payment_slip_audit_status = ''
queryParams.supply_mode = ''
+ queryParams.audit_admin_id = ''
resetParams()
}
diff --git a/admin/src/views/tcm/diagnosis/components/DailyMatrix.vue b/admin/src/views/tcm/diagnosis/components/DailyMatrix.vue
index 7ba95c4c..ded7fbba 100644
--- a/admin/src/views/tcm/diagnosis/components/DailyMatrix.vue
+++ b/admin/src/views/tcm/diagnosis/components/DailyMatrix.vue
@@ -23,6 +23,10 @@