更新

Merge branch 'master20260610'

TUICallKit-Vue3/tongji/components/FoodTileIcon.vue

@@ -1,11 +1,14 @@
 <template>
-    <view class="food-tile-icon" :class="[`food-tile-icon--${size}`]">
-        <text class="food-tile-icon__emoji">{{ fallbackIcon }}</text>
+    <view
+        class="food-tile-icon"
+        :class="[`food-tile-icon--${size}`, { 'is-custom-img': hasCustomImg }]"
+    >
+        <text v-if="showEmojiFallback" class="food-tile-icon__emoji">{{ fallbackIcon }}</text>
         <image
             v-if="src && !imageFailed"
             class="food-tile-icon__img"
             :src="src"
-            mode="aspectFit"
+            :mode="imageMode"
             @error="onImageError"
         />
     </view>
@@ -27,12 +30,20 @@ const fallbackIcon = computed(() => {
     return '🍽'
 })
 
+const hasCustomImg = computed(() => typeof props.food === 'object' && !!props.food?.img)
+
 const src = computed(() => {
     if (typeof props.food === 'object' && props.food?.img) return props.food.img
     if (typeof props.food === 'object' && props.food?.icon) return getFoodImgUrl(props.food.icon)
     return ''
 })
 
+/** 有可用图片时不渲染 emoji，避免 PNG 透明区域露出底层符号 */
+const showEmojiFallback = computed(() => !src.value || imageFailed.value)
+
+/** 自定义素材用 aspectFill 铺满，减少边缘露底 */
+const imageMode = computed(() => (hasCustomImg.value ? 'aspectFill' : 'aspectFit'))
+
 watch(
     () => src.value,
     () => {
@@ -71,6 +82,11 @@ function onImageError() {
     z-index: 2;
 }
 
+.food-tile-icon--tile.is-custom-img .food-tile-icon__img {
+    width: 82%;
+    height: 82%;
+}
+
 /* 玻璃格上的食材图片：投影增强立体感（参考稿） */
 .food-tile-icon--tile .food-tile-icon__img {
     filter: drop-shadow(0 6rpx 10rpx rgba(0, 0, 0, 0.16));
@@ -109,6 +125,11 @@ function onImageError() {
     font-size: 34rpx;
 }
 
+.food-tile-icon--goal.is-custom-img .food-tile-icon__img,
+.food-tile-icon--tooltip.is-custom-img .food-tile-icon__img {
+    border-radius: 8rpx;
+}
+
 .food-tile-icon__img {
     position: absolute;
     left: 0;

TUICallKit-Vue3/tongji/components/VoiceSpeakMascot.vue

@@ -0,0 +1,189 @@
+<template>
+    <view class="vsm" :class="[`vsm--${size}`, { 'vsm--active': active, 'vsm--on-dark': onDark }]">
+        <view class="vsm-body">
+            <view class="vsm-leaf" aria-hidden="true" />
+            <view class="vsm-face">
+                <view class="vsm-eye vsm-eye--l" />
+                <view class="vsm-eye vsm-eye--r" />
+                <view class="vsm-blush vsm-blush--l" />
+                <view class="vsm-blush vsm-blush--r" />
+                <view class="vsm-mouth" />
+            </view>
+            <view v-if="active" class="vsm-waves" aria-hidden="true">
+                <view class="vsm-wave vsm-wave--1" />
+                <view class="vsm-wave vsm-wave--2" />
+                <view class="vsm-wave vsm-wave--3" />
+            </view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+defineProps({
+    /** 正在按住说话 / 录音中 */
+    active: { type: Boolean, default: false },
+    /** 深色条背景上使用浅色卡通 */
+    onDark: { type: Boolean, default: false },
+    size: { type: String, default: 'md' }
+})
+</script>
+
+<style scoped lang="scss">
+.vsm {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+}
+.vsm--md { width: 72rpx; height: 72rpx; }
+.vsm--sm { width: 64rpx; height: 64rpx; }
+
+.vsm-body {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.vsm-leaf {
+    position: absolute;
+    top: 2rpx;
+    left: 50%;
+    width: 16rpx;
+    height: 16rpx;
+    margin-left: -8rpx;
+    border-radius: 0 100% 0 100%;
+    background: #34d399;
+    transform: rotate(-18deg);
+    z-index: 2;
+}
+.vsm--on-dark .vsm-leaf {
+    background: #a7f3d0;
+}
+
+.vsm-face {
+    position: relative;
+    width: 52rpx;
+    height: 52rpx;
+    border-radius: 50%;
+    background: #fef9c3;
+    border: 3rpx solid #047857;
+    box-shadow: 0 4rpx 10rpx rgba(4, 120, 87, 0.18);
+    z-index: 1;
+}
+.vsm--sm .vsm-face {
+    width: 46rpx;
+    height: 46rpx;
+}
+.vsm--on-dark .vsm-face {
+    background: #fffbeb;
+    border-color: rgba(255, 255, 255, 0.85);
+    box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.12);
+}
+
+.vsm-eye {
+    position: absolute;
+    top: 16rpx;
+    width: 6rpx;
+    height: 8rpx;
+    border-radius: 50%;
+    background: #064e3b;
+}
+.vsm--sm .vsm-eye { top: 14rpx; width: 5rpx; height: 7rpx; }
+.vsm--on-dark .vsm-eye { background: #134e4a; }
+.vsm-eye--l { left: 12rpx; }
+.vsm-eye--r { right: 12rpx; }
+.vsm--sm .vsm-eye--l { left: 10rpx; }
+.vsm--sm .vsm-eye--r { right: 10rpx; }
+
+.vsm-blush {
+    position: absolute;
+    top: 24rpx;
+    width: 10rpx;
+    height: 6rpx;
+    border-radius: 50%;
+    background: rgba(251, 113, 133, 0.45);
+    opacity: 0.85;
+}
+.vsm--sm .vsm-blush { top: 21rpx; width: 8rpx; height: 5rpx; }
+.vsm-blush--l { left: 6rpx; }
+.vsm-blush--r { right: 6rpx; }
+.vsm--on-dark .vsm-blush { background: rgba(255, 255, 255, 0.35); }
+
+.vsm-mouth {
+    position: absolute;
+    left: 50%;
+    bottom: 10rpx;
+    width: 18rpx;
+    height: 8rpx;
+    margin-left: -9rpx;
+    border-radius: 0 0 18rpx 18rpx;
+    background: #047857;
+    transform-origin: center top;
+}
+.vsm--sm .vsm-mouth {
+    bottom: 9rpx;
+    width: 16rpx;
+    height: 7rpx;
+    margin-left: -8rpx;
+}
+.vsm--on-dark .vsm-mouth { background: #ecfdf5; }
+
+.vsm-waves {
+    position: absolute;
+    right: -2rpx;
+    top: 50%;
+    display: flex;
+    align-items: flex-end;
+    gap: 4rpx;
+    height: 28rpx;
+    margin-top: -14rpx;
+    z-index: 0;
+}
+.vsm-wave {
+    width: 5rpx;
+    border-radius: 4rpx;
+    background: #047857;
+    animation: vsm-wave-jump 0.72s ease-in-out infinite;
+}
+.vsm--on-dark .vsm-wave { background: rgba(255, 255, 255, 0.9); }
+.vsm-wave--1 { height: 10rpx; animation-delay: 0s; }
+.vsm-wave--2 { height: 18rpx; animation-delay: 0.12s; }
+.vsm-wave--3 { height: 12rpx; animation-delay: 0.24s; }
+
+.vsm--active .vsm-body {
+    animation: vsm-bob 0.9s ease-in-out infinite;
+}
+.vsm--active .vsm-mouth {
+    animation: vsm-talk 0.32s ease-in-out infinite alternate;
+}
+.vsm--active .vsm-eye {
+    animation: vsm-blink 2.4s ease-in-out infinite;
+}
+
+@keyframes vsm-bob {
+    0%, 100% { transform: translateY(0); }
+    50% { transform: translateY(-4rpx); }
+}
+@keyframes vsm-talk {
+    0% {
+        transform: scaleY(0.45);
+        border-radius: 0 0 18rpx 18rpx;
+    }
+    100% {
+        transform: scaleY(1.15);
+        height: 12rpx;
+        border-radius: 50%;
+    }
+}
+@keyframes vsm-blink {
+    0%, 42%, 46%, 100% { transform: scaleY(1); }
+    44% { transform: scaleY(0.15); }
+}
+@keyframes vsm-wave-jump {
+    0%, 100% { transform: scaleY(0.45); opacity: 0.55; }
+    50% { transform: scaleY(1); opacity: 1; }
+}
+</style>

TUICallKit-Vue3/tongji/composables/useSpeechToText.js

@@ -2,6 +2,27 @@ import { ref, onUnmounted } from 'vue'
 
 const MIN_HOLD_MS = 280
 
+/** 短按/过早松手时插件常见错误，不应打扰用户 */
+function isBenignSttError(msg, retcode) {
+    const m = String(msg || '').toLowerCase()
+    if (/internal voice data failed/i.test(m)) return true
+    if (/voice data failed/i.test(m)) return true
+    if (/recordfailed|record failed|record manager/i.test(m)) return true
+    if (/please stop after start/i.test(m)) return true
+    if (/no recognition|not start|未开始|无识别/i.test(m)) return true
+    const code = Number(retcode)
+    if (code === -30002 || code === -30003 || code === -30012) return true
+    return false
+}
+
+function friendlySttError(msg) {
+    const m = String(msg || '').trim()
+    if (!m || isBenignSttError(m)) return ''
+    if (/not allowed|auth|permission|权限|麦克风/i.test(m)) return '请允许使用麦克风'
+    if (/network|网络|timeout/i.test(m)) return '网络异常，请稍后再试'
+    return '语音识别失败，请重试'
+}
+
 // #ifdef MP-WEIXIN
 // WechatSI 录音管理器是全局单例：回调只在模块级绑定一次，
 // 再分发给「当前活跃实例」。否则跨页面（如 more → weekly）后，
@@ -112,7 +133,8 @@ export function useSpeechToText({ onResult, onSettle, onPartial, onError, showTo
     function stopListening() {
         // #ifdef MP-WEIXIN
         const ownsRecording = sharedRecording && activeCtl === controller
-        if (wxRecordManager && (sttListening.value || startRequested || ownsRecording)) {
+        // 仅在识别已真正开始后再 stop，避免 -30012 / internal voice data failed
+        if (wxRecordManager && (sttListening.value || ownsRecording)) {
             try {
                 wxRecordManager.stop()
             } catch (e) {}
@@ -128,6 +150,7 @@ export function useSpeechToText({ onResult, onSettle, onPartial, onError, showTo
         // #endif
 
         startRequested = false
+        sttHolding.value = false
         sttListening.value = false
     }
 
@@ -171,7 +194,6 @@ export function useSpeechToText({ onResult, onSettle, onPartial, onError, showTo
         }
         try {
             startRequested = true
-            sharedRecording = true
             wxRecordManager.start({
                 duration: 60000,
                 lang: 'zh_CN'
@@ -251,22 +273,28 @@ export function useSpeechToText({ onResult, onSettle, onPartial, onError, showTo
         // #endif
     }
 
-    /** 松手结束：手指抬起 */
-    function endHoldSpeech() {
+    /** 松手结束：手指抬起；force=true 时强制取消尚未真正开始的按住会话 */
+    function endHoldSpeech(force = false) {
         let recording = false
         // #ifdef MP-WEIXIN
         recording = sharedRecording && activeCtl === controller
         // #endif
-        if (!sttHolding.value && !sttListening.value && !startRequested && !recording) {
+        if (!force && !sttHolding.value && !sttListening.value && !startRequested && !recording) {
             return
         }
         sttHolding.value = false
         // 松手后不再补开排队的录音
         pendingStartSession = 0
-        if (sttListening.value || startRequested || recording) {
+        if (sttListening.value || recording) {
             stopListening()
             return
         }
+        if (startRequested) {
+            // start 已发出但 onStart 未到：取消会话，勿调 stop()
+            startRequested = false
+            holdSessionId += 1
+            return
+        }
         holdSessionId += 1
     }
 
@@ -276,9 +304,9 @@ export function useSpeechToText({ onResult, onSettle, onPartial, onError, showTo
     const controller = {
         handleStart() {
             if (!sttHolding.value) {
-                try {
-                    wxRecordManager.stop()
-                } catch (e) {}
+                // 用户已松手，忽略迟到的 onStart，不再 stop() 以免触发插件报错
+                startRequested = false
+                sttListening.value = false
                 return
             }
             startRequested = false
@@ -306,6 +334,7 @@ export function useSpeechToText({ onResult, onSettle, onPartial, onError, showTo
             sttListening.value = false
             startRequested = false
             const msg = (res && res.msg) || ''
+            const retcode = res && (res.retcode ?? res.errCode ?? res.code)
             // 上一段未停止就再次 start 触发：停止后若仍按住则自动重试，不打扰用户
             if (/please stop after start/i.test(msg)) {
                 try {
@@ -316,12 +345,18 @@ export function useSpeechToText({ onResult, onSettle, onPartial, onError, showTo
             }
             pendingStartSession = 0
             sttHolding.value = false
+            const heldMs = Date.now() - holdStartTs
+            if (isBenignSttError(msg, retcode) || heldMs < MIN_HOLD_MS) {
+                if (typeof onError === 'function') onError(msg || '')
+                return
+            }
             // 上层（如一问一答流程）可接管错误并自行重试，返回 true 时不再弹默认提示
             if (typeof onError === 'function') {
                 const handled = onError(msg || '')
                 if (handled === true) return
             }
-            notify(msg || '语音识别失败')
+            const tip = friendlySttError(msg)
+            if (tip) notify(tip)
         }
     }
 
@@ -411,3 +446,5 @@ export function useSpeechToText({ onResult, onSettle, onPartial, onError, showTo
         stopSpeechToText: endHoldSpeech
     }
 }
+
+export { isBenignSttError, friendlySttError }

TUICallKit-Vue3/tongji/data/gameFoodLibrary.js

@@ -63,7 +63,15 @@ const FOOD_TIP_OVERRIDE = {
     grainMantou: '杂粮做的，比白馒头稳，仍要控量',
     riceNoodleSoup: '米粉升糖快，汤粉要少吃',
     friedNoodles: '油多又是精面，升糖快',
-    centuryEggCongee: '白粥熬得软烂，升糖很快，糖友要少喝'
+    centuryEggCongee: '白粥熬得软烂，升糖很快，糖友要少喝',
+    sandwich: '夹心面包精制碳多，升糖快',
+    eightTreasureCongee: '八宝粥甜糯，升糖快，要少喝',
+    milletCongee: '小米粥熬软升糖快，糖友控量',
+    shandongPancake: '煎饼加油面，升糖中等偏快',
+    cake: '蛋糕又甜又油，升糖快',
+    biscuit: '饼干又甜又碎，升糖快',
+    wonton: '馄饨面皮精白，升糖中等，别多吃',
+    blackCoffee: '不加糖的黑咖啡，升糖很低'
 }
 
 /** 含糖等级通用科普文案 */
@@ -109,7 +117,7 @@ const RAW_FOODS = [
 
     // 中 GI
     { key: 'brownRice', icon: '🍙', name: '糙米饭', gi: 'mid', val: 4, color: '#C9A26B' },
-    { key: 'sweetPotato', icon: '🍠', name: '番薯', gi: 'mid', val: 5, color: '#C75B39' },
+    { key: 'sweetPotato', icon: '🍠', name: '番薯', gi: 'mid', val: 5, color: '#C75B39', img: `${GAMES_IMG_BASE}/%E7%95%AA%E8%96%AF.png` },
     { key: 'taro', icon: '🥔', name: '芋头', gi: 'mid', val: 5, color: '#B39DDB' },
     { key: 'fish', icon: '🐟', name: '鱼肉', gi: 'mid', val: 2, color: '#4FA3C7' },
     { key: 'chicken', icon: '🍗', name: '鸡肉', gi: 'mid', val: 3, color: '#D6A15A' },
@@ -126,16 +134,24 @@ const RAW_FOODS = [
     { key: 'wine', icon: '🍷', name: '红酒', gi: 'mid', val: 4, color: '#9B2C3B' },
     { key: 'beer', icon: '🍺', name: '啤酒', gi: 'mid', val: 5, color: '#E0A83E' },
     { key: 'coffee', icon: '☕', name: '咖啡', gi: 'mid', val: 2, color: '#6F4E37' },
+    { key: 'blackCoffee', icon: '☕', name: '黑咖啡', gi: 'low', val: -1, color: '#4E342E', img: `${GAMES_IMG_BASE}/%E9%BB%91%E5%92%96%E5%95%A1.png` },
+    { key: 'wonton', icon: '🥟', name: '馄饨', gi: 'mid', val: 5, color: '#E8DCC8', img: `${GAMES_IMG_BASE}/%E9%A6%84%E9%A5%A8.png` },
+    { key: 'milletCongee', icon: '🥣', name: '小米粥', gi: 'mid', val: 5, color: '#F5E6B8', img: `${GAMES_IMG_BASE}/%E5%B0%8F%E7%B1%B3%E7%B2%A5.png` },
+    { key: 'shandongPancake', icon: '🥞', name: '山东煎饼', gi: 'high', val: 16, color: '#D4A574', img: `${GAMES_IMG_BASE}/%E5%B1%B1%E4%B8%9C%E7%85%8E%E9%A5%BC.png` },
     { key: 'corn', icon: '🌽', name: '玉米', gi: 'mid', val: 5, color: '#F9C513' },
     { key: 'udon', icon: '🍲', name: '乌冬面', gi: 'mid', val: 5, color: '#D9B88F' },
     { key: 'milkOats', icon: '🥣', name: '奶冲麦片', gi: 'mid', val: 6, color: '#E8D9B5', img: `${GAMES_IMG_BASE}/%E5%A5%B6%E5%86%B2%E9%BA%A6%E7%89%87.png` },
     { key: 'grainMantou', icon: '🫓', name: '杂粮馒头', gi: 'mid', val: 5, color: '#C8A878', img: `${GAMES_IMG_BASE}/%E6%9D%82%E7%B2%AE%E9%A6%92%E5%A4%B4.png` },
 
     // 高 GI
-    { key: 'whiteRice', icon: '🍚', name: '白米饭', gi: 'high', val: 18, color: '#E0E0E0' },
+    { key: 'whiteRice', icon: '🍚', name: '白米饭', gi: 'high', val: 18, color: '#E0E0E0', img: `${GAMES_IMG_BASE}/%E7%B1%B3%E9%A5%AD.png` },
     { key: 'whiteBread', icon: '🍞', name: '白面包', gi: 'high', val: 16, color: '#D9A85C' },
     { key: 'mantou', icon: '🥯', name: '馒头', gi: 'high', val: 17, color: '#ECE0C8' },
-    { key: 'youtiao', icon: '🥖', name: '油条', gi: 'high', val: 20, color: '#D4943F' },
+    { key: 'youtiao', icon: '🥖', name: '油条', gi: 'high', val: 20, color: '#D4943F', img: `${GAMES_IMG_BASE}/%E6%B2%B9%E6%9D%A1.png` },
+    { key: 'sandwich', icon: '🥪', name: '三明治', gi: 'high', val: 16, color: '#D9B88F', img: `${GAMES_IMG_BASE}/%E4%B8%89%E6%98%8E%E6%B2%BB.png` },
+    { key: 'biscuit', icon: '🍪', name: '饼干', gi: 'high', val: 18, color: '#C9A063', img: `${GAMES_IMG_BASE}/%E9%A5%BC%E5%B9%B2.png` },
+    { key: 'cake', icon: '🎂', name: '蛋糕', gi: 'high', val: 22, color: '#F48FB1', img: `${GAMES_IMG_BASE}/%E8%9B%8B%E7%B3%95.png` },
+    { key: 'eightTreasureCongee', icon: '🥣', name: '八宝粥', gi: 'high', val: 17, color: '#E8C4A0', img: `${GAMES_IMG_BASE}/%E5%85%AB%E5%AE%9D%E7%B2%A5.png` },
     { key: 'donut', icon: '🍩', name: '甜甜圈', gi: 'high', val: 22, color: '#E87FB0' },
     { key: 'popcorn', icon: '🍿', name: '爆米花', gi: 'high', val: 18, color: '#F5E6B3' },
     { key: 'ramen', icon: '🍜', name: '拉面', gi: 'high', val: 17, color: '#E0A96D' },

TUICallKit-Vue3/tongji/data/gameLevels.js

@@ -4,10 +4,27 @@
  */
 /**
  * 指定关卡固定食材（按 key）。未配置的关卡走随机抽取逻辑。
- * 第一关固定为这 5 种带真实图片素材的食物。
+ * 第一关固定为这 16 种带真实图片素材的食物。
  */
 const FIXED_LEVEL_FOODS = {
-    1: ['milkOats', 'grainMantou', 'riceNoodleSoup', 'friedNoodles', 'centuryEggCongee']
+    1: [
+        'sandwich',
+        'eightTreasureCongee',
+        'milkOats',
+        'milletCongee',
+        'shandongPancake',
+        'grainMantou',
+        'riceNoodleSoup',
+        'youtiao',
+        'friedNoodles',
+        'sweetPotato',
+        'centuryEggCongee',
+        'whiteRice',
+        'cake',
+        'biscuit',
+        'wonton',
+        'blackCoffee'
+    ]
 }
 
 export function getLevelConfig(levelId) {

TUICallKit-Vue3/tongji/styles/more-stitch.scss

@@ -639,7 +639,8 @@
 }
 
 .more-page .mc-tasks-section {
-    margin-top: 40rpx;
+    margin-top: 0;
+    margin-bottom: 32rpx;
 }
 
 .more-page .mc-tasks-grid {
@@ -1167,3 +1168,259 @@
     font-size: 22rpx;
     color: rgba(108, 122, 113, 0.6);
 }
+
+.more-page .mc-tree-species-btn {
+    display: inline-flex;
+    align-items: center;
+    gap: 4rpx;
+    margin-left: 8rpx;
+    padding: 4rpx 12rpx;
+    border-radius: 999rpx;
+    background: rgba(0, 108, 73, 0.08);
+    font-size: 20rpx;
+    font-weight: 700;
+    color: var(--primary);
+}
+
+.more-page .mc-water-panel,
+.more-page .mc-species-panel {
+    width: calc(100% - 48rpx);
+    max-width: 680rpx;
+    margin: 0 auto;
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    max-height: 78vh;
+    background: var(--surface);
+    border-radius: 32rpx 32rpx 0 0;
+    padding: 32rpx 28rpx calc(32rpx + env(safe-area-inset-bottom));
+    box-shadow: 0 -12rpx 40rpx rgba(15, 23, 42, 0.12);
+}
+
+.more-page .mc-water-panel-head {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 20rpx;
+}
+
+.more-page .mc-water-panel-title {
+    font-size: 34rpx;
+    font-weight: 800;
+    color: var(--on-surface);
+}
+
+.more-page .mc-water-panel-close {
+    width: 56rpx;
+    height: 56rpx;
+    border-radius: 50%;
+    background: var(--surface-container-low);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 36rpx;
+    color: var(--outline);
+}
+
+.more-page .mc-water-panel-summary {
+    display: block;
+    font-size: 26rpx;
+    line-height: 1.5;
+    color: var(--on-surface-variant);
+    margin-bottom: 24rpx;
+}
+
+.more-page .mc-water-panel-list {
+    display: flex;
+    flex-direction: column;
+    gap: 12rpx;
+    margin-bottom: 20rpx;
+}
+
+.more-page .mc-water-panel-row {
+    display: flex;
+    align-items: center;
+    gap: 16rpx;
+    padding: 18rpx 16rpx;
+    border-radius: 20rpx;
+    background: var(--surface-container-low);
+    border: 1rpx solid rgba(0, 108, 73, 0.08);
+}
+
+.more-page .mc-water-panel-row.is-water {
+    border-color: rgba(0, 108, 73, 0.22);
+    background: rgba(0, 108, 73, 0.06);
+}
+
+.more-page .mc-water-panel-row.is-claimed {
+    opacity: 0.72;
+}
+
+.more-page .mc-water-panel-row-main {
+    flex: 1;
+    min-width: 0;
+}
+
+.more-page .mc-water-panel-row-name {
+    display: block;
+    font-size: 28rpx;
+    font-weight: 700;
+    color: var(--on-surface);
+}
+
+.more-page .mc-water-panel-row-sub {
+    display: block;
+    margin-top: 4rpx;
+    font-size: 22rpx;
+    color: var(--outline);
+}
+
+.more-page .mc-water-panel-row-tag {
+    flex-shrink: 0;
+    font-size: 22rpx;
+    font-weight: 700;
+    color: var(--primary);
+}
+
+.more-page .mc-water-panel-row.is-pending .mc-water-panel-row-tag {
+    color: #b45309;
+}
+
+.more-page .mc-water-panel-growth {
+    padding: 16rpx 18rpx;
+    border-radius: 16rpx;
+    background: rgba(0, 108, 73, 0.06);
+    margin-bottom: 20rpx;
+    font-size: 24rpx;
+    line-height: 1.45;
+    color: var(--primary);
+}
+
+.more-page .mc-water-panel-actions {
+    display: flex;
+    flex-direction: column;
+    gap: 12rpx;
+}
+
+.more-page .mc-water-panel-btn {
+    width: 100%;
+    height: 88rpx;
+    line-height: 88rpx;
+    border-radius: 999rpx;
+    font-size: 28rpx;
+    font-weight: 700;
+    background: var(--on-surface);
+    color: var(--surface);
+    border: none;
+}
+
+.more-page .mc-water-panel-btn.primary {
+    background: var(--primary);
+    color: var(--on-primary);
+}
+
+.more-page .mc-water-panel-btn.ghost {
+    background: var(--surface-container-low);
+    color: var(--on-surface);
+}
+
+.more-page .mc-species-panel-tip {
+    display: block;
+    font-size: 22rpx;
+    line-height: 1.45;
+    color: var(--outline);
+    margin-bottom: 20rpx;
+}
+
+.more-page .mc-species-scroll {
+    max-height: 56vh;
+}
+
+.more-page .mc-species-card {
+    padding: 20rpx;
+    border-radius: 24rpx;
+    border: 2rpx solid rgba(0, 108, 73, 0.1);
+    background: var(--surface-container-low);
+    margin-bottom: 16rpx;
+}
+
+.more-page .mc-species-card.active {
+    border-color: var(--primary);
+    background: rgba(0, 108, 73, 0.06);
+}
+
+.more-page .mc-species-card-head {
+    display: flex;
+    align-items: center;
+    gap: 16rpx;
+    margin-bottom: 16rpx;
+}
+
+.more-page .mc-species-card-emoji {
+    font-size: 56rpx;
+    line-height: 1;
+}
+
+.more-page .mc-species-card-name {
+    display: block;
+    font-size: 30rpx;
+    font-weight: 800;
+    color: var(--on-surface);
+}
+
+.more-page .mc-species-card-tagline {
+    display: block;
+    margin-top: 4rpx;
+    font-size: 22rpx;
+    color: var(--outline);
+}
+
+.more-page .mc-species-stages {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 10rpx;
+}
+
+.more-page .mc-species-stage {
+    width: calc(20% - 8rpx);
+    min-width: 96rpx;
+    padding: 10rpx 6rpx;
+    border-radius: 16rpx;
+    background: rgba(255, 255, 255, 0.7);
+    text-align: center;
+    opacity: 0.45;
+}
+
+.more-page .mc-species-stage.reached {
+    opacity: 1;
+}
+
+.more-page .mc-species-stage.current {
+    box-shadow: 0 0 0 2rpx var(--primary);
+    background: rgba(0, 108, 73, 0.1);
+}
+
+.more-page .mc-species-stage-emoji {
+    display: block;
+    font-size: 32rpx;
+    line-height: 1.1;
+}
+
+.more-page .mc-species-stage-lv {
+    display: block;
+    font-size: 18rpx;
+    font-weight: 700;
+    color: var(--primary);
+    margin-top: 4rpx;
+}
+
+.more-page .mc-species-stage-name {
+    display: block;
+    font-size: 18rpx;
+    color: var(--outline);
+    margin-top: 2rpx;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}

TUICallKit-Vue3/tongji/utils/treeSpecies.js

@@ -0,0 +1,75 @@
+import { TREE_LEVELS, TREE_MAX_LEVEL, TREE_XP_PER_LEVEL } from './treeLevels.js'
+
+/** 可选树种：每级 emoji 与 treeLevels.js Lv.0～9 一一对应 */
+export const TREE_SPECIES_LIST = [
+    {
+        id: 'classic',
+        name: '稳糖灵树',
+        tagline: '经典路线，从种子到圆满',
+        stages: TREE_LEVELS.map((l) => l.emoji)
+    },
+    {
+        id: 'bonsai',
+        name: '雅韵盆景',
+        tagline: '小巧精致，书桌旁的温柔陪伴',
+        stages: ['🫘', '🌱', '🪴', '🎋', '🪴', '🌳', '🎍', '🌸', '🏵️', '🏆']
+    },
+    {
+        id: 'pine',
+        name: '苍劲青松',
+        tagline: '挺拔向上，越记越稳',
+        stages: ['🫘', '🌱', '🌿', '🌲', '🌲', '🌲', '⛰️', '🌲', '🏔️', '🏆']
+    },
+    {
+        id: 'sakura',
+        name: '樱花小树',
+        tagline: '坚持打卡，枝头渐开',
+        stages: ['🫘', '🌱', '🌿', '🌳', '🌸', '🌸', '🌸', '🌸', '🌺', '🏆']
+    },
+    {
+        id: 'ginkgo',
+        name: '金秋银杏',
+        tagline: '叶色渐变，见证每一天',
+        stages: ['🫘', '🌱', '🍃', '🌳', '🍂', '🍂', '🌳', '🍁', '🌟', '🏆']
+    }
+]
+
+export const TREE_SPECIES_STORAGE_KEY = 'tongji_tree_species_v1'
+
+/** 四项任务全勤时每日最多可领积分（与后端 taskDefs 一致） */
+export const DAILY_MAX_TASK_POINTS = 40
+
+export function getTreeSpecies(id) {
+    return TREE_SPECIES_LIST.find((s) => s.id === id) || TREE_SPECIES_LIST[0]
+}
+
+export function speciesEmojiAtLevel(speciesId, level) {
+    const sp = getTreeSpecies(speciesId)
+    const lv = Math.min(TREE_MAX_LEVEL, Math.max(0, Number(level) || 0))
+    return sp.stages[lv] || sp.stages[0] || '🌱'
+}
+
+/** 当前树种成长路线图（供选择面板展示） */
+export function speciesGrowthRoadmap(speciesId) {
+    const sp = getTreeSpecies(speciesId)
+    return TREE_LEVELS.map((meta, i) => {
+        const xpTotal = i * TREE_XP_PER_LEVEL
+        const daysHint = i === 0
+            ? 0
+            : Math.max(1, Math.ceil(xpTotal / DAILY_MAX_TASK_POINTS))
+        return {
+            level: i,
+            name: meta.name,
+            emoji: sp.stages[i] || meta.emoji,
+            desc: meta.desc,
+            xpTotal,
+            daysHint
+        }
+    })
+}
+
+/** 全勤打卡大约多少天满级 */
+export function estimateDaysToMaxLevel() {
+    const totalXp = TREE_MAX_LEVEL * TREE_XP_PER_LEVEL
+    return Math.max(1, Math.ceil(totalXp / DAILY_MAX_TASK_POINTS))
+}

admin/src/api/stats.ts

@@ -96,6 +96,21 @@ export function yejiStatsRevisitBreakdown(params: {
     return request.get({ url: '/stats.yejiStats/revisitBreakdown', params })
 }
 
+/** 被指派数明细：与看板「被指派数」同口径；部门行传 dept_id，医助排行榜传 assistant_id */
+export function yejiStatsAssignLines(params: {
+    start_date: string
+    end_date: string
+    dept_id?: number
+    assistant_id?: number
+    dept_ids?: string
+    channel_code?: string
+    tag_id?: string
+    page?: number
+    page_size?: number
+}) {
+    return request.get({ url: '/stats.yejiStats/assignLines', params })
+}
+
 export function doctorDailyStatsOverview(params: {
     start_date?: string
     end_date?: string

admin/src/api/tcm.ts

@@ -446,6 +446,11 @@ export function prescriptionOrderRevokeRxAudit(params: { id: number }) {
     return request.post({ url: '/tcm.prescriptionOrder/revokeRxAudit', params })
 }
 
+/** 批量将处方业务订单（创建人/医助归属）改派给其他医助 */
+export function prescriptionOrderBatchAssignAssistant(params: { order_ids: number[]; assistant_id: number }) {
+    return request.post({ url: '/tcm.prescriptionOrder/batchAssignAssistant', params })
+}
+
 /** 撤回支付单审核 */
 export function prescriptionOrderRevokePayAudit(params: { id: number }) {
     return request.post({ url: '/tcm.prescriptionOrder/revokePayAudit', params })
@@ -468,6 +473,8 @@ export function prescriptionOrderAddPayOrder(params: {
     pay_amount: number
     pay_remark?: string
     completion_request?: number
+    /** 创建方式：fubei 付呗(默认) / express_cod 快递代收 */
+    pay_create_type?: 'fubei' | 'express_cod'
 }) {
     return request.post({ url: '/tcm.prescriptionOrder/addPayOrder', params })
 }
@@ -516,6 +523,18 @@ export function prescriptionOrderLogs(params: { id: number }) {
     return request.get({ url: '/tcm.prescriptionOrder/logs', params })
 }
 
+/** 手工新增操作日志（可选调整处方/支付单审核状态） */
+export function prescriptionOrderAddLog(params: {
+    id: number
+    summary: string
+    prescription_audit_status?: number | ''
+    payment_slip_audit_status?: number | ''
+    prescription_audit_remark?: string
+    payment_slip_audit_remark?: string
+}) {
+    return request.post({ url: '/tcm.prescriptionOrder/addLog', params })
+}
+
 /** 修改订单金额 */
 export function prescriptionOrderUpdateAmount(params: { id: number; amount: number }) {
     return request.post({ url: '/tcm.prescriptionOrder/updateAmount', params })

admin/src/views/asset/resource/index.vue

@@ -32,8 +32,12 @@
 
         <!-- 列表区域 -->
         <el-card class="!border-none mt-4" shadow="never">
-            <div class="mb-4">
+            <div class="mb-4 flex items-center gap-2">
                 <el-button type="primary" @click="handleAdd">上传资源</el-button>
+                <el-button type="danger" :disabled="selectedIds.length === 0" @click="handleBatchDelete">
+                    批量删除
+                </el-button>
+                <span v-if="selectedIds.length > 0" class="text-sm text-gray-500">已选 {{ selectedIds.length }} 条</span>
             </div>
             
             <el-tabs v-model="queryParams.type" @tab-change="handleTabChange">
@@ -42,7 +46,8 @@
                 <el-tab-pane label="语音" name="3"></el-tab-pane>
             </el-tabs>
 
-            <el-table :data="tableData" v-loading="loading">
+            <el-table :data="tableData" v-loading="loading" @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55" />
                 <!-- <el-table-column prop="id" label="ID" width="80" /> -->
                 <el-table-column prop="title" label="标题" min-width="80" />
                 <el-table-column label="预览" width="100">
@@ -129,8 +134,9 @@ import MaterialPicker from '@/components/material/picker.vue'
 import Upload from '@/components/upload/index.vue'
 
 const loading = ref(false)
-const tableData = ref([])
+const tableData = ref<any[]>([])
 const total = ref(0)
+const selectedIds = ref<number[]>([])
 
 const searchData = reactive<any>({
     title: '',
@@ -198,6 +204,7 @@ const getList = async () => {
         const res = await apiAssetResourceList(buildQueryParams())
         tableData.value = res.lists
         total.value = res.count
+        selectedIds.value = []
     } catch (e) {
         console.error(e)
     } finally {
@@ -269,6 +276,22 @@ const handleDelete = async (row: any) => {
     }
 }
 
+const handleSelectionChange = (rows: any[]) => {
+    selectedIds.value = rows.map((row) => Number(row.id)).filter((id) => id > 0)
+}
+
+const handleBatchDelete = async () => {
+    if (!selectedIds.value.length) return
+    try {
+        await ElMessageBox.confirm(`确定要删除选中的 ${selectedIds.value.length} 个资源吗？用户将无法再看到。`, '提示', { type: 'warning' })
+        await apiAssetResourceDelete({ id: selectedIds.value })
+        ElMessage.success('删除成功')
+        getList()
+    } catch (e) {
+        // canceled
+    }
+}
+
 const submitForm = async () => {
     if (!formRef.value) return
     await formRef.value.validate(async (valid: boolean) => {

admin/src/views/consumer/prescription/components/PrescriptionOrderDetailDrawer.vue

@@ -378,6 +378,9 @@
                                     </div>
                                 </div>
                             </el-descriptions-item>
+                            <el-descriptions-item v-if="detailDietaryText" label="忌口" :span="2">
+                                {{ detailDietaryText }}
+                            </el-descriptions-item>
                             <el-descriptions-item label="状态" :span="2">
                                 <el-tag :type="Number(detailPrescription.void_status) === 1 ? 'danger' : 'success'" size="small">
                                     {{ Number(detailPrescription.void_status) === 1 ? '已作废' : '正常' }}
@@ -628,7 +631,7 @@
                     <el-descriptions-item label="上次医护">{{ detailData.prev_staff || '—' }}</el-descriptions-item>
 
                     <el-descriptions-item label="服务渠道">{{ detailData.service_channel || '—' }}</el-descriptions-item>
-                    <el-descriptions-item label="服务套餐">{{ formatServicePackage(detailData.service_package) }}</el-descriptions-item>
+                    <el-descriptions-item label="服务套餐">{{ detailServicePackageText }}</el-descriptions-item>
                     <el-descriptions-item label="费用类别">{{ feeTypeText(detailData.fee_type) }}</el-descriptions-item>
 
                     <el-descriptions-item v-if="showInternalCost" label="内部成本">
@@ -777,7 +780,18 @@
                 class="po-panel border-gray-100 mt-4"
             >
                 <template #header>
-                    <span class="font-medium text-[15px]">操作日志</span>
+                    <div class="flex items-center justify-between gap-2">
+                        <span class="font-medium text-[15px]">操作日志</span>
+                        <el-button
+                            v-if="canAddPrescriptionOrderLog()"
+                            type="primary"
+                            link
+                            size="small"
+                            @click="openAddLogDialog"
+                        >
+                            新增日志
+                        </el-button>
+                    </div>
                 </template>
                 <el-timeline v-if="detailLogs.length" class="mt-2 pl-2">
                     <el-timeline-item
@@ -797,16 +811,92 @@
                 </el-timeline>
                 <el-empty v-else description="暂无操作日志" :image-size="64" />
             </el-card>
+
+            <!-- 新增操作日志 -->
+            <el-dialog
+                v-model="addLogVisible"
+                title="新增操作日志"
+                width="520px"
+                :close-on-click-modal="false"
+                destroy-on-close
+                append-to-body
+                @closed="resetAddLogForm"
+            >
+                <el-form ref="addLogFormRef" :model="addLogForm" :rules="addLogRules" label-width="108px">
+                    <el-form-item label="日志内容" prop="summary">
+                        <el-input
+                            v-model="addLogForm.summary"
+                            type="textarea"
+                            :rows="4"
+                            maxlength="500"
+                            show-word-limit
+                            placeholder="记录本次操作说明、沟通结果等"
+                        />
+                    </el-form-item>
+                    <el-form-item v-if="canSetRxAuditOnAddLog" label="处方审核">
+                        <el-select v-model="addLogForm.prescription_audit_status" class="w-full" clearable placeholder="不修改">
+                            <el-option label="待审核" :value="0" />
+                            <el-option label="已通过" :value="1" />
+                            <el-option label="已驳回" :value="2" />
+                        </el-select>
+                        <div v-if="detailData" class="text-xs text-gray-400 mt-1">
+                            当前：{{ auditStatusText(detailData.prescription_audit_status) }}
+                        </div>
+                    </el-form-item>
+                    <el-form-item
+                        v-if="canSetRxAuditOnAddLog && addLogForm.prescription_audit_status !== '' && addLogForm.prescription_audit_status !== null && addLogForm.prescription_audit_status !== undefined"
+                        label="处方审核意见"
+                    >
+                        <el-input
+                            v-model="addLogForm.prescription_audit_remark"
+                            type="textarea"
+                            :rows="2"
+                            maxlength="500"
+                            show-word-limit
+                            placeholder="选填"
+                        />
+                    </el-form-item>
+                    <el-form-item v-if="canSetPayAuditOnAddLog" label="支付单审核">
+                        <el-select v-model="addLogForm.payment_slip_audit_status" class="w-full" clearable placeholder="不修改">
+                            <el-option label="待审核" :value="0" />
+                            <el-option label="已通过" :value="1" />
+                            <el-option label="已驳回" :value="2" />
+                        </el-select>
+                        <div v-if="detailData" class="text-xs text-gray-400 mt-1">
+                            当前：{{ auditStatusText(detailData.payment_slip_audit_status) }}
+                        </div>
+                    </el-form-item>
+                    <el-form-item
+                        v-if="canSetPayAuditOnAddLog && addLogForm.payment_slip_audit_status !== '' && addLogForm.payment_slip_audit_status !== null && addLogForm.payment_slip_audit_status !== undefined"
+                        label="支付审核意见"
+                    >
+                        <el-input
+                            v-model="addLogForm.payment_slip_audit_remark"
+                            type="textarea"
+                            :rows="2"
+                            maxlength="500"
+                            show-word-limit
+                            placeholder="选填"
+                        />
+                    </el-form-item>
+                </el-form>
+                <template #footer>
+                    <el-button @click="addLogVisible = false">取消</el-button>
+                    <el-button type="primary" :loading="addLogSaving" @click="submitAddLog">保存</el-button>
+                </template>
+            </el-dialog>
         </div>
     </el-drawer>
 </template>
 
 <script lang="ts" setup name="PrescriptionOrderDetailDrawer">
-import { computed, onMounted, ref } from 'vue'
+import { computed, onMounted, reactive, ref } from 'vue'
+import type { FormInstance, FormRules } from 'element-plus'
 import { Refresh, Loading, Search, Van } from '@element-plus/icons-vue'
 import {
     prescriptionOrderDetail,
     prescriptionOrderLogs,
+    prescriptionOrderAddLog,
     prescriptionOrderLogisticsTrace,
     prescriptionOrderLogisticsJdUpdate,
     prescriptionOrderPaidPayOrders
@@ -828,6 +918,7 @@ import {
     consumerRxAuditTag,
     expressCompanyLabel,
     logActionText,
+    auditStatusText,
     formatPayOrderSource,
     normalizeBizPhone,
     recipientVsPrescriptionPhoneMismatch,
@@ -837,7 +928,11 @@ import {
     logisticsTraceLineUrgent,
     analyzeLogisticsPayloadUrgent,
     parseLogisticsTracePayload,
-    canUpdateAmount
+    canUpdateAmount,
+    formatDietaryTaboo,
+    type ServicePackageOption,
+    normalizeServicePackageOptions,
+    formatServicePackageLabels
 } from './prescription-order-utils'
 
 const props = withDefaults(
@@ -869,6 +964,7 @@ const emit = defineEmits<{
     (e: 'view-prescription'): void
     (e: 'test-gancao-preview'): void
     (e: 'view-patient'): void
+    (e: 'detail-changed'): void
 }>()
 
 const userStore = useUserStore()
@@ -896,6 +992,8 @@ const detailPrescription = computed(() => {
     return p && typeof p === 'object' ? p : null
 })
 
+const detailDietaryText = computed(() => formatDietaryTaboo(detailPrescription.value?.dietary_taboo))
+
 const detailLinkedPayOrders = computed(() => {
     const d = detailData.value
     if (!d) return []
@@ -1082,36 +1180,20 @@ const detailFullAddress = computed(() => {
 })
 
 // ─── 服务套餐字典 ───
-const servicePackageOptions = ref<Array<{ name: string; value: string }>>([])
+const servicePackageOptions = ref<ServicePackageOption[]>([])
 
 async function loadServicePackageOptions() {
     try {
         const data: any = await getDictData({ type: 'server_order' })
-        servicePackageOptions.value = (data?.server_order || []).filter((item: any) => item.status !== 0)
+        servicePackageOptions.value = normalizeServicePackageOptions(data?.server_order)
     } catch {
         servicePackageOptions.value = []
     }
 }
 
-function formatServicePackage(value: any): string {
-    if (!value) return '—'
-
-    let packages: string[] = []
-    if (Array.isArray(value)) {
-        packages = value
-    } else if (typeof value === 'string') {
-        packages = value.split(',').filter((v) => v.trim() !== '')
-    }
-
-    if (packages.length === 0) return '—'
-
-    const names = packages.map((val) => {
-        const option = servicePackageOptions.value.find((opt) => opt.value === val)
-        return option ? option.name : val
-    })
-
-    return names.join('、')
-}
+const detailServicePackageText = computed(() =>
+    formatServicePackageLabels(detailData.value?.service_package, servicePackageOptions.value)
+)
 
 onMounted(() => {
     loadServicePackageOptions()
@@ -1136,6 +1218,102 @@ async function fetchLogs(id: number) {
     }
 }
 
+function hasPerm(perm: string) {
+    const p = userStore.perms || []
+    return p.includes('*') || p.includes(perm)
+}
+
+function canAddPrescriptionOrderLog() {
+    return hasPerm('tcm.prescriptionOrder/addLog')
+}
+
+/** 与后端 canAuditPrescriptionOrder 同档：超管或 prescription_audit_roles */
+const canSetRxAuditOnAddLog = computed(() => {
+    const u = userStore.userInfo
+    if (!u || Number(u.root) === 1) return true
+    const ids = Array.isArray(u.role_ids) ? u.role_ids.map((n: unknown) => Number(n)) : []
+    return ids.some((id) => PRESCRIPTION_AUDIT_ROLE_IDS.includes(id))
+})
+
+/** 与后端 canAuditPaymentSlipOrder 同档：超管或 prescription_order_payment_audit_roles 默认 0,3 */
+const canSetPayAuditOnAddLog = computed(() => {
+    const u = userStore.userInfo
+    if (!u || Number(u.root) === 1) return true
+    const ids = Array.isArray(u.role_ids) ? u.role_ids.map((n: unknown) => Number(n)) : []
+    return ids.some((id) => [0, 3].includes(id))
+})
+
+const addLogVisible = ref(false)
+const addLogSaving = ref(false)
+const addLogFormRef = ref<FormInstance>()
+const addLogForm = reactive({
+    summary: '',
+    prescription_audit_status: '' as number | '',
+    payment_slip_audit_status: '' as number | '',
+    prescription_audit_remark: '',
+    payment_slip_audit_remark: ''
+})
+const addLogRules: FormRules = {
+    summary: [{ required: true, message: '请填写日志内容', trigger: 'blur' }]
+}
+
+function resetAddLogForm() {
+    addLogForm.summary = ''
+    addLogForm.prescription_audit_status = ''
+    addLogForm.payment_slip_audit_status = ''
+    addLogForm.prescription_audit_remark = ''
+    addLogForm.payment_slip_audit_remark = ''
+    addLogFormRef.value?.clearValidate()
+}
+
+function openAddLogDialog() {
+    if (!detailData.value?.id) return
+    resetAddLogForm()
+    const d = detailData.value
+    addLogForm.prescription_audit_remark = String(d.prescription_audit_remark || '')
+    addLogForm.payment_slip_audit_remark = String(d.payment_slip_audit_remark || '')
+    addLogVisible.value = true
+}
+
+async function submitAddLog() {
+    if (!addLogFormRef.value || !detailData.value?.id) return
+    await addLogFormRef.value.validate()
+    addLogSaving.value = true
+    try {
+        const payload: Record<string, unknown> = {
+            id: detailData.value.id,
+            summary: addLogForm.summary.trim()
+        }
+        if (
+            canSetRxAuditOnAddLog.value &&
+            addLogForm.prescription_audit_status !== '' &&
+            addLogForm.prescription_audit_status !== null &&
+            addLogForm.prescription_audit_status !== undefined
+        ) {
+            payload.prescription_audit_status = addLogForm.prescription_audit_status
+            payload.prescription_audit_remark = addLogForm.prescription_audit_remark
+        }
+        if (
+            canSetPayAuditOnAddLog.value &&
+            addLogForm.payment_slip_audit_status !== '' &&
+            addLogForm.payment_slip_audit_status !== null &&
+            addLogForm.payment_slip_audit_status !== undefined
+        ) {
+            payload.payment_slip_audit_status = addLogForm.payment_slip_audit_status
+            payload.payment_slip_audit_remark = addLogForm.payment_slip_audit_remark
+        }
+        await prescriptionOrderAddLog(payload as any)
+        feedback.msgSuccess('日志已添加')
+        addLogVisible.value = false
+        await refresh()
+        emit('detail-changed')
+    } catch {
+        /* 拦截器已提示 */
+    } finally {
+        addLogSaving.value = false
+    }
+}
+
 // ─── 未关联支付单 ───
 async function loadDetailUnlinkedPayOrders(diagnosisId: number, prescriptionOrderId: number, linkedIds: number[]) {
     if (!diagnosisId) {

admin/src/views/consumer/prescription/components/prescription-order-utils.ts

@@ -137,22 +137,35 @@ export function logActionText(act: string) {
         patch_rx_patient: '处方患者信息',
         update_amount: '修改订单金额',
         complete: '完成订单',
-        refund: '退款'
+        refund: '退款',
+        manual_log: '手工备注',
+        assign_assistant: '改派医助',
+        add_pay_order: '补齐支付单',
+        set_ship_mode: '发货类型'
     }
     return m[act] || act
 }
 
-/** 支付单来源/方式：企微对外收款、付呗等创建链路 + 支付方式回退 */
+/** 处方/支付单审核状态文案（0 待审核 / 1 已通过 / 2 已驳回） */
+export function auditStatusText(s: number | undefined) {
+    if (s === 1) return '已通过'
+    if (s === 2) return '已驳回'
+    return '待审核'
+}
+
+/** 支付单来源/方式：企微对外收款、付呗、快递代收等创建链路 + 支付方式回退 */
 export function formatPayOrderSource(row: { payment_method?: unknown; create_type?: unknown }) {
     const createType = String(row?.create_type || '')
     if (createType === 'wechat_work') return '企业微信对外收款'
     if (createType === 'fubei') return '付呗'
+    if (createType === 'express_cod') return '快递代收'
     const paymentMethod = String(row?.payment_method || '')
     const methodMap: Record<string, string> = {
         alipay: '支付宝',
         wechat: '微信',
         wechat_work: '企业微信',
         fubei: '付呗',
+        express_cod: '快递代收',
         manual: '手动确认到账'
     }
     if (paymentMethod && methodMap[paymentMethod]) {
@@ -340,3 +353,100 @@ export function canUpdateAmount(row: { id?: number; fulfillment_status?: number
     const fs = Number(row.fulfillment_status)
     return fs !== 3 && fs !== 4
 }
+
+/** 处方忌口：库内逗号分隔字符串或前端多选数组，统一为「、」连接展示 */
+export function formatDietaryTaboo(raw: unknown): string {
+    if (Array.isArray(raw)) {
+        return raw.map((v) => String(v ?? '').trim()).filter(Boolean).join('、')
+    }
+    if (typeof raw === 'string' && raw.trim()) {
+        return raw
+            .split(',')
+            .map((s) => s.trim())
+            .filter(Boolean)
+            .join('、')
+    }
+    return ''
+}
+
+/** 服务套餐 dict：server_order */
+export type ServicePackageOption = { name: string; value: string; status?: number }
+
+export function normalizeServicePackageValue(v: unknown): string {
+    return String(v ?? '').trim()
+}
+
+/** 解析订单 service_package（逗号串 / 数组 / 单值数字） */
+export function parseServicePackageValues(raw: unknown): string[] {
+    if (raw == null || raw === '') return []
+    if (Array.isArray(raw)) {
+        return raw.map(normalizeServicePackageValue).filter(Boolean)
+    }
+    if (typeof raw === 'string') {
+        return raw.split(',').map((v) => v.trim()).filter(Boolean)
+    }
+    const one = normalizeServicePackageValue(raw)
+    return one ? [one] : []
+}
+
+export function servicePackageValueEquals(a: unknown, b: unknown): boolean {
+    const sa = normalizeServicePackageValue(a)
+    const sb = normalizeServicePackageValue(b)
+    if (!sa || !sb) return false
+    if (sa === sb) return true
+    const na = Number(sa)
+    const nb = Number(sb)
+    return Number.isFinite(na) && Number.isFinite(nb) && na === nb
+}
+
+export function normalizeServicePackageOptions(raw: unknown): ServicePackageOption[] {
+    if (!Array.isArray(raw)) return []
+    return raw
+        .map((item: any) => ({
+            name: String(item?.name ?? '').trim() || normalizeServicePackageValue(item?.value),
+            value: normalizeServicePackageValue(item?.value),
+            status: Number(item?.status ?? 1)
+        }))
+        .filter((item) => item.value !== '')
+}
+
+export function findServicePackageOption(
+    options: ServicePackageOption[],
+    value: unknown
+): ServicePackageOption | undefined {
+    const key = normalizeServicePackageValue(value)
+    if (!key) return undefined
+    return options.find((opt) => servicePackageValueEquals(opt.value, key))
+}
+
+/** 展示用：value → 字典 name，多选用「、」连接 */
+export function formatServicePackageLabels(
+    value: unknown,
+    options: ServicePackageOption[],
+    emptyText = '—'
+): string {
+    const packages = parseServicePackageValues(value)
+    if (packages.length === 0) return emptyText
+    const names = packages.map((val) => {
+        const option = findServicePackageOption(options, val)
+        return option?.name || val
+    })
+    return names.join('、')
+}
+
+/** 编辑下拉：字典项 + 当前已选但字典缺失的兜底项 */
+export function mergeServicePackageSelectOptions(
+    options: ServicePackageOption[],
+    selected: unknown[]
+): ServicePackageOption[] {
+    const known = new Set(options.map((o) => o.value))
+    const extras: ServicePackageOption[] = []
+    for (const raw of selected) {
+        const val = normalizeServicePackageValue(raw)
+        if (!val || known.has(val)) continue
+        const matched = findServicePackageOption(options, val)
+        extras.push(matched ?? { name: val, value: val, status: 0 })
+        known.add(val)
+    }
+    return extras.length ? [...options, ...extras] : options
+}

admin/src/views/consumer/prescription/index.vue

@@ -39,7 +39,7 @@
                         <el-radio-button label="rejected">驳回</el-radio-button>
                     </el-radio-group>
                     <span class="pl-toolbar__sep" aria-hidden="true" />
-                    <span class="pl-toolbar__k" title="与列表「来源」列一致：系统代开 / 手工">来源</span>
+                    <span class="pl-toolbar__k" title="与列表「来源」列一致：空白处方 / 手工">来源</span>
                     <el-radio-group
                         v-model="formData.source_filter"
                         size="small"
@@ -48,7 +48,7 @@
                     >
                         <el-radio-button label="all">全部</el-radio-button>
                         <el-radio-button label="manual">手工</el-radio-button>
-                        <el-radio-button label="system">系统代开</el-radio-button>
+                        <el-radio-button label="system">空白处方</el-radio-button>
                     </el-radio-group>
                 </div>
                 <div class="pl-toolbar__line pl-toolbar__line--second">
@@ -146,7 +146,7 @@
                                 size="small"
                                 effect="plain"
                             >
-                                系统代开
+                                空白处方
                             </el-tag>
                             <span v-else class="text-gray-400 text-sm">手工</span>
                         </template>
@@ -290,7 +290,7 @@
                         type="warning"
                         size="small"
                         effect="plain"
-                    >系统代开</el-tag>
+                    >空白处方</el-tag>
                     <el-tag v-if="slipView && Number(slipView.void_status) === 1" type="danger" size="small">已作废</el-tag>
                     <el-tag
                         v-else-if="slipView && Number(slipView.business_prescription_audit_rejected) === 1"
@@ -437,6 +437,7 @@
                         <p>主方服法：{{ rxUsageText }}</p>
                         <p v-if="rxAuxUsageText">辅方服法：{{ rxAuxUsageText }}</p>
                         <p v-if="rxAdviceText">医嘱：{{ rxAdviceText }}</p>
+                        <p v-if="slipDietaryText">忌口：{{ slipDietaryText }}</p>
                         <p v-if="rxRemarkText">备注：{{ rxRemarkText }}</p>
                         <p v-if="rxPharmacyRemarkText" class="rx-text-warn">
                             药房备注：{{ rxPharmacyRemarkText }}
@@ -1856,7 +1857,7 @@ const formData = reactive({
     creator_ids: [] as number[],
     /** all | passed | not_passed | pending | rejected（all 表示不限，接口传参会转为空） */
     audit_filter: 'all' as string,
-    /** all | manual | system — 与 is_system_auto：手工(0) / 系统代开(1) */
+    /** all | manual | system — 与 is_system_auto：手工(0) / 空白处方(1) */
     source_filter: 'all' as string,
     start_time: '',
     end_time: ''

admin/src/views/consumer/prescription/order_list.vue

@@ -283,6 +283,12 @@
                         <el-option label="未指派" value="0" />
                     </el-select>
                 </el-form-item>
+                <el-form-item class="w-[140px]" label="辅方">
+                    <el-select v-model="queryParams.has_aux_formula" clearable placeholder="全部" class="!w-full">
+                        <el-option label="含辅方" value="1" />
+                        <el-option label="不含辅方" value="0" />
+                    </el-select>
+                </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="handleReset">重置</el-button>
@@ -292,7 +298,7 @@
                         :fetch-fun="prescriptionOrderExport"
                         :params="prescriptionOrderExportParams"
                         :page-size="pager.size"
-                        export-hint="导出范围与上方筛选一致（履约状态、创建时间及其他条件均会生效）。含「自媒体渠道（挂号渠道来源）」：优先取该单关联处方登记的挂号；无则诊单下同患者挂号取 id 最大的一条（与前台挂号选择的记录一致）；业绩侧栏带渠道筛选导出时与同页列表高亮挂号同源。「服务套餐」按字典 server_order 解析展示。「签收日期」与详情/业绩看板同源，仅读物流库（轨迹/签收时间）：导出不再实时查快递100，速度只取决于数据库；签收时间由 `tcm:backfill-sign-time` 命令与物流自动更新定时任务落库，刚发货尚未同步的单子会暂时为空，待下次回填/定时任务刷新后显示。"
+                        export-hint="导出范围与上方筛选一致（履约状态、创建时间及其他条件均会生效）。含「自媒体渠道（挂号渠道来源）」：优先取该单关联处方登记的挂号；无则诊单下同患者挂号取 id 最大的一条（与前台挂号选择的记录一致）；业绩侧栏带渠道筛选导出时与同页列表高亮挂号同源。「服务套餐」按字典 server_order 解析展示。「处方」导出主方/辅方药材明细；「主方/辅方服用方式、天数」与详情侧栏、处方笺同口径（天数优先取订单 medication_days，缺省回退处方 usage_days / 辅方 aux_usage）。「关联收款记录」与详情侧栏同源（已支付/已退款/待审核），每笔两行展示（摘要行+明细行），多笔空行分隔，单元格自动换行。「签收日期」与详情/业绩看板同源，仅读物流库（轨迹/签收时间）：导出不再实时查快递100，速度只取决于数据库；签收时间由 `tcm:backfill-sign-time` 命令与物流自动更新定时任务落库，刚发货尚未同步的单子会暂时为空，待下次回填/定时任务刷新后显示。"
                     />
                 </el-form-item>
             </el-form>
@@ -303,6 +309,17 @@
                 <div class="po-table-toolbar__title-wrap">
                     <span class="po-table-title text-gray-800">订单列表</span>
                     <span class="po-table-hint text-gray-400">共 {{ pager.count }} 条</span>
+                    <el-button
+                        v-if="canBatchReassign"
+                        type="primary"
+                        plain
+                        size="small"
+                        class="ml-3"
+                        :disabled="selectedOrders.length === 0"
+                        @click="openReassignDialog"
+                    >
+                        批量改派医助{{ selectedOrders.length ? `（${selectedOrders.length}）` : '' }}
+                    </el-button>
                 </div>
                 <div class="po-focus-board">
                     <div
@@ -339,7 +356,15 @@
                     </div>
                 </div>
             </div>
-            <el-table :data="pager.lists" size="default" stripe class="po-data-table" :row-class-name="orderRowClassName">
+            <el-table
+                :data="pager.lists"
+                size="default"
+                stripe
+                class="po-data-table"
+                :row-class-name="orderRowClassName"
+                @selection-change="onOrderSelectionChange"
+            >
+                <el-table-column v-if="canBatchReassign" type="selection" width="44" :selectable="() => true" />
                 <el-table-column label="订单号" min-width="178" show-overflow-tooltip>
                     <template #default="{ row }">
                         <div class="po-order-no-cell">
@@ -406,16 +431,41 @@
                                     </div>
                                     <div v-if="canViewFinanceFields() && row.internal_cost != null && row.internal_cost !== ''" class="flex justify-between">
                                         <span class="text-gray-500">内部成本：</span>
-                                        <span class="font-medium text-orange-600">¥{{ formatMoney(row.internal_cost) }}</span>
+                                        <span
+                                            class="font-medium cursor-pointer select-none"
+                                            :class="internalCostVisible ? 'text-orange-600' : 'text-gray-400'"
+                                            title="点击显示/隐藏"
+                                            @click.stop="internalCostVisible = !internalCostVisible"
+                                        >
+                                            {{ internalCostVisible ? `¥${formatMoney(row.internal_cost)}` : '****' }}
+                                        </span>
                                     </div>
                                 </div>
                             </el-popover>
                         </div>
                     </template>
                 </el-table-column>
-                <el-table-column v-if="canViewFinanceFields()" label="内部成本" width="92">
+                <el-table-column v-if="canViewFinanceFields()" width="100">
+                    <template #header>
+                        <span
+                            class="cursor-pointer select-none hover:text-primary"
+                            title="点击显示/隐藏内部成本"
+                            @click.stop="internalCostVisible = !internalCostVisible"
+                        >
+                            内部成本
+                        </span>
+                    </template>
                     <template #default="{ row }">
-                        {{ row.internal_cost != null && row.internal_cost !== '' ? `¥${row.internal_cost}` : '—' }}
+                        <span
+                            v-if="row.internal_cost != null && row.internal_cost !== ''"
+                            class="cursor-pointer select-none"
+                            :class="internalCostVisible ? 'text-orange-600 font-medium' : 'text-gray-400'"
+                            title="点击显示/隐藏"
+                            @click.stop="internalCostVisible = !internalCostVisible"
+                        >
+                            {{ internalCostVisible ? `¥${row.internal_cost}` : '****' }}
+                        </span>
+                        <span v-else>—</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="处方审核" width="110">
@@ -573,6 +623,7 @@
             @view-prescription="detailData && openPrescriptionView(detailData)"
             @test-gancao-preview="testGancaoPreviewFromDetail"
             @view-patient="openDiagnosisPatientDetailFromOrder"
+            @detail-changed="getLists"
         >
             <template #header-extra="{ detail }">
                 <div class="flex items-center gap-2 ml-4 shrink-0">
@@ -704,7 +755,7 @@
                 <el-form-item label="新金额" prop="amount">
                     <el-input-number
                         v-model="updateAmountForm.amount"
-                        :min="0.01"
+                        :min="0"
                         :step="0.01"
                         :precision="2"
                         controls-position="right"
@@ -974,10 +1025,11 @@
                                         class="w-full"
                                     >
                                         <el-option
-                                            v-for="item in servicePackageOptions"
+                                            v-for="item in editServicePackageSelectOptions"
                                             :key="item.value"
                                             :label="item.name"
                                             :value="item.value"
+                                            :disabled="item.status === 0"
                                         />
                                     </el-select>
                                 </el-form-item>
@@ -1522,13 +1574,14 @@
                 <el-form-item label="添加方式" prop="add_mode">
                     <el-radio-group v-model="addPayOrderForm.add_mode">
                         <el-radio value="create">付呗</el-radio>
+                        <el-radio value="create_express">快递代收</el-radio>
                         <el-radio value="link">关联已有</el-radio>
                         <el-radio value="completion_only">直接完单申请</el-radio>
                     </el-radio-group>
                 </el-form-item>
 
-                <!-- 付呗（手动创建支付单） -->
-                <template v-if="addPayOrderForm.add_mode === 'create'">
+                <!-- 付呗 / 快递代收（手动创建支付单） -->
+                <template v-if="addPayOrderForm.add_mode === 'create' || addPayOrderForm.add_mode === 'create_express'">
                     <el-form-item label="费用类别" prop="order_type">
                         <el-select v-model="addPayOrderForm.order_type" class="w-full">
                             <el-option label="挂号费" :value="1" />
@@ -1897,6 +1950,7 @@
                             <p v-if="rxAuxUsageText">辅服法：{{ rxAuxUsageText }}</p>
                         </template>
                         <p v-if="rxAdviceText">医嘱：{{ rxAdviceText }}</p>
+                        <p v-if="slipDietaryText">忌口：{{ slipDietaryText }}</p>
                         <p v-if="prescriptionTabType === 'internal' && rxRemarkText">备注：{{ rxRemarkText }}</p>
                         <p v-if="rxPharmacyRemarkText" class="rx-text-warn">
                             药房备注：{{ rxPharmacyRemarkText }}
@@ -2112,6 +2166,34 @@
             </div>
         </el-drawer>
 
+        <!-- 批量改派医助 -->
+        <el-dialog v-model="reassignVisible" title="批量改派医助" width="440px" append-to-body>
+            <div class="text-sm text-gray-600 mb-3">
+                已选 <strong class="text-primary">{{ selectedOrders.length }}</strong> 单，将订单「创建人(医助归属)」改派为：
+            </div>
+            <el-select
+                v-model="reassignAssistantId"
+                clearable
+                filterable
+                placeholder="选择目标医助"
+                class="!w-full"
+            >
+                <el-option
+                    v-for="a in assistantOptions"
+                    :key="a.id"
+                    :label="a.name"
+                    :value="a.id"
+                />
+            </el-select>
+            <p class="text-xs text-gray-400 mt-2 leading-relaxed">
+                仅变更订单的业务归属（医助筛选 / 业绩口径），并写入操作日志；不影响处方、支付单及审核状态。已是该医助的订单会自动跳过。
+            </p>
+            <template #footer>
+                <el-button @click="reassignVisible = false">取消</el-button>
+                <el-button type="primary" :loading="reassignSubmitting" @click="submitReassign">确定改派</el-button>
+            </template>
+        </el-dialog>
+
         <!-- 与 consumer/prescription/index、诊单 edit 同一套界面：只读诊单与全部分页签 -->
         <TcmDiagnosisEditView ref="diagnosisViewRef" />
     </div>
@@ -2143,8 +2225,13 @@ import {
     analyzeLogisticsPayloadUrgent,
     parseLogisticsTracePayload,
     canUpdateAmount,
+    formatDietaryTaboo,
     type SlipFormulaType,
-    type SlipAuxUsageForm
+    type SlipAuxUsageForm,
+    type ServicePackageOption,
+    normalizeServicePackageOptions,
+    parseServicePackageValues,
+    mergeServicePackageSelectOptions
 } from './components/prescription-order-utils'
 import { useListTimeFilter } from '@/hooks/useListTimeFilter'
 import {
@@ -2166,6 +2253,7 @@ import {
     prescriptionOrderRefund,
     prescriptionOrderRevokeRxAudit,
     prescriptionOrderRevokePayAudit,
+    prescriptionOrderBatchAssignAssistant,
     prescriptionOrderPatchPrescriptionPatient,
     prescriptionOrderLinkPayOrder,
     prescriptionOrderSubmitGancaoRecipel,
@@ -2265,11 +2353,75 @@ const canViewFinanceFields = () => {
     return FINANCE_ROLE_IDS.some((rid) => ids.includes(rid))
 }
 
+/** 内部成本默认隐藏，点击表头或单元格切换显示 */
+const internalCostVisible = ref(false)
+
+/** 是否可批量改派医助（与后端 canSeeAllPrescriptionOrders 一致：超管 / 全量编辑角色） */
+const canBatchReassign = 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_EDIT_ALL_ROLE_IDS.some((rid) => ids.includes(rid))
+})
+
+/** 批量改派：表格多选 */
+const selectedOrders = ref<Array<{ id: number; order_no?: string; creator_id?: number }>>([])
+function onOrderSelectionChange(rows: Array<{ id: number; order_no?: string; creator_id?: number }>) {
+    selectedOrders.value = Array.isArray(rows) ? rows : []
+}
+
+/** 批量改派弹窗 */
+const reassignVisible = ref(false)
+const reassignAssistantId = ref<number | ''>('')
+const reassignSubmitting = ref(false)
+
+function openReassignDialog() {
+    if (selectedOrders.value.length === 0) {
+        feedback.msgWarning('请先勾选要改派的订单')
+        return
+    }
+    reassignAssistantId.value = ''
+    reassignVisible.value = true
+}
+
+async function submitReassign() {
+    const assistantId = Number(reassignAssistantId.value)
+    if (!assistantId) {
+        feedback.msgWarning('请选择目标医助')
+        return
+    }
+    const orderIds = selectedOrders.value.map((r) => Number(r.id)).filter((id) => id > 0)
+    if (orderIds.length === 0) {
+        feedback.msgWarning('请先勾选要改派的订单')
+        return
+    }
+    reassignSubmitting.value = true
+    try {
+        const res: any = await prescriptionOrderBatchAssignAssistant({
+            order_ids: orderIds,
+            assistant_id: assistantId
+        })
+        const ok = Number(res?.success ?? 0)
+        const errs: string[] = Array.isArray(res?.errors) ? res.errors : []
+        let msg = `已改派 ${ok} 单`
+        if (errs.length) msg += `；${errs.join('；')}`
+        feedback.msgSuccess(msg)
+        reassignVisible.value = false
+        selectedOrders.value = []
+        getLists()
+    } catch {
+        // request 拦截器已弹错误提示
+    } finally {
+        reassignSubmitting.value = false
+    }
+}
+
 // 省市区数据
 const regionOptions = ref([])
 
-// 服务套餐选项
-const servicePackageOptions = ref<Array<{ name: string; value: string }>>([])
+// 服务套餐选项（含已停用项，便于编辑时回显历史值）
+const servicePackageOptions = ref<ServicePackageOption[]>([])
 
 /** 筛选：开方医生、诊单医助（与列表接口 doctor_id / assistant_id 一致） */
 const doctorOptions = ref<Array<{ id: number; name: string }>>([])
@@ -2390,8 +2542,7 @@ const loadRegionData = async () => {
 const loadServicePackageOptions = async () => {
     try {
         const data = await getDictData({ type: 'server_order' })
-        servicePackageOptions.value = (data?.server_order || []).filter((item: any) => item.status !== 0)
-        console.log('服务套餐选项已加载:', servicePackageOptions.value.length)
+        servicePackageOptions.value = normalizeServicePackageOptions(data?.server_order)
     } catch (error) {
         console.error('加载服务套餐选项失败:', error)
         servicePackageOptions.value = []
@@ -2468,6 +2619,8 @@ const queryParams = reactive({
     supply_mode: '' as '' | 'gancao' | 'self',
     /** 服务渠道：'' 不限；'0' 未指派（库内 '' 或 '0'） */
     service_channel: '' as '' | '0',
+    /** 是否含辅方：'' 不限；'1' 含辅方；'0' 不含辅方 */
+    has_aux_formula: '' as '' | '0' | '1',
     /** 列表排除履约已取消(4)：重点看板「待处方审核」等用 */
     exclude_fulfillment_cancelled: 0 as number,
     /** 下单人（关联操作日志 audit_rx_* / audit_pay_*） */
@@ -2615,6 +2768,11 @@ function normalizePrescriptionOrderListQuery(params: Record<string, unknown>): R
         p.service_channel = String(p.service_channel).trim()
         if (p.service_channel === '') delete p.service_channel
     }
+    if (p.has_aux_formula === '' || p.has_aux_formula === undefined || p.has_aux_formula === null) {
+        delete p.has_aux_formula
+    } else {
+        p.has_aux_formula = Number(p.has_aux_formula)
+    }
     if (Number(p.exclude_fulfillment_cancelled) !== 1) delete p.exclude_fulfillment_cancelled
     if (!String(p.start_time || '').trim() || !String(p.end_time || '').trim()) {
         delete p.start_time
@@ -2853,6 +3011,7 @@ function handleReset() {
     queryParams.payment_slip_audit_status = ''
     queryParams.supply_mode = ''
     queryParams.service_channel = ''
+    queryParams.has_aux_formula = ''
     queryParams.audit_admin_id = ''
     queryParams.exclude_fulfillment_cancelled = 0
     resetParams()
@@ -3041,10 +3200,17 @@ async function onDetailShipModeChange(mode: string | number | boolean | undefine
     }
 }
 
-function canAddPayOrderRow(row: { fulfillment_status?: number }) {
-    // 已发货(5) / 已签收(6) 状态可补齐支付单
+function canAddPayOrderRow(row: {
+    fulfillment_status?: number
+    amount?: number | string
+    linked_pay_paid_total?: number | string
+}) {
+    // 已发货(5) / 已签收(6) 状态可补齐支付单；总金额已付清则不允许
     const fs = Number(row.fulfillment_status)
-    return fs === 5 || fs === 6
+    if (fs !== 5 && fs !== 6) return false
+    const orderAmount = Math.round((Number(row.amount) || 0) * 100) / 100
+    const paidTotal = Math.round((Number(row.linked_pay_paid_total) || 0) * 100) / 100
+    return paidTotal < orderAmount
 }
 
 function canCompleteRow(row: { fulfillment_status?: number; payment_slip_audit_status?: number }) {
@@ -3103,8 +3269,8 @@ const updateAmountRules: FormRules = {
         {
             validator: (_rule, value, callback) => {
                 const num = Number(value)
-                if (!Number.isFinite(num) || num <= 0) {
-                    callback(new Error('订单金额必须大于0'))
+                if (!Number.isFinite(num) || num < 0) {
+                    callback(new Error('订单金额不能为负数'))
                     return
                 }
                 callback()
@@ -3161,7 +3327,8 @@ function openUpdateAmount() {
         return
     }
     updateAmountForm.id = Number(row?.id) || 0
-    updateAmountForm.amount = Number(row?.amount) || undefined
+    const amt = Number(row?.amount)
+    updateAmountForm.amount = Number.isFinite(amt) ? amt : undefined
     updateAmountVisible.value = true
     nextTick(() => updateAmountFormRef.value?.clearValidate())
 }
@@ -3294,6 +3461,11 @@ const editForm = reactive({
     diagnosis_creator_dept_path: ''
 })
 
+/** 编辑弹窗下拉：字典项 + 当前已选但字典中缺失的兜底项 */
+const editServicePackageSelectOptions = computed(() =>
+    mergeServicePackageSelectOptions(servicePackageOptions.value, editForm.service_package)
+)
+
 /** 诊单创建人部门：拆成面包屑。多部门为「；」分隔；路径内为「 / 」含父级（与后端 buildDeptPath 一致） */
 const editDiagnosisCreatorDeptBreadcrumbs = computed(() => {
     const raw = String(editForm.diagnosis_creator_dept_path || '').trim()
@@ -3526,18 +3698,7 @@ async function openEdit(row: {
         editForm.dose_unit = d.dose_unit || '剂'
         editForm.prev_staff = d.prev_staff || ''
         editForm.service_channel = d.service_channel || ''
-        // 处理服务套餐：如果是字符串，转换为数组
-        if (d.service_package) {
-            if (Array.isArray(d.service_package)) {
-                editForm.service_package = d.service_package
-            } else if (typeof d.service_package === 'string') {
-                editForm.service_package = d.service_package.split(',').filter(v => v.trim() !== '')
-            } else {
-                editForm.service_package = []
-            }
-        } else {
-            editForm.service_package = []
-        }
+        editForm.service_package = parseServicePackageValues(d.service_package)
         editForm.express_company = String(d.express_company || 'auto') || 'auto'
         editForm.tracking_number = d.tracking_number || ''
         editForm.fee_type = Number(d.fee_type) || 3
@@ -4274,11 +4435,14 @@ const addPayOrderAlertTitle = computed(() => {
     if (addPayOrderForm.add_mode === 'completion_only') {
         return '不创建或关联支付单，仅提交完单申请，由审核人员在支付审核时处理。'
     }
+    if (addPayOrderForm.add_mode === 'create_express') {
+        return '通过快递代收创建新支付单（流转同付呗），或关联已存在但未绑定的支付单。'
+    }
     return '可以通过付呗创建新支付单，或关联已存在但未绑定的支付单。'
 })
 
 const addPayOrderForm = reactive({
-    add_mode: 'create' as 'create' | 'link' | 'completion_only',
+    add_mode: 'create' as 'create' | 'create_express' | 'link' | 'completion_only',
     order_type: 3,
     pay_amount: undefined as number | undefined,
     pay_remark: '',
@@ -4290,7 +4454,7 @@ const addPayOrderRules = computed<FormRules>(() => {
     const rules: FormRules = {
         add_mode: [{ required: true, message: '请选择添加方式', trigger: 'change' }]
     }
-    if (addPayOrderForm.add_mode === 'create') {
+    if (addPayOrderForm.add_mode === 'create' || addPayOrderForm.add_mode === 'create_express') {
         rules.order_type = [{ required: true, message: '请选择费用类别', trigger: 'change' }]
         rules.pay_amount = [
             {
@@ -4351,7 +4515,18 @@ async function loadAddPayOrderAvailable(diagnosisId: number, currentLinkedIds: n
     }
 }
 
-function openAddPayOrder(row: { id: number; diagnosis_id?: number; pay_order_ids?: number[] }) {
+function openAddPayOrder(row: {
+    id: number
+    diagnosis_id?: number
+    pay_order_ids?: number[]
+    fulfillment_status?: number
+    amount?: number | string
+    linked_pay_paid_total?: number | string
+}) {
+    if (!canAddPayOrderRow(row)) {
+        feedback.msgWarning('订单总金额与已付金额一致，无需补齐支付单')
+        return
+    }
     addPayOrderRowId.value = row.id
     addPayOrderForm.add_mode = 'create'
     addPayOrderForm.order_type = 3
@@ -4377,14 +4552,19 @@ async function submitAddPayOrder() {
         if (addPayOrderForm.add_mode === 'completion_only') {
             await prescriptionOrderRequestCompletion({ id: addPayOrderRowId.value })
             feedback.msgSuccess('完单申请已提交，请等待支付审核')
-        } else if (addPayOrderForm.add_mode === 'create') {
-            // 手动创建新支付单
+        } else if (
+            addPayOrderForm.add_mode === 'create' ||
+            addPayOrderForm.add_mode === 'create_express'
+        ) {
+            // 手动创建新支付单（付呗 / 快递代收）
             await prescriptionOrderAddPayOrder({
                 id: addPayOrderRowId.value,
                 order_type: addPayOrderForm.order_type,
                 pay_amount: addPayOrderForm.pay_amount!,
                 pay_remark: addPayOrderForm.pay_remark || '',
-                completion_request: addPayOrderForm.completion_request
+                completion_request: addPayOrderForm.completion_request,
+                pay_create_type:
+                    addPayOrderForm.add_mode === 'create_express' ? 'express_cod' : 'fubei'
             })
             feedback.msgSuccess('支付单已新增，请等待审核')
         } else {
@@ -4535,12 +4715,7 @@ 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('、')
-    if (typeof d === 'string' && d.trim()) return d.trim()
-    return ''
-})
+const slipDietaryText = computed(() => formatDietaryTaboo(prescriptionViewData.value?.dietary_taboo))
 
 const slipChuwanVisible = computed(() => {
     const d = prescriptionViewData.value

admin/src/views/consumer/prescription/order_list_h5.vue

@@ -894,6 +894,9 @@
                                         </div>
                                     </div>
                                 </el-descriptions-item>
+                                <el-descriptions-item v-if="detailDietaryText" label="忌口" :span="2">
+                                    {{ detailDietaryText }}
+                                </el-descriptions-item>
                                 <el-descriptions-item label="状态" :span="2">
                                     <el-tag :type="Number(detailPrescription.void_status) === 1 ? 'danger' : 'success'" size="small">
                                         {{ Number(detailPrescription.void_status) === 1 ? '已作废' : '正常' }}
@@ -1136,7 +1139,7 @@
                         <el-descriptions-item label="上次医护">{{ detailData.prev_staff || '—' }}</el-descriptions-item>
                         
                         <el-descriptions-item label="服务渠道">{{ detailData.service_channel || '—' }}</el-descriptions-item>
-                        <el-descriptions-item label="服务套餐">{{ formatServicePackage(detailData.service_package) }}</el-descriptions-item>
+                        <el-descriptions-item label="服务套餐">{{ detailServicePackageText }}</el-descriptions-item>
                         <el-descriptions-item label="费用类别">{{ feeTypeText(detailData.fee_type) }}</el-descriptions-item>
                         
                         <el-descriptions-item v-if="detailData.internal_cost != null && detailData.internal_cost !== ''" label="内部成本">
@@ -1295,7 +1298,7 @@
                 <el-form-item label="新金额" prop="amount">
                     <el-input-number
                         v-model="updateAmountForm.amount"
-                        :min="0.01"
+                        :min="0"
                         :step="0.01"
                         :precision="2"
                         controls-position="right"
@@ -1522,10 +1525,11 @@
                                         class="w-full"
                                     >
                                         <el-option
-                                            v-for="item in servicePackageOptions"
+                                            v-for="item in editServicePackageSelectOptions"
                                             :key="item.value"
                                             :label="item.name"
                                             :value="item.value"
+                                            :disabled="item.status === 0"
                                         />
                                     </el-select>
                                 </el-form-item>
@@ -1998,13 +2002,14 @@
                 <el-form-item label="添加方式" prop="add_mode">
                     <el-radio-group v-model="addPayOrderForm.add_mode">
                         <el-radio value="create">付呗</el-radio>
+                        <el-radio value="create_express">快递代收</el-radio>
                         <el-radio value="link">关联已有</el-radio>
                         <el-radio value="completion_only">直接完单申请</el-radio>
                     </el-radio-group>
                 </el-form-item>
 
-                <!-- 付呗（手动创建支付单） -->
-                <template v-if="addPayOrderForm.add_mode === 'create'">
+                <!-- 付呗 / 快递代收（手动创建支付单） -->
+                <template v-if="addPayOrderForm.add_mode === 'create' || addPayOrderForm.add_mode === 'create_express'">
                     <el-form-item label="费用类别" prop="order_type">
                         <el-select v-model="addPayOrderForm.order_type" class="w-full">
                             <el-option label="挂号费" :value="1" />
@@ -2310,6 +2315,7 @@
                     <div class="rx-text">
                         <p>服法：{{ rxUsageText }}</p>
                         <p v-if="rxAdviceText">医嘱：{{ rxAdviceText }}</p>
+                        <p v-if="slipDietaryText">忌口：{{ slipDietaryText }}</p>
                         <p v-if="rxRemarkText">备注：{{ rxRemarkText }}</p>
                         <p v-if="rxPharmacyRemarkText" class="rx-text-warn">
                             药房备注：{{ rxPharmacyRemarkText }}
@@ -2568,6 +2574,14 @@ import {
     getDoctors,
     getAssistants
 } from '@/api/tcm'
+import {
+    formatDietaryTaboo,
+    type ServicePackageOption,
+    normalizeServicePackageOptions,
+    parseServicePackageValues,
+    mergeServicePackageSelectOptions,
+    formatServicePackageLabels
+} from './components/prescription-order-utils'
 import html2canvas from 'html2canvas'
 import { jsPDF } from 'jspdf'
 import { getDictData } from '@/api/app'
@@ -2663,7 +2677,7 @@ const canViewFinanceFields = () => {
 const regionOptions = ref([])
 
 // 服务套餐选项
-const servicePackageOptions = ref<Array<{ name: string; value: string }>>([])
+const servicePackageOptions = ref<ServicePackageOption[]>([])
 
 /** 筛选：开方医生、诊单医助（与列表接口 doctor_id / assistant_id 一致） */
 const doctorOptions = ref<Array<{ id: number; name: string }>>([])
@@ -2784,8 +2798,7 @@ const loadRegionData = async () => {
 const loadServicePackageOptions = async () => {
     try {
         const data = await getDictData({ type: 'server_order' })
-        servicePackageOptions.value = (data?.server_order || []).filter((item: any) => item.status !== 0)
-        console.log('服务套餐选项已加载:', servicePackageOptions.value.length)
+        servicePackageOptions.value = normalizeServicePackageOptions(data?.server_order)
     } catch (error) {
         console.error('加载服务套餐选项失败:', error)
         servicePackageOptions.value = []
@@ -3193,28 +3206,6 @@ function feeTypeText(t: number | undefined) {
     return m[Number(t)] ?? '—'
 }
 
-// 格式化服务套餐显示
-function formatServicePackage(value: any): string {
-    if (!value) return '—'
-    
-    let packages: string[] = []
-    if (Array.isArray(value)) {
-        packages = value
-    } else if (typeof value === 'string') {
-        packages = value.split(',').filter(v => v.trim() !== '')
-    }
-    
-    if (packages.length === 0) return '—'
-    
-    // 将值转换为名称
-    const names = packages.map(val => {
-        const option = servicePackageOptions.value.find(opt => opt.value === val)
-        return option ? option.name : val
-    })
-    
-    return names.join('、')
-}
-
 function auditStatusText(s: number | undefined) {
     if (s === 1) return '已通过'
     if (s === 2) return '已驳回'
@@ -3467,6 +3458,10 @@ const detailVisible = ref(false)
 const detailLoading = ref(false)
 const detailData = ref<Record<string, any> | null>(null)
 
+const detailServicePackageText = computed(() =>
+    formatServicePackageLabels(detailData.value?.service_package, servicePackageOptions.value)
+)
+
 // --- 订单可视化审批履约流程逻辑 ---
 const workflowActiveStep = computed(() => {
     if (!detailData.value) return 0
@@ -3578,6 +3573,8 @@ const detailPrescription = computed(() => {
     return p && typeof p === 'object' ? p : null
 })
 
+const detailDietaryText = computed(() => formatDietaryTaboo(detailPrescription.value?.dietary_taboo))
+
 function normalizeBizPhone(v: unknown): string {
     if (v === null || v === undefined) return ''
     return String(v).replace(/\s/g, '').trim()
@@ -3725,8 +3722,8 @@ const updateAmountRules: FormRules = {
         {
             validator: (_rule, value, callback) => {
                 const num = Number(value)
-                if (!Number.isFinite(num) || num <= 0) {
-                    callback(new Error('订单金额必须大于0'))
+                if (!Number.isFinite(num) || num < 0) {
+                    callback(new Error('订单金额不能为负数'))
                     return
                 }
                 callback()
@@ -3878,7 +3875,8 @@ function openUpdateAmount() {
         return
     }
     updateAmountForm.id = Number(row?.id) || 0
-    updateAmountForm.amount = Number(row?.amount) || undefined
+    const amt = Number(row?.amount)
+    updateAmountForm.amount = Number.isFinite(amt) ? amt : undefined
     updateAmountVisible.value = true
     nextTick(() => updateAmountFormRef.value?.clearValidate())
 }
@@ -4051,6 +4049,10 @@ const editForm = reactive({
     diagnosis_creator_dept_path: ''
 })
 
+const editServicePackageSelectOptions = computed(() =>
+    mergeServicePackageSelectOptions(servicePackageOptions.value, editForm.service_package)
+)
+
 /** 诊单创建人部门：拆成面包屑。多部门为「；」分隔；路径内为「 / 」含父级（与后端 buildDeptPath 一致） */
 const editDiagnosisCreatorDeptBreadcrumbs = computed(() => {
     const raw = String(editForm.diagnosis_creator_dept_path || '').trim()
@@ -4096,12 +4098,14 @@ function formatPayOrderSource(row: { payment_method?: unknown; create_type?: unk
     const createType = String(row?.create_type || '')
     if (createType === 'wechat_work') return '企业微信对外收款'
     if (createType === 'fubei') return '付呗'
+    if (createType === 'express_cod') return '快递代收'
     const paymentMethod = String(row?.payment_method || '')
     const methodMap: Record<string, string> = {
         alipay: '支付宝',
         wechat: '微信',
         wechat_work: '企业微信',
         fubei: '付呗',
+        express_cod: '快递代收',
         manual: '手动确认到账'
     }
     if (paymentMethod && methodMap[paymentMethod]) {
@@ -4299,18 +4303,7 @@ async function openEdit(row: {
         editForm.dose_unit = d.dose_unit || '剂'
         editForm.prev_staff = d.prev_staff || ''
         editForm.service_channel = d.service_channel || ''
-        // 处理服务套餐：如果是字符串，转换为数组
-        if (d.service_package) {
-            if (Array.isArray(d.service_package)) {
-                editForm.service_package = d.service_package
-            } else if (typeof d.service_package === 'string') {
-                editForm.service_package = d.service_package.split(',').filter(v => v.trim() !== '')
-            } else {
-                editForm.service_package = []
-            }
-        } else {
-            editForm.service_package = []
-        }
+        editForm.service_package = parseServicePackageValues(d.service_package)
         editForm.express_company = String(d.express_company || 'auto') || 'auto'
         editForm.tracking_number = d.tracking_number || ''
         editForm.fee_type = Number(d.fee_type) || 3
@@ -4955,10 +4948,13 @@ const addPayOrderAlertTitle = computed(() => {
     if (addPayOrderForm.add_mode === 'completion_only') {
         return '不创建或关联支付单，仅提交完单申请，由审核人员在支付审核时处理。'
     }
+    if (addPayOrderForm.add_mode === 'create_express') {
+        return '通过快递代收创建新支付单（流转同付呗），或关联已存在但未绑定的支付单。'
+    }
     return '可以通过付呗创建新支付单，或关联已存在但未绑定的支付单。'
 })
 const addPayOrderForm = reactive({
-    add_mode: 'create' as 'create' | 'link' | 'completion_only',
+    add_mode: 'create' as 'create' | 'create_express' | 'link' | 'completion_only',
     order_type: 3,
     pay_amount: undefined as number | undefined,
     pay_remark: '',
@@ -4970,7 +4966,7 @@ const addPayOrderRules = computed<FormRules>(() => {
     const rules: FormRules = {
         add_mode: [{ required: true, message: '请选择添加方式', trigger: 'change' }]
     }
-    if (addPayOrderForm.add_mode === 'create') {
+    if (addPayOrderForm.add_mode === 'create' || addPayOrderForm.add_mode === 'create_express') {
         rules.order_type = [{ required: true, message: '请选择费用类别', trigger: 'change' }]
         rules.pay_amount = [
             { required: true, message: '请输入支付金额', trigger: 'blur' },
@@ -5054,14 +5050,19 @@ async function submitAddPayOrder() {
         if (addPayOrderForm.add_mode === 'completion_only') {
             await prescriptionOrderRequestCompletion({ id: addPayOrderRowId.value })
             feedback.msgSuccess('完单申请已提交，请等待支付审核')
-        } else if (addPayOrderForm.add_mode === 'create') {
-            // 手动创建新支付单
+        } else if (
+            addPayOrderForm.add_mode === 'create' ||
+            addPayOrderForm.add_mode === 'create_express'
+        ) {
+            // 手动创建新支付单（付呗 / 快递代收）
             await prescriptionOrderAddPayOrder({
                 id: addPayOrderRowId.value,
                 order_type: addPayOrderForm.order_type,
                 pay_amount: addPayOrderForm.pay_amount!,
                 pay_remark: addPayOrderForm.pay_remark || '',
-                completion_request: addPayOrderForm.completion_request
+                completion_request: addPayOrderForm.completion_request,
+                pay_create_type:
+                    addPayOrderForm.add_mode === 'create_express' ? 'express_cod' : 'fubei'
             })
             feedback.msgSuccess('支付单已新增，请等待审核')
         } else {
@@ -5176,12 +5177,7 @@ const slipHerbsList = computed(() => {
     return Array.isArray(h) ? h : []
 })
 
-const slipDietaryText = computed(() => {
-    const d = prescriptionViewData.value?.dietary_taboo
-    if (Array.isArray(d)) return d.filter(Boolean).join('、')
-    if (typeof d === 'string' && d.trim()) return d.trim()
-    return ''
-})
+const slipDietaryText = computed(() => formatDietaryTaboo(prescriptionViewData.value?.dietary_taboo))
 
 const slipChuwanVisible = computed(() => {
     const d = prescriptionViewData.value

admin/src/views/doctor/roster.vue

@@ -231,8 +231,7 @@ import { ref, computed, onMounted } from 'vue'
 import dayjs from 'dayjs'
 import isoWeek from 'dayjs/plugin/isoWeek'
 import feedback from '@/utils/feedback'
-import { adminLists } from '@/api/perms/admin'
-import { rosterLists, rosterSave, rosterDelete, rosterBatchSave } from '@/api/doctor'
+import { doctorLists, rosterLists, rosterSave, rosterDelete, rosterBatchSave } from '@/api/doctor'
 import { ElMessageBox } from 'element-plus'
 
 dayjs.extend(isoWeek)
@@ -491,10 +490,9 @@ async function removeSegment(row: RosterSegment) {
 
 const loadDoctors = async () => {
   try {
-    const res = await adminLists({
+    const res = await doctorLists({
       page_no: 1,
-      page_size: 1000,
-      role_id: 1
+      page_size: 1000
     })
     tableData.value = (res?.lists || []).map((doctor: any) => ({
       doctorId: doctor.id,

admin/src/views/fans/yeji.vue

@@ -283,7 +283,15 @@
                                                     <td class="col-name">{{ r.name }}</td>
                                                     <td class="col-consult">{{ formatLeaderboardInt(r.consult_count) }}</td>
                                                     <td class="col-deal">{{ formatLeaderboardInt(r.deal_order_count) }}</td>
-                                                    <td class="col-assign">{{ formatLeaderboardInt(r.assign_count ?? 0) }}</td>
+                                                    <td class="col-assign" @click.stop="onLeaderboardAssignCellClick(r)">
+                                                        <span
+                                                            v-if="Number(r.assign_count ?? 0) > 0"
+                                                            class="yeji-lead-cell--link"
+                                                        >{{ formatLeaderboardInt(r.assign_count ?? 0) }}</span>
+                                                        <template v-else>{{
+                                                            formatLeaderboardInt(r.assign_count ?? 0)
+                                                        }}</template>
+                                                    </td>
                                                     <td class="col-appointment" @click.stop="onLeaderboardAppointmentCellClick(r)">
                                                         <span
                                                             v-if="Number(r.appointment_count ?? 0) > 0"
@@ -561,7 +569,13 @@
                                 >{{ formatInt(r.lead_count) }}</span>
                                 <template v-else>{{ formatInt(r.lead_count) }}</template>
                             </td>
-                            <td>{{ formatInt(r.assign_count ?? 0) }}</td>
+                            <td @click.stop="onAssignCountCellClick($event, tb, r)">
+                                <span
+                                    v-if="yejiAssignCountCellClickable(r)"
+                                    class="yeji-lead-cell--link"
+                                >{{ formatInt(r.assign_count ?? 0) }}</span>
+                                <template v-else>{{ formatInt(r.assign_count ?? 0) }}</template>
+                            </td>
                             <td @click.stop="onYejiRevisitTotalCellClick(tb, r)">
                                 <span
                                     v-if="r.dept_id > 0 && Number(r.revisit_count ?? 0) > 0"
@@ -1356,6 +1370,59 @@
                 />
             </div>
         </el-dialog>
+
+        <el-dialog
+            v-model="assignLinesDialogVisible"
+            width="min(960px, 96vw)"
+            destroy-on-close
+            class="yeji-leadlines-dialog"
+        >
+            <template #header>
+                <div class="yeji-unassigned-dialog__head">
+                    <span class="yeji-unassigned-dialog__title">被指派明细</span>
+                    <p class="yeji-unassigned-dialog__sub">{{ assignLinesSubtitle }}</p>
+                </div>
+            </template>
+            <p v-if="assignLinesApiNote" class="yeji-unassigned-dialog__note">{{ assignLinesApiNote }}</p>
+            <div v-loading="assignLinesLoading" class="yeji-unassigned-dialog__body">
+                <el-table
+                    v-if="assignLinesRows.length > 0 || assignLinesLoading"
+                    :data="assignLinesRows"
+                    size="small"
+                    stripe
+                    border
+                    max-height="440"
+                    class="yeji-unassigned-dialog__table"
+                    :empty-text="assignLinesLoading ? '加载中…' : '暂无数据'"
+                >
+                    <el-table-column type="index" label="#" width="46" :index="assignLinesIndexMethod" />
+                    <el-table-column prop="diagnosis_id" label="诊单ID" width="88" />
+                    <el-table-column prop="patient_name" label="患者" min-width="100" show-overflow-tooltip />
+                    <el-table-column prop="patient_phone" label="联系电话" min-width="120" show-overflow-tooltip />
+                    <el-table-column prop="assistant_name" label="被指派医助" min-width="108" show-overflow-tooltip />
+                    <el-table-column prop="assign_count" label="指派次数" width="88" align="right" />
+                    <el-table-column prop="last_assign_time_text" label="最近指派时间" min-width="156" show-overflow-tooltip />
+                </el-table>
+                <el-empty
+                    v-if="!assignLinesLoading && assignLinesRows.length === 0"
+                    description="暂无被指派明细"
+                />
+                <div v-if="assignLinesCount > 0" class="yeji-leadlines-dialog__pager">
+                    <el-pagination
+                        :current-page="assignLinesPage"
+                        :page-size="assignLinesPageSize"
+                        background
+                        layout="total, sizes, prev, pager, next, jumper"
+                        :total="assignLinesCount"
+                        :page-sizes="[10, 20, 50, 100]"
+                        :disabled="assignLinesLoading"
+                        :hide-on-single-page="false"
+                        @current-change="onAssignLinesPageChange"
+                        @size-change="onAssignLinesPageSizeChange"
+                    />
+                </div>
+            </div>
+        </el-dialog>
     </div>
 </template>
 
@@ -1376,6 +1443,7 @@ import {
     yejiStatsLeadLines,
     yejiStatsAppointmentLines,
     yejiStatsRevisitBreakdown,
+    yejiStatsAssignLines,
 } from '@/api/stats'
 import { deptPerformanceTargetMonthMatrix } from '@/api/finance'
 import { prescriptionOrderLists } from '@/api/tcm'
@@ -1491,6 +1559,17 @@ interface YejiLeadLineRow {
     external_contact_name: string
 }
 
+interface YejiAssignLineRow {
+    diagnosis_id: number
+    patient_name: string
+    patient_phone: string
+    assistant_id: number
+    assistant_name: string
+    assign_count: number
+    last_assign_time: number
+    last_assign_time_text: string
+}
+
 interface YejiRow {
     dept_id: number
     dept_name: string
@@ -1709,6 +1788,31 @@ type AppointmentLinesCtx =
       }
 const appointmentLinesContext = ref<AppointmentLinesCtx | null>(null)
 
+const assignLinesDialogVisible = ref(false)
+const assignLinesLoading = ref(false)
+const assignLinesSubtitle = ref('')
+const assignLinesApiNote = ref('')
+const assignLinesRows = ref<YejiAssignLineRow[]>([])
+const assignLinesCount = ref(0)
+const assignLinesPage = ref(1)
+const assignLinesPageSize = ref(20)
+type AssignLinesCtx =
+    | {
+          mode: 'assistant'
+          assistant_id: number
+          name: string
+          start_date: string
+          end_date: string
+      }
+    | {
+          mode: 'dept'
+          dept_id: number
+          dept_name: string
+          start_date: string
+          end_date: string
+      }
+const assignLinesContext = ref<AssignLinesCtx | null>(null)
+
 const appointmentLinesShowChannelColumn = computed(() =>
     appointmentLinesRows.value.some(r => String(r.channel_source ?? '') !== '')
 )
@@ -3193,6 +3297,124 @@ function onLeadCountCellClick(ev: MouseEvent, tb: YejiTable, row: YejiRow) {
     void openLeadLinesDialog(tb, row)
 }
 
+function yejiAssignCountCellClickable(r: YejiRow): boolean {
+    return r.dept_id > 0 && Number(r.assign_count ?? 0) > 0
+}
+
+function onAssignCountCellClick(ev: MouseEvent, tb: YejiTable, row: YejiRow) {
+    if (!yejiAssignCountCellClickable(row)) {
+        return
+    }
+    ev.stopPropagation()
+    void openAssignLinesDialogForDept(tb, row)
+}
+
+function assignLinesIndexMethod(index: number) {
+    return (assignLinesPage.value - 1) * assignLinesPageSize.value + index + 1
+}
+
+function buildAssignLinesRequestParams(page: number, pageSize: number): Record<string, string | number> | null {
+    const ctx = assignLinesContext.value
+    if (!ctx) {
+        return null
+    }
+    const p: Record<string, string | number> = {
+        start_date: ctx.start_date,
+        end_date: ctx.end_date,
+        page,
+        page_size: pageSize,
+    }
+    if (ctx.mode === 'dept') {
+        p.dept_id = ctx.dept_id
+    } else {
+        p.assistant_id = ctx.assistant_id
+    }
+    if (selectedDeptIds.value.length > 0) {
+        p.dept_ids = selectedDeptIds.value.join(',')
+    }
+    if (selectedChannel.value) {
+        p.channel_code = selectedChannel.value
+    }
+    return p
+}
+
+async function fetchAssignLinesPage() {
+    const params = buildAssignLinesRequestParams(assignLinesPage.value, assignLinesPageSize.value)
+    if (!params) {
+        return
+    }
+    assignLinesLoading.value = true
+    try {
+        const res: any = await yejiStatsAssignLines(params as any)
+        assignLinesRows.value = Array.isArray(res?.lists) ? res.lists : []
+        assignLinesCount.value = Number(res?.count ?? 0)
+        assignLinesApiNote.value = typeof res?.note === 'string' ? res.note : ''
+    } catch (e: unknown) {
+        if (axios.isCancel(e)) return
+        const any = e as any
+        ElMessage.error(any?.msg || any?.message || '加载被指派明细失败')
+        assignLinesRows.value = []
+        assignLinesCount.value = 0
+        assignLinesApiNote.value = ''
+    } finally {
+        assignLinesLoading.value = false
+    }
+}
+
+async function openAssignLinesDialogForDept(tb: YejiTable, row: YejiRow) {
+    assignLinesContext.value = {
+        mode: 'dept',
+        dept_id: row.dept_id,
+        dept_name: row.dept_name,
+        start_date: tb.start_date,
+        end_date: tb.end_date,
+    }
+    assignLinesSubtitle.value = `${row.dept_name} · ${tb.start_date} ～ ${tb.end_date}`
+    assignLinesApiNote.value = ''
+    assignLinesRows.value = []
+    assignLinesCount.value = 0
+    assignLinesPage.value = 1
+    assignLinesPageSize.value = 20
+    assignLinesDialogVisible.value = true
+    await fetchAssignLinesPage()
+}
+
+function onLeaderboardAssignCellClick(r: LeaderboardPack['leaderboards'][0]['rows'][0]) {
+    if (!r || r.admin_id <= 0 || !leaderboardBlock.value) {
+        return
+    }
+    if (Number(r.assign_count ?? 0) <= 0) {
+        return
+    }
+    const lb = leaderboardBlock.value
+    assignLinesContext.value = {
+        mode: 'assistant',
+        assistant_id: r.admin_id,
+        name: r.name,
+        start_date: lb.start_date,
+        end_date: lb.end_date,
+    }
+    assignLinesSubtitle.value = `${r.name} · 医助 · ${lb.start_date} ～ ${lb.end_date}`
+    assignLinesApiNote.value = ''
+    assignLinesRows.value = []
+    assignLinesCount.value = 0
+    assignLinesPage.value = 1
+    assignLinesPageSize.value = 20
+    assignLinesDialogVisible.value = true
+    void fetchAssignLinesPage()
+}
+
+function onAssignLinesPageChange(p: number) {
+    assignLinesPage.value = p
+    void fetchAssignLinesPage()
+}
+
+function onAssignLinesPageSizeChange(size: number) {
+    assignLinesPageSize.value = size
+    assignLinesPage.value = 1
+    void fetchAssignLinesPage()
+}
+
 const LEAD_LINES_EXPORT_COLUMNS: { key: keyof YejiLeadLineRow; label: string }[] = [
     { key: 'event_time_text', label: '进线时间' },
     { key: 'reception_admin_name', label: '接待' },

admin/src/views/order/index.vue

@@ -220,7 +220,7 @@
                             编辑
                         </el-button>
                         <el-button
-                            v-if="row.status === 1 || row.status === 2 || (row.status === 5 && row.payment_method === 'fubei')"
+                            v-if="row.status === 1 || row.status === 2 || (row.status === 5 && (row.payment_method === 'fubei' || row.create_type === 'express_cod'))"
                             v-perms="['order.order/split']"
                             type="primary"
                             link
@@ -237,7 +237,7 @@
                             小程序码
                         </el-button>
                         <el-button
-                            v-if="row.status === 1 || (row.status === 5 && row.payment_method === 'fubei')"
+                            v-if="row.status === 1 || (row.status === 5 && (row.payment_method === 'fubei' || row.create_type === 'express_cod'))"
                             v-perms="['order.order/pay']"
                             type="success"
                             link
@@ -255,7 +255,7 @@
                             退款
                         </el-button>
                         <el-button
-                            v-if="row.status === 1 || (row.status === 5 && row.payment_method === 'fubei')"
+                            v-if="row.status === 1 || (row.status === 5 && (row.payment_method === 'fubei' || row.create_type === 'express_cod'))"
                             v-perms="['order.order/cancel']"
                             type="danger"
                             link
@@ -434,7 +434,7 @@
                     type="warning"
                     :closable="false"
                     class="mb-3"
-                    title="该单为付呗·待审核，请选择实际到账方式后确认「已支付」"
+                    title="该单为待审核（付呗/快递代收），请选择实际到账方式后确认「已支付」"
                 />
                 <el-form-item v-if="!payForm.fubeiPendingAudit" label="支付类型" required>
                     <el-radio-group v-model="payForm.payType">
@@ -502,6 +502,7 @@
                         <el-radio label="normal">普通订单</el-radio>
                         <el-radio label="wechat_work">企业微信对外收款</el-radio>
                         <el-radio label="fubei">付呗</el-radio>
+                        <el-radio label="express_cod">快递代收</el-radio>
                     </el-radio-group>
                 </el-form-item>
                 <el-alert
@@ -524,7 +525,20 @@
                     <template #title>付呗</template>
                     通过付呗收款的支付单，创建后请按实际对账/审核流程在列表中处理。
                 </el-alert>
-                <el-form-item v-if="createForm.createType === 'fubei'" label="支付单审核">
+                <el-alert
+                    v-if="createForm.createType === 'express_cod'"
+                    type="info"
+                    :closable="false"
+                    show-icon
+                    class="mb-4"
+                >
+                    <template #title>快递代收</template>
+                    通过快递代收的支付单，流转与付呗一致；审核通过/确认到账后将更新为已支付。
+                </el-alert>
+                <el-form-item
+                    v-if="createForm.createType === 'fubei' || createForm.createType === 'express_cod'"
+                    label="支付单审核"
+                >
                     <el-switch
                         v-model="createForm.requirePaymentSlipAudit"
                         active-text="申请审核"
@@ -980,8 +994,8 @@ const patientLoading = ref(false)
 const patientList = ref<any[]>([])
 
 const createForm = reactive({
-    createType: 'normal' as 'normal' | 'wechat_work' | 'fubei',
-    /** 仅「付呗」：开启后订单为待审核(5) */
+    createType: 'normal' as 'normal' | 'wechat_work' | 'fubei' | 'express_cod',
+    /** 「付呗」「快递代收」：开启后订单为待审核(5) */
     requirePaymentSlipAudit: false,
     patient_id: '',
     order_type: '',
@@ -1167,13 +1181,17 @@ const submitCreateOrder = async () => {
             if (createForm.createType === 'fubei') {
                 params.payment_channel = 'fubei'
                 params.require_payment_slip_audit = createForm.requirePaymentSlipAudit ? 1 : 0
+            } else if (createForm.createType === 'express_cod') {
+                params.payment_channel = 'express_cod'
+                params.require_payment_slip_audit = createForm.requirePaymentSlipAudit ? 1 : 0
             } else {
                 params.payment_channel = 'normal'
                 params.require_payment_slip_audit = 0
             }
             await orderCreate(params)
             const tip =
-                createForm.createType === 'fubei' && createForm.requirePaymentSlipAudit
+                (createForm.createType === 'fubei' || createForm.createType === 'express_cod') &&
+                createForm.requirePaymentSlipAudit
                     ? '订单已创建，支付状态为「待审核」'
                     : '订单创建成功'
             feedback.msgSuccess(tip)
@@ -1254,10 +1272,11 @@ const getCreateTypeText = (row: any) => {
     const createTypeMap: Record<string, string> = {
         normal: '普通订单',
         wechat_work: '企业微信对外收款',
-        fubei: '付呗'
+        fubei: '付呗',
+        express_cod: '快递代收'
     }
     const ct = row?.create_type
-    if (ct === 'wechat_work' || ct === 'fubei') {
+    if (ct === 'wechat_work' || ct === 'fubei' || ct === 'express_cod') {
         return createTypeMap[ct]
     }
     if (ct === 'normal' && row?.payment_method) {
@@ -1395,7 +1414,8 @@ const handleDetail = async (row: any) => {
 
 // 支付订单
 const handlePay = (row: any) => {
-    const fubeiPending = row.status === 5 && row.payment_method === 'fubei'
+    const fubeiPending =
+        row.status === 5 && (row.payment_method === 'fubei' || row.create_type === 'express_cod')
     payForm.value = {
         order_id: row.id,
         order_no: row.order_no,

admin/src/views/stats/conversion/index.vue

@@ -129,7 +129,7 @@
                 <el-card class="!border-none" shadow="never">
                     <template #header>
                         <div class="card-header">
-                            <span>诊单金额占比</span>
+                            <span>{{ amountPieTitle }}</span>
                             <span class="card-hint">TOP 10</span>
                         </div>
                     </template>
@@ -146,17 +146,17 @@
                 <el-card class="!border-none" shadow="never">
                     <template #header>
                         <div class="card-header">
-                            <span>加粉占比</span>
+                            <span>{{ secondaryPieTitle }}</span>
                             <span class="card-hint">TOP 10</span>
                         </div>
                     </template>
                     <v-charts
-                        v-if="fanPieHasData"
+                        v-if="secondaryPieHasData"
                         class="stats-chart"
-                        :option="fanPieOption"
+                        :option="secondaryPieOption"
                         autoresize
                     />
-                    <el-empty v-else description="暂无加粉数据" />
+                    <el-empty v-else :description="secondaryPieEmptyText" />
                 </el-card>
             </el-col>
         </el-row>
@@ -311,10 +311,13 @@ const overview = reactive<Record<string, any>>({
             amounts: [],
             order_counts: [],
             fan_counts: [],
-            rois: []
+            rois: [],
+            appointment_counts: [],
+            interview_counts: []
         },
         amount_share: [],
-        fan_share: []
+        fan_share: [],
+        order_share: []
     }
 })
 
@@ -392,7 +395,7 @@ const currentEntityId = computed({
     }
 })
 
-const summaryCards: MetricCard[] = [
+const defaultSummaryCards: MetricCard[] = [
     { key: 'add_fans_count', label: '加粉数', type: 'count' },
     { key: 'paid_appointment_count', label: '付费挂号', type: 'count' },
     { key: 'free_appointment_count', label: '免费挂号', type: 'count' },
@@ -410,7 +413,15 @@ const summaryCards: MetricCard[] = [
     { key: 'roi', label: 'ROI', type: 'ratio' }
 ]
 
-const tableColumns: MetricColumn[] = [
+const doctorSummaryCards: MetricCard[] = [
+    { key: 'appointment_total_count', label: '挂号数', type: 'count' },
+    { key: 'interview_count', label: '面诊数', type: 'count' },
+    { key: 'completed_order_count', label: '接诊单数', type: 'count' },
+    { key: 'completed_order_amount', label: '开药金额', type: 'money' },
+    { key: 'receive_rate', label: '接诊率', type: 'percent' }
+]
+
+const defaultTableColumns: MetricColumn[] = [
     { key: 'add_fans_count', label: '加粉数', type: 'count' },
     { key: 'total_open_count', label: '总开口', type: 'count', placeholder: true },
     { key: 'unreplied_count', label: '未回复', type: 'count', placeholder: true },
@@ -431,6 +442,18 @@ const tableColumns: MetricColumn[] = [
     { key: 'roi', label: 'ROI', type: 'ratio', minWidth: 90 }
 ]
 
+const doctorTableColumns: MetricColumn[] = [
+    { key: 'appointment_total_count', label: '挂号数', type: 'count' },
+    { key: 'interview_count', label: '面诊数', type: 'count' },
+    { key: 'completed_order_count', label: '接诊单数', type: 'count' },
+    { key: 'completed_order_amount', label: '开药金额', type: 'money', minWidth: 120 },
+    { key: 'receive_rate', label: '接诊率', type: 'percent', minWidth: 100 }
+]
+
+const isDoctorDimension = computed(() => queryParams.dimension === 'doctor')
+const summaryCards = computed(() => isDoctorDimension.value ? doctorSummaryCards : defaultSummaryCards)
+const tableColumns = computed(() => isDoctorDimension.value ? doctorTableColumns : defaultTableColumns)
+
 const dateRangeText = computed(() => {
     if (!overview.date_range?.length) return '未选择'
     return `${overview.date_range[0]} 至 ${overview.date_range[1]}`
@@ -438,7 +461,14 @@ const dateRangeText = computed(() => {
 
 const rankingChartHasData = computed(() => overview.charts.ranking.names.length > 0)
 const amountPieHasData = computed(() => overview.charts.amount_share.length > 0)
-const fanPieHasData = computed(() => overview.charts.fan_share.length > 0)
+const secondaryPieHasData = computed(() =>
+    isDoctorDimension.value
+        ? (overview.charts.order_share?.length || 0) > 0
+        : (overview.charts.fan_share?.length || 0) > 0
+)
+const amountPieTitle = computed(() => isDoctorDimension.value ? '开药金额占比' : '诊单金额占比')
+const secondaryPieTitle = computed(() => isDoctorDimension.value ? '接诊单数占比' : '加粉占比')
+const secondaryPieEmptyText = computed(() => isDoctorDimension.value ? '暂无接诊数据' : '暂无加粉数据')
 
 const rankingChartData = computed(() => {
     const ranking = overview.charts?.ranking || {}
@@ -448,56 +478,110 @@ const rankingChartData = computed(() => {
     return {
         names,
         amounts: normalize(Array.isArray(ranking.amounts) ? ranking.amounts : []),
+        appointmentCounts: normalize(Array.isArray(ranking.appointment_counts) ? ranking.appointment_counts : []),
+        interviewCounts: normalize(Array.isArray(ranking.interview_counts) ? ranking.interview_counts : []),
         orderCounts: normalize(Array.isArray(ranking.order_counts) ? ranking.order_counts : []),
-        fanCounts: normalize(Array.isArray(ranking.fan_counts) ? ranking.fan_counts : []),
+        fanCounts: normalize(Array.isArray(ranking.fan_counts) ? ranking.fan_counts : [])
     }
 })
 
-const rankingChartOption = computed(() => ({
-    tooltip: { trigger: 'axis' },
-    legend: { data: ['诊单金额', '接诊诊单', '加粉数'] },
-    grid: { left: 48, right: 24, top: 48, bottom: 48 },
-    xAxis: {
-        type: 'category',
-        data: rankingChartData.value.names,
-        axisLabel: {
-            interval: 0,
-            rotate: rankingChartData.value.names.length > 6 ? 25 : 0
-        }
-    },
-    yAxis: [
-        { type: 'value', name: '金额 / 数量' }
-    ],
-    series: [
-        {
-            name: '诊单金额',
-            type: 'bar',
-            barMaxWidth: 36,
-            data: rankingChartData.value.amounts,
-            itemStyle: { color: '#4a78ff' }
+const rankingChartOption = computed(() => {
+    const common = {
+        tooltip: { trigger: 'axis' },
+        grid: { left: 48, right: 24, top: 48, bottom: 48 },
+        xAxis: {
+            type: 'category',
+            data: rankingChartData.value.names,
+            axisLabel: {
+                interval: 0,
+                rotate: rankingChartData.value.names.length > 6 ? 25 : 0
+            }
         },
-        {
-            name: '接诊诊单',
-            type: 'line',
-            smooth: true,
-            showSymbol: true,
-            symbolSize: 8,
-            lineStyle: { width: 3 },
-            data: rankingChartData.value.orderCounts,
-            itemStyle: { color: '#15b8a6' }
-        },
-        {
-            name: '加粉数',
-            type: 'line',
-            smooth: true,
-            showSymbol: true,
-            symbolSize: 8,
-            lineStyle: { width: 3 },
-            data: rankingChartData.value.fanCounts,
-            itemStyle: { color: '#ff9f43' }
+        yAxis: [
+            { type: 'value', name: '金额 / 数量' }
+        ]
+    }
+
+    if (!isDoctorDimension.value) {
+        return {
+            ...common,
+            legend: { data: ['诊单金额', '接诊诊单', '加粉数'] },
+            series: [
+                {
+                    name: '诊单金额',
+                    type: 'bar',
+                    barMaxWidth: 36,
+                    data: rankingChartData.value.amounts,
+                    itemStyle: { color: '#4a78ff' }
+                },
+                {
+                    name: '接诊诊单',
+                    type: 'line',
+                    smooth: true,
+                    showSymbol: true,
+                    symbolSize: 8,
+                    lineStyle: { width: 3 },
+                    data: rankingChartData.value.orderCounts,
+                    itemStyle: { color: '#15b8a6' }
+                },
+                {
+                    name: '加粉数',
+                    type: 'line',
+                    smooth: true,
+                    showSymbol: true,
+                    symbolSize: 8,
+                    lineStyle: { width: 3 },
+                    data: rankingChartData.value.fanCounts,
+                    itemStyle: { color: '#ff9f43' }
+                }
+            ]
         }
-    ]
-}))
+    }
+
+    return {
+        ...common,
+        legend: { data: ['开药金额', '挂号数', '面诊数', '接诊单数'] },
+        series: [
+            {
+                name: '开药金额',
+                type: 'bar',
+                barMaxWidth: 36,
+                data: rankingChartData.value.amounts,
+                itemStyle: { color: '#4a78ff' }
+            },
+            {
+                name: '挂号数',
+                type: 'line',
+                smooth: true,
+                showSymbol: true,
+                symbolSize: 8,
+                lineStyle: { width: 3 },
+                data: rankingChartData.value.appointmentCounts,
+                itemStyle: { color: '#15b8a6' }
+            },
+            {
+                name: '面诊数',
+                type: 'line',
+                smooth: true,
+                showSymbol: true,
+                symbolSize: 8,
+                lineStyle: { width: 3 },
+                data: rankingChartData.value.interviewCounts,
+                itemStyle: { color: '#ff9f43' }
+            },
+            {
+                name: '接诊单数',
+                type: 'line',
+                smooth: true,
+                showSymbol: true,
+                symbolSize: 8,
+                lineStyle: { width: 3 },
+                data: rankingChartData.value.orderCounts,
+                itemStyle: { color: '#7c3aed' }
+            }
+        ]
+    }
+})
 
 const amountPieOption = computed(() => ({
     tooltip: { trigger: 'item' },
@@ -511,7 +595,7 @@ const amountPieOption = computed(() => ({
     },
     series: [
         {
-            name: '诊单金额',
+            name: amountPieTitle.value,
             type: 'pie',
             radius: ['42%', '70%'],
             center: ['50%', '42%'],
@@ -531,7 +615,7 @@ const amountPieOption = computed(() => ({
     ]
 }))
 
-const fanPieOption = computed(() => ({
+const secondaryPieOption = computed(() => ({
     tooltip: { trigger: 'item' },
     legend: {
         bottom: 0,
@@ -543,7 +627,7 @@ const fanPieOption = computed(() => ({
     },
     series: [
         {
-            name: '加粉数',
+            name: secondaryPieTitle.value,
             type: 'pie',
             radius: ['42%', '70%'],
             center: ['50%', '42%'],
@@ -558,7 +642,7 @@ const fanPieOption = computed(() => ({
             labelLayout: {
                 hideOverlap: true,
             },
-            data: overview.charts.fan_share
+            data: isDoctorDimension.value ? overview.charts.order_share : overview.charts.fan_share
         }
     ]
 }))
@@ -658,9 +742,18 @@ const handleReset = () => {
     fetchOverview()
 }
 
+const calcDoctorReceiveRate = (source: Record<string, any>) => {
+    const completedOrderCount = Number(source?.completed_order_count || 0)
+    const interviewCount = Number(source?.interview_count || 0)
+    if (interviewCount <= 0) return 0
+    return (completedOrderCount / interviewCount) * 100
+}
+
 const renderMetric = (key: string, source: Record<string, any>, type = 'count', placeholder = false) => {
     if (placeholder) return '—'
-    const value = source?.[key] ?? 0
+    const value = isDoctorDimension.value && key === 'receive_rate'
+        ? calcDoctorReceiveRate(source)
+        : source?.[key] ?? 0
     if (type === 'money') return `¥${Number(value || 0).toFixed(2)}`
     if (type === 'percent') return `${Number(value || 0).toFixed(2)}%`
     if (type === 'ratio') return Number(value || 0).toFixed(2)

admin/src/views/tcm/diagnosis/add.vue

@@ -556,7 +556,11 @@ const validatePhone = (rule: any, value: any, callback: any) => {
 }
 
 const validateIdCard = (rule: any, value: any, callback: any) => {
-    if (value && !/^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$/.test(value)) {
+    if (!value) {
+        callback()
+        return
+    }
+    if (!/^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$/.test(value)) {
         callback(new Error('身份证号格式不正确'))
         return
     }
@@ -572,6 +576,7 @@ const formRules = {
     diagnosis_type: [{ required: true, message: '请选择诊断类型', trigger: 'change' }],
     syndrome_type: [{ required: true, message: '请选择证型', trigger: 'change' }],
     diabetes_type: [{ required: true, message: '请选择糖尿病期数', trigger: 'change' }],
+    local_hospital_name: [{ required: true, message: '请输入当地就诊医院名称', trigger: 'blur' }],
     diabetes_discovery_year: [{ max: 50, message: '最多50个字符', trigger: 'blur' }]
 }
 

admin/src/views/tcm/diagnosis/edit.vue

@@ -67,26 +67,66 @@
                 >
                 <!-- 基本信息 -->
                 <el-divider content-position="left">基本信息</el-divider>
+
+                <el-alert
+                    v-if="mode === 'edit' && patientBasicLocked && !canEditPatientBasicFields"
+                    type="warning"
+                    :closable="false"
+                    show-icon
+                    class="mb-3"
+                >
+                    <template v-if="latestPrescriptionOrder">
+                        最近业务订单 #{{ latestPrescriptionOrder.id }} 状态为「{{ latestPrescriptionOrder.fulfillment_status_text }}」，患者基本信息不可修改
+                    </template>
+                    <template v-else>
+                        存在未完成的业务订单，患者基本信息不可修改
+                    </template>
+                </el-alert>
                 
                 <el-form-item label="诊单ID">
                     <el-input v-model="formData.patient_id" disabled placeholder="系统自动生成" />
                 </el-form-item>
 
+                <fieldset
+                    :disabled="!canEditPatientBasicFields"
+                    class="diagnosis-patient-basic-fieldset border-0 min-w-0 p-0 m-0"
+                >
                 <el-row :gutter="20">
                     <el-col :span="12">
                         <el-form-item label="姓名" prop="patient_name">
                             <el-input
                                 v-model="formData.patient_name"
                                 placeholder="请输入姓名"
+                                :disabled="!canEditPatientBasicFields"
                             />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="身份证号" prop="id_card">
+                            <template v-if="showIdCardMaskedEdit">
+                                <el-input
+                                    :model-value="
+                                        idCardRevealUnlocked ? originalIdCard || '' : maskIdCard(originalIdCard || '')
+                                    "
+                                    readonly
+                                    placeholder="点击可查看完整身份证号"
+                                    maxlength="18"
+                                    class="cursor-pointer phone-mask-toggle"
+                                    @click="toggleIdCardReveal"
+                                />
+                                <p
+                                    v-if="originalIdCard && !idCardRevealUnlocked"
+                                    class="text-xs text-gray-400 mt-1"
+                                >
+                                    当前为脱敏显示，点击输入框可查看完整号码
+                                </p>
+                            </template>
                             <el-input
+                                v-else
                                 v-model="formData.id_card"
                                 placeholder="请输入身份证号"
                                 maxlength="18"
+                                :disabled="!canEditIdCard"
                                 @focus="handleIdCardFocus"
                                 @blur="handleIdCardBlur"
                             />
@@ -120,6 +160,7 @@
                                 v-model="formData.phone"
                                 placeholder="请输入手机号"
                                 maxlength="11"
+                                :disabled="!canEditPatientBasicFields"
                                 @focus="handlePhoneFocus"
                                 @blur="handlePhoneBlur"
                             />
@@ -127,7 +168,7 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="性别" prop="gender">
-                            <el-radio-group v-model="formData.gender">
+                            <el-radio-group v-model="formData.gender" :disabled="!canEditPatientBasicFields">
                                 <el-radio :label="1">男</el-radio>
                                 <el-radio :label="0">女</el-radio>
                             </el-radio-group>
@@ -144,11 +185,14 @@
                                 :max="150"
                                 placeholder="请输入年龄"
                                 class="w-full"
+                                :disabled="!canEditPatientBasicFields"
+                                :controls="canEditPatientBasicFields"
                             />
                         </el-form-item>
                     </el-col>
                     
                 </el-row>
+                </fieldset>
 
            
                 <!-- 生命体征 -->
@@ -778,9 +822,40 @@ const submitting = ref(false)
 /** 拥有后手机号可正常编辑，失焦不再强制脱敏 */
 const hasPhonePlainPermission = computed(() => hasPermission(['tcm.diagnosis/phonePlain']))
 const hasDailyRecordPermission = computed(() => hasPermission(['tcm.diagnosis/dailyRecord']))
-/** 编辑且无明文权限：只读脱敏，点击切换查看完整号 */
-const showPhoneMaskedEdit = computed(() => mode.value === 'edit' && !hasPhonePlainPermission.value)
+const patientBasicLocked = ref(false)
+const canEditPatientBasicFromApi = ref(true)
+const latestPrescriptionOrder = ref<{
+    id: number
+    fulfillment_status: number
+    fulfillment_status_text: string
+} | null>(null)
+const canEditPatientBasicFields = computed(() => {
+    if (viewOnly.value) return false
+    if (mode.value === 'add') return true
+    return canEditPatientBasicFromApi.value
+})
+/** 编辑且无明文权限或基本信息锁定：只读脱敏，点击切换查看完整号 */
+const showPhoneMaskedEdit = computed(() => {
+    if (mode.value !== 'edit') return false
+    if (!canEditPatientBasicFields.value) return true
+    return !hasPhonePlainPermission.value
+})
 const phoneRevealUnlocked = ref(false)
+/** 编辑且已有身份证号：无明文权限或基本信息锁定时只读脱敏；空身份证号仍可编辑 */
+const showIdCardMaskedEdit = computed(() => {
+    if (mode.value !== 'edit') return false
+    if (!originalIdCard.value) return false
+    if (!canEditPatientBasicFields.value) return true
+    return !hasPhonePlainPermission.value
+})
+/** 身份证号是否可编辑：空号允许补录；已有号需明文权限 */
+const canEditIdCard = computed(() => {
+    if (!canEditPatientBasicFields.value) return false
+    if (mode.value === 'add') return true
+    if (!originalIdCard.value) return true
+    return hasPhonePlainPermission.value
+})
+const idCardRevealUnlocked = ref(false)
 const activeTab = ref('basic')
 const drawerTitle = computed(() => {
     if (viewOnly.value) return '诊单详情'
@@ -920,6 +995,11 @@ const togglePhoneReveal = () => {
     phoneRevealUnlocked.value = !phoneRevealUnlocked.value
 }
 
+const toggleIdCardReveal = () => {
+    if (!originalIdCard.value) return
+    idCardRevealUnlocked.value = !idCardRevealUnlocked.value
+}
+
 const maskIdCard = (idCard: string) => {
     if (!idCard) return idCard
     if (idCard.length === 15) {
@@ -990,43 +1070,40 @@ const handlePhoneBlur = async () => {
     }
 }
 
-// 身份证聚焦 - 显示完整数据
+// 身份证聚焦 - 显示完整数据（无「明文」权限时仅新增模式在失焦后可再次展开编辑）
 const handleIdCardFocus = () => {
     isIdCardFocused.value = true
-    if (originalIdCard.value) {
+    if (!originalIdCard.value) return
+    if (hasPhonePlainPermission.value) {
+        formData.value.id_card = originalIdCard.value
+        return
+    }
+    if (mode.value === 'add') {
         formData.value.id_card = originalIdCard.value
     }
 }
 
-// 身份证失焦 - 恢复脱敏并验证
+// 身份证失焦：有明文权限则保持明文并校验；新增且无明文权限时仍脱敏展示
 const handleIdCardBlur = async () => {
     isIdCardFocused.value = false
-    
-    // 保存原始数据并脱敏显示
-    if (formData.value.id_card && (formData.value.id_card.length === 15 || formData.value.id_card.length === 18)) {
-        originalIdCard.value = formData.value.id_card
-        
-        // 验证身份证格式并计算年龄
-        if (/^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$/.test(formData.value.id_card)) {
-            // 从身份证提取出生日期计算年龄
-            const id = formData.value.id_card
-            const birthYear = parseInt(id.substring(6, 10))
-            const birthMonth = parseInt(id.substring(10, 12))
-            const birthDay = parseInt(id.substring(12, 14))
+
+    const processIdCard = async (idCard: string) => {
+        if (/^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$/.test(idCard)) {
+            const birthYear = parseInt(idCard.substring(6, 10))
+            const birthMonth = parseInt(idCard.substring(10, 12))
+            const birthDay = parseInt(idCard.substring(12, 14))
             const today = new Date()
             let age = today.getFullYear() - birthYear
             if (today.getMonth() + 1 < birthMonth || (today.getMonth() + 1 === birthMonth && today.getDate() < birthDay)) {
                 age--
             }
             formData.value.age = age
-            
-            // 验证身份证唯一性
+
             try {
                 const result = await checkIdCard({
-                    id_card: formData.value.id_card,
+                    id_card: idCard,
                     id: formData.value.id || ''
                 })
-                
                 if (result.exists) {
                     ElMessage.warning(result.message)
                 }
@@ -1034,8 +1111,24 @@ const handleIdCardBlur = async () => {
                 console.error('检查身份证号失败:', error)
             }
         }
-        
-        // 脱敏显示
+    }
+
+    if (hasPhonePlainPermission.value) {
+        if (formData.value.id_card && (formData.value.id_card.length === 15 || formData.value.id_card.length === 18)) {
+            originalIdCard.value = formData.value.id_card
+            await processIdCard(formData.value.id_card)
+        }
+        return
+    }
+
+    // 编辑模式下已有身份证号且无明文权限时不处理
+    if (mode.value === 'edit' && originalIdCard.value) {
+        return
+    }
+
+    if (formData.value.id_card && (formData.value.id_card.length === 15 || formData.value.id_card.length === 18)) {
+        originalIdCard.value = formData.value.id_card
+        await processIdCard(formData.value.id_card)
         formData.value.id_card = maskIdCard(formData.value.id_card)
     }
 }
@@ -1058,7 +1151,11 @@ const validatePhone = (rule: any, value: any, callback: any) => {
 const validateIdCard = (rule: any, value: any, callback: any) => {
     // 使用原始数据进行验证
     const idCardToValidate = originalIdCard.value || value
-    if (idCardToValidate && !/^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$/.test(idCardToValidate)) {
+    if (!idCardToValidate) {
+        callback()
+        return
+    }
+    if (!/^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$/.test(idCardToValidate)) {
         callback(new Error('身份证号格式不正确'))
         return
     }
@@ -1073,6 +1170,7 @@ const formRules = {
     age: [{ required: true, message: '请输入年龄', trigger: 'blur' }],
     fasting_blood_sugar: [{ required: true, message: '请输入空腹血糖', trigger: 'blur' }],
     diagnosis_type: [{ required: true, message: '请选择诊断类型', trigger: 'change' }],
+    local_hospital_name: [{ required: true, message: '请输入当地就诊医院名称', trigger: 'blur' }],
     diabetes_discovery_year: [{ max: 50, message: '最多50个字符', trigger: 'blur' }],
 }
 
@@ -1167,9 +1265,12 @@ async function loadDiagnosisDetailIntoForm(id: number): Promise<void> {
 
     originalPhone.value = data.phone || ''
     originalIdCard.value = data.id_card || ''
+    patientBasicLocked.value = !!data.patient_basic_locked
+    canEditPatientBasicFromApi.value = data.can_edit_patient_basic !== false
+    latestPrescriptionOrder.value = data.latest_prescription_order ?? null
 
     data.phone = hasPhonePlainPermission.value ? data.phone || '' : maskPhone(data.phone || '')
-    data.id_card = maskIdCard(data.id_card || '')
+    data.id_card = hasPhonePlainPermission.value ? data.id_card || '' : maskIdCard(data.id_card || '')
 
     formData.value = data
     formData.value.create_source = data.create_source ?? ''
@@ -1178,12 +1279,20 @@ async function loadDiagnosisDetailIntoForm(id: number): Promise<void> {
     formData.value.diabetes_discovery_year = y == null || y === '' ? '' : String(y)
 }
 
+const resetPatientBasicLockState = () => {
+    patientBasicLocked.value = false
+    canEditPatientBasicFromApi.value = true
+    latestPrescriptionOrder.value = null
+}
+
 const open = async (type: string, id?: number) => {
     viewOnly.value = false
     mode.value = type
     visible.value = true
     activeTab.value = 'basic' // 重置到基本信息标签页
     phoneRevealUnlocked.value = false
+    idCardRevealUnlocked.value = false
+    resetPatientBasicLockState()
 
     // 加载字典数据
     await getDictOptions()
@@ -1206,6 +1315,8 @@ const openViewOnly = async (id: number) => {
     visible.value = true
     activeTab.value = 'basic'
     phoneRevealUnlocked.value = false
+    idCardRevealUnlocked.value = false
+    resetPatientBasicLockState()
     await getDictOptions()
     await loadDiagnosisDetailIntoForm(id)
 }
@@ -1230,6 +1341,7 @@ const handleSubmit = async () => {
             if (result && result.id) {
                 mode.value = 'edit'
                 phoneRevealUnlocked.value = false
+                idCardRevealUnlocked.value = false
                 formData.value.id = result.id
 
                 // 重新获取详情，确保patient_id等字段正确
@@ -1244,7 +1356,9 @@ const handleSubmit = async () => {
                     formData.value.phone = hasPhonePlainPermission.value
                         ? detail.phone || ''
                         : maskPhone(detail.phone || '')
-                    formData.value.id_card = maskIdCard(detail.id_card || '')
+                    formData.value.id_card = hasPhonePlainPermission.value
+                        ? detail.id_card || ''
+                        : maskIdCard(detail.id_card || '')
                 } catch (error) {
                     console.error('获取详情失败:', error)
                 }
@@ -1346,6 +1460,7 @@ const handleClose = () => {
     isPhoneFocused.value = false
     isIdCardFocused.value = false
     phoneRevealUnlocked.value = false
+    idCardRevealUnlocked.value = false
     viewOnly.value = false
 
     visible.value = false
@@ -1370,6 +1485,19 @@ defineExpose({
         }
     }
 
+    .diagnosis-patient-basic-fieldset:disabled {
+        opacity: 1;
+        :deep(.el-input__wrapper),
+        :deep(.el-input-number),
+        :deep(.el-input-number__decrease),
+        :deep(.el-input-number__increase),
+        :deep(.el-radio),
+        :deep(.el-radio__input) {
+            cursor: not-allowed;
+            pointer-events: none;
+        }
+    }
+
     :deep(.el-form) {
         padding-bottom: 20px;
         font-size: 12px;

admin/src/views/tcm/diagnosis/index.vue

@@ -121,6 +121,16 @@
                     end-placeholder="最近挂号结束"
                     @change="handleLatestAppointmentFilterChange"
                 />
+                <daterange-picker
+                    class="latest-assign-range"
+                    v-model:startTime="formData.latest_assign_start_date"
+                    v-model:endTime="formData.latest_assign_end_date"
+                    picker-type="daterange"
+                    value-format="YYYY-MM-DD"
+                    start-placeholder="最近指派开始"
+                    end-placeholder="最近指派结束"
+                    @change="handleLatestAssignFilterChange"
+                />
                 <el-select
                     v-model="formData.latest_appointment_channel_source"
                     placeholder="最近挂号渠道"
@@ -173,6 +183,7 @@
                 v-loading="pager.loading"
                 @selection-change="handleSelectionChange"
                 @row-dblclick="goReadonly"
+                @sort-change="handleTableSortChange"
                 :row-class-name="getRowClassName"
                 class="diagnosis-table"
                 stripe
@@ -283,7 +294,14 @@
                         <span v-else class="status-unprescribed">未开方</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="未服务天数" width="110" align="center">
+                <el-table-column
+                    label="未服务天数"
+                    prop="unserved_days"
+                    width="110"
+                    align="center"
+                    sortable="custom"
+                    :sort-orders="['descending', 'ascending']"
+                >
                     <template #default="{ row }">
                         <el-tooltip
                             v-if="row.last_blood_record_at"
@@ -762,6 +780,10 @@ const formData = reactive({
     latest_appointment_start_date: '' as string,
     latest_appointment_end_date: '' as string,
     latest_appointment_channel_source: '' as string,
+    latest_assign_start_date: '' as string,
+    latest_assign_end_date: '' as string,
+    /** 未服务天数排序：desc=天数多到少 asc=少到多 */
+    sort_unserved_days: '' as '' | 'asc' | 'desc',
     diagnosis_confirmed: '' as '' | '0' | '1',
     appointment_date: '' as string,
     has_appointment: '' as '' | '0' | '1',
@@ -849,22 +871,50 @@ function resolvePendingAssignOrderMonthForRequest(): string {
     return dayjs().format('YYYY-MM')
 }
 
-/** 待分配角标 count 请求：与列表同条件，且去掉其它顶部 Tab 残留（如默认「当天挂号」） */
-function buildPendingAssignCountPayload(): Record<string, unknown> {
-    return buildTcmDiagnosisListRequestPayload({
-        ...formData,
+/** 除顶部 Tab 专属条件外，与主列表共用的「更多筛选」参数（角标 count 需同步） */
+function buildSharedDiagnosisFilterPayload(): Record<string, unknown> {
+    return {
+        keyword: formData.keyword,
+        diagnosis_type: formData.diagnosis_type,
+        syndrome_type: formData.syndrome_type,
+        assistant_id: formData.assistant_id,
+        diagnosis_confirmed: formData.diagnosis_confirmed,
+        has_appointment: formData.has_appointment,
+        latest_appointment_start_date: formData.latest_appointment_start_date,
+        latest_appointment_end_date: formData.latest_appointment_end_date,
+        latest_appointment_channel_source: formData.latest_appointment_channel_source,
+        latest_assign_start_date: formData.latest_assign_start_date,
+        latest_assign_end_date: formData.latest_assign_end_date
+    }
+}
+
+/** 顶部 Tab 角标 count 请求：带上共用筛选，再叠加各 Tab 专属条件 */
+function buildDateCountRequestPayload(overrides: Record<string, unknown> = {}): Record<string, unknown> {
+    return {
         page_no: 1,
         page_size: 1,
-        pending_assign: 1,
+        ...buildSharedDiagnosisFilterPayload(),
         appointment_date: '',
-        has_appointment: '',
         pending_booking: '',
         completed_appointment: '',
-        latest_appointment_start_date: '',
-        latest_appointment_end_date: '',
-        latest_appointment_channel_source: '',
-        pending_assign_order_month: resolvePendingAssignOrderMonthForRequest()
-    } as Record<string, unknown>) as Record<string, unknown>
+        pending_assign: '',
+        pending_assign_order_month: '',
+        pending_assign_keyword: '',
+        sort_unserved_days: '',
+        ...overrides
+    }
+}
+
+/** 待分配角标 count 请求：与列表同条件，且去掉其它顶部 Tab 残留（如默认「当天挂号」） */
+function buildPendingAssignCountPayload(): Record<string, unknown> {
+    return buildTcmDiagnosisListRequestPayload(
+        buildDateCountRequestPayload({
+            pending_assign: 1,
+            has_appointment: '',
+            pending_assign_order_month: resolvePendingAssignOrderMonthForRequest(),
+            pending_assign_keyword: formData.pending_assign_keyword
+        }) as Record<string, unknown>
+    ) as Record<string, unknown>
 }
 
 const fetchTcmDiagnosisListsForPaging = (req: Record<string, unknown>) =>
@@ -893,6 +943,9 @@ function clearSecondaryFiltersWhenPendingAssignWideSearch() {
     formData.latest_appointment_start_date = ''
     formData.latest_appointment_end_date = ''
     formData.latest_appointment_channel_source = ''
+    formData.latest_assign_start_date = ''
+    formData.latest_assign_end_date = ''
+    formData.sort_unserved_days = ''
     formData.pending_assign_order_month = ''
     activeTab.value = 'all'
     if (kw1 !== '') {
@@ -994,14 +1047,26 @@ const onPendingAssignOrderMonthChange = async (val: string | null) => {
 const fetchDateCounts = async () => {
     try {
         const [yesterday, dayBefore, today, tomorrow, dayAfter, all, noApt, doneVisit, pending] = await Promise.all([
-            tcmDiagnosisLists({ appointment_date: yesterdayStr.value, page_no: 1, page_size: 1 }),
-            tcmDiagnosisLists({ appointment_date: dayBeforeStr.value, page_no: 1, page_size: 1 }),
-            tcmDiagnosisLists({ appointment_date: todayStr.value, page_no: 1, page_size: 1 }),
-            tcmDiagnosisLists({ appointment_date: tomorrowStr.value, page_no: 1, page_size: 1 }),
-            tcmDiagnosisLists({ appointment_date: dayAfterStr.value, page_no: 1, page_size: 1 }),
-            tcmDiagnosisLists({ page_no: 1, page_size: 1 }),
-            tcmDiagnosisLists({ has_appointment: 0, page_no: 1, page_size: 1 }),
-            tcmDiagnosisLists({ completed_appointment: 1, page_no: 1, page_size: 1 }),
+            tcmDiagnosisLists(
+                buildDateCountRequestPayload({ appointment_date: yesterdayStr.value, has_appointment: '' }) as any
+            ),
+            tcmDiagnosisLists(
+                buildDateCountRequestPayload({ appointment_date: dayBeforeStr.value, has_appointment: '' }) as any
+            ),
+            tcmDiagnosisLists(
+                buildDateCountRequestPayload({ appointment_date: todayStr.value, has_appointment: '' }) as any
+            ),
+            tcmDiagnosisLists(
+                buildDateCountRequestPayload({ appointment_date: tomorrowStr.value, has_appointment: '' }) as any
+            ),
+            tcmDiagnosisLists(
+                buildDateCountRequestPayload({ appointment_date: dayAfterStr.value, has_appointment: '' }) as any
+            ),
+            tcmDiagnosisLists(buildDateCountRequestPayload() as any),
+            tcmDiagnosisLists(buildDateCountRequestPayload({ has_appointment: 0 }) as any),
+            tcmDiagnosisLists(
+                buildDateCountRequestPayload({ completed_appointment: 1, has_appointment: '' }) as any
+            ),
             tcmDiagnosisLists(buildPendingAssignCountPayload() as any)
         ])
         dateCounts.value = {
@@ -1135,6 +1200,11 @@ const clearLatestAppointmentFilters = () => {
     formData.latest_appointment_channel_source = ''
 }
 
+const clearLatestAssignFilters = () => {
+    formData.latest_assign_start_date = ''
+    formData.latest_assign_end_date = ''
+}
+
 const hasLatestAppointmentFilter = () =>
     !!(
         formData.latest_appointment_start_date ||
@@ -1142,6 +1212,9 @@ const hasLatestAppointmentFilter = () =>
         formData.latest_appointment_channel_source
     )
 
+const hasLatestAssignFilter = () =>
+    !!(formData.latest_assign_start_date || formData.latest_assign_end_date)
+
 const handleLatestAppointmentFilterChange = () => {
     if (hasLatestAppointmentFilter()) {
         formData.appointment_date = ''
@@ -1154,6 +1227,27 @@ const handleLatestAppointmentFilterChange = () => {
     doSearch()
 }
 
+const handleLatestAssignFilterChange = () => {
+    doSearch()
+}
+
+const handleTableSortChange = ({
+    prop,
+    order
+}: {
+    prop: string
+    order: 'ascending' | 'descending' | null
+}) => {
+    if (prop === 'unserved_days') {
+        formData.sort_unserved_days =
+            order === 'ascending' ? 'asc' : order === 'descending' ? 'desc' : ''
+    } else {
+        formData.sort_unserved_days = ''
+    }
+    pager.page = 1
+    getLists()
+}
+
 const latestAppointmentChannelText = (row: any) => {
     const desc = String(row?.latest_appointment_channel_source_desc || '').trim()
     const raw = String(row?.latest_appointment_channel_source || '').trim()
@@ -1200,6 +1294,9 @@ const handleReset = () => {
     formData.latest_appointment_start_date = ''
     formData.latest_appointment_end_date = ''
     formData.latest_appointment_channel_source = ''
+    formData.latest_assign_start_date = ''
+    formData.latest_assign_end_date = ''
+    formData.sort_unserved_days = ''
     formData.diagnosis_confirmed = ''
     formData.appointment_date = ''
     formData.has_appointment = ''
@@ -2298,6 +2395,11 @@ onUnmounted(() => {
         max-width: 100%;
     }
 
+    .latest-assign-range {
+        width: 260px;
+        max-width: 100%;
+    }
+
     .latest-appointment-channel {
         width: 170px;
     }

server/app/adminapi/controller/asset/AssetResourceController.php

@@ -169,14 +169,19 @@ class AssetResourceController extends BaseAdminController
     public function delete()
     {
         $id = $this->request->post('id');
-        if (empty($id)) {
+        $ids = is_array($id) ? $id : [$id];
+        $ids = array_values(array_unique(array_filter(array_map('intval', $ids), static function (int $item): bool {
+            return $item > 0;
+        })));
+
+        if (empty($ids)) {
             return $this->fail('缺少参数');
         }
         
         Db::startTrans();
         try {
-            AssetResource::destroy($id);
-            AssetUserResource::where('resource_id', $id)->delete();
+            AssetResource::destroy($ids);
+            AssetUserResource::whereIn('resource_id', $ids)->delete();
             Db::commit();
             return $this->success('删除成功');
         } catch (\Exception $e) {

server/app/adminapi/controller/order/OrderController.php

@@ -207,11 +207,17 @@ class OrderController extends BaseAdminController
         $params['creator_id'] = $this->adminId;
         $params['payment_channel'] = (string)$this->request->post('payment_channel', 'normal');
         $params['require_payment_slip_audit'] = (int)$this->request->post('require_payment_slip_audit', 0);
-        // 创建方式：优先取前端透传的 create_type，否则按 payment_channel 派生（fubei→fubei，其余 normal）
+        // 创建方式：优先取前端透传的 create_type，否则按 payment_channel 派生（fubei→fubei，express_cod→express_cod，其余 normal）
         $createTypeReq = (string)$this->request->post('create_type', '');
-        $params['create_type'] = in_array($createTypeReq, ['normal', 'wechat_work', 'fubei'], true)
-            ? $createTypeReq
-            : ($params['payment_channel'] === 'fubei' ? 'fubei' : 'normal');
+        if (in_array($createTypeReq, ['normal', 'wechat_work', 'fubei', 'express_cod'], true)) {
+            $params['create_type'] = $createTypeReq;
+        } elseif ($params['payment_channel'] === 'fubei') {
+            $params['create_type'] = 'fubei';
+        } elseif ($params['payment_channel'] === 'express_cod') {
+            $params['create_type'] = 'express_cod';
+        } else {
+            $params['create_type'] = 'normal';
+        }
 
         $result = OrderLogic::create($params);
         if (!$result) {

server/app/adminapi/controller/stats/YejiStatsController.php

@@ -17,6 +17,7 @@ use app\adminapi\logic\stats\YejiStatsLogic;
  * - GET stats.yejiStats/leadLines               进线数据明细（add_external_contact 逐条）
  * - GET stats.yejiStats/appointmentLines       医助排行榜「预约诊单」挂号逐条明细
  * - GET stats.yejiStats/revisitBreakdown        二中心复诊下钻：医助 × 业务订单笔数
+ * - GET stats.yejiStats/assignLines             被指派数明细（医助×诊单去重，与看板同口径）
  */
 class YejiStatsController extends BaseAdminController
 {
@@ -141,4 +142,13 @@ class YejiStatsController extends BaseAdminController
 
         return $this->data(YejiStatsLogic::revisitDeptAssistantBreakdown($params, $this->adminId, $this->adminInfo));
     }
+
+    /** 被指派数明细：与看板「被指派数」同口径（区间内非继承指派，医助×诊单去重） */
+    public function assignLines()
+    {
+        @set_time_limit(120);
+        $params = $this->request->get();
+
+        return $this->data(YejiStatsLogic::assignLines($params, $this->adminId, $this->adminInfo));
+    }
 }

server/app/adminapi/controller/tcm/DiagnosisController.php

@@ -87,7 +87,7 @@ class DiagnosisController extends BaseAdminController
     public function edit()
     {
         $params = (new DiagnosisValidate())->post()->goCheck('edit');
-        $result = DiagnosisLogic::edit($params);
+        $result = DiagnosisLogic::edit($params, $this->adminInfo);
         if ($result) {
             return $this->success('编辑成功', [], 1, 1);
         }
@@ -116,7 +116,7 @@ class DiagnosisController extends BaseAdminController
     {
 
         $params = (new DiagnosisValidate())->goCheck('id');
-        $result = DiagnosisLogic::detail($params);
+        $result = DiagnosisLogic::detail($params, $this->adminInfo);
         DiagnosisLogic::markAssignRead((int) ($params['id'] ?? 0), $this->adminId);
         return $this->data($result);
     }

server/app/adminapi/controller/tcm/PrescriptionOrderController.php

@@ -286,6 +286,32 @@ class PrescriptionOrderController extends BaseAdminController
         return $this->success('已撤回', $result);
     }
 
+    /**
+     * @notes 批量将处方业务订单改派给其他医助（写入 creator_id 并逐单记操作日志）
+     */
+    public function batchAssignAssistant()
+    {
+        if (!PrescriptionOrderLogic::canSeeAllPrescriptionOrders($this->adminInfo)) {
+            return $this->fail('无权限批量改派订单');
+        }
+        $params = $this->request->post();
+        $rawIds = $params['order_ids'] ?? [];
+        if (!\is_array($rawIds) || $rawIds === []) {
+            return $this->fail('请选择订单');
+        }
+        $assistantId = (int) ($params['assistant_id'] ?? 0);
+        $result = PrescriptionOrderLogic::batchAssignAssistant($rawIds, $assistantId, $this->adminId, $this->adminInfo);
+        if ($result === false) {
+            return $this->fail(PrescriptionOrderLogic::getError());
+        }
+        $msg = '已改派 ' . (int) $result['success'] . ' 单';
+        if (!empty($result['errors'])) {
+            $msg .= '；' . implode('；', $result['errors']);
+        }
+
+        return $this->success($msg, $result);
+    }
+
     /**
      * 获取业务订单操作日志
      */
@@ -302,6 +328,20 @@ class PrescriptionOrderController extends BaseAdminController
         return $this->success('', $result);
     }
 
+    /**
+     * 手工新增操作日志（可选同步调整处方/支付单审核状态）
+     */
+    public function addLog()
+    {
+        $params = (new PrescriptionOrderValidate())->post()->goCheck('addLog');
+        $result = PrescriptionOrderLogic::addLog($params, $this->adminId, $this->adminInfo);
+        if ($result === false) {
+            return $this->fail(PrescriptionOrderLogic::getError());
+        }
+
+        return $this->success('日志已添加', $result);
+    }
+
     /**
      * 为「已发货」订单新增一条关联支付单，并重置支付单审核状态为待审核
      */

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

@@ -140,6 +140,7 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
         }
 
         $this->applyLatestAppointmentFilters($query, $pendingWideSearch);
+        $this->applyLatestAssignFilters($query, $pendingWideSearch);
 
         $this->applyPendingAssignBusinessOrderMonthFilter($query);
 
@@ -167,30 +168,7 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
             }
         }
 
-        // 按挂号状态优先级排序：已过号(4) > 已预约(1) > 已完成(3)，然后按挂号日期+时间升序
-        // 若传了 appointment_date（当天/明天等筛选），只按「该日」的挂号排序与展示
-        $diagTbl = (new Diagnosis())->getTable();
-        $aptTbl = (new Appointment())->getTable();
-        $minAptDateCond = '';
-        if (!$pendingWideSearch && !empty($this->params['appointment_date'])) {
-            $sortAptDate = addslashes((string) $this->params['appointment_date']);
-            $minAptDateCond = " AND apt.appointment_date = '{$sortAptDate}'";
-        }
-        
-        // 获取最早的挂号状态（用于排序优先级）
-        $minAptStatusExpr = '(SELECT apt.status FROM ' . $aptTbl . ' apt WHERE apt.patient_id = ' . $diagTbl . '.id AND apt.status IN (1,3,4)' . $minAptDateCond . ' ORDER BY CASE apt.status WHEN 4 THEN 1 WHEN 1 THEN 2 WHEN 3 THEN 3 ELSE 4 END, apt.appointment_date ASC, apt.appointment_time ASC LIMIT 1)';
-        
-        // 获取最早的挂号时间（用于同状态内排序）
-        $minAptExpr = '(SELECT MIN(CONCAT(apt.appointment_date, \' \', IFNULL(NULLIF(TRIM(apt.appointment_time), \'\'), \'00:00:00\'))) FROM ' . $aptTbl . ' apt WHERE apt.patient_id = ' . $diagTbl . '.id AND apt.status IN (1,3,4)' . $minAptDateCond . ')';
-
-        // 「已完成」Tab：按最近一条「已完成」(status=3) 挂号日期+时间降序…
-        $isCompletedTab = !$pendingWideSearch && isset($this->params['completed_appointment']) && (string) $this->params['completed_appointment'] === '1';
-        if ($isCompletedTab) {
-            $maxCompletedAptExpr = '(SELECT MAX(CONCAT(apt.appointment_date, \' \', IFNULL(NULLIF(TRIM(apt.appointment_time), \'\'), \'00:00:00\'))) FROM ' . $aptTbl . ' apt WHERE apt.patient_id = ' . $diagTbl . '.id AND apt.status = 3' . $minAptDateCond . ')';
-            $orderRaw              = $diagTbl . '.assign_read_at IS NULL DESC, IFNULL(' . $maxCompletedAptExpr . ", '1970-01-01 00:00:00') DESC, {$diagTbl}.id DESC";
-        } else {
-            $orderRaw = $diagTbl . '.assign_read_at IS NULL DESC, CASE IFNULL(' . $minAptStatusExpr . ', 999) WHEN 4 THEN 1 WHEN 1 THEN 2 WHEN 3 THEN 3 ELSE 4 END ASC, IFNULL(' . $minAptExpr . ", '9999-12-31 23:59:59') ASC, {$diagTbl}.id DESC";
-        }
+        $orderRaw = $this->resolveListOrderRaw($pendingWideSearch);
 
         $lists = $query
             ->with(['DiagnosisViewRecord'])
@@ -571,6 +549,7 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
         }
 
         $this->applyLatestAppointmentFilters($query, $pendingWideSearch);
+        $this->applyLatestAssignFilters($query, $pendingWideSearch);
 
         // 仅已开方（待分配+关键词检索时不限制）
         if (!$pendingWideSearch && isset($this->params['only_has_prescription']) && (string) $this->params['only_has_prescription'] === '1') {
@@ -644,6 +623,99 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
         $query->whereExists("SELECT 1 FROM {$aptTbl} latest_apt WHERE " . implode(' AND ', $conditions));
     }
 
+    /**
+     * 最近一次成功指派过滤：按 create_time DESC, id DESC 取 to_assistant_id>0 的一条。
+     *
+     * @param mixed $query
+     */
+    private function applyLatestAssignFilters($query, bool $pendingWideSearch): void
+    {
+        if ($pendingWideSearch) {
+            return;
+        }
+
+        $startDate = $this->normalizeYmd($this->params['latest_assign_start_date'] ?? '');
+        $endDate = $this->normalizeYmd($this->params['latest_assign_end_date'] ?? '');
+        if ($startDate === '' && $endDate === '') {
+            return;
+        }
+
+        $logTbl = Db::name('tcm_diagnosis_assign_log')->getTable();
+        $diagTbl = (new Diagnosis())->getTable();
+        $latestIdSql = $this->latestAssignLogIdSubSql($logTbl, $diagTbl);
+        $conditions = ["latest_lg.id = ({$latestIdSql})"];
+
+        if ($startDate !== '') {
+            $startTs = (int) strtotime($startDate . ' 00:00:00');
+            $conditions[] = "latest_lg.create_time >= {$startTs}";
+        }
+        if ($endDate !== '') {
+            $endTs = (int) strtotime($endDate . ' 23:59:59');
+            $conditions[] = "latest_lg.create_time <= {$endTs}";
+        }
+
+        $query->whereExists("SELECT 1 FROM {$logTbl} latest_lg WHERE " . implode(' AND ', $conditions));
+    }
+
+    private function latestAssignLogIdSubSql(string $logTbl, string $diagTbl): string
+    {
+        return "SELECT lg_latest.id FROM {$logTbl} lg_latest "
+            . "WHERE lg_latest.diagnosis_id = {$diagTbl}.id "
+            . 'AND lg_latest.to_assistant_id > 0 '
+            . 'ORDER BY lg_latest.create_time DESC, lg_latest.id DESC LIMIT 1';
+    }
+
+    /**
+     * 列表默认排序；支持 sort_unserved_days=asc|desc 按未服务天数排序。
+     */
+    private function resolveListOrderRaw(bool $pendingWideSearch): string
+    {
+        $diagTbl = (new Diagnosis())->getTable();
+        $sortUnserved = strtolower(trim((string) ($this->params['sort_unserved_days'] ?? '')));
+        if (in_array($sortUnserved, ['asc', 'desc'], true)) {
+            $anchorExpr = $this->unservedAnchorExpr($diagTbl);
+            $nullLast = "CASE WHEN IFNULL({$anchorExpr}, 0) = 0 THEN 1 ELSE 0 END ASC";
+            if ($sortUnserved === 'desc') {
+                return "{$nullLast}, IFNULL({$anchorExpr}, 0) ASC, {$diagTbl}.id DESC";
+            }
+
+            return "{$nullLast}, IFNULL({$anchorExpr}, 0) DESC, {$diagTbl}.id DESC";
+        }
+
+        $aptTbl = (new Appointment())->getTable();
+        $minAptDateCond = '';
+        if (!$pendingWideSearch && !empty($this->params['appointment_date'])) {
+            $sortAptDate = addslashes((string) $this->params['appointment_date']);
+            $minAptDateCond = " AND apt.appointment_date = '{$sortAptDate}'";
+        }
+
+        $minAptStatusExpr = '(SELECT apt.status FROM ' . $aptTbl . ' apt WHERE apt.patient_id = ' . $diagTbl . '.id AND apt.status IN (1,3,4)' . $minAptDateCond . ' ORDER BY CASE apt.status WHEN 4 THEN 1 WHEN 1 THEN 2 WHEN 3 THEN 3 ELSE 4 END, apt.appointment_date ASC, apt.appointment_time ASC LIMIT 1)';
+        $minAptExpr = '(SELECT MIN(CONCAT(apt.appointment_date, \' \', IFNULL(NULLIF(TRIM(apt.appointment_time), \'\'), \'00:00:00\'))) FROM ' . $aptTbl . ' apt WHERE apt.patient_id = ' . $diagTbl . '.id AND apt.status IN (1,3,4)' . $minAptDateCond . ')';
+
+        $isCompletedTab = !$pendingWideSearch && isset($this->params['completed_appointment']) && (string) $this->params['completed_appointment'] === '1';
+        if ($isCompletedTab) {
+            $maxCompletedAptExpr = '(SELECT MAX(CONCAT(apt.appointment_date, \' \', IFNULL(NULLIF(TRIM(apt.appointment_time), \'\'), \'00:00:00\'))) FROM ' . $aptTbl . ' apt WHERE apt.patient_id = ' . $diagTbl . '.id AND apt.status = 3' . $minAptDateCond . ')';
+
+            return $diagTbl . '.assign_read_at IS NULL DESC, IFNULL(' . $maxCompletedAptExpr . ", '1970-01-01 00:00:00') DESC, {$diagTbl}.id DESC";
+        }
+
+        return $diagTbl . '.assign_read_at IS NULL DESC, CASE IFNULL(' . $minAptStatusExpr . ', 999) WHEN 4 THEN 1 WHEN 1 THEN 2 WHEN 3 THEN 3 ELSE 4 END ASC, IFNULL(' . $minAptExpr . ", '9999-12-31 23:59:59') ASC, {$diagTbl}.id DESC";
+    }
+
+    /** 未服务天数锚点：血糖/饮食/运动记录最近 record_date 的最大值 */
+    private function unservedAnchorExpr(string $diagTbl): string
+    {
+        $bloodTbl = (new BloodRecord())->getTable();
+        $dietTbl = (new DietRecord())->getTable();
+        $exerciseTbl = (new ExerciseRecord())->getTable();
+
+        return 'GREATEST('
+            . "COALESCE((SELECT MAX(br.record_date) FROM {$bloodTbl} br WHERE br.diagnosis_id = {$diagTbl}.id AND br.delete_time IS NULL), 0), "
+            . "COALESCE((SELECT MAX(dr.record_date) FROM {$dietTbl} dr WHERE dr.diagnosis_id = {$diagTbl}.id AND dr.delete_time IS NULL), 0), "
+            . "COALESCE((SELECT MAX(er.record_date) FROM {$exerciseTbl} er WHERE er.diagnosis_id = {$diagTbl}.id AND er.delete_time IS NULL), 0)"
+            . ')';
+    }
+
     private function latestAppointmentIdSubSql(string $aptTbl, string $diagTbl): string
     {
         $statuses = implode(',', self::EFFECTIVE_APPOINTMENT_STATUSES);

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

@@ -9,6 +9,7 @@ use app\adminapi\logic\dept\DeptLogic;
 use app\adminapi\logic\stats\YejiStatsLogic;
 use app\adminapi\logic\tcm\PrescriptionOrderLogic;
 use app\common\enum\ExportEnum;
+use app\common\cache\ExportCache;
 use app\common\lists\ListsExcelInterface;
 use app\common\lists\ListsExtendInterface;
 use app\common\lists\ListsSearchInterface;
@@ -26,6 +27,12 @@ use app\common\service\gancao\GancaoScmRecipelService;
 use think\facade\Config;
 use think\facade\Db;
 use think\db\Query;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
 
 class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchInterface, ListsExtendInterface, ListsExcelInterface
 {
@@ -108,6 +115,7 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
         $this->applyExpressKeywordFilter($query);
         $this->applyServiceChannelFilter($query);
         $this->applySupplyModeFilter($query);
+        $this->applyHasAuxFormulaFilter($query);
         $this->applyAuditAdminFilter($query);
         if (!$this->shouldBypassListVisibilityForDiagnosisEdit()) {
             // 业绩看板按部门点「合计业绩」/复诊下钻：部门或数据域内医助筛选已收口，勿再叠「仅本人订单」
@@ -347,6 +355,39 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
         }
     }
 
+    /**
+     * 是否含辅方：关联处方 herbs 中是否存在 formula_type=辅方（与 PrescriptionOrderLogic::detail 口径一致）
+     *
+     * 入参 has_aux_formula：1 含辅方 | 0 不含辅方，空表示不限
+     */
+    private function applyHasAuxFormulaFilter($query): void
+    {
+        $raw = $this->params['has_aux_formula'] ?? '';
+        if ($raw === '' || $raw === null) {
+            return;
+        }
+        $wantAux = (int) $raw === 1;
+        $poTbl = (new PrescriptionOrder())->getTable();
+        $rxTbl = (new Prescription())->getTable();
+        // herbs 为 JSON 字段，ThinkPHP 写入时中文按 Unicode 转义存储（辅方 => \u8f85\u65b9）。
+        // 用 ESCAPE '~' 让反斜杠按字面匹配；同时兼容极少数原文「辅方」写法。
+        $auxEsc = '%"formula_type":"\\\\u8f85\\\\u65b9"%';
+        $auxRaw = '%"formula_type":"辅方"%';
+        $herbsHasAux = "(IFNULL(rx.`herbs`,'') LIKE '{$auxEsc}' ESCAPE '~'"
+            . " OR IFNULL(rx.`herbs`,'') LIKE '{$auxRaw}')";
+        $existsSql = "SELECT 1 FROM `{$rxTbl}` rx WHERE rx.`id` = `{$poTbl}`.`prescription_id`"
+            . " AND rx.`delete_time` IS NULL AND {$herbsHasAux}";
+        if ($wantAux) {
+            $query->whereExists($existsSql);
+
+            return;
+        }
+        $query->whereExists(
+            "SELECT 1 FROM `{$rxTbl}` rx WHERE rx.`id` = `{$poTbl}`.`prescription_id`"
+            . " AND rx.`delete_time` IS NULL AND NOT ({$herbsHasAux})"
+        );
+    }
+
     /**
      * 非「业务订单全量」角色：默认仅本人创建；若持有 viewOrdersForOwnPrescription 则额外包含关联处方开方人为本人的订单。
      * 显式筛选 assistant_id 时：若该医助落在当前账号数据域内，则允许按订单创建人命中（与 applyDoctorAssistantFilters 一致）。
@@ -779,10 +820,16 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
             'export_guahao_channel_source'     => '自媒体渠道（挂号渠道来源）',
             'export_medication_form'           => '药品形态',
             'export_prescription_name'         => '药方名称',
+            'export_prescription_herbs'        => '处方',
+            'export_main_usage'                => '主方服用方式',
+            'export_main_usage_days'           => '主方天数',
+            'export_aux_usage'                 => '辅方服用方式',
+            'export_aux_usage_days'            => '辅方天数',
             'export_service_package'           => '服务套餐',
             'export_medication_days'           => '天数',
             'export_amount'                    => '总金额',
             'export_paid_amount'               => '已付金额',
+            'export_linked_pay_records'        => '关联收款记录',
             'export_refund_amount'             => '退款金额',
             'export_agency_collect'           => '代收金额',
             'export_tracking_number'           => '快递单号',
@@ -795,6 +842,141 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
         ];
     }
 
+    /**
+     * 处方业务订单导出：深色表头、斑马纹、长文本自动换行（覆盖默认亮蓝表头）
+     *
+     * @param array<string, string>       $excelFields
+     * @param array<int, array<string, mixed>> $lists
+     */
+    public function createExcel($excelFields, $lists): string
+    {
+        $title = array_values($excelFields);
+        $fieldKeys = array_keys($excelFields);
+
+        $data = [];
+        foreach ($lists as $row) {
+            $temp = [];
+            foreach ($excelFields as $key => $excelField) {
+                $fieldData = $row[$key] ?? '';
+                if (is_numeric($fieldData) && strlen((string) $fieldData) >= 12) {
+                    $fieldData .= "\t";
+                }
+                $temp[$key] = $fieldData;
+            }
+            $data[] = $temp;
+        }
+
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->setTitle('处方业务订单');
+
+        foreach ($title as $key => $value) {
+            $sheet->setCellValueByColumnAndRow($key + 1, 1, $value);
+        }
+
+        $rowNum = 2;
+        foreach ($data as $item) {
+            $column = 1;
+            foreach ($item as $value) {
+                $sheet->setCellValueByColumnAndRow($column, $rowNum, $value);
+                ++$column;
+            }
+            ++$rowNum;
+        }
+
+        $highest = $sheet->getHighestRowAndColumn();
+        $highestRow = (int) $highest['row'];
+        $lastColumn = (string) $highest['column'];
+        $titleScope = 'A1:' . $lastColumn . '1';
+        $allScope = 'A1:' . $lastColumn . $highestRow;
+        $bodyScope = 'A2:' . $lastColumn . $highestRow;
+
+        $sheet->freezePane('A2');
+        $sheet->getRowDimension(1)->setRowHeight(26);
+
+        $sheet->getStyle($titleScope)->getFill()
+            ->setFillType(Fill::FILL_SOLID)
+            ->getStartColor()->setARGB('FF334155');
+        $sheet->getStyle($titleScope)->getFont()->getColor()->setARGB('FFFFFFFF');
+        $sheet->getStyle($titleScope)->getFont()->setBold(true);
+        $sheet->getStyle($titleScope)->getAlignment()
+            ->setHorizontal(Alignment::HORIZONTAL_CENTER)
+            ->setVertical(Alignment::VERTICAL_CENTER);
+
+        $sheet->getStyle($allScope)->getBorders()->getAllBorders()
+            ->setBorderStyle(Border::BORDER_THIN)
+            ->getColor()->setARGB('FFE2E8F0');
+
+        $sheet->getStyle($bodyScope)->getAlignment()
+            ->setVertical(Alignment::VERTICAL_TOP)
+            ->setWrapText(true);
+
+        $wrapWideKeys = [
+            'export_linked_pay_records',
+            'export_prescription_name',
+            'export_prescription_herbs',
+            'export_main_usage',
+            'export_aux_usage',
+            'export_guahao_channel_source',
+            'export_assistant_dept',
+            'export_service_package',
+        ];
+        $fixedWidths = [
+            'export_fulfillment_status_text' => 12,
+            'export_order_time'                => 18,
+            'export_patient_gender'             => 6,
+            'export_patient_age'               => 6,
+            'export_medication_days'           => 6,
+            'export_main_usage_days'           => 8,
+            'export_aux_usage_days'            => 8,
+            'export_amount'                    => 10,
+            'export_paid_amount'               => 10,
+            'export_refund_amount'             => 10,
+            'export_agency_collect'           => 10,
+            'export_sign_time'                 => 12,
+            'export_supply_mode'               => 10,
+            'export_linked_pay_records'        => 52,
+            'export_prescription_name'         => 34,
+            'export_prescription_herbs'        => 36,
+            'export_main_usage'                => 28,
+            'export_aux_usage'                 => 28,
+            'export_guahao_channel_source'     => 22,
+            'export_assistant_dept'           => 24,
+            'export_service_package'           => 18,
+            'export_tracking_number'           => 18,
+        ];
+
+        foreach ($fieldKeys as $idx => $fieldKey) {
+            $colLetter = Coordinate::stringFromColumnIndex($idx + 1);
+            if (isset($fixedWidths[$fieldKey])) {
+                $sheet->getColumnDimension($colLetter)->setWidth($fixedWidths[$fieldKey]);
+            } elseif (!in_array($fieldKey, $wrapWideKeys, true)) {
+                $sheet->getColumnDimension($colLetter)->setAutoSize(true);
+            } else {
+                $sheet->getColumnDimension($colLetter)->setWidth(28);
+            }
+        }
+
+        for ($r = 2; $r <= $highestRow; ++$r) {
+            if ($r % 2 === 0) {
+                $sheet->getStyle('A' . $r . ':' . $lastColumn . $r)->getFill()
+                    ->setFillType(Fill::FILL_SOLID)
+                    ->getStartColor()->setARGB('FFF8FAFC');
+            }
+        }
+
+        $writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
+        $exportCache = new ExportCache();
+        $src = $exportCache->getSrc();
+        if (!file_exists($src)) {
+            mkdir($src, 0775, true);
+        }
+        $writer->save($src . $this->fileName);
+        $vars = ['file' => $exportCache->setFile($this->fileName)];
+
+        return (string) url('adminapi/download/export', $vars, true, true);
+    }
+
     /**
      * 业绩看板侧栏专用：约诊/接诊条数，与 YejiStatsLogic::applyConsultFiltersAlignedWithAppointmentLists 同口径
      * （doctor_appointment.status=3，appointment_date 落入区间，有效医助 COALESCE(挂号.assistant_id,诊单.assistant_id)）。

server/app/adminapi/logic/order/OrderLogic.php

@@ -23,9 +23,9 @@ use think\facade\Log;
 class OrderLogic
 {
     /**
-     * 创建方式统一三值：normal 普通订单 / wechat_work 企业微信对外收款 / fubei 付呗
+     * 创建方式：normal 普通订单 / wechat_work 企业微信对外收款 / fubei 付呗 / express_cod 快递代收
      */
-    private const CREATE_TYPES = ['normal', 'wechat_work', 'fubei'];
+    private const CREATE_TYPES = ['normal', 'wechat_work', 'fubei', 'express_cod'];
 
     /**
      * @notes 生成订单号
@@ -64,6 +64,15 @@ class OrderLogic
         return 'normal';
     }
 
+    /**
+     * 是否为「待审核(5)且需人工确认到账」的单：付呗(payment_method=fubei) 或 快递代收(create_type=express_cod)
+     */
+    private static function isPendingManualAudit(Order $order): bool
+    {
+        return (string)($order->payment_method ?? '') === 'fubei'
+            || (string)($order->create_type ?? '') === 'express_cod';
+    }
+
     /**
      * @notes 创建订单
      * @param array $params
@@ -73,11 +82,16 @@ class OrderLogic
     {
         try {
             $channel = (string)($params['payment_channel'] ?? 'normal');
-            if (!in_array($channel, ['normal', 'fubei'], true)) {
+            if (!in_array($channel, ['normal', 'fubei', 'express_cod'], true)) {
                 $channel = 'normal';
             }
             $paymentMethod = $channel === 'fubei' ? 'fubei' : null;
-            $createType = self::normalizeCreateType((string)($params['create_type'] ?? ''), $paymentMethod);
+            // 快递代收：以 express_cod 标记创建方式（与 fubei 流转一致，但 payment_method 待到账时再写）
+            $createTypeHint = $channel === 'express_cod' ? 'express_cod' : '';
+            $createType = self::normalizeCreateType(
+                (string)($params['create_type'] ?? $createTypeHint),
+                $paymentMethod
+            );
             $requirePaymentSlipAudit = (int)($params['require_payment_slip_audit'] ?? 0) === 1;
 
             $order = new Order();
@@ -87,10 +101,13 @@ class OrderLogic
             $order->order_type = $params['order_type'];
             $order->amount = $params['amount'];
             $order->create_type = $createType;
-            // 付呗且申请审核支付单：待审核(5)；否则待支付(1)
+            // 付呗/快递代收且申请审核支付单：待审核(5)；否则待支付(1)
             if ($channel === 'fubei') {
                 $order->payment_method = 'fubei';
                 $order->status = $requirePaymentSlipAudit ? 5 : 1;
+            } elseif ($channel === 'express_cod') {
+                // payment_method 留空，待人工确认到账时再写真实支付方式
+                $order->status = $requirePaymentSlipAudit ? 5 : 1;
             } else {
                 $order->status = 1; // 待支付
             }
@@ -387,11 +404,11 @@ class OrderLogic
             }
 
             $st = (int)$order->status;
-            // 1=待支付；5=待审核(付呗+申请支付单审核) 时允许录入手动到账
+            // 1=待支付；5=待审核(付呗/快递代收+申请支付单审核) 时允许录入手动到账
             if ($st === 1) {
                 // 正常待支付
-            } elseif ($st === 5 && (string)($order->payment_method ?? '') === 'fubei') {
-                // 待审核的付呗单，通过人工确认后标记已支付
+            } elseif ($st === 5 && self::isPendingManualAudit($order)) {
+                // 待审核的付呗/快递代收单，通过人工确认后标记已支付
             } else {
                 self::setError('订单状态不允许支付');
                 return false;
@@ -424,8 +441,8 @@ class OrderLogic
             }
 
             $st = (int)$order->status;
-            if ($st !== 1 && !($st === 5 && (string)($order->payment_method ?? '') === 'fubei')) {
-                self::setError('只有待支付或待审核(付呗)的订单才能取消');
+            if ($st !== 1 && !($st === 5 && self::isPendingManualAudit($order))) {
+                self::setError('只有待支付或待审核(付呗/快递代收)的订单才能取消');
                 return false;
             }
 
@@ -509,13 +526,13 @@ class OrderLogic
         }
 
         $st = (int) $order->status;
-        if ($st === 5 && (string) ($order->payment_method ?? '') !== 'fubei') {
-            self::setError('待审核订单仅支持付呗渠道拆分');
+        if ($st === 5 && !self::isPendingManualAudit($order)) {
+            self::setError('待审核订单仅支持付呗/快递代收渠道拆分');
 
             return false;
         }
         if (! in_array($st, [1, 5, 2], true)) {
-            self::setError('仅「待支付」「待审核(付呗)」或「已支付」的订单可拆分');
+            self::setError('仅「待支付」「待审核(付呗/快递代收)」或「已支付」的订单可拆分');
 
             return false;
         }
@@ -586,7 +603,10 @@ class OrderLogic
                     (string) ($order->remark ?? '')
                 );
                 if ($st === 5) {
-                    $n->payment_method = 'fubei';
+                    // 付呗子单沿用 payment_method=fubei；快递代收子单 payment_method 留空，靠 create_type 标记
+                    if ((string) ($order->payment_method ?? '') === 'fubei') {
+                        $n->payment_method = 'fubei';
+                    }
                     $n->status = 5;
                 } elseif ($st === 2) {
                     $n->status = 2;

server/app/adminapi/logic/stats/ConversionLogic.php

@@ -48,8 +48,8 @@ class ConversionLogic
             $emptyResult = [
                 'dimension' => $dimension,
                 'date_range' => [$startDate, $endDate],
-                'summary' => self::buildSummary([]),
-                'charts' => self::buildCharts([]),
+                'summary' => self::buildSummary([], $dimension),
+                'charts' => self::buildCharts([], $dimension),
                 'lists' => [],
                 'count' => 0,
                 'page_no' => $pageNo,
@@ -57,8 +57,8 @@ class ConversionLogic
                 'extend' => [
                     'dimension' => $dimension,
                     'date_range' => [$startDate, $endDate],
-                    'summary' => self::buildSummary([]),
-                    'charts' => self::buildCharts([]),
+                    'summary' => self::buildSummary([], $dimension),
+                    'charts' => self::buildCharts([], $dimension),
                 ],
             ];
             if ($includeFilters) {
@@ -75,8 +75,8 @@ class ConversionLogic
             $result = [
                 'dimension' => $dimension,
                 'date_range' => [$startDate, $endDate],
-                'summary' => self::buildSummary([]),
-                'charts' => self::buildCharts([]),
+                'summary' => self::buildSummary([], $dimension),
+                'charts' => self::buildCharts([], $dimension),
                 'lists' => [],
                 'count' => 0,
                 'page_no' => $pageNo,
@@ -84,8 +84,8 @@ class ConversionLogic
                 'extend' => [
                     'dimension' => $dimension,
                     'date_range' => [$startDate, $endDate],
-                    'summary' => self::buildSummary([]),
-                    'charts' => self::buildCharts([]),
+                    'summary' => self::buildSummary([], $dimension),
+                    'charts' => self::buildCharts([], $dimension),
                 ],
             ];
             if ($includeFilters) {
@@ -124,8 +124,8 @@ class ConversionLogic
             $result = [
                 'dimension' => $dimension,
                 'date_range' => [$startDate, $endDate],
-                'summary' => self::buildSummary([]),
-                'charts' => self::buildCharts([]),
+                'summary' => self::buildSummary([], $dimension),
+                'charts' => self::buildCharts([], $dimension),
                 'lists' => [],
                 'count' => 0,
                 'page_no' => $pageNo,
@@ -133,8 +133,8 @@ class ConversionLogic
                 'extend' => [
                     'dimension' => $dimension,
                     'date_range' => [$startDate, $endDate],
-                    'summary' => self::buildSummary([]),
-                    'charts' => self::buildCharts([]),
+                    'summary' => self::buildSummary([], $dimension),
+                    'charts' => self::buildCharts([], $dimension),
                 ],
             ];
             if ($includeFilters) {
@@ -191,8 +191,8 @@ class ConversionLogic
             $result = [
                 'dimension' => $dimension,
                 'date_range' => [$startDate, $endDate],
-                'summary' => self::buildSummary($allRows),
-                'charts' => self::buildCharts($chartRows),
+                'summary' => self::buildSummary($allRows, $dimension),
+                'charts' => self::buildCharts($chartRows, $dimension),
                 'lists' => $pagedRows,
                 'count' => count($allRows),
                 'page_no' => $pageNo,
@@ -200,8 +200,8 @@ class ConversionLogic
                 'extend' => [
                     'dimension' => $dimension,
                     'date_range' => [$startDate, $endDate],
-                    'summary' => self::buildSummary($allRows),
-                    'charts' => self::buildCharts($chartRows),
+                    'summary' => self::buildSummary($allRows, $dimension),
+                    'charts' => self::buildCharts($chartRows, $dimension),
                 ],
             ];
             if ($includeFilters) {
@@ -226,8 +226,8 @@ class ConversionLogic
         $result = [
             'dimension' => $dimension,
             'date_range' => [$startDate, $endDate],
-            'summary' => self::buildSummary($rows),
-            'charts' => self::buildCharts($rows),
+            'summary' => self::buildSummary($rows, $dimension),
+            'charts' => self::buildCharts($rows, $dimension),
             'lists' => array_slice($rows, $offset, $pageSize),
             'count' => $count,
             'page_no' => $pageNo,
@@ -235,8 +235,8 @@ class ConversionLogic
             'extend' => [
                 'dimension' => $dimension,
                 'date_range' => [$startDate, $endDate],
-                'summary' => self::buildSummary($rows),
-                'charts' => self::buildCharts($rows),
+                'summary' => self::buildSummary($rows, $dimension),
+                'charts' => self::buildCharts($rows, $dimension),
             ],
         ];
         if ($includeFilters) {
@@ -1226,7 +1226,7 @@ class ConversionLogic
             $entity['paid_appointment_rate'] = self::percent($paidAppointmentCount, $addFansCount);
             $entity['open_appointment_rate'] = self::percent($paidAppointmentCount, $totalOpenCount);
             $entity['interview_rate'] = self::percent($interviewCount, $appointmentTotalCount);
-            $entity['receive_rate'] = self::percent($completedOrderCount, $addFansCount);
+            $entity['receive_rate'] = self::receiveRate($completedOrderCount, $addFansCount, $interviewCount, $dimension);
             $entity['interview_receive_rate'] = self::percent($completedOrderCount, $interviewCount);
             $entity['open_receive_rate'] = self::percent($completedOrderCount, $totalOpenCount);
             $entity['avg_unit_price'] = self::safeDivideMoney($completedOrderAmount, $completedOrderCount);
@@ -1459,7 +1459,7 @@ class ConversionLogic
         $node['paid_appointment_rate'] = self::percent($paidAppointmentCount, $addFansCount);
         $node['open_appointment_rate'] = self::percent($paidAppointmentCount, $totalOpenCount);
         $node['interview_rate'] = self::percent($interviewCount, $appointmentTotalCount);
-        $node['receive_rate'] = self::percent($completedOrderCount, $addFansCount);
+        $node['receive_rate'] = self::receiveRate($completedOrderCount, $addFansCount, $interviewCount, 'dept');
         $node['interview_receive_rate'] = self::percent($completedOrderCount, $interviewCount);
         $node['open_receive_rate'] = self::percent($completedOrderCount, $totalOpenCount);
         $node['avg_unit_price'] = self::safeDivideMoney($completedOrderAmount, $completedOrderCount);
@@ -2010,7 +2010,12 @@ class ConversionLogic
             'paid_appointment_rate' => self::percent($paidAppointmentCount, $addFansCount),
             'open_appointment_rate' => self::percent($paidAppointmentCount, $totalOpenCount),
             'interview_rate' => self::percent($interviewCount, $appointmentTotalCount),
-            'receive_rate' => self::percent($completedOrderCount, $addFansCount),
+            'receive_rate' => self::receiveRate(
+                $completedOrderCount,
+                $addFansCount,
+                $interviewCount,
+                'member'
+            ),
             'interview_receive_rate' => self::percent($completedOrderCount, $interviewCount),
             'open_receive_rate' => self::percent($completedOrderCount, $totalOpenCount),
             'avg_unit_price' => self::safeDivideMoney($completedOrderAmount, $completedOrderCount),
@@ -2149,7 +2154,7 @@ class ConversionLogic
      * @param array<int, array<string, mixed>> $rows
      * @return array<string, mixed>
      */
-    private static function buildSummary(array $rows): array
+    private static function buildSummary(array $rows, string $dimension = 'dept'): array
     {
         $summary = [
             'add_fans_count' => 0,
@@ -2181,7 +2186,12 @@ class ConversionLogic
         $summary['paid_appointment_rate'] = self::percent($summary['paid_appointment_count'], $summary['add_fans_count']);
         $summary['open_appointment_rate'] = self::percent($summary['paid_appointment_count'], $summary['total_open_count']);
         $summary['interview_rate'] = self::percent($summary['interview_count'], $summary['appointment_total_count']);
-        $summary['receive_rate'] = self::percent($summary['completed_order_count'], $summary['add_fans_count']);
+        $summary['receive_rate'] = self::receiveRate(
+            $summary['completed_order_count'],
+            $summary['add_fans_count'],
+            $summary['interview_count'],
+            $dimension
+        );
         $summary['interview_receive_rate'] = self::percent($summary['completed_order_count'], $summary['interview_count']);
         $summary['open_receive_rate'] = self::percent($summary['completed_order_count'], $summary['total_open_count']);
         $summary['avg_unit_price'] = self::safeDivideMoney($summary['completed_order_amount'], $summary['completed_order_count']);
@@ -2310,7 +2320,7 @@ class ConversionLogic
      * @param array<int, array<string, mixed>> $rows
      * @return array<string, mixed>
      */
-    private static function buildCharts(array $rows): array
+    private static function buildCharts(array $rows, string $dimension = 'dept'): array
     {
         $chartableRows = array_values(array_filter($rows, static fn (array $row): bool => !((bool)($row['_virtual_bucket'] ?? false))));
         $topRows = array_slice($chartableRows, 0, 10);
@@ -2319,29 +2329,56 @@ class ConversionLogic
             'names' => [],
             'amounts' => [],
             'order_counts' => [],
-            'fan_counts' => [],
-            'rois' => [],
         ];
+        if ($dimension === 'doctor') {
+            $ranking['appointment_counts'] = [];
+            $ranking['interview_counts'] = [];
+        } else {
+            $ranking['fan_counts'] = [];
+            $ranking['rois'] = [];
+        }
 
         foreach ($topRows as $row) {
             $ranking['names'][] = $row['name'];
             $ranking['amounts'][] = $row['completed_order_amount'];
             $ranking['order_counts'][] = $row['completed_order_count'];
-            $ranking['fan_counts'][] = $row['add_fans_count'];
-            $ranking['rois'][] = $row['roi'];
+            if ($dimension === 'doctor') {
+                $ranking['appointment_counts'][] = $row['appointment_total_count'];
+                $ranking['interview_counts'][] = $row['interview_count'];
+            } else {
+                $ranking['fan_counts'][] = $row['add_fans_count'];
+                $ranking['rois'][] = $row['roi'];
+            }
         }
 
-        return [
+        $charts = [
             'ranking' => $ranking,
             'amount_share' => array_map(
                 static fn (array $row): array => ['name' => $row['name'], 'value' => $row['completed_order_amount']],
                 array_filter($topRows, static fn (array $row): bool => (float)$row['completed_order_amount'] > 0)
             ),
-            'fan_share' => array_map(
+        ];
+
+        if ($dimension === 'doctor') {
+            $charts['order_share'] = array_map(
+                static fn (array $row): array => ['name' => $row['name'], 'value' => $row['completed_order_count']],
+                array_filter($topRows, static fn (array $row): bool => (int)$row['completed_order_count'] > 0)
+            );
+        } else {
+            $charts['fan_share'] = array_map(
                 static fn (array $row): array => ['name' => $row['name'], 'value' => $row['add_fans_count']],
                 array_filter($topRows, static fn (array $row): bool => (int)$row['add_fans_count'] > 0)
-            ),
-        ];
+            );
+        }
+
+        return $charts;
+    }
+
+    private static function receiveRate(int $completedOrderCount, int $addFansCount, int $interviewCount, string $dimension): float
+    {
+        $denominator = $dimension === 'doctor' ? $interviewCount : $addFansCount;
+
+        return self::percent($completedOrderCount, $denominator);
     }
 
     private static function percent(int $numerator, int $denominator): float

server/app/adminapi/logic/stats/YejiStatsLogic.php

@@ -2616,6 +2616,420 @@ class YejiStatsLogic
         ];
     }
 
+    /**
+     * 被指派明细：与看板「被指派数」同口径（区间内非继承指派，医助×诊单去重）。
+     *
+     * @param array{
+     *   start_date?:string,end_date?:string,dept_ids?:int[]|string,channel_code?:string,tag_id?:string,
+     *   assistant_id?:int|string,admin_id?:int|string,dept_id?:int|string,
+     *   page?:int|string,page_size?:int|string
+     * } $params
+     *
+     * @return array<string, mixed>
+     */
+    public static function assignLines(array $params, int $viewerAdminId = 0, array $viewerAdminInfo = []): array
+    {
+        $c = self::resolveYejiContext($params);
+        if ($viewerAdminId > 0) {
+            self::applyYejiDataScope($c, $viewerAdminId, $viewerAdminInfo);
+        }
+
+        $assistantId = (int) ($params['assistant_id'] ?? $params['admin_id'] ?? 0);
+
+        if ($assistantId <= 0 && array_key_exists('dept_id', $params)) {
+            return self::yejiDeptAssignLinesInner($params, $c);
+        }
+
+        return self::yejiAssistantAssignLinesInner($params, $c, $assistantId);
+    }
+
+    /**
+     * @param array<string, mixed> $params
+     * @param array<string, mixed> $c
+     *
+     * @return array<string, mixed>
+     */
+    private static function yejiDeptAssignLinesInner(array $params, array $c): array
+    {
+        $deptIdParam = (int) ($params['dept_id'] ?? 0);
+        $channelCode = (string) $c['channelCode'];
+        $deptName = $deptIdParam === 0
+            ? '未归属中心'
+            : self::formatYejiDeptRowDisplayName($deptIdParam, $c['deptById']);
+
+        $empty = static function (string $note) use ($c, $channelCode, $deptIdParam, $deptName): array {
+            return self::yejiAssignLinesEmptyPayload($c, $note, 0, '', $deptIdParam, $deptName, $channelCode);
+        };
+
+        if ($deptIdParam <= 0) {
+            return $empty('未归属中心无被指派明细（看板该行为 0）。');
+        }
+        if (!in_array($deptIdParam, $c['tableRowDeptIds'], true)) {
+            return $empty('该部门不在当前展示部门筛选或数据权限范围内。');
+        }
+
+        $erCenterDeptSet = DeptLogic::getErCenterSubtreeDeptIdSet();
+        if ($channelCode !== '' && isset($erCenterDeptSet[$deptIdParam])) {
+            return $empty('与看板一致：二中心及其组织下级在选定渠道下被指派数计 0，无明细。');
+        }
+
+        $targetAssistantIds = [];
+        foreach ($c['adminToPrimary'] as $aid => $primary) {
+            if ((int) $primary === $deptIdParam) {
+                $targetAssistantIds[] = (int) $aid;
+            }
+        }
+        if ($targetAssistantIds === []) {
+            return $empty('当前部门下没有可映射的被指派医助，无明细。');
+        }
+
+        return self::yejiAssignLinesFetch($c, $params, $targetAssistantIds, 0, '', $deptIdParam, $deptName);
+    }
+
+    /**
+     * @param array<string, mixed> $params
+     * @param array<string, mixed> $c
+     *
+     * @return array<string, mixed>
+     */
+    private static function yejiAssistantAssignLinesInner(array $params, array $c, int $assistantId): array
+    {
+        $channelCode = (string) $c['channelCode'];
+
+        $assistantName = '';
+        if ($assistantId > 0) {
+            $assistantName = (string) (Db::name('admin')->where('id', $assistantId)->whereNull('delete_time')->value('name') ?: '');
+        }
+
+        $empty = static function (string $note) use ($c, $assistantId, $assistantName, $channelCode): array {
+            return self::yejiAssignLinesEmptyPayload($c, $note, $assistantId, $assistantName, 0, '', $channelCode);
+        };
+
+        if ($assistantId <= 0) {
+            return $empty('请指定有效医助，或传入 dept_id 查看部门汇总明细。');
+        }
+
+        $dataScopeRestricted = !empty($c['dataScopeRestricted']);
+        $dataScopeAdminIds = $dataScopeRestricted && isset($c['dataScopeVisibleAdminIds'])
+            ? $c['dataScopeVisibleAdminIds']
+            : null;
+        if ($dataScopeRestricted && $dataScopeAdminIds !== null) {
+            $flip = array_flip($dataScopeAdminIds);
+            if (!isset($flip[$assistantId])) {
+                return $empty('当前账号数据权限下不可查看该医助被指派明细。');
+            }
+        }
+
+        if (!isset($c['adminToPrimary'][$assistantId])) {
+            return $empty('该医助不在当前业绩看板展示范围内。');
+        }
+
+        $tagDiagIds = $c['tagDiagIds'];
+        $tagAssistantIds = $c['tagAssistantIds'];
+        $tagFallback = $c['tagFallback'];
+        $scopedAssistants = $tagFallback ? $tagAssistantIds : null;
+
+        if ($tagDiagIds !== null && $tagDiagIds === []) {
+            return $empty('当前渠道标签下无关联诊单，无被指派明细。');
+        }
+        if ($scopedAssistants !== null && $scopedAssistants === []) {
+            return $empty('当前渠道标签下无关联医助，无被指派明细。');
+        }
+        if ($scopedAssistants !== null && !isset($scopedAssistants[$assistantId])) {
+            return $empty('当前渠道标签口径下该医助无被指派记录（与排行榜「被指派数」一致）。');
+        }
+
+        $erCenterDeptSet = DeptLogic::getErCenterSubtreeDeptIdSet();
+        $primaryDept = (int) ($c['adminToPrimary'][$assistantId] ?? 0);
+        if ($channelCode !== '' && $primaryDept > 0 && isset($erCenterDeptSet[$primaryDept])) {
+            return $empty('与看板一致：二中心及其组织下级医助在选定渠道下被指派数计 0，无明细。');
+        }
+
+        return self::yejiAssignLinesFetch(
+            $c,
+            $params,
+            [$assistantId],
+            $assistantId,
+            $assistantName,
+            0,
+            ''
+        );
+    }
+
+    /**
+     * @param array<string, mixed> $c
+     * @param array<string, mixed> $params
+     * @param list<int>            $targetAssistantIds
+     *
+     * @return array<string, mixed>
+     */
+    private static function yejiAssignLinesFetch(
+        array $c,
+        array $params,
+        array $targetAssistantIds,
+        int $assistantIdOut,
+        string $assistantNameOut,
+        int $deptIdOut,
+        string $deptNameOut
+    ): array {
+        $channelCode = (string) $c['channelCode'];
+        $startTs = (int) $c['startTs'];
+        $endTs = (int) $c['endTs'];
+        $page = max(1, (int) ($params['page'] ?? 1));
+        $limit = min(100, max(1, (int) ($params['page_size'] ?? 20)));
+        $offset = ($page - 1) * $limit;
+
+        $dataScopeRestricted = !empty($c['dataScopeRestricted']);
+        $dataScopeAdminIds = $dataScopeRestricted && isset($c['dataScopeVisibleAdminIds'])
+            ? $c['dataScopeVisibleAdminIds']
+            : null;
+        if ($dataScopeAdminIds !== null && $dataScopeAdminIds !== []) {
+            $visFlip = array_flip($dataScopeAdminIds);
+            $targetAssistantIds = array_values(array_filter(
+                $targetAssistantIds,
+                static fn (int $aid): bool => isset($visFlip[$aid])
+            ));
+        }
+
+        if ($targetAssistantIds === []) {
+            return self::yejiAssignLinesEmptyPayload(
+                $c,
+                '当前数据权限下无可查看的被指派医助。',
+                $assistantIdOut,
+                $assistantNameOut,
+                $deptIdOut,
+                $deptNameOut,
+                $channelCode
+            );
+        }
+
+        $tagDiagIds = $c['tagDiagIds'];
+        $tagAssistantIds = $c['tagAssistantIds'];
+        $tagFallback = $c['tagFallback'];
+        $scopedAssistants = $tagFallback ? $tagAssistantIds : null;
+
+        if ($tagDiagIds !== null && $tagDiagIds === []) {
+            return self::yejiAssignLinesEmptyPayload(
+                $c,
+                '当前渠道标签下无关联诊单，无被指派明细。',
+                $assistantIdOut,
+                $assistantNameOut,
+                $deptIdOut,
+                $deptNameOut,
+                $channelCode
+            );
+        }
+        if ($scopedAssistants !== null && $scopedAssistants === []) {
+            return self::yejiAssignLinesEmptyPayload(
+                $c,
+                '当前渠道标签下无关联医助，无被指派明细。',
+                $assistantIdOut,
+                $assistantNameOut,
+                $deptIdOut,
+                $deptNameOut,
+                $channelCode
+            );
+        }
+
+        $buildBaseQuery = static function () use (
+            $c,
+            $targetAssistantIds,
+            $startTs,
+            $endTs,
+            $tagDiagIds,
+            $scopedAssistants
+        ) {
+            $diagTable = self::tableWithPrefix('tcm_diagnosis');
+            $q = Db::name('tcm_diagnosis_assign_log')
+                ->alias('lg')
+                ->join("{$diagTable} dg", 'dg.id = lg.diagnosis_id AND dg.delete_time IS NULL', 'INNER')
+                ->where('lg.create_time', 'between', [$startTs, $endTs])
+                ->where('lg.to_assistant_id', '>', 0)
+                ->where('lg.is_inherit', 0)
+                ->whereIn('lg.to_assistant_id', $targetAssistantIds);
+
+            self::applyYejiAssignLogChannelFilters(
+                $q,
+                $tagDiagIds,
+                $scopedAssistants,
+                $c['appointmentChannelValues'],
+                $c['channelFilterActive'],
+                $c['channelInfo']
+            );
+
+            return $q;
+        };
+
+        $countRows = $buildBaseQuery()
+            ->field(['lg.to_assistant_id', 'lg.diagnosis_id'])
+            ->group('lg.to_assistant_id,lg.diagnosis_id')
+            ->select()
+            ->toArray();
+        $count = \count($countRows);
+
+        $rawList = $buildBaseQuery()
+            ->field([
+                'lg.to_assistant_id',
+                'lg.diagnosis_id',
+                Db::raw('COUNT(*) AS assign_count'),
+                Db::raw('MAX(lg.create_time) AS last_assign_time'),
+            ])
+            ->group('lg.to_assistant_id,lg.diagnosis_id')
+            ->order('last_assign_time', 'desc')
+            ->order('lg.diagnosis_id', 'desc')
+            ->limit($offset, $limit)
+            ->select()
+            ->toArray();
+
+        $diagIds = [];
+        $assistantIds = [];
+        foreach ($rawList as $rw) {
+            $diagIds[(int) ($rw['diagnosis_id'] ?? 0)] = true;
+            $assistantIds[(int) ($rw['to_assistant_id'] ?? 0)] = true;
+        }
+        $diagInfo = self::fetchYejiAssignDiagnosisInfo(array_keys($diagIds));
+        $nameMap = $assistantIds !== []
+            ? Db::name('admin')->whereIn('id', array_keys($assistantIds))->column('name', 'id')
+            : [];
+
+        $lists = [];
+        foreach ($rawList as $rw) {
+            $did = (int) ($rw['diagnosis_id'] ?? 0);
+            $aid = (int) ($rw['to_assistant_id'] ?? 0);
+            $lastTs = (int) ($rw['last_assign_time'] ?? 0);
+            $lists[] = [
+                'diagnosis_id'          => $did,
+                'patient_name'          => (string) ($diagInfo[$did]['patient_name'] ?? ''),
+                'patient_phone'         => (string) ($diagInfo[$did]['phone'] ?? ''),
+                'assistant_id'          => $aid,
+                'assistant_name'        => $aid > 0 ? (string) ($nameMap[$aid] ?? ('#' . $aid)) : '—',
+                'assign_count'          => (int) ($rw['assign_count'] ?? 0),
+                'last_assign_time'      => $lastTs,
+                'last_assign_time_text' => $lastTs > 0 ? date('Y-m-d H:i:s', $lastTs) : '',
+            ];
+        }
+
+        $note = '与看板「被指派数」同口径：区间内 `tcm_diagnosis_assign_log` 成功指派（to_assistant_id>0，剔除勾选「继承」），'
+            . '按指派操作时间落区间，「医助 × 诊单」去重、剔除已删诊单。';
+
+        return [
+            'start_date'     => (string) $c['startDate'],
+            'end_date'       => (string) $c['endDate'],
+            'assistant_id'   => $assistantIdOut,
+            'assistant_name' => $assistantNameOut,
+            'dept_id'        => $deptIdOut,
+            'dept_name'      => $deptNameOut,
+            'channel_code'   => $channelCode,
+            'count'          => $count,
+            'lists'          => $lists,
+            'note'           => $note,
+        ];
+    }
+
+    /**
+     * @param array<string, mixed> $c
+     *
+     * @return array<string, mixed>
+     */
+    private static function yejiAssignLinesEmptyPayload(
+        array $c,
+        string $note,
+        int $assistantId,
+        string $assistantName,
+        int $deptId,
+        string $deptName,
+        string $channelCode
+    ): array {
+        return [
+            'start_date'     => (string) $c['startDate'],
+            'end_date'       => (string) $c['endDate'],
+            'assistant_id'   => $assistantId,
+            'assistant_name' => $assistantName,
+            'dept_id'        => $deptId,
+            'dept_name'      => $deptName,
+            'channel_code'   => $channelCode,
+            'count'          => 0,
+            'lists'          => [],
+            'note'           => $note,
+        ];
+    }
+
+    /**
+     * @param \think\db\Query $query
+     */
+    private static function applyYejiAssignLogChannelFilters(
+        $query,
+        ?array $tagDiagIds,
+        ?array $tagAssistantIds,
+        array $appointmentChannelValues,
+        bool $channelFilterActive,
+        ?array $channelInfo
+    ): void {
+        if (!$channelFilterActive) {
+            return;
+        }
+        if ($appointmentChannelValues !== []) {
+            $norm = self::normalizeAppointmentChannelValues($appointmentChannelValues);
+            if ($norm === []) {
+                $query->whereRaw('0 = 1');
+
+                return;
+            }
+            $pack = self::buildChannelScopedAppointmentExistsSqlAndBindings('dg.id', $norm, $channelInfo);
+            if ($pack === null) {
+                $query->whereRaw('0 = 1');
+
+                return;
+            }
+            $query->whereRaw($pack[0], $pack[1]);
+        } elseif ($tagDiagIds !== null || $tagAssistantIds !== null) {
+            if ($tagDiagIds !== null && $tagDiagIds === []) {
+                $query->whereRaw('0 = 1');
+
+                return;
+            }
+            if ($tagAssistantIds !== null && $tagAssistantIds === []) {
+                $query->whereRaw('0 = 1');
+
+                return;
+            }
+            if ($tagDiagIds !== null) {
+                $query->whereIn('lg.diagnosis_id', $tagDiagIds);
+            }
+            if ($tagAssistantIds !== null) {
+                $query->whereIn('lg.to_assistant_id', array_map('intval', array_keys($tagAssistantIds)));
+            }
+        } else {
+            $query->whereRaw('0 = 1');
+        }
+    }
+
+    /**
+     * @param list<int> $diagIds
+     *
+     * @return array<int, array{patient_name:string,phone:string}>
+     */
+    private static function fetchYejiAssignDiagnosisInfo(array $diagIds): array
+    {
+        if ($diagIds === []) {
+            return [];
+        }
+        $rows = Db::name('tcm_diagnosis')
+            ->whereIn('id', $diagIds)
+            ->field(['id', 'patient_name', 'phone'])
+            ->select()
+            ->toArray();
+        $out = [];
+        foreach ($rows as $r) {
+            $out[(int) $r['id']] = [
+                'patient_name' => trim((string) ($r['patient_name'] ?? '')),
+                'phone'        => trim((string) ($r['phone'] ?? '')),
+            ];
+        }
+
+        return $out;
+    }
+
     /**
      * admin → 展示「中心」映射：用于挂号明细按部门筛选（与 aggregateConsults 映射同源）。
      */

server/app/adminapi/logic/tcm/DiagnosisLogic.php

@@ -28,6 +28,7 @@ use app\common\model\DiagnosisViewRecord;
 use app\common\model\doctor\Appointment;
 use app\common\model\auth\Admin;
 use app\common\model\auth\AdminRole;
+use app\adminapi\logic\auth\AuthLogic;
 use app\adminapi\logic\doctor\DoctorNoteLogic;
 use app\adminapi\logic\doctor\AppointmentLogic;
 use app\adminapi\logic\tcm\TrackingNoteLogic;
@@ -73,8 +74,8 @@ class DiagnosisLogic extends BaseLogic
                 }
             }
             
-            // 生成患者ID
-            $params['patient_id'] = self::generatePatientId();
+            // 新患者先占位 0，写入后 patient_id 与自增 id 对齐
+            $params['patient_id'] = 0;
             
             // 处理既往史数组
             if (isset($params['past_history']) && is_array($params['past_history'])) {
@@ -119,6 +120,7 @@ class DiagnosisLogic extends BaseLogic
             }
 
             $model = Diagnosis::create($params);
+            $model = self::syncPatientIdWithDiagnosisId($model);
 
             // 图片写入 doctor_note 表
             if (!empty($newTongueImages) || !empty($newReportFiles)) {
@@ -130,7 +132,7 @@ class DiagnosisLogic extends BaseLogic
             }
 
             // 自动为患者创建 TRTC 账号
-            self::createPatientTrtcAccount($model->id);
+            self::createPatientTrtcAccount($model->patient_id);
 
             return $model->id;
         } catch (\Exception $e) {
@@ -140,16 +142,20 @@ class DiagnosisLogic extends BaseLogic
     }
 
     /**
-     * @notes 生成患者ID
-     * @return int
+     * @notes 新患者首张诊单：patient_id 与自增 id 对齐
+     * @param Diagnosis $model
+     * @return Diagnosis
      */
-    private static function generatePatientId(): int
+    private static function syncPatientIdWithDiagnosisId(Diagnosis $model): Diagnosis
     {
-        // 获取当前最大的患者ID
-        $maxPatientId = Diagnosis::max('id') ?? 10000000;
-        
-        // 返回下一个患者ID
-        return $maxPatientId + 1;
+        if ((int) $model->patient_id === (int) $model->id) {
+            return $model;
+        }
+
+        Diagnosis::where('id', $model->id)->update(['patient_id' => $model->id]);
+        $model->patient_id = (int) $model->id;
+
+        return $model;
     }
 
     /**
@@ -157,9 +163,23 @@ class DiagnosisLogic extends BaseLogic
      * @param array $params
      * @return bool
      */
-    public static function edit(array $params): bool
+    /** 诊单编辑：患者基本信息字段（姓名/身份证/手机/性别/年龄） */
+    private const PATIENT_BASIC_FIELDS = ['patient_name', 'id_card', 'phone', 'gender', 'age'];
+
+    public static function edit(array $params, array $adminInfo = []): bool
     {
         try {
+            if (!empty($params['id']) && $adminInfo !== []) {
+                $existing = Diagnosis::find((int) $params['id']);
+                if ($existing && !self::canEditPatientBasicInfo((int) $params['id'], $adminInfo)) {
+                    if (self::patientBasicFieldsChanged($existing, $params)) {
+                        self::setError('最近业务订单未完成，无法修改患者基本信息');
+
+                        return false;
+                    }
+                }
+            }
+
             // 检查手机号是否重复（排除当前记录）
             if (!empty($params['phone'])) {
                 $exists = Diagnosis::where('phone', $params['phone'])
@@ -250,7 +270,7 @@ class DiagnosisLogic extends BaseLogic
      * @param $params
      * @return array
      */
-    public static function detail($params): array
+    public static function detail($params, array $adminInfo = []): array
     {
         $diagnosis = Diagnosis::findOrEmpty($params['id'])->toArray();
         
@@ -317,7 +337,17 @@ class DiagnosisLogic extends BaseLogic
             $diagnosis['local_hospital_visit_date'] = $diagnosis['diagnosis_date'];
         }
         $diagnosis['is_view'] =DiagnosisViewRecord::where(['diagnosis_id'=> $diagnosis['id'], 'user_id' =>$params['user_id']??0])->find() ? 1 : 0;
-       
+
+        $latestPo = self::getLatestPrescriptionOrderRowForDiagnosis((int) ($diagnosis['id'] ?? 0));
+        $patientBasicLocked = $latestPo !== null && (int) ($latestPo['fulfillment_status'] ?? 0) !== 3;
+        $diagnosis['patient_basic_locked'] = $patientBasicLocked;
+        $diagnosis['can_edit_patient_basic'] = self::canEditPatientBasicInfo((int) ($diagnosis['id'] ?? 0), $adminInfo);
+        $diagnosis['latest_prescription_order'] = $latestPo !== null ? [
+            'id'                     => (int) ($latestPo['id'] ?? 0),
+            'fulfillment_status'     => (int) ($latestPo['fulfillment_status'] ?? 0),
+            'fulfillment_status_text'=> PrescriptionOrderLogic::fulfillmentStatusLabel((int) ($latestPo['fulfillment_status'] ?? 0)),
+        ] : null;
+
         return $diagnosis;
     }
     
@@ -486,11 +516,11 @@ class DiagnosisLogic extends BaseLogic
     }
 
     /**
-     * 诊单下用于指派日志快照的「最新」业务单：按 create_time 最新，其次 id（避免误用更早下单但 id 更大的记录）。
+     * 诊单下「最新」业务单：按 create_time 最新，其次 id（避免误用更早下单但 id 更大的记录）。
      *
-     * @return array{creator_id: int, create_time: int}|null
+     * @return array<string, mixed>|null
      */
-    private static function getLatestPrescriptionOrderSnapshotForDiagnosis(int $diagnosisId): ?array
+    private static function getLatestPrescriptionOrderRowForDiagnosis(int $diagnosisId): ?array
     {
         if ($diagnosisId <= 0) {
             return null;
@@ -500,19 +530,88 @@ class DiagnosisLogic extends BaseLogic
             ->whereNull('delete_time')
             ->order('create_time', 'desc')
             ->order('id', 'desc')
-            ->field(['creator_id', 'create_time'])
+            ->field(['id', 'creator_id', 'create_time', 'fulfillment_status'])
             ->find();
 
         if ($row === null || $row === []) {
             return null;
         }
 
+        return $row;
+    }
+
+    /**
+     * 诊单下用于指派日志快照的「最新」业务单：按 create_time 最新，其次 id（避免误用更早下单但 id 更大的记录）。
+     *
+     * @return array{creator_id: int, create_time: int}|null
+     */
+    private static function getLatestPrescriptionOrderSnapshotForDiagnosis(int $diagnosisId): ?array
+    {
+        $row = self::getLatestPrescriptionOrderRowForDiagnosis($diagnosisId);
+        if ($row === null) {
+            return null;
+        }
+
         return [
             'creator_id'   => (int) ($row['creator_id'] ?? 0),
             'create_time' => (int) ($row['create_time'] ?? 0),
         ];
     }
 
+    /**
+     * 菜单权限 tcm.diagnosis/editPatientBasic：最近业务订单未完成时仍可改患者基本信息
+     */
+    public static function hasEditPatientBasicPermission(array $adminInfo): bool
+    {
+        if (!empty($adminInfo['root']) && (int) $adminInfo['root'] === 1) {
+            return true;
+        }
+        $perms = AuthLogic::getAuthByAdminId((int) ($adminInfo['admin_id'] ?? 0));
+
+        return in_array('tcm.diagnosis/editPatientBasic', $perms, true);
+    }
+
+    /**
+     * 是否允许编辑诊单患者基本信息（无业务单 / 最近一单已完成 / 具备 editPatientBasic 权限）
+     */
+    public static function canEditPatientBasicInfo(int $diagnosisId, array $adminInfo): bool
+    {
+        $latest = self::getLatestPrescriptionOrderRowForDiagnosis($diagnosisId);
+        if ($latest === null) {
+            return true;
+        }
+        if ((int) ($latest['fulfillment_status'] ?? 0) === 3) {
+            return true;
+        }
+
+        return self::hasEditPatientBasicPermission($adminInfo);
+    }
+
+    /**
+     * @param Diagnosis $existing
+     */
+    private static function patientBasicFieldsChanged($existing, array $params): bool
+    {
+        foreach (self::PATIENT_BASIC_FIELDS as $field) {
+            if (!array_key_exists($field, $params)) {
+                continue;
+            }
+            $old = $existing->{$field};
+            $new = $params[$field];
+            if ($field === 'age' || $field === 'gender') {
+                if ((int) $old !== (int) $new) {
+                    return true;
+                }
+                continue;
+            }
+            if ((string) $old !== (string) $new) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * 诊单 current assistant_id 为 0 时，从最近一条指派日志推断「原医助」（如发货释放后：上一条多为 from=X、to=0）。
      * - 最近一条 to_assistant_id > 0：视为上一任持有人（库未同步时的兜底）
@@ -3092,8 +3191,9 @@ class DiagnosisLogic extends BaseLogic
             unset($params['user_id']); // 诊单表无此字段，仅用于创建 view_record
 
             $patientId = $params['patient_id'] ?? 0;
-            if (!$patientId) {
-                $params['patient_id'] = self::generatePatientId();
+            $isNewPatient = !$patientId;
+            if ($isNewPatient) {
+                $params['patient_id'] = 0;
             }
             $params['status'] = 1;
 
@@ -3123,6 +3223,9 @@ class DiagnosisLogic extends BaseLogic
             }
 
             $model = Diagnosis::create($params);
+            if ($isNewPatient) {
+                $model = self::syncPatientIdWithDiagnosisId($model);
+            }
             self::createPatientTrtcAccount($model->patient_id);
 
             // 图片写入 doctor_note

server/app/adminapi/logic/tcm/PrescriptionOrderLogic.php

@@ -2324,7 +2324,8 @@ class PrescriptionOrderLogic
                 ->where(function ($query) {
                     $query->where('payment_method', 'manual')
                         ->whereOr('payment_method', 'fubei')
-                        ->whereOr('create_type', 'fubei');
+                        ->whereOr('create_type', 'fubei')
+                        ->whereOr('create_type', 'express_cod');
                 })
                 ->update([
                     'status' => 5,  // 待审核
@@ -2374,6 +2375,123 @@ class PrescriptionOrderLogic
             ->toArray();
     }
 
+    /**
+     * 手工新增操作日志；可选单独调整处方审核 / 支付单审核状态（不触发常规审核流程副作用）
+     *
+     * @param array<string,mixed> $params id, summary, prescription_audit_status?, payment_slip_audit_status?, prescription_audit_remark?, payment_slip_audit_remark?
+     * @return array<string,mixed>|false
+     */
+    public static function addLog(array $params, int $adminId, array $adminInfo)
+    {
+        self::$error = '';
+        $id = (int) ($params['id'] ?? 0);
+        $summary = mb_substr(trim((string) ($params['summary'] ?? '')), 0, 500);
+        if ($summary === '') {
+            self::$error = '请填写日志内容';
+
+            return false;
+        }
+
+        $order = PrescriptionOrder::where('id', $id)->whereNull('delete_time')->find();
+        if (!$order) {
+            self::$error = '订单不存在';
+
+            return false;
+        }
+        if (!self::canAccessOrder($order, $adminId, $adminInfo)) {
+            self::$error = '无权限操作';
+
+            return false;
+        }
+
+        $changeParts = [];
+        $hasRxChange = array_key_exists('prescription_audit_status', $params)
+            && $params['prescription_audit_status'] !== ''
+            && $params['prescription_audit_status'] !== null;
+        $hasPayChange = array_key_exists('payment_slip_audit_status', $params)
+            && $params['payment_slip_audit_status'] !== ''
+            && $params['payment_slip_audit_status'] !== null;
+
+        if ($hasRxChange) {
+            if (!self::canAuditPrescriptionOrder($adminInfo)) {
+                self::$error = '无处方审核权限，不能调整处方审核状态';
+
+                return false;
+            }
+            $newRx = (int) $params['prescription_audit_status'];
+            if (!in_array($newRx, [0, 1, 2], true)) {
+                self::$error = '处方审核状态无效';
+
+                return false;
+            }
+            $oldRx = (int) $order->prescription_audit_status;
+            if ($newRx !== $oldRx) {
+                $order->prescription_audit_status = $newRx;
+                $changeParts[] = '处方审核：' . self::auditStatusLabelForLog($oldRx)
+                    . ' → ' . self::auditStatusLabelForLog($newRx);
+            }
+            if (array_key_exists('prescription_audit_remark', $params)) {
+                $order->prescription_audit_remark = mb_substr(trim((string) $params['prescription_audit_remark']), 0, 500);
+            }
+        }
+
+        if ($hasPayChange) {
+            if (!self::canAuditPaymentSlipOrder($adminInfo)) {
+                self::$error = '无支付单审核权限，不能调整支付单审核状态';
+
+                return false;
+            }
+            $newPay = (int) $params['payment_slip_audit_status'];
+            if (!in_array($newPay, [0, 1, 2], true)) {
+                self::$error = '支付单审核状态无效';
+
+                return false;
+            }
+            $oldPay = (int) $order->payment_slip_audit_status;
+            if ($newPay !== $oldPay) {
+                $order->payment_slip_audit_status = $newPay;
+                $changeParts[] = '支付单审核：' . self::auditStatusLabelForLog($oldPay)
+                    . ' → ' . self::auditStatusLabelForLog($newPay);
+            }
+            if (array_key_exists('payment_slip_audit_remark', $params)) {
+                $order->payment_slip_audit_remark = mb_substr(trim((string) $params['payment_slip_audit_remark']), 0, 500);
+            }
+        }
+
+        if ($hasRxChange || $hasPayChange) {
+            self::syncFulfillmentStatus($order);
+            try {
+                $order->save();
+            } catch (\Throwable $e) {
+                self::$error = $e->getMessage();
+
+                return false;
+            }
+        }
+
+        $logSummary = $summary;
+        if ($changeParts !== []) {
+            $logSummary .= '（' . implode('；', $changeParts) . '）';
+        }
+        self::writeLog($id, $adminId, $adminInfo, 'manual_log', $logSummary);
+
+        $out = $order->toArray();
+        self::maskInternalCostIfNeeded($out, $adminInfo);
+        self::maskRemarkExtraIfNeeded($out, $adminInfo);
+        self::attachLinkedPayOrders($out);
+
+        return $out;
+    }
+
+    private static function auditStatusLabelForLog(int $status): string
+    {
+        return match ($status) {
+            1 => '已通过',
+            2 => '已驳回',
+            default => '待审核',
+        };
+    }
+
     /**
      * 为「已发货/已签收」(fulfillment_status=5/6) 的业务订单新增一条关联支付单（zyt_order），
      * 创建后将支付单链接到业务订单，并将处方/支付审核状态重置为待审核以启动再次审核流程。
@@ -2403,6 +2521,9 @@ class PrescriptionOrderLogic
         $amount    = round((float) ($params['pay_amount'] ?? 0), 2);
         $remark    = mb_substr(trim((string) ($params['pay_remark'] ?? '')), 0, 200);
         $completionRequest = (int) ($params['completion_request'] ?? 0);
+        // 创建方式：付呗(默认) 或 快递代收(express_cod)
+        $payCreateType = (string) ($params['pay_create_type'] ?? 'fubei');
+        $isExpressCod  = $payCreateType === 'express_cod';
 
         if ($amount < 0) {
             self::$error = '支付单金额不能为负数';
@@ -2417,8 +2538,13 @@ class PrescriptionOrderLogic
         $payOrder->order_type      = $orderType;
         $payOrder->amount          = $amount;
         $payOrder->status          = 5;  // 待审核
-        $payOrder->payment_method  = 'fubei';  // 补齐支付单按「付呗」记账
-        $payOrder->create_type     = 'fubei';
+        if ($isExpressCod) {
+            // 快递代收：payment_method 留空，审核通过/到账后再写；用 create_type 标记
+            $payOrder->create_type = 'express_cod';
+        } else {
+            $payOrder->payment_method = 'fubei';  // 补齐支付单按「付呗」记账
+            $payOrder->create_type    = 'fubei';
+        }
         $payOrder->payment_time    = null;  // 审核通过后再设置支付时间
         $payOrder->remark          = $remark;
 
@@ -3098,6 +3224,210 @@ class PrescriptionOrderLogic
         return $type;
     }
 
+    /**
+     * 导出用：处方药材明细（主方/辅方分行，与处方笺一致）
+     *
+     * @param array<string, mixed> $rx
+     */
+    public static function formatPrescriptionHerbsForExport(array $rx): string
+    {
+        [$mainHerbs, $auxHerbs] = self::splitPrescriptionHerbsFromRx($rx);
+        $formatList = static function (array $herbs): string {
+            $parts = [];
+            foreach ($herbs as $h) {
+                if (!\is_array($h)) {
+                    continue;
+                }
+                $name = trim((string) ($h['name'] ?? ''));
+                if ($name === '') {
+                    continue;
+                }
+                $parts[] = $name . ' ' . self::formatExportDosageNumber((float) ($h['dosage'] ?? 0)) . 'g';
+            }
+
+            return implode('、', $parts);
+        };
+
+        $sections = [];
+        $mainText = $formatList($mainHerbs);
+        if ($mainText !== '') {
+            $sections[] = '主方：' . $mainText;
+        }
+        $auxText = $formatList($auxHerbs);
+        if ($auxText !== '') {
+            $sections[] = '辅方：' . $auxText;
+        }
+
+        return implode("\n", $sections);
+    }
+
+    /**
+     * 导出用：主方/辅方服用方式（与前端 buildUsageSegmentText / 处方笺同口径）
+     *
+     * @param array<string, mixed> $usage
+     */
+    public static function formatUsageSegmentForExport(
+        array $usage,
+        string $prescriptionType = '浓缩水丸',
+        string $fallbackWay = '',
+        string $fallbackTime = ''
+    ): string {
+        $pt = trim($prescriptionType) !== '' ? trim($prescriptionType) : '浓缩水丸';
+        $times = (int) ($usage['times_per_day'] ?? 0);
+        if ($times <= 0) {
+            $times = 3;
+        }
+        $amount = isset($usage['dosage_amount']) && $usage['dosage_amount'] !== '' && $usage['dosage_amount'] !== null
+            ? (float) $usage['dosage_amount']
+            : 10.0;
+        $unit = trim((string) ($usage['usage_dosage_unit'] ?? ($usage['dosage_unit'] ?? '')));
+        if ($unit === '') {
+            $unit = $pt === '饮片' ? 'ml' : 'g';
+        }
+        $usageWay = trim((string) ($usage['usage_way'] ?? ''));
+        if ($usageWay === '') {
+            $usageWay = $fallbackWay !== '' ? $fallbackWay : '温水送服';
+        }
+        $usageTime = trim((string) ($usage['usage_time'] ?? ''));
+        if ($usageTime === '') {
+            $usageTime = $fallbackTime;
+        }
+
+        $seg = ['每天' . $times . '次'];
+        if ($pt === '浓缩水丸') {
+            $bags = (int) ($usage['dosage_bag_count'] ?? 0);
+            if ($bags <= 0) {
+                $bags = 1;
+            }
+            $seg[] = '一次' . $bags . '袋';
+            $seg[] = '每袋' . self::formatExportDosageNumber($amount) . $unit;
+        } else {
+            $seg[] = '一次' . self::formatExportDosageNumber($amount) . $unit;
+        }
+        $seg[] = $usageWay;
+        if ($usageTime !== '') {
+            $seg[] = $usageTime;
+        }
+
+        return implode(', ', $seg);
+    }
+
+    /**
+     * 导出用：辅方用法 JSON 规范化（与前端 normalizeSlipAuxUsageForm 默认值一致）
+     *
+     * @return array<string, mixed>
+     */
+    private static function normalizeAuxUsageForExport($raw, string $prescriptionType): array
+    {
+        $pt = trim($prescriptionType) !== '' ? trim($prescriptionType) : '浓缩水丸';
+        if ($pt === '饮片') {
+            $base = [
+                'dosage_amount' => 50.0,
+                'dosage_bag_count' => 1,
+                'times_per_day' => 3,
+                'usage_days' => 7,
+            ];
+        } elseif ($pt === '浓缩水丸') {
+            $base = [
+                'dosage_amount' => 5.0,
+                'dosage_bag_count' => 1,
+                'times_per_day' => 3,
+                'usage_days' => 7,
+            ];
+        } else {
+            $base = [
+                'dosage_amount' => 1.0,
+                'dosage_bag_count' => 1,
+                'times_per_day' => 3,
+                'usage_days' => 7,
+            ];
+        }
+
+        if (\is_string($raw) && $raw !== '') {
+            $decoded = json_decode($raw, true);
+            $raw = \is_array($decoded) ? $decoded : null;
+        }
+        if (!\is_array($raw)) {
+            return $base;
+        }
+
+        return [
+            'dosage_amount' => isset($raw['dosage_amount']) && $raw['dosage_amount'] !== '' && $raw['dosage_amount'] !== null
+                ? (float) $raw['dosage_amount']
+                : $base['dosage_amount'],
+            'dosage_bag_count' => (int) ($raw['dosage_bag_count'] ?? 0) > 0
+                ? (int) $raw['dosage_bag_count']
+                : $base['dosage_bag_count'],
+            'times_per_day' => (int) ($raw['times_per_day'] ?? 0) > 0
+                ? (int) $raw['times_per_day']
+                : $base['times_per_day'],
+            'usage_days' => (int) ($raw['usage_days'] ?? 0) > 0
+                ? (int) $raw['usage_days']
+                : $base['usage_days'],
+        ];
+    }
+
+    /**
+     * @return array{0: array<int, array<string, mixed>>, 1: array<int, array<string, mixed>>}
+     */
+    private static function splitPrescriptionHerbsFromRx(array $rx): array
+    {
+        $herbs = $rx['herbs'] ?? null;
+        if (\is_string($herbs) && $herbs !== '') {
+            $decoded = json_decode($herbs, true);
+            $herbs = \is_array($decoded) ? $decoded : [];
+        }
+        if (!\is_array($herbs)) {
+            $herbs = [];
+        }
+
+        $mainHerbs = [];
+        $auxHerbs = [];
+        foreach ($herbs as $h) {
+            if (!\is_array($h)) {
+                continue;
+            }
+            if (((string) ($h['formula_type'] ?? '')) === '辅方') {
+                $auxHerbs[] = $h;
+            } else {
+                $mainHerbs[] = $h;
+            }
+        }
+
+        return [$mainHerbs, $auxHerbs];
+    }
+
+    private static function formatExportDosageNumber(float $dosage): string
+    {
+        if (floor($dosage) === $dosage) {
+            return (string) (int) $dosage;
+        }
+
+        return rtrim(rtrim(number_format($dosage, 4, '.', ''), '0'), '.');
+    }
+
+    /**
+     * 导出用：主方/辅方服用天数（优先业务订单 medication_days，缺省回退处方 usage_days / 辅方 aux_usage）
+     *
+     * @param array<string, mixed> $rx
+     * @param array<string, mixed>|null $auxUsage
+     */
+    private static function resolveExportUsageDays(array $rx, ?array $auxUsage, $orderMedicationDays, bool $isAux): string
+    {
+        $medDays = $orderMedicationDays;
+        if ($medDays !== null && $medDays !== '' && (int) $medDays > 0) {
+            return (string) (int) $medDays;
+        }
+        if ($isAux) {
+            $days = (int) ($auxUsage['usage_days'] ?? 0);
+
+            return $days > 0 ? (string) $days : '';
+        }
+        $days = (int) ($rx['usage_days'] ?? 0);
+
+        return $days > 0 ? (string) $days : '';
+    }
+
     /**
      * 导出列：挂号表渠道来源展示（与 AppointmentLists channel_source_desc 同字典口径）
      *
@@ -3152,6 +3482,197 @@ class PrescriptionOrderLogic
         return $out;
     }
 
+    /**
+     * 导出用：统一解析时间（支持 Unix 秒/毫秒与 Y-m-d H:i:s 字符串，与前端 formatOrderTime 同口径）
+     *
+     * @param mixed $value
+     */
+    private static function formatDateTimeForExport($value, string $format = 'Y-m-d H:i'): string
+    {
+        if ($value === null || $value === '' || $value === false) {
+            return '';
+        }
+        if (\is_int($value) || \is_float($value)) {
+            $ts = (int) $value;
+            if ($ts > 9999999999) {
+                $ts = (int) floor($ts / 1000);
+            }
+
+            return $ts > 0 ? date($format, $ts) : '';
+        }
+        $str = trim((string) $value);
+        if ($str === '') {
+            return '';
+        }
+        if (preg_match('/^\d+$/', $str)) {
+            $ts = (int) $str;
+            if ($ts > 9999999999) {
+                $ts = (int) floor($ts / 1000);
+            }
+
+            return $ts > 0 ? date($format, $ts) : '';
+        }
+        if (str_contains($str, '-') || str_contains($str, '/')) {
+            $ts = strtotime($str);
+
+            return $ts !== false ? date($format, $ts) : $str;
+        }
+
+        return $str;
+    }
+
+    /**
+     * 导出用：支付单来源/方式（与前端 formatPayOrderSource 同口径）
+     *
+     * @param array<string, mixed> $row
+     */
+    private static function formatPayOrderSourceForExport(array $row): string
+    {
+        $createType = trim((string) ($row['create_type'] ?? ''));
+        if ($createType === 'wechat_work') {
+            return '企业微信对外收款';
+        }
+        if ($createType === 'fubei') {
+            return '付呗';
+        }
+        if ($createType === 'express_cod') {
+            return '快递代收';
+        }
+        $paymentMethod = trim((string) ($row['payment_method'] ?? ''));
+        $methodMap = [
+            'alipay'      => '支付宝',
+            'wechat'      => '微信',
+            'wechat_work' => '企业微信',
+            'fubei'       => '付呗',
+            'express_cod' => '快递代收',
+            'manual'      => '手动确认到账',
+        ];
+        if ($paymentMethod !== '' && isset($methodMap[$paymentMethod])) {
+            return $methodMap[$paymentMethod];
+        }
+
+        return '普通订单';
+    }
+
+    /**
+     * 导出用：单条关联收款可读文本（两行结构，便于 Excel 自动换行阅读）
+     *
+     * @param array<string, mixed>     $pay
+     * @param array<int|string, string> $creatorNames
+     */
+    private static function formatLinkedPayRecordLineForExport(array $pay, array $creatorNames, int $index = 1): string
+    {
+        $typeMap = [
+            1 => '挂号费',
+            2 => '问诊费',
+            3 => '药品费用',
+            4 => '首付费用',
+            5 => '尾款费用',
+            6 => '其他费用',
+            7 => '全部费用',
+            8 => '驼奶费用',
+        ];
+        $statusMap = [
+            1 => '待支付',
+            2 => '已支付',
+            3 => '已取消',
+            4 => '已退款',
+            5 => '待审核',
+        ];
+        $orderNo = trim((string) ($pay['order_no'] ?? ''));
+        $amount = number_format(round((float) ($pay['amount'] ?? 0), 2), 2, '.', '');
+        $typeDesc = $typeMap[(int) ($pay['order_type'] ?? 0)] ?? '—';
+        $statusDesc = $statusMap[(int) ($pay['status'] ?? 0)] ?? '—';
+        $source = self::formatPayOrderSourceForExport($pay);
+        $cid = (int) ($pay['creator_id'] ?? 0);
+        $creator = $cid > 0 ? (string) ($creatorNames[$cid] ?? '') : '—';
+        $timeStr = self::formatDateTimeForExport($pay['create_time'] ?? '') ?: '—';
+
+        $line1 = sprintf('[%d] %s  ¥%s  %s  %s', $index, $orderNo, $amount, $typeDesc, $statusDesc);
+        $line2 = sprintf('    %s  %s  %s', $source, $creator, $timeStr);
+
+        return $line1 . "\n" . $line2;
+    }
+
+    /**
+     * 导出用：批量解析业务订单关联收款记录（与详情 linked_pay_orders 同口径：status ∈ {2,4,5}）
+     *
+     * @param int[] $poIds
+     *
+     * @return array<int, string> prescription_order_id => 多笔以空行分隔的可读文本
+     */
+    private static function batchLinkedPayRecordsExportTextByPoIds(array $poIds): array
+    {
+        $poIds = array_values(array_filter(array_unique(array_map('intval', $poIds)), static fn (int $id): bool => $id > 0));
+        if ($poIds === []) {
+            return [];
+        }
+
+        $linksByPo = [];
+        $allPayIds = [];
+        $linkRows = PrescriptionOrderPayOrder::whereIn('prescription_order_id', $poIds)
+            ->field(['prescription_order_id', 'pay_order_id'])
+            ->order('id', 'asc')
+            ->select()
+            ->toArray();
+        foreach ($linkRows as $l) {
+            $poid = (int) ($l['prescription_order_id'] ?? 0);
+            $payId = (int) ($l['pay_order_id'] ?? 0);
+            if ($poid <= 0 || $payId <= 0) {
+                continue;
+            }
+            $linksByPo[$poid][] = $payId;
+            $allPayIds[$payId] = true;
+        }
+
+        $out = [];
+        foreach ($poIds as $poid) {
+            $out[$poid] = '';
+        }
+        if ($allPayIds === []) {
+            return $out;
+        }
+
+        $payRows = Order::whereIn('id', array_keys($allPayIds))
+            ->whereNull('delete_time')
+            ->whereIn('status', [2, 4, 5])
+            ->field(['id', 'order_no', 'order_type', 'amount', 'status', 'create_time', 'creator_id', 'payment_method', 'create_type'])
+            ->select()
+            ->toArray();
+        $payById = [];
+        $creatorIds = [];
+        foreach ($payRows as $r) {
+            $id = (int) ($r['id'] ?? 0);
+            if ($id <= 0) {
+                continue;
+            }
+            $payById[$id] = $r;
+            $cid = (int) ($r['creator_id'] ?? 0);
+            if ($cid > 0) {
+                $creatorIds[$cid] = true;
+            }
+        }
+        $creatorNames = $creatorIds !== []
+            ? Admin::whereIn('id', array_keys($creatorIds))->column('name', 'id')
+            : [];
+
+        foreach ($poIds as $poid) {
+            $lines = [];
+            $seq = 0;
+            foreach ($linksByPo[$poid] ?? [] as $payId) {
+                $pay = $payById[$payId] ?? null;
+                if (!\is_array($pay)) {
+                    continue;
+                }
+                ++$seq;
+                $lines[] = self::formatLinkedPayRecordLineForExport($pay, $creatorNames, $seq);
+            }
+            $out[$poid] = implode("\n\n", $lines);
+        }
+
+        return $out;
+    }
+
     /**
      * 业务订单列表导出：写入与 PrescriptionOrderLists::setExcelFields 对应的字段（export=2 时由列表类调用）
      * 「挂号渠道来源」取值与详情/列表解析一致：处方 appointment_id → 否则诊单下 MAX(挂号.id)；业绩抽屉带渠道时与列表同源高亮。
@@ -3203,7 +3724,12 @@ class PrescriptionOrderLogic
         $rxById = [];
         if ($rxIdList !== []) {
             $rxRows = Prescription::whereIn('id', $rxIdList)->whereNull('delete_time')
-                ->field(['id', 'prescription_type', 'need_decoction', 'dose_unit', 'assistant_id', 'appointment_id', 'prescription_name', 'aux_usage', 'herbs', 'creator_id'])
+                ->field([
+                    'id', 'prescription_type', 'need_decoction', 'dose_unit', 'assistant_id', 'appointment_id',
+                    'prescription_name', 'aux_usage', 'herbs', 'creator_id',
+                    'dosage_amount', 'dosage_unit', 'dosage_bag_count', 'times_per_day', 'usage_days',
+                    'usage_way', 'usage_time',
+                ])
                 ->select()
                 ->toArray();
             foreach ($rxRows as $xr) {
@@ -3383,6 +3909,7 @@ class PrescriptionOrderLogic
 
         $firstVisitAssistantByDiag = self::batchFirstVisitAssistantNameByDiagnosis($diagIdList, $diagById);
         $assistantDeptCache = [];
+        $linkedPayExportByPo = self::batchLinkedPayRecordsExportTextByPoIds($poIds);
 
         foreach ($lists as &$item) {
             $poId = (int) ($item['id'] ?? 0);
@@ -3436,6 +3963,39 @@ class PrescriptionOrderLogic
             }
             $item['export_prescription_name'] = implode(' ', $rxNameParts);
 
+            $rxArr = \is_array($rx) ? $rx : [];
+            $rxType = trim((string) ($rxArr['prescription_type'] ?? '')) ?: '浓缩水丸';
+            $item['export_prescription_herbs'] = self::formatPrescriptionHerbsForExport($rxArr);
+            $item['export_main_usage'] = $rxArr !== []
+                ? self::formatUsageSegmentForExport($rxArr, $rxType)
+                : '';
+            [, $auxHerbs] = self::splitPrescriptionHerbsFromRx($rxArr);
+            $auxUsageNorm = $auxHerbs !== []
+                ? self::normalizeAuxUsageForExport($rxArr['aux_usage'] ?? null, $rxType)
+                : null;
+            if ($auxHerbs !== [] && $auxUsageNorm !== null) {
+                $item['export_aux_usage'] = self::formatUsageSegmentForExport(
+                    [
+                        'dosage_amount' => $auxUsageNorm['dosage_amount'],
+                        'dosage_bag_count' => $auxUsageNorm['dosage_bag_count'],
+                        'times_per_day' => $auxUsageNorm['times_per_day'],
+                        'usage_dosage_unit' => $rxArr['dosage_unit'] ?? '',
+                        'usage_way' => $rxArr['usage_way'] ?? '',
+                        'usage_time' => $rxArr['usage_time'] ?? '',
+                    ],
+                    $rxType,
+                    (string) ($rxArr['usage_way'] ?? ''),
+                    (string) ($rxArr['usage_time'] ?? '')
+                );
+            } else {
+                $item['export_aux_usage'] = '';
+            }
+            $orderMedDays = $item['medication_days'] ?? null;
+            $item['export_main_usage_days'] = self::resolveExportUsageDays($rxArr, $auxUsageNorm, $orderMedDays, false);
+            $item['export_aux_usage_days'] = $auxHerbs !== []
+                ? self::resolveExportUsageDays($rxArr, $auxUsageNorm, $orderMedDays, true)
+                : '';
+
             $item['export_service_package'] = self::formatServicePackageForExport(
                 $item['service_package'] ?? '',
                 $packageNameByValue
@@ -3455,6 +4015,7 @@ class PrescriptionOrderLogic
             $paid = round((float) ($item['linked_pay_paid_total'] ?? 0), 2);
             $item['export_amount'] = number_format($amt, 2, '.', '');
             $item['export_paid_amount'] = number_format($paid, 2, '.', '');
+            $item['export_linked_pay_records'] = $linkedPayExportByPo[$poId] ?? '';
             $refundStored = round((float) ($item['refund_amount'] ?? 0), 2);
             $item['export_refund_amount'] = $refundStored > 0
                 ? number_format($refundStored, 2, '.', '')
@@ -3605,27 +4166,7 @@ class PrescriptionOrderLogic
 
         $doctorId = (int) ($rx['creator_id'] ?? 0);
 
-        $herbs = $rx['herbs'] ?? null;
-        if (\is_string($herbs) && $herbs !== '') {
-            $decoded = json_decode($herbs, true);
-            $herbs = \is_array($decoded) ? $decoded : [];
-        }
-        if (!\is_array($herbs)) {
-            $herbs = [];
-        }
-
-        $mainHerbs = [];
-        $auxHerbs  = [];
-        foreach ($herbs as $h) {
-            if (!\is_array($h)) {
-                continue;
-            }
-            if (((string) ($h['formula_type'] ?? '')) === '辅方') {
-                $auxHerbs[] = $h;
-            } else {
-                $mainHerbs[] = $h;
-            }
-        }
+        [$mainHerbs, $auxHerbs] = self::splitPrescriptionHerbsFromRx($rx);
 
         $lookup = static function (string $ft, array $hs) use ($doctorId, $libByDoctor, $libPublic): string {
             if ($hs === []) {
@@ -4207,6 +4748,112 @@ class PrescriptionOrderLogic
         return true;
     }
 
+    /**
+     * 批量将处方业务订单「创建人(医助归属)」改派给其他医助。
+     * 仅改写 creator_id（业务归属/医助筛选口径），逐单记操作日志；与支付单批量改派口径一致。
+     *
+     * @param int[] $orderIds
+     * @param int   $assistantAdminId 目标医助 admin_id（须含医助角色）
+     * @return array{success:int, fail:int, errors:string[], per_log:array<int,array{order_id:int,summary:string}>}|false
+     */
+    public static function batchAssignAssistant(array $orderIds, int $assistantAdminId, int $adminId, array $adminInfo)
+    {
+        self::$error = '';
+        $assistantAdminId = (int) $assistantAdminId;
+        if ($assistantAdminId <= 0) {
+            self::$error = '请选择医助';
+
+            return false;
+        }
+
+        // 目标须为医助角色（与支付单批量改派一致）
+        $assistantRoleId = (int) Config::get('project.prescription_order_stats_assistant_role_id', 2);
+        if (
+            \app\common\model\auth\AdminRole::where('admin_id', $assistantAdminId)
+                ->where('role_id', $assistantRoleId)
+                ->count() === 0
+        ) {
+            self::$error = '目标账号不是医助角色';
+
+            return false;
+        }
+
+        $ids = array_values(array_unique(array_filter(
+            array_map('intval', $orderIds),
+            static fn (int $id) => $id > 0
+        )));
+        if ($ids === []) {
+            self::$error = '请选择订单';
+
+            return false;
+        }
+        if (count($ids) > 200) {
+            self::$error = '单次最多改派200单';
+
+            return false;
+        }
+
+        $targetName = (string) Admin::where('id', $assistantAdminId)->whereNull('delete_time')->value('name');
+        if ($targetName === '') {
+            $targetName = (string) $assistantAdminId;
+        }
+
+        $perLog  = [];
+        $errors  = [];
+        $success = 0;
+        foreach ($ids as $oid) {
+            $order = PrescriptionOrder::where('id', $oid)->whereNull('delete_time')->find();
+            if (! $order) {
+                $errors[] = "订单{$oid}不存在或已删除";
+                continue;
+            }
+            $label = (string) ($order->order_no ?: $oid);
+            if (! self::canAccessOrder($order, $adminId, $adminInfo)) {
+                $errors[] = "订单{$label}无操作权限";
+                continue;
+            }
+            $oldCreatorId = (int) $order->creator_id;
+            if ($oldCreatorId === $assistantAdminId) {
+                $errors[] = "订单{$label}创建人已是该医助，已跳过";
+                continue;
+            }
+            $oldName = $oldCreatorId > 0
+                ? (string) Admin::where('id', $oldCreatorId)->whereNull('delete_time')->value('name')
+                : '';
+            if ($oldName === '' && $oldCreatorId > 0) {
+                $oldName = (string) $oldCreatorId;
+            } elseif ($oldName === '') {
+                $oldName = '—';
+            }
+
+            $order->creator_id = $assistantAdminId;
+            try {
+                $order->save();
+            } catch (\Throwable $e) {
+                $errors[] = "订单{$label}保存失败";
+                continue;
+            }
+
+            $summary = '创建人(医助)由「' . $oldName . '」改派为「' . $targetName . '」';
+            self::writeLog($oid, $adminId, $adminInfo, 'assign_assistant', $summary);
+            $perLog[] = ['order_id' => $oid, 'summary' => $summary];
+            $success++;
+        }
+
+        if ($success === 0) {
+            self::$error = $errors !== [] ? implode('；', $errors) : '未能改派任何订单';
+
+            return false;
+        }
+
+        return [
+            'success' => $success,
+            'fail'    => count($errors),
+            'errors'  => $errors,
+            'per_log' => $perLog,
+        ];
+    }
+
     private static function writeLog(int $orderId, int $adminId, array $adminInfo, string $action, string $summary): void
     {
         $adminName = $adminInfo['name'] ?? '';

server/app/adminapi/validate/tcm/DiagnosisValidate.php

@@ -32,6 +32,7 @@ class DiagnosisValidate extends BaseValidate
         'gender' => 'require|in:0,1',
         'age' => 'require|number|between:0,150',
         'diagnosis_type' => 'require',
+        'local_hospital_name' => 'require|max:255',
         'status' => 'in:0,1',
         'show_card' => 'in:0,1',
         'create_source' => 'max:32',
@@ -50,6 +51,7 @@ class DiagnosisValidate extends BaseValidate
         'patient_name.require' => '请输入患者姓名',
         'patient_name.length' => '患者姓名长度须在1-50位字符',
         'id_card.length' => '身份证号长度不正确',
+        'id_card.require' => '请输入身份证号',
         'phone.require' => '请输入手机号',
         'phone.mobile' => '手机号格式不正确',
         'gender.require' => '请选择性别',
@@ -58,6 +60,8 @@ class DiagnosisValidate extends BaseValidate
         'age.number' => '年龄必须为数字',
         'age.between' => '年龄范围0-150',
         'diagnosis_type.require' => '请选择诊断类型',
+        'local_hospital_name.require' => '请输入当地就诊医院名称',
+        'local_hospital_name.max' => '当地就诊医院名称最多255个字符',
         'status.in' => '状态参数错误',
         'create_source.max' => '渠道来源长度不能超过32个字符',
         'current_medications.max' => '在用药物最多2000个字符',

server/app/adminapi/validate/tcm/PrescriptionOrderValidate.php

@@ -32,6 +32,11 @@ class PrescriptionOrderValidate extends BaseValidate
         'remark_assistant' => 'max:500',
         'action'           => 'require|in:approve,reject',
         'remark'           => 'max:500',
+        'summary'          => 'require|max:500',
+        'prescription_audit_status' => 'in:0,1,2',
+        'payment_slip_audit_status' => 'in:0,1,2',
+        'prescription_audit_remark' => 'max:500',
+        'payment_slip_audit_remark' => 'max:500',
         'fulfillment_status' => 'require|integer|in:3,7,8,9,11,12',
         'reason'             => 'require|max:500',
         'refund_amount'      => 'float|egt:0',
@@ -74,6 +79,7 @@ class PrescriptionOrderValidate extends BaseValidate
         'withdraw' => ['id'],
         'ship' => ['id', 'tracking_number', 'express_company', 'ship_mode'],
         'logs' => ['id'],
+        'addLog' => ['id', 'summary'],
         'paidPayOrders' => ['diagnosis_id'],
         'addPayOrder' => ['id', 'order_type', 'pay_amount', 'pay_remark'],
         'linkPayOrder' => ['id', 'pay_order_id'],
@@ -91,6 +97,6 @@ class PrescriptionOrderValidate extends BaseValidate
     {
         return $this->only(['id', 'amount'])
             ->append('id', 'require|integer|gt:0')
-            ->append('amount', 'require|float|gt:0');
+            ->append('amount', 'require|float|egt:0');
     }
 }

server/app/common/service/gancao/GancaoScmRecipelService.php

@@ -482,7 +482,6 @@ final class GancaoScmRecipelService
                 'city'=>$order['shipping_city'],
                 'addr'=>$order['shipping_province'].$order['shipping_city'].$order['shipping_city'].$order['shipping_address']
             ];
-        
             $base['callback_url']= $c['callback_url'];
             $base['diagnosis']= $rx['clinical_diagnosis']||'无';
             $base['disease']= $rx['clinical_diagnosis']||'无';

server/public/admin/assets/403-0nMsodxR.js

@@ -0,0 +1 @@
+import t from"./error-D-UZdrhy.js";import{o,q as r,r as a,v as n,D as c,s}from"./.pnpm-BGZW0UGg.js";import"./index-CeIwrh_6.js";const p="/admin/assets/no_perms-jDxcYpYC.png",i={class:"error404"},x=o({__name:"403",setup(m){return(_,e)=>(r(),a("div",i,[n(t,{code:"403",title:"您的账号权限不足，请联系管理员添加权限！","show-btn":!1},{content:c(()=>[...e[0]||(e[0]=[s("div",{class:"flex justify-center"},[s("img",{class:"w-[150px] h-[150px]",src:p,alt:""})],-1)])]),_:1})]))}});export{x as default};

server/public/admin/assets/403-CThNHHJ5.js

@@ -1 +0,0 @@
-import r from"./error-Bwzf7Oa1.js";import{f as p,ak as i,I as m,a as e,aN as s,J as o}from"./@vue/runtime-core-C6bnekPw.js";import"./element-plus-Bolc0EfP.js";import"./@vue/runtime-dom-DDAG46FW.js";import"./lodash-D3kF6u-c.js";import"./@vue/shared-mAAVTE9n.js";import"./@vue/reactivity-DiY1c2vO.js";import"./@element-plus/icons-vue-B0jSCQ-G.js";import"./lodash-es-C2A-Pj28.js";import"./@popperjs/core-C5az9QE8.js";import"./dayjs-DG77mNTn.js";import"./@ctrl/tinycolor-BuyEbX8F.js";import"./async-validator-CFA_igpM.js";import"./normalize-wheel-es-BQoi3Ox2.js";import"./vue-router-QlpZ4wdW.js";import"./index-B2ihmdtf.js";import"./jspdf-BsthCvR5.js";import"./@babel/runtime-BanGtE2-.js";import"./fflate-_ayOYiT1.js";import"./pinia-B8cvXbiZ.js";import"./axios-C80V62Fs.js";import"./@vueuse/core-1S4fJlii.js";import"./@vueuse/shared-Cl3lVqjz.js";import"./css-color-function-DI01JAaZ.js";import"./balanced-match-BdS7OldZ.js";import"./color-B2zxaWkI.js";import"./clone-DBZ6_OiU.js";import"./color-convert-OrFsTA_V.js";import"./color-name-Dju3oUBS.js";import"./color-string-pUQDDJII.js";import"./ms-CzQ2E3wO.js";import"./vue-clipboard3-DByT_rEQ.js";import"./clipboard-CHgxszqY.js";import"./echarts-CNLwa9wG.js";import"./tslib-BDyQ-Jie.js";import"./zrender-DRNXw7y3.js";import"./highlight.js-Bxt7hFFy.js";import"./@highlightjs/vue-plugin-C4onkBvW.js";const a="/admin/assets/no_perms-jDxcYpYC.png",n={class:"error404"},W=p({__name:"403",setup(c){return(_,t)=>(i(),m("div",n,[e(r,{code:"403",title:"您的账号权限不足，请联系管理员添加权限！","show-btn":!1},{content:s(()=>[...t[0]||(t[0]=[o("div",{class:"flex justify-center"},[o("img",{class:"w-[150px] h-[150px]",src:a,alt:""})],-1)])]),_:1})]))}});export{W as default};

server/public/admin/assets/404-BCUgZ4Wm.js

@@ -0,0 +1 @@
+import e from"./error-D-UZdrhy.js";import{o,q as r,r as t,v as s}from"./.pnpm-BGZW0UGg.js";import"./index-CeIwrh_6.js";const a={class:"error404"},d=o({__name:"404",setup(c){return(n,_)=>(r(),t("div",a,[s(e,{code:"404",title:"哎呀，出错了！您访问的页面不存在…"})]))}});export{d as default};

server/public/admin/assets/404-BG9YZSG-.js

@@ -1 +0,0 @@
-import o from"./error-Bwzf7Oa1.js";import{f as r,ak as t,I as m,a as p}from"./@vue/runtime-core-C6bnekPw.js";import"./element-plus-Bolc0EfP.js";import"./@vue/runtime-dom-DDAG46FW.js";import"./lodash-D3kF6u-c.js";import"./@vue/shared-mAAVTE9n.js";import"./@vue/reactivity-DiY1c2vO.js";import"./@element-plus/icons-vue-B0jSCQ-G.js";import"./lodash-es-C2A-Pj28.js";import"./@popperjs/core-C5az9QE8.js";import"./dayjs-DG77mNTn.js";import"./@ctrl/tinycolor-BuyEbX8F.js";import"./async-validator-CFA_igpM.js";import"./normalize-wheel-es-BQoi3Ox2.js";import"./vue-router-QlpZ4wdW.js";import"./index-B2ihmdtf.js";import"./jspdf-BsthCvR5.js";import"./@babel/runtime-BanGtE2-.js";import"./fflate-_ayOYiT1.js";import"./pinia-B8cvXbiZ.js";import"./axios-C80V62Fs.js";import"./@vueuse/core-1S4fJlii.js";import"./@vueuse/shared-Cl3lVqjz.js";import"./css-color-function-DI01JAaZ.js";import"./balanced-match-BdS7OldZ.js";import"./color-B2zxaWkI.js";import"./clone-DBZ6_OiU.js";import"./color-convert-OrFsTA_V.js";import"./color-name-Dju3oUBS.js";import"./color-string-pUQDDJII.js";import"./ms-CzQ2E3wO.js";import"./vue-clipboard3-DByT_rEQ.js";import"./clipboard-CHgxszqY.js";import"./echarts-CNLwa9wG.js";import"./tslib-BDyQ-Jie.js";import"./zrender-DRNXw7y3.js";import"./highlight.js-Bxt7hFFy.js";import"./@highlightjs/vue-plugin-C4onkBvW.js";const i={class:"error404"},T=r({__name:"404",setup(e){return(a,s)=>(t(),m("div",i,[p(o,{code:"404",title:"哎呀，出错了！您访问的页面不存在…"})]))}});export{T as default};

server/public/admin/assets/@babel/runtime-BanGtE2-.js

@@ -1 +0,0 @@
-function a(e){"@babel/helpers - typeof";return a=typeof Symbol=="function"&&typeof Symbol.iterator=="symbol"?function(t){return typeof t}:function(t){return t&&typeof Symbol=="function"&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},a(e)}function c(e,t,r,n,f,y,i){try{var u=e[y](i),o=u.value}catch(l){return void r(l)}u.done?t(o):Promise.resolve(o).then(n,f)}function p(e){return function(){var t=this,r=arguments;return new Promise(function(n,f){var y=e.apply(t,r);function i(o){c(y,n,f,i,u,"next",o)}function u(o){c(y,n,f,i,u,"throw",o)}i(void 0)})}}function b(e,t){if(a(e)!="object"||!e)return e;var r=e[Symbol.toPrimitive];if(r!==void 0){var n=r.call(e,t);if(a(n)!="object")return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return(t==="string"?String:Number)(e)}function m(e){var t=b(e,"string");return a(t)=="symbol"?t:t+""}function s(e,t,r){return(t=m(t))in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}export{a as _,p as a,s as b};

server/public/admin/assets/@floating-ui/core-l0sNRNKZ.js

@@ -1 +0,0 @@
-

server/public/admin/assets/@floating-ui/dom-l0sNRNKZ.js

@@ -1 +0,0 @@
-

server/public/admin/assets/@floating-ui/utils-l0sNRNKZ.js

@@ -1 +0,0 @@
-

server/public/admin/assets/@highlightjs/vue-plugin-C4onkBvW.js

@@ -1 +0,0 @@
-import{H as u}from"../highlight.js-Bxt7hFFy.js";import{f as c,i as g,w as s,A as n}from"../@vue/runtime-core-C6bnekPw.js";import{n as h}from"../@vue/reactivity-DiY1c2vO.js";var i=c({props:{code:{type:String,required:!0},language:{type:String,default:""},autodetect:{type:Boolean,default:!0},ignoreIllegals:{type:Boolean,default:!0}},setup:function(e){var t=h(e.language);s((function(){return e.language}),(function(a){t.value=a}));var r=n((function(){return e.autodetect||!t.value})),o=n((function(){return!r.value&&!u.getLanguage(t.value)}));return{className:n((function(){return o.value?"":"hljs "+t.value})),highlightedCode:n((function(){var a;if(o.value)return console.warn('The language "'+t.value+'" you specified could not be found.'),e.code.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#x27;");if(r.value){var l=u.highlightAuto(e.code);return t.value=(a=l.language)!==null&&a!==void 0?a:"",l.value}return(l=u.highlight(e.code,{language:t.value,ignoreIllegals:e.ignoreIllegals})).value}))}},render:function(){return g("pre",{},[g("code",{class:this.className,innerHTML:this.highlightedCode})])}}),v={install:function(e){e.component("highlightjs",i)},component:i};export{v as o};

server/public/admin/assets/@tencentcloud/chat-uikit-vue3-CLQ__Wr9.js

@@ -1 +0,0 @@
-import"./uikit-base-component-vue3-YgTqL4da.js";import{A as r}from"../tuikit-atomicx-vue3-Dln8Zi6e.js";import{f as s,ak as c,I as l,aq as m,G as u,at as i,H as p,A as d}from"../@vue/runtime-core-C6bnekPw.js";import{y as v}from"../@vue/reactivity-DiY1c2vO.js";import"./chat-uikit-engine-zx802ozq.js";const _=(t,o)=>{const a=t.__vccOpts||t;for(const[e,n]of o)a[e]=n;return a},f={key:0,class:"chat"},h=s({name:"Chat",__name:"Chat",props:{PlaceholderEmpty:{default:null}},setup(t){const{activeConversation:o}=r(),a=d(()=>{var e;return!((e=o.value)!=null&&e.conversationID)});return(e,n)=>v(o)?(c(),l("div",f,[m(e.$slots,"default",{},void 0,!0)])):a.value&&t.PlaceholderEmpty?(c(),u(i(t.PlaceholderEmpty),{key:1})):p("",!0)}}),A=_(h,[["__scopeId","data-v-1c9c77cd"]]);typeof window<"u"&&(window.__CHAT_ATOMICX_VUE3__={name:"@tencentcloud/chat-uikit-vue3",version:"4.5.4"},console.log("[@tencentcloud/chat-uikit-vue3] v4.5.4"));export{A as E};

server/public/admin/assets/@tencentcloud/chat-uikit-vue3-Cj2eB1Uk.css

@@ -1 +0,0 @@
-.chat[data-v-1c9c77cd]{display:flex;flex-direction:column;min-width:0}.uikit-chat-header[data-v-a0c42ddc]{padding:14px 10px;height:64px;display:flex;justify-content:center;background-color:var(--bg-color-operate)}.uikit-chat-header__container[data-v-a0c42ddc]{padding:0 10px;flex-direction:row;align-items:center;justify-content:space-between}.uikit-chat-header__left[data-v-a0c42ddc]{flex:1 1 auto;display:flex;flex-direction:row;align-items:center}.uikit-chat-header__avatar[data-v-a0c42ddc]{margin-right:12px}.uikit-chat-header__info[data-v-a0c42ddc]{flex:1;display:flex;flex-direction:column;justify-content:center}.uikit-chat-header__title[data-v-a0c42ddc]{display:block;margin:0;font-size:16px;font-weight:700;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--text-color-primary)}.uikit-chat-header__typing-indicator[data-v-a0c42ddc]{font-size:12px;color:var(--text-color-secondary)}.uikit-chat-header__live[data-v-a0c42ddc]{margin-top:4px;font-size:12px;color:var(--text-color-secondary)}/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}main{display:block}h1{font-size:2em;margin:.67em 0}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent}abbr[title]{border-bottom:none;text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{border-style:none}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}button,[type=button],[type=reset],[type=submit]{-webkit-appearance:button}button::-moz-focus-inner,[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner{border-style:none;padding:0}button:-moz-focusring,[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:.35em .75em .625em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details{display:block}summary{display:list-item}template{display:none}[hidden]{display:none}:root{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}*,*:after,*:before{box-sizing:border-box}ul,li{list-style:none;padding:0;margin:0}picture,img,video,canvas,svg{display:block;max-width:100%}img{max-width:100%;height:auto;vertical-align:middle;image-rendering:-webkit-optimize-contrast;aspect-ratio:attr(width)/attr(height);display:inline-block;-webkit-user-drag:none;-webkit-user-select:none;-moz-user-select:none;user-select:none}img:not([src],[srcset]){visibility:hidden}

server/public/admin/assets/@vue/devtools-api-l0sNRNKZ.js

@@ -1 +0,0 @@
-

server/public/admin/assets/@vueuse/shared-Cl3lVqjz.js

@@ -1 +0,0 @@
-import{C as A,F as C,a as w,L as h,q as D,J as R,H as g,u as k,n as W}from"../@vue/reactivity-DiY1c2vO.js";import{w as b,b as x,n as L,g as F,$ as M,a5 as P}from"../@vue/runtime-core-C6bnekPw.js";function J(e){return A()?(C(e),!0):!1}const d=new WeakMap,z=(...e)=>{var t;const r=e[0],n=(t=F())==null?void 0:t.proxy;if(n==null&&!M())throw new Error("injectLocal must be called in setup");return n&&d.has(n)&&r in d.get(n)?d.get(n)[r]:P(...e)},B=typeof window<"u"&&typeof document<"u";typeof WorkerGlobalScope<"u"&&globalThis instanceof WorkerGlobalScope;const K=e=>typeof e<"u",I=Object.prototype.toString,Q=e=>I.call(e)==="[object Object]",m=()=>{};function j(e,t){function r(...n){return new Promise((a,o)=>{Promise.resolve(e(()=>t.apply(this,n),{fn:t,thisArg:this,args:n})).then(a).catch(o)})}return r}const S=e=>e();function V(...e){let t=0,r,n=!0,a=m,o,s,i,u,c;!w(e[0])&&typeof e[0]=="object"?{delay:s,trailing:i=!0,leading:u=!0,rejectOnCancel:c=!1}=e[0]:[s,i=!0,u=!0,c=!1]=e;const f=()=>{r&&(clearTimeout(r),r=void 0,a(),a=m)};return O=>{const l=h(s),v=Date.now()-t,p=()=>o=O();return f(),l<=0?(t=Date.now(),p()):(v>l&&(u||!n)?(t=Date.now(),p()):i&&(o=new Promise((y,T)=>{a=c?T:y,r=setTimeout(()=>{t=Date.now(),n=!0,y(p()),f()},Math.max(0,l-v))})),!u&&!r&&(r=setTimeout(()=>n=!0,l)),n=!1,o)}}function E(e=S,t={}){const{initialState:r="active"}=t,n=N(r==="active");function a(){n.value=!1}function o(){n.value=!0}const s=(...i)=>{n.value&&e(...i)};return{isActive:g(n),pause:a,resume:o,eventFilter:s}}function U(e){return e.endsWith("rem")?Number.parseFloat(e)*16:Number.parseFloat(e)}function G(e){return F()}function X(e){return Array.isArray(e)?e:[e]}function N(...e){if(e.length!==1)return R(...e);const t=e[0];return typeof t=="function"?g(k(()=>({get:t,set:m}))):W(t)}function Y(e,t=200,r=!1,n=!0,a=!1){return j(V(t,r,n,a),e)}function _(e,t,r={}){const{eventFilter:n=S,...a}=r;return b(e,j(n,t),a)}function Z(e,t,r={}){const{eventFilter:n,initialState:a="active",...o}=r,{eventFilter:s,pause:i,resume:u,isActive:c}=E(n,{initialState:a});return{stop:_(e,t,{...o,eventFilter:s}),pause:i,resume:u,isActive:c}}function ee(e,t=!0,r){G()?x(e,r):t?e():L(e)}function te(e=!1,t={}){const{truthyValue:r=!0,falsyValue:n=!1}=t,a=w(e),o=D(e);function s(i){if(arguments.length)return o.value=i,o.value;{const u=h(r);return o.value=o.value===u?h(n):u,o.value}}return a?s:[o,s]}function ne(e,t,r){return b(e,t,{...r,immediate:!0})}export{N as a,ee as b,Q as c,X as d,Z as e,z as f,K as g,Y as h,B as i,U as p,J as t,te as u,ne as w};

server/public/admin/assets/@wangeditor/editor-for-vue-D1vSph3l.js

@@ -1,2 +0,0 @@
-import{i as C,Q as y,a as E}from"./editor-Cyf37SuL.js";import{ak as g,I as h,f as w,b as P,w as O,aJ as b}from"../@vue/runtime-core-C6bnekPw.js";import{n as d,t as $,q as F}from"../@vue/reactivity-DiY1c2vO.js";var B=Object.defineProperty,D=Object.defineProperties,j=Object.getOwnPropertyDescriptors,m=Object.getOwnPropertySymbols,H=Object.prototype.hasOwnProperty,S=Object.prototype.propertyIsEnumerable,_=(e,t,o)=>t in e?B(e,t,{enumerable:!0,configurable:!0,writable:!0,value:o}):e[t]=o,A=(e,t)=>{for(var o in t||(t={}))H.call(t,o)&&_(e,o,t[o]);if(m)for(var o of m(t))S.call(t,o)&&_(e,o,t[o]);return e},M=(e,t)=>D(e,j(t));function u(e){let t=`请使用 '@${e}' 事件，不要放在 props 中`;return t+=`
-Please use '@${e}' event instead of props`,t}var v=(e,t)=>{for(const[o,a]of t)e[o]=a;return e};const V=w({props:{mode:{type:String,default:"default"},defaultContent:{type:Array,default:[]},defaultHtml:{type:String,default:""},defaultConfig:{type:Object,default:{}},modelValue:{type:String,default:""}},setup(e,t){const o=d(null),a=F(null),i=d(""),s=()=>{if(!o.value)return;const f=$(e.defaultContent);C({selector:o.value,mode:e.mode,content:f||[],html:e.defaultHtml||e.modelValue||"",config:M(A({},e.defaultConfig),{onCreated(r){if(a.value=r,t.emit("onCreated",r),e.defaultConfig.onCreated){const n=u("onCreated");throw new Error(n)}},onChange(r){const n=r.getHtml();if(i.value=n,t.emit("update:modelValue",n),t.emit("onChange",r),e.defaultConfig.onChange){const l=u("onChange");throw new Error(l)}},onDestroyed(r){if(t.emit("onDestroyed",r),e.defaultConfig.onDestroyed){const n=u("onDestroyed");throw new Error(n)}},onMaxLength(r){if(t.emit("onMaxLength",r),e.defaultConfig.onMaxLength){const n=u("onMaxLength");throw new Error(n)}},onFocus(r){if(t.emit("onFocus",r),e.defaultConfig.onFocus){const n=u("onFocus");throw new Error(n)}},onBlur(r){if(t.emit("onBlur",r),e.defaultConfig.onBlur){const n=u("onBlur");throw new Error(n)}},customAlert(r,n){if(t.emit("customAlert",r,n),e.defaultConfig.customAlert){const l=u("customAlert");throw new Error(l)}},customPaste:(r,n)=>{if(e.defaultConfig.customPaste){const c=u("customPaste");throw new Error(c)}let l;return t.emit("customPaste",r,n,c=>{l=c}),l}})})};function p(f){const r=a.value;r!=null&&r.setHtml(f)}return P(()=>{s()}),O(()=>e.modelValue,f=>{f!==i.value&&p(f)}),{box:o}}}),I={ref:"box",style:{height:"100%"}};function L(e,t,o,a,i,s){return g(),h("div",I,null,512)}var J=v(V,[["render",L]]);const T=w({props:{editor:{type:Object},mode:{type:String,default:"default"},defaultConfig:{type:Object,default:{}}},setup(e){const t=d(null),o=a=>{if(t.value){if(a==null)throw new Error("Not found instance of Editor when create <Toolbar/> component");y.getToolbar(a)||E({editor:a,selector:t.value||"<div></div>",mode:e.mode,config:e.defaultConfig})}};return b(()=>{const{editor:a}=e;a!=null&&o(a)}),{selector:t}}}),R={ref:"selector"};function k(e,t,o,a,i,s){return g(),h("div",R,null,512)}var N=v(T,[["render",k]]);export{J as E,N as T};

server/public/admin/assets/AppointmentRecordPanel-BWS3OyF0.css

@@ -0,0 +1 @@
+.cell-stack[data-v-7005d187]{display:flex;flex-direction:column;gap:2px;line-height:1.35}

server/public/admin/assets/AppointmentRecordPanel-CofiR1sU.js

@@ -0,0 +1 @@
+import{o as C,R as D,q as d,r as I,ac as N,O as u,bj as B,D as o,v as l,bk as E,br as L,L as i,T as r,s as p,bi as R,M as w}from"./.pnpm-BGZW0UGg.js";import{a as V}from"./doctor-CF92xvl4.js";import{m as A,_ as M}from"./index-CeIwrh_6.js";const P={class:"appointment-record-panel"},$={class:"cell-stack"},j={class:"font-medium"},q={class:"text-gray-500 text-sm"},O={class:"cell-stack"},F={class:"text-gray-500 text-sm"},G=C({__name:"AppointmentRecordPanel",props:{diagnosisId:{}},setup(v,{expose:y}){const f=v,m=w(!1),g=w([]),h=w({});function x(t){return t?String(t).length>=8?String(t).slice(0,5):t:""}function k(t){return t==="morning"?"上午":t==="afternoon"?"下午":t==="all"?"全天":t||"—"}function S(t){const n=t.channel_source??t.channels??"";if(n===""||n===null||n===void 0)return"—";const a=String(n),s=h.value[a]||a,c=String(t.channel_source_detail??"").trim();return c!==""?`${s}（${c}）`:s}function T(t){return[...t].sort((n,a)=>{const s=String(n.appointment_date||""),c=String(a.appointment_date||"");if(s!==c)return c.localeCompare(s);const _=String(n.appointment_time||""),e=String(a.appointment_time||"");return _!==e?e.localeCompare(_):Number(a.id||0)-Number(n.id||0)})}const z=async()=>{try{const t=await A({type:"channels"}),n=((t==null?void 0:t.channels)||[]).filter(s=>s.status!==0),a={};for(const s of n)s.value!=null&&(a[String(s.value)]=s.name||String(s.value));h.value=a}catch{h.value={}}},b=async()=>{if(f.diagnosisId){m.value=!0;try{await z();const t=await V({patient_id:f.diagnosisId,diag_scope_relax:1,page_no:1,page_size:500}),n=(t==null?void 0:t.lists)||[];g.value=T(n)}catch(t){console.error(t),g.value=[]}finally{m.value=!1}}};return D(()=>f.diagnosisId,()=>{b()},{immediate:!0}),y({refresh:b}),(t,n)=>{const a=E,s=L,c=B,_=R;return d(),I("div",P,[N((d(),u(c,{data:g.value,border:"",stripe:"","empty-text":"暂无挂号记录"},{default:o(()=>[l(a,{label:"ID",prop:"id",width:"72",align:"center"}),l(a,{label:"状态",width:"100",align:"center"},{default:o(({row:e})=>[l(s,{type:e.status===1?"success":e.status===2?"info":e.status===3?"primary":"danger",size:"small",effect:"light"},{default:o(()=>[i(r(e.status_desc||"—"),1)]),_:2},1032,["type"])]),_:1}),l(a,{label:"患者（挂号人）","min-width":"150"},{default:o(({row:e})=>[p("div",$,[p("span",j,r(e.patient_name||"—"),1),p("span",q,r(e.patient_phone||""),1)])]),_:1}),l(a,{label:"挂号医生",prop:"doctor_name",width:"110","show-overflow-tooltip":""}),l(a,{label:"挂号助理",width:"110","show-overflow-tooltip":""},{default:o(({row:e})=>[i(r(e.assistant_name||"—"),1)]),_:1}),l(a,{label:"预约时间","min-width":"130"},{default:o(({row:e})=>[p("div",O,[p("span",null,r(e.appointment_date||"—"),1),p("span",F,r(x(e.appointment_time)),1)])]),_:1}),l(a,{label:"时段",width:"80",align:"center"},{default:o(({row:e})=>[i(r(k(e.period)),1)]),_:1}),l(a,{label:"类型",width:"100","show-overflow-tooltip":""},{default:o(({row:e})=>[i(r(e.appointment_type_desc||"—"),1)]),_:1}),l(a,{label:"渠道",width:"110","show-overflow-tooltip":""},{default:o(({row:e})=>[i(r(S(e)),1)]),_:1}),l(a,{label:"确认诊单",width:"92",align:"center"},{default:o(({row:e})=>[e.diagnosis_confirmed?(d(),u(s,{key:0,type:"success",size:"small",effect:"plain"},{default:o(()=>[...n[0]||(n[0]=[i("已确认",-1)])]),_:1})):(d(),u(s,{key:1,type:"warning",size:"small",effect:"plain"},{default:o(()=>[...n[1]||(n[1]=[i("未确认",-1)])]),_:1}))]),_:1}),l(a,{label:"开方",width:"80",align:"center"},{default:o(({row:e})=>[e.has_prescription?(d(),u(s,{key:0,type:"success",size:"small",effect:"plain"},{default:o(()=>[...n[2]||(n[2]=[i("已开方",-1)])]),_:1})):(d(),u(s,{key:1,type:"info",size:"small",effect:"plain"},{default:o(()=>[...n[3]||(n[3]=[i("未开方",-1)])]),_:1}))]),_:1}),l(a,{label:"备注",prop:"remark","min-width":"100","show-overflow-tooltip":""}),l(a,{label:"创建时间",width:"165",prop:"create_time"})]),_:1},8,["data"])),[[_,m.value]])])}}}),Q=M(G,[["__scopeId","data-v-7005d187"]]);export{Q as default};

server/public/admin/assets/AppointmentRecordPanel-DC22GDgn.css

@@ -1 +0,0 @@
-.cell-stack[data-v-4de87dfa]{display:flex;flex-direction:column;gap:2px;line-height:1.35}

server/public/admin/assets/AssignLogPanel-9L2L9pAg.js

@@ -0,0 +1 @@
+import{o as T,R as C,q as _,r as b,ac as D,O as h,bj as $,D as r,v as n,bk as L,L as c,T as d,br as k,s as E,a1 as A,w as P,u as B,ch as F,bi as M,M as w}from"./.pnpm-BGZW0UGg.js";import{a6 as V}from"./tcm-o2aZele6.js";import{_ as q}from"./index-CeIwrh_6.js";const K={class:"assign-log-panel"},j={key:1,class:"text-gray-400"},z=T({__name:"AssignLogPanel",props:{diagnosisId:{}},setup(v,{expose:y}){const u=v,m=w(!1),p=w([]);function N(a){const e=a.related_po_creator_name;if(e!=null&&String(e).trim()!=="")return String(e);const t=Number(a.related_po_creator_id);return Number.isFinite(t)&&t>0?`ID:${t}`:"—"}function x(a){const e=a.related_po_create_time_text;if(e!=null&&String(e).trim()!=="")return String(e);const t=Number(a.related_po_create_time);if(!Number.isFinite(t)||t<=0)return"—";const s=new Date(t*1e3);if(Number.isNaN(s.getTime()))return"—";const o=l=>String(l).padStart(2,"0");return`${s.getFullYear()}-${o(s.getMonth()+1)}-${o(s.getDate())} ${o(s.getHours())}:${o(s.getMinutes())}:${o(s.getSeconds())}`}function f(a,e){const t=e==="from"?"from_assistant_name":"to_assistant_name",s=e==="from"?"from_assistant_id":"to_assistant_id",o=a[t];if(o!=null&&String(o).trim()!==""&&String(o)!=="—")return String(o);const l=Number(a[s]);return Number.isFinite(l)&&l>0?`ID:${l}`:"—"}const g=async()=>{if(u.diagnosisId){m.value=!0;try{const a=await V({id:u.diagnosisId}),e=Array.isArray(a)?a:[];p.value=e}catch(a){console.error(a),p.value=[]}finally{m.value=!1}}};return C(()=>u.diagnosisId,()=>{g()},{immediate:!0}),y({refresh:g}),(a,e)=>{const t=L,s=k,o=P,l=A,S=$,I=M;return _(),b("div",K,[D((_(),h(S,{data:p.value,border:"",stripe:"","empty-text":"暂无指派记录"},{default:r(()=>[n(t,{label:"操作时间",width:"175",prop:"create_time_text"}),n(t,{label:"原医助","min-width":"120"},{default:r(({row:i})=>[c(d(f(i,"from")),1)]),_:1}),n(t,{label:"新医助","min-width":"120"},{default:r(({row:i})=>[c(d(f(i,"to")),1)]),_:1}),n(t,{label:"继承",width:"72",align:"center"},{default:r(({row:i})=>[Number(i.is_inherit)===1?(_(),h(s,{key:0,type:"success",size:"small"},{default:r(()=>[...e[0]||(e[0]=[c("是",-1)])]),_:1})):(_(),b("span",j,"否"))]),_:1}),n(t,{label:"快照·业务单创建人","min-width":"130","show-overflow-tooltip":""},{default:r(({row:i})=>[c(d(N(i)),1)]),_:1}),n(t,{label:"快照·业务单创建时间",width:"190"},{header:r(()=>[e[1]||(e[1]=E("span",null,"快照·业务单创建时间",-1)),n(l,{placement:"top",content:"related_po_create_time：触发本次操作的处方业务订单 create_time；与原文助一致时表示医助创建订单时间"},{default:r(()=>[n(o,{class:"assign-log-col-hint"},{default:r(()=>[n(B(F))]),_:1})]),_:1})]),default:r(({row:i})=>[c(d(x(i)),1)]),_:1}),n(t,{label:"操作人",width:"110",prop:"operator_name"}),n(t,{label:"操作账号",width:"120",prop:"operator_account","show-overflow-tooltip":""}),n(t,{label:"IP",width:"130",prop:"ip","show-overflow-tooltip":""})]),_:1},8,["data"])),[[I,m.value]])])}}}),Y=q(z,[["__scopeId","data-v-0a09e3d2"]]);export{Y as default};

server/public/admin/assets/AssignLogPanel-CbpABGSR.css

@@ -0,0 +1 @@
+.assign-log-col-hint[data-v-0a09e3d2]{margin-left:4px;vertical-align:middle;color:var(--el-text-color-secondary);cursor:help}

server/public/admin/assets/AssignLogPanel-DkQMoEkX.css

@@ -1 +0,0 @@
-.assign-log-col-hint[data-v-f670e3e6]{margin-left:4px;vertical-align:middle;color:var(--el-text-color-secondary);cursor:help}

server/public/admin/assets/AssignLogPanel-M1LWWDpU.js

@@ -1 +0,0 @@
-import{M as T,N as C,T as $,r as D,d as L,L as k}from"./element-plus-Bolc0EfP.js";import{Y as E}from"./@element-plus/icons-vue-B0jSCQ-G.js";import{a5 as P}from"./tcm-ChSbmg0P.js";import{f as A,w as B,ak as p,I as b,aP as F,G as h,aN as n,a as i,O as m,J as M}from"./@vue/runtime-core-C6bnekPw.js";import{Q as c}from"./@vue/shared-mAAVTE9n.js";import{y as V,n as w}from"./@vue/reactivity-DiY1c2vO.js";import{_ as K}from"./index-B2ihmdtf.js";import"./@vue/runtime-dom-DDAG46FW.js";import"./lodash-D3kF6u-c.js";import"./lodash-es-C2A-Pj28.js";import"./@popperjs/core-C5az9QE8.js";import"./dayjs-DG77mNTn.js";import"./@ctrl/tinycolor-BuyEbX8F.js";import"./async-validator-CFA_igpM.js";import"./normalize-wheel-es-BQoi3Ox2.js";import"./jspdf-BsthCvR5.js";import"./@babel/runtime-BanGtE2-.js";import"./fflate-_ayOYiT1.js";import"./vue-router-QlpZ4wdW.js";import"./pinia-B8cvXbiZ.js";import"./axios-C80V62Fs.js";import"./@vueuse/core-1S4fJlii.js";import"./@vueuse/shared-Cl3lVqjz.js";import"./css-color-function-DI01JAaZ.js";import"./balanced-match-BdS7OldZ.js";import"./color-B2zxaWkI.js";import"./clone-DBZ6_OiU.js";import"./color-convert-OrFsTA_V.js";import"./color-name-Dju3oUBS.js";import"./color-string-pUQDDJII.js";import"./ms-CzQ2E3wO.js";import"./vue-clipboard3-DByT_rEQ.js";import"./clipboard-CHgxszqY.js";import"./echarts-CNLwa9wG.js";import"./tslib-BDyQ-Jie.js";import"./zrender-DRNXw7y3.js";import"./highlight.js-Bxt7hFFy.js";import"./@highlightjs/vue-plugin-C4onkBvW.js";const Y={class:"assign-log-panel"},q={key:1,class:"text-gray-400"},z=A({__name:"AssignLogPanel",props:{diagnosisId:{}},setup(N,{expose:v}){const _=N,d=w(!1),u=w([]);function y(o){const e=o.related_po_creator_name;if(e!=null&&String(e).trim()!=="")return String(e);const t=Number(o.related_po_creator_id);return Number.isFinite(t)&&t>0?`ID:${t}`:"—"}function x(o){const e=o.related_po_create_time_text;if(e!=null&&String(e).trim()!=="")return String(e);const t=Number(o.related_po_create_time);if(!Number.isFinite(t)||t<=0)return"—";const a=new Date(t*1e3);if(Number.isNaN(a.getTime()))return"—";const r=l=>String(l).padStart(2,"0");return`${a.getFullYear()}-${r(a.getMonth()+1)}-${r(a.getDate())} ${r(a.getHours())}:${r(a.getMinutes())}:${r(a.getSeconds())}`}function f(o,e){const t=e==="from"?"from_assistant_name":"to_assistant_name",a=e==="from"?"from_assistant_id":"to_assistant_id",r=o[t];if(r!=null&&String(r).trim()!==""&&String(r)!=="—")return String(r);const l=Number(o[a]);return Number.isFinite(l)&&l>0?`ID:${l}`:"—"}const g=async()=>{if(_.diagnosisId){d.value=!0;try{const o=await P({id:_.diagnosisId}),e=Array.isArray(o)?o:[];u.value=e}catch(o){console.error(o),u.value=[]}finally{d.value=!1}}};return B(()=>_.diagnosisId,()=>{g()},{immediate:!0}),v({refresh:g}),(o,e)=>{const t=C,a=$,r=L,l=D,S=T,I=k;return p(),b("div",Y,[F((p(),h(S,{data:u.value,border:"",stripe:"","empty-text":"暂无指派记录"},{default:n(()=>[i(t,{label:"操作时间",width:"175",prop:"create_time_text"}),i(t,{label:"原医助","min-width":"120"},{default:n(({row:s})=>[m(c(f(s,"from")),1)]),_:1}),i(t,{label:"新医助","min-width":"120"},{default:n(({row:s})=>[m(c(f(s,"to")),1)]),_:1}),i(t,{label:"继承",width:"72",align:"center"},{default:n(({row:s})=>[Number(s.is_inherit)===1?(p(),h(a,{key:0,type:"success",size:"small"},{default:n(()=>[...e[0]||(e[0]=[m("是",-1)])]),_:1})):(p(),b("span",q,"否"))]),_:1}),i(t,{label:"快照·业务单创建人","min-width":"130","show-overflow-tooltip":""},{default:n(({row:s})=>[m(c(y(s)),1)]),_:1}),i(t,{label:"快照·业务单创建时间",width:"190"},{header:n(()=>[e[1]||(e[1]=M("span",null,"快照·业务单创建时间",-1)),i(l,{placement:"top",content:"related_po_create_time：触发本次操作的处方业务订单 create_time；与原文助一致时表示医助创建订单时间"},{default:n(()=>[i(r,{class:"assign-log-col-hint"},{default:n(()=>[i(V(E))]),_:1})]),_:1})]),default:n(({row:s})=>[m(c(x(s)),1)]),_:1}),i(t,{label:"操作人",width:"110",prop:"operator_name"}),i(t,{label:"操作账号",width:"120",prop:"operator_account","show-overflow-tooltip":""}),i(t,{label:"IP",width:"130",prop:"ip","show-overflow-tooltip":""})]),_:1},8,["data"])),[[I,d.value]])])}}}),Ct=K(z,[["__scopeId","data-v-f670e3e6"]]);export{Ct as default};

server/public/admin/assets/AssistantWatchCallDialog-BIPZRgaH.css

@@ -1 +0,0 @@
-.watch-state[data-v-7aff665d]{min-height:200px;display:flex;align-items:center;justify-content:center;color:var(--el-text-color-secondary);font-size:14px}.watch-error[data-v-7aff665d]{color:var(--el-color-danger)}.watch-grid[data-v-7aff665d]{display:grid;grid-template-columns:repeat(auto-fill,minmax(280px,1fr));gap:12px;min-height:220px}.watch-tile[data-v-7aff665d]{background:#0f0f0f;border-radius:8px;overflow:hidden;aspect-ratio:16 / 10;display:flex;flex-direction:column}.watch-tile-cap[data-v-7aff665d]{padding:6px 10px;font-size:12px;color:#e5e5e5;background:#0000008c}.watch-tile-view[data-v-7aff665d]{flex:1;min-height:0;position:relative}.watch-hint[data-v-7aff665d]{float:left;line-height:32px;font-size:12px;color:var(--el-text-color-secondary)}

server/public/admin/assets/AssistantWatchCallDialog-BYViF8Fb.css

@@ -0,0 +1 @@
+.watch-state[data-v-8c719418]{min-height:200px;display:flex;align-items:center;justify-content:center;color:var(--el-text-color-secondary);font-size:14px}.watch-error[data-v-8c719418]{color:var(--el-color-danger)}.watch-grid[data-v-8c719418]{display:grid;grid-template-columns:repeat(auto-fill,minmax(280px,1fr));gap:12px;min-height:220px}.watch-tile[data-v-8c719418]{background:#0f0f0f;border-radius:8px;overflow:hidden;aspect-ratio:16 / 10;display:flex;flex-direction:column}.watch-tile-cap[data-v-8c719418]{padding:6px 10px;font-size:12px;color:#e5e5e5;background:#0000008c}.watch-tile-view[data-v-8c719418]{flex:1;min-height:0;position:relative}.watch-hint[data-v-8c719418]{float:left;line-height:32px;font-size:12px;color:var(--el-text-color-secondary)}

server/public/admin/assets/AssistantWatchCallDialog-yv0smRfc.js

@@ -0,0 +1 @@
+import{o as B,R as D,q as E,O,D as I,r as _,T as S,P as x,ac as W,s as h,ad as P,v as U,K as $,L as j,bt as H,p as K,M as v,cW as d}from"./.pnpm-BGZW0UGg.js";import{a7 as Y}from"./tcm-o2aZele6.js";import{_ as q}from"./index-CeIwrh_6.js";const z={key:0,class:"watch-state"},F={key:1,class:"watch-state watch-error"},G=B({__name:"AssistantWatchCallDialog",props:{modelValue:{type:Boolean},diagnosisId:{}},emits:["update:modelValue","closed"],setup(R,{emit:A}){const u=R,g=A,y=K({get:()=>u.modelValue,set:t=>g("update:modelValue",t)}),r=v(null),l=v(!1),i=v(""),p=v("旁观视频通话"),n=new Map;let a=null,f=0;function w(t,e){return`${t}\0${String(e)}`}function N(t){return t.startsWith("patient_")?"患者":t.startsWith("doctor_")?"医护":t}async function T(t){if(!a||!r.value||t.streamType!==d.TYPE.STREAM_TYPE_MAIN)return;const e=w(t.userId,t.streamType);if(n.has(e))return;const o=document.createElement("div");o.className="watch-tile";const s=document.createElement("div");s.className="watch-tile-cap",s.textContent=N(t.userId);const c=document.createElement("div");c.className="watch-tile-view",o.appendChild(s),o.appendChild(c),r.value.appendChild(o),n.set(e,{wrap:o,userId:t.userId,streamType:t.streamType});try{await a.startRemoteVideo({userId:t.userId,streamType:t.streamType,view:c})}catch(b){console.warn("[AssistantWatchCall] startRemoteVideo",b)}}async function V(t){if(!a)return;const e=w(t.userId,t.streamType),o=n.get(e);if(o){try{await a.stopRemoteVideo({userId:t.userId,streamType:t.streamType})}catch{}o.wrap.remove(),n.delete(e)}}function C(){a&&(a.on(d.EVENT.REMOTE_VIDEO_AVAILABLE,T),a.on(d.EVENT.REMOTE_VIDEO_UNAVAILABLE,V))}function k(){a&&(a.off(d.EVENT.REMOTE_VIDEO_AVAILABLE,T),a.off(d.EVENT.REMOTE_VIDEO_UNAVAILABLE,V))}async function m(){if(k(),a){for(const[,t]of n){try{await a.stopRemoteVideo({userId:t.userId,streamType:t.streamType})}catch{}t.wrap.remove()}n.clear(),r.value&&(r.value.innerHTML="");try{await a.exitRoom()}catch{}try{a.destroy()}catch{}a=null}else n.clear(),r.value&&(r.value.innerHTML="")}async function L(){const t=++f;if(await m(),!u.diagnosisId){i.value="诊单无效";return}l.value=!0,i.value="",p.value="旁观视频通话";try{const e=await Y({diagnosis_id:u.diagnosisId});if(t!==f)return;e.patientName&&(p.value=`旁观视频通话 · ${e.patientName}`),a=d.create(),C();const o={sdkAppId:e.sdkAppId,userId:e.userId,userSig:e.userSig,autoReceiveAudio:!0,autoReceiveVideo:!0,...e.roomId!=null&&e.roomId>0?{roomId:e.roomId}:{strRoomId:e.strRoomId}};if(!(e.roomId!=null&&e.roomId>0)&&!e.strRoomId)throw new Error("缺少房间号");if(await a.enterRoom(o),t!==f){await m();return}l.value=!1}catch(e){l.value=!1;let o="进入房间失败";if(typeof e=="string")o=e;else if(e&&typeof e=="object"){const s=e;s.msg?o=String(s.msg):s.message&&(o=String(s.message))}i.value=o,await m()}}function M(){m(),l.value=!1,i.value="",p.value="旁观视频通话",g("closed")}return D(()=>[u.modelValue,u.diagnosisId],([t,e])=>{if(!t){f++,m();return}e>0&&L()}),(t,e)=>{const o=$,s=H;return E(),O(s,{modelValue:y.value,"onUpdate:modelValue":e[1]||(e[1]=c=>y.value=c),title:p.value,width:"760px","destroy-on-close":"","append-to-body":"","close-on-click-modal":!1,class:"assistant-watch-call-dialog",onClosed:M},{footer:I(()=>[e[3]||(e[3]=h("span",{class:"watch-hint"},"仅观看，不会开启摄像头与麦克风",-1)),U(o,{type:"primary",onClick:e[0]||(e[0]=c=>y.value=!1)},{default:I(()=>[...e[2]||(e[2]=[j("离开",-1)])]),_:1})]),default:I(()=>[l.value?(E(),_("div",z,"正在连接房间…")):i.value?(E(),_("div",F,S(i.value),1)):x("",!0),W(h("div",{ref_key:"gridRef",ref:r,class:"watch-grid"},null,512),[[P,!l.value&&!i.value]])]),_:1},8,["modelValue","title"])}}}),Z=q(G,[["__scopeId","data-v-8c719418"]]);export{Z as default};

server/public/admin/assets/BloodRecordList-DhVK-Y_e.css

@@ -1 +0,0 @@
-.blood-record-list[data-v-3a187401]{padding:20px}

server/public/admin/assets/BloodRecordList-QXCJIVBd.css

@@ -0,0 +1 @@
+.blood-record-list[data-v-002163f9]{padding:20px}

server/public/admin/assets/CallRecordPanel-BWpJA8fG.js

@@ -0,0 +1 @@
+import{o as N,cY as O,R as P,q as d,r as f,v as o,D as i,K as V,L as n,P as h,ac as D,O as w,bj as L,bk as z,T as u,s as y,bi as M,M as v}from"./.pnpm-BGZW0UGg.js";import j from"./RecordingPlaybackBlock-By4EH6-v.js";import{U as x}from"./index-TD4t951S.js";import{i as c,_ as q}from"./index-CeIwrh_6.js";import{ab as K,ac as k,ad as Y}from"./tcm-o2aZele6.js";import"./RecordingVideoPlayer-CF68w3pY.js";import"./file-tQw_m7Aj.js";const A={class:"call-record-panel"},F={key:0,class:"call-record-toolbar"},G={class:"call-record-empty"},H={class:"call-record-empty__desc"},J={key:0,class:"text-primary"},Q={key:1,class:"text-gray-400"},W=N({__name:"CallRecordPanel",props:{diagnosisId:{},readOnly:{type:Boolean,default:!1}},setup(_,{expose:R}){const r=_,p=v(!1),g=v([]),U=O("toolbarUploadRef"),m=async()=>{if(r.diagnosisId){p.value=!0;try{g.value=await K({diagnosis_id:r.diagnosisId})||[]}catch(e){console.error(e),g.value=[]}finally{p.value=!1}}};P(()=>r.diagnosisId,()=>{m()},{immediate:!0}),R({refresh:m});function C(e){return{1:"进行中",2:"已结束",3:"未接听",4:"已取消"}[e]??"—"}async function S(e){const t=b(e);if(!t){c.msgError("上传成功但未返回视频地址");return}try{const a=await Y({diagnosis_id:r.diagnosisId});await k({diagnosis_id:r.diagnosisId,call_record_id:Number((a==null?void 0:a.id)||0),file_url:t}),c.msgSuccess("视频回放上传成功"),await m()}catch(a){c.msgError((a==null?void 0:a.message)||"写入回放失败")}}async function E(e,t){const a=b(t);if(!a){c.msgError("上传成功但未返回视频地址");return}try{await k({diagnosis_id:r.diagnosisId,call_record_id:Number(e.id||0),file_url:a}),c.msgSuccess("视频回放上传成功"),await m()}catch(l){c.msgError((l==null?void 0:l.message)||"写入回放失败")}}function b(e){var t,a;return String(((t=e==null?void 0:e.data)==null?void 0:t.uri)||((a=e==null?void 0:e.data)==null?void 0:a.url)||"").trim()}return(e,t)=>{const a=V,l=z,I=L,B=M;return d(),f("div",A,[_.readOnly?h("",!0):(d(),f("div",F,[o(x,{ref_key:"toolbarUploadRef",ref:U,type:"video",direct:"",multiple:!1,limit:1,"show-progress":!0,onSuccess:S},{default:i(()=>[o(a,{type:"primary"},{default:i(()=>[...t[0]||(t[0]=[n("上传视频",-1)])]),_:1})]),_:1},512)])),D((d(),w(I,{data:g.value,border:"",stripe:""},{empty:i(()=>[y("div",G,[t[1]||(t[1]=y("div",{class:"call-record-empty__title"},"暂无通话记录",-1)),y("div",H,u(_.readOnly?"暂无录制回放数据。":"现在可以直接点击上方“上传视频”。系统会自动生成一条默认通话记录来承载回放。"),1)])]),default:i(()=>[o(l,{label:"录制回放","min-width":"320"},{default:i(({row:s})=>[o(j,{"record-id":s.id,urls:s.recording_urls_list},null,8,["record-id","urls"])]),_:1}),o(l,{label:"开始时间",width:"170",prop:"start_time_text"}),o(l,{label:"结束时间",width:"170",prop:"end_time_text"}),o(l,{label:"通话类型",width:"100"},{default:i(({row:s})=>[n(u(s.call_type===1?"语音":"视频"),1)]),_:1}),o(l,{label:"房间号",width:"180"},{default:i(({row:s})=>[s.room_id?(d(),f("span",J,u(s.room_id),1)):(d(),f("span",Q,"—"))]),_:1}),o(l,{label:"时长",width:"110",prop:"duration_text"}),o(l,{label:"状态",width:"90"},{default:i(({row:s})=>[n(u(C(s.status)),1)]),_:1}),o(l,{label:"录制",width:"100"},{default:i(({row:s})=>[n(u(s.recording_status_text||"—"),1)]),_:1}),_.readOnly?h("",!0):(d(),w(l,{key:0,label:"上传回放",width:"180"},{default:i(({row:s})=>[o(x,{type:"video",direct:"",multiple:!1,limit:1,"show-progress":!0,onSuccess:T=>E(s,T)},{default:i(()=>[o(a,{type:"primary",plain:"",size:"small"},{default:i(()=>[...t[2]||(t[2]=[n("上传视频",-1)])]),_:1})]),_:1},8,["onSuccess"])]),_:1}))]),_:1},8,["data"])),[[B,p.value]])])}}}),sa=q(W,[["__scopeId","data-v-41737096"]]);export{sa as default};

server/public/admin/assets/CallRecordPanel-TsjZtTO8.css

@@ -1 +0,0 @@
-.call-record-panel .call-record-toolbar[data-v-78d5c9e4]{display:flex;align-items:center;gap:12px;margin-bottom:12px}.call-record-panel .call-record-empty[data-v-78d5c9e4]{padding:28px 12px;color:var(--el-text-color-secondary);text-align:center}.call-record-panel .call-record-empty__title[data-v-78d5c9e4]{font-size:14px;color:var(--el-text-color-primary)}.call-record-panel .call-record-empty__desc[data-v-78d5c9e4]{margin-top:8px;font-size:12px;line-height:1.6}

server/public/admin/assets/CallRecordPanel-p7h_1hh9.css

@@ -0,0 +1 @@
+.call-record-panel .call-record-toolbar[data-v-41737096]{display:flex;align-items:center;gap:12px;margin-bottom:12px}.call-record-panel .call-record-empty[data-v-41737096]{padding:28px 12px;color:var(--el-text-color-secondary);text-align:center}.call-record-panel .call-record-empty__title[data-v-41737096]{font-size:14px;color:var(--el-text-color-primary)}.call-record-panel .call-record-empty__desc[data-v-41737096]{margin-top:8px;font-size:12px;line-height:1.6}

server/public/admin/assets/CaseRecordList-Bk86rMKp.js

@@ -0,0 +1 @@
+import{o as T,ap as V,R as I,q as o,r as l,v as s,K as N,D as i,L as c,P as k,ac as z,bi as M,u as p,O as g,bk as O,T as _,F as P,br as j,s as F,bj as R,bB as A,M as w}from"./.pnpm-BGZW0UGg.js";import{ae as q}from"./tcm-o2aZele6.js";import{_ as H}from"./index-CeIwrh_6.js";const K={class:"case-record-list"},Y={key:0,class:"mb-3 flex justify-end"},G={key:0},J={key:1,class:"text-gray-400"},Q={class:"void-detail text-xs text-gray-500 mt-1"},U=T({__name:"CaseRecordList",props:{diagnosisId:{type:Number,default:0},readOnly:{type:Boolean,default:!1}},emits:["view","openPrescription"],setup(y,{expose:x,emit:C}){const m=y,b=C,r=w([]),d=w(!1),u=async()=>{if(m.diagnosisId){d.value=!0;try{const t=await q({diagnosis_id:m.diagnosisId});r.value=Array.isArray(t)?t:[]}catch(t){console.error("获取病历记录失败:",t),r.value=[]}finally{d.value=!1}}},S=t=>{if(!t)return"";const e=new Date(t*1e3);return`${e.getFullYear()}-${String(e.getMonth()+1).padStart(2,"0")}-${String(e.getDate()).padStart(2,"0")} ${String(e.getHours()).padStart(2,"0")}:${String(e.getMinutes()).padStart(2,"0")}`},B=t=>{b("view",t)},$=()=>{b("openPrescription")};return V(()=>{u()}),I(()=>m.diagnosisId,()=>{u()}),x({refresh:u}),(t,e)=>{const h=N,n=O,v=j,E=R,D=A,L=M;return o(),l("div",K,[y.readOnly?k("",!0):(o(),l("div",Y,[s(h,{type:"primary",size:"small",onClick:$},{default:i(()=>[...e[0]||(e[0]=[c("开方",-1)])]),_:1})])),z((o(),g(E,{data:p(r),border:""},{default:i(()=>[s(n,{prop:"prescription_date",label:"就诊日期",width:"120"}),s(n,{prop:"visit_no",label:"门诊号",width:"120"}),s(n,{prop:"clinical_diagnosis",label:"临床诊断","min-width":"160","show-overflow-tooltip":""}),s(n,{label:"处方摘要","min-width":"180"},{default:i(({row:a})=>[a.herbs&&a.herbs.length?(o(),l("span",G,_(a.herbs.slice(0,3).map(f=>`${f.name}${f.dosage}克`).join("、"))+_(a.herbs.length>3?"...":""),1)):(o(),l("span",J,"—"))]),_:1}),s(n,{prop:"doctor_name",label:"医师",width:"90","show-overflow-tooltip":""}),s(n,{label:"状态",width:"140",align:"center"},{default:i(({row:a})=>[a.void_status===1?(o(),l(P,{key:0},[s(v,{type:"danger",size:"small"},{default:i(()=>[...e[1]||(e[1]=[c("已作废",-1)])]),_:1}),F("div",Q,_(a.void_by_name||"—")+" "+_(S(a.void_time)),1)],64)):(o(),g(v,{key:1,type:"success",size:"small"},{default:i(()=>[...e[2]||(e[2]=[c("正常",-1)])]),_:1}))]),_:1}),s(n,{label:"操作",width:"120",fixed:"right"},{default:i(({row:a})=>[s(h,{link:"",type:"primary",size:"small",onClick:f=>B(a)},{default:i(()=>[...e[3]||(e[3]=[c(" 查看 ",-1)])]),_:1},8,["onClick"])]),_:1})]),_:1},8,["data"])),[[L,p(d)]]),!p(d)&&p(r).length===0?(o(),g(D,{key:1,description:"暂无病历记录，开方后会自动显示",class:"mt-4"})):k("",!0)])}}}),ee=H(U,[["__scopeId","data-v-da9a20f3"]]);export{ee as default};

server/public/admin/assets/CaseRecordList-Cl-c3q7S.css

@@ -1 +0,0 @@
-.case-record-list[data-v-043d2738]{padding:20px}