更新

Merge branch 'AI-20260710'

.zshrc.codex.tmp

@@ -1,120 +0,0 @@
-alias ll='ls -alhG'
-
-# Starship prompt
-eval "$(starship init zsh)"
-
-# zsh-autosuggestions 自动补全
-source /opt/homebrew/share/zsh-autosuggestions/zsh-autosuggestions.zsh
-
-# NVM 懒加载 - 只在第一次使用相关命令时再初始化
-export NVM_DIR="$HOME/.nvm"
-_nvm_default_bin() {
-  local default_alias version_dir
-  [ -r "$NVM_DIR/alias/default" ] || return 1
-
-  default_alias="$(<"$NVM_DIR/alias/default")"
-  default_alias="${default_alias#"${default_alias%%[![:space:]]*}"}"
-  default_alias="${default_alias%"${default_alias##*[![:space:]]}"}"
-
-  case "$default_alias" in
-    v[0-9]*)
-      version_dir="$NVM_DIR/versions/node/$default_alias"
-      ;;
-    [0-9]*)
-      version_dir="$(ls -d "$NVM_DIR"/versions/node/v"$default_alias".* 2>/dev/null | tail -n 1)"
-      ;;
-    node|stable|lts/*)
-      version_dir="$(ls -d "$NVM_DIR"/versions/node/v* 2>/dev/null | sort -V | tail -n 1)"
-      ;;
-    *)
-      return 1
-      ;;
-  esac
-
-  [ -n "$version_dir" ] && [ -x "$version_dir/bin/node" ] || return 1
-  printf '%s\n' "$version_dir/bin"
-}
-if _nvm_default_node_bin="$(_nvm_default_bin)"; then
-  export PATH="$_nvm_default_node_bin:$PATH"
-fi
-unset _nvm_default_node_bin
-_lazy_load_nvm() {
-  unset -f nvm node npm npx pnpm yarn 2>/dev/null
-  [ -s "$NVM_DIR/nvm.sh" ] || return 1
-  \. "$NVM_DIR/nvm.sh"
-  [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
-  hash -r 2>/dev/null
-}
-nvm() { _lazy_load_nvm && nvm "$@"; }
-node() { _lazy_load_nvm && node "$@"; }
-npm() { _lazy_load_nvm && npm "$@"; }
-npx() { _lazy_load_nvm && npx "$@"; }
-pnpm() { _lazy_load_nvm && pnpm "$@"; }
-yarn() { _lazy_load_nvm && yarn "$@"; }
-export PATH="/Applications/EServer/bin:$PATH"
-function EC_start(){
-    /Applications/EasyConnect.app/Contents/Resources/bin/EasyMonitor > /dev/null 2>&1 &
-    /Applications/EasyConnect.app/Contents/MacOS/EasyConnect > /dev/null 2>&1 &
-    open /Applications/EasyConnect.app
-}
-
-function EC_kill(){
-    pkill EasyMonitor
-    pkill ECAgent
-    pkill ECAgentProxy
-    pkill EasyConnect
-}
-# The following lines have been added by Docker Desktop to enable Docker CLI completions.
-fpath=(/Users/long/.docker/completions $fpath)
-autoload -Uz compinit
-compinit
-# End of Docker CLI completions
-
-
-export HOMEBREW_BOTTLE_DOMAIN=https://mirrors.ustc.edu.cn/homebrew-bottles/
-
-# pyenv 懒加载 - 只在第一次使用 Python 相关命令时再初始化
-export PYENV_ROOT="$HOME/.pyenv"
-_lazy_load_pyenv() {
-  unset -f pyenv python python3 pip pip3 2>/dev/null
-
-  local pyenv_bin
-  pyenv_bin="$(command -v pyenv 2>/dev/null)"
-  if [ -z "$pyenv_bin" ] && [ -x /opt/homebrew/bin/pyenv ]; then
-    pyenv_bin=/opt/homebrew/bin/pyenv
-  fi
-
-  [ -n "$pyenv_bin" ] || return 1
-
-  eval "$("$pyenv_bin" init --path)"
-  eval "$("$pyenv_bin" init - zsh)"
-  hash -r 2>/dev/null
-}
-pyenv() { _lazy_load_pyenv && pyenv "$@"; }
-python() { _lazy_load_pyenv && python "$@"; }
-python3() { _lazy_load_pyenv && python3 "$@"; }
-pip() { _lazy_load_pyenv && pip "$@"; }
-pip3() { _lazy_load_pyenv && pip3 "$@"; }
-
-# 引入 bash 配置
-if [ -f ~/.bash_profile ]; then
-    source ~/.bash_profile
-fi
-if [ -f ~/.bashrc ]; then
-    source ~/.bashrc
-fi
-
-# Added by Windsurf
-export PATH="/Users/long/.codeium/windsurf/bin:$PATH"
-
-# Added by Antigravity
-export PATH="/Users/long/.antigravity/antigravity/bin:$PATH"
-export PATH="$HOME/.local/bin:$PATH"
-
-# MindOS Desktop — CLI (mindos)
-export PATH="$HOME/.mindos/bin:$PATH"
-
-source "$HOME/.cargo/env"
-
-# Added by Antigravity
-export PATH="/Users/long/.antigravity/antigravity/bin:$PATH"

.zshrc.codex.tmp2

@@ -1,74 +0,0 @@
-alias ll='ls -alhG'
-
-# Starship prompt
-eval "$(starship init zsh)"
-
-# zsh-autosuggestions 自动补全
-source /opt/homebrew/share/zsh-autosuggestions/zsh-autosuggestions.zsh
-
-# NVM
-export NVM_DIR="$HOME/.nvm"
-if [ -s "$NVM_DIR/nvm.sh" ]; then
-  \. "$NVM_DIR/nvm.sh"
-fi
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
-export PATH="/Applications/EServer/bin:$PATH"
-function EC_start(){
-    /Applications/EasyConnect.app/Contents/Resources/bin/EasyMonitor > /dev/null 2>&1 &
-    /Applications/EasyConnect.app/Contents/MacOS/EasyConnect > /dev/null 2>&1 &
-    open /Applications/EasyConnect.app
-}
-
-function EC_kill(){
-    pkill EasyMonitor
-    pkill ECAgent
-    pkill ECAgentProxy
-    pkill EasyConnect
-}
-# The following lines have been added by Docker Desktop to enable Docker CLI completions.
-fpath=(/Users/long/.docker/completions $fpath)
-autoload -Uz compinit
-compinit
-# End of Docker CLI completions
-
-
-export HOMEBREW_BOTTLE_DOMAIN=https://mirrors.ustc.edu.cn/homebrew-bottles/
-
-# pyenv
-export PYENV_ROOT="$HOME/.pyenv"
-export PATH="/opt/homebrew/bin:$PYENV_ROOT/bin:$PATH"
-if command -v pyenv >/dev/null 2>&1; then
-  eval "$(pyenv init --path)"
-  eval "$(pyenv init - zsh)"
-fi
-
-# 引入 bash 配置
-if [ -f ~/.bash_profile ]; then
-    source ~/.bash_profile
-fi
-if [ -f ~/.bashrc ]; then
-    source ~/.bashrc
-fi
-
-# Added by Windsurf
-export PATH="/Users/long/.codeium/windsurf/bin:$PATH"
-
-# Added by Antigravity
-export PATH="/Users/long/.antigravity/antigravity/bin:$PATH"
-
-if command -v nvm >/dev/null 2>&1; then
-  _nvm_default_version="$(nvm version default 2>/dev/null)"
-  if [ -n "$_nvm_default_version" ] && [ -d "$NVM_DIR/versions/node/$_nvm_default_version/bin" ]; then
-    export PATH="$NVM_DIR/versions/node/$_nvm_default_version/bin:$PATH"
-  fi
-  unset _nvm_default_version
-fi
-export PATH="$HOME/.local/bin:$PATH"
-
-# MindOS Desktop — CLI (mindos)
-export PATH="$HOME/.mindos/bin:$PATH"
-
-source "$HOME/.cargo/env"
-
-# Added by Antigravity
-export PATH="/Users/long/.antigravity/antigravity/bin:$PATH"

TUICallKit-Vue3/manifest.json

@@ -52,14 +52,14 @@
     "mp-weixin" : {
         "appid" : "wx79b9a0bfbfe7cbcd",
         "setting" : {
-            "urlCheck" : false
+            "urlCheck" : false,
+            "minified" : true
         },
         "optimization" : {
             "subPackages" : true
         },
         "usingComponents" : true,
-        "requiredBackgroundModes" : ["audio"],
-
+        "requiredBackgroundModes" : [ "audio" ],
         "plugins" : {
             "WechatSI" : {
                 "version" : "0.3.5",

TUICallKit-Vue3/pages.json

@@ -204,7 +204,15 @@
 						"navigationStyle": "custom",
 						"navigationBarTitleText": "日常护理",
 						"backgroundColor": "#f4fbf4",
-						"enablePullDownRefresh": true
+						"enablePullDownRefresh": true,
+						"mp-weixin": {
+							"usingPlugins": {
+								"WechatSI": {
+									"version": "0.3.5",
+									"provider": "wx069ba97219f66d99"
+								}
+							}
+						}
 					}
 				},
 				{

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/useDietAi.js

@@ -207,6 +207,8 @@ export function useDietAi(proxy, { diagnosisId, showUserToast, formatUserMessage
             return
         }
         if (!diagnosisId.value) return
+        // 发送后立即清空输入框
+        dietAiAskText.value = ''
         dietAiAsking.value = true
         dietAiAskResult.value = { advice: '', level: '', level_label: '', portion: '', food: '' }
         try {

TUICallKit-Vue3/tongji/composables/useSpeechToText.js

@@ -2,22 +2,106 @@ 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）后，
+// 回调仍指向已销毁页面的闭包，新页面收不到 onStart/onStop，
+// 其本地状态卡在 recording，表现为一直录制/无法再次语音。
+let sharedManager = null
+let sharedManagerInited = false
+let sharedRecording = false
+let activeCtl = null
+
+function getSharedRecordManager() {
+    if (sharedManagerInited) return sharedManager
+    sharedManagerInited = true
+    try {
+        // eslint-disable-next-line no-undef
+        const plugin = requirePlugin('WechatSI')
+        sharedManager = plugin.getRecordRecognitionManager()
+    } catch (e) {
+        console.warn('WechatSI record recognition not available', e)
+        sharedManager = null
+        return null
+    }
+    if (!sharedManager) return null
+
+    sharedManager.onStart = () => {
+        sharedRecording = true
+        if (activeCtl) activeCtl.handleStart()
+    }
+    sharedManager.onRecognize = (res) => {
+        if (activeCtl) activeCtl.handleRecognize(res)
+    }
+    sharedManager.onStop = (res) => {
+        sharedRecording = false
+        if (activeCtl) activeCtl.handleStop(res)
+    }
+    sharedManager.onError = (res) => {
+        sharedRecording = false
+        if (activeCtl) activeCtl.handleError(res)
+    }
+    return sharedManager
+}
+// #endif
+
 /**
  * 语音转文字（长按说话）：微信小程序 WechatSI；H5 Web Speech API。
  *
- * @param {{ onResult?: (text: string) => void, showToast?: (msg: string) => void }} options
+ * @param {{
+ *   onResult?: (text: string) => void,
+ *   onSettle?: (text: string, info: { heldMs: number }) => boolean | void,
+ *   onPartial?: (text: string) => void,
+ *   onError?: (msg: string) => boolean | void,
+ *   showToast?: (msg: string) => void
+ * }} options
+ *
+ * onSettle 在每次录音结束时都会触发（含空结果），用于语音一问一答等需要
+ * 完全接管识别结果的场景。若 onSettle 返回 true，则跳过默认的 onResult 回调
+ * 与「没听清」提示，避免与上层流程重复处理。
+ *
+ * onPartial 在录音过程中实时返回中间识别结果（微信 onRecognize / H5 interim），
+ * 用于「抢答打断」等场景：检测到用户已开口作答即可提前结束播报/录音。
+ *
+ * onError 在录音/识别出错时触发（如 "record manager recordfailed"）。
+ * 若返回 true，则跳过默认的错误 Toast，由上层自行处理（如自动重试）。
  */
-export function useSpeechToText({ onResult, showToast } = {}) {
+export function useSpeechToText({ onResult, onSettle, onPartial, onError, showToast } = {}) {
     const sttListening = ref(false)
     const sttHolding = ref(false)
     const sttSupported = ref(false)
 
     let wxRecordManager = null
     let h5Recognition = null
+    let h5GotResult = false
     let holdStartTs = 0
     let holdSessionId = 0
     let startRequested = false
     let recordAuthorized = null
+    // 快速点按可能残留会话：用排队标记把 start/stop 串行化，
+    // 避免 "please stop after start"
+    let pendingStartSession = 0
 
     function notify(msg) {
         if (!msg) return
@@ -31,6 +115,11 @@ export function useSpeechToText({ onResult, showToast } = {}) {
     function emitResult(text) {
         const t = String(text || '').trim()
         const heldMs = Date.now() - holdStartTs
+        // onSettle 总会收到结果（含空），返回 true 表示已完全接管
+        if (typeof onSettle === 'function') {
+            const handled = onSettle(t, { heldMs })
+            if (handled === true) return
+        }
         if (!t) {
             if (heldMs < MIN_HOLD_MS) return
             notify('没听清，请再试一次')
@@ -43,7 +132,9 @@ export function useSpeechToText({ onResult, showToast } = {}) {
 
     function stopListening() {
         // #ifdef MP-WEIXIN
-        if (wxRecordManager && (sttListening.value || startRequested)) {
+        const ownsRecording = sharedRecording && activeCtl === controller
+        // 仅在识别已真正开始后再 stop，避免 -30012 / internal voice data failed
+        if (wxRecordManager && (sttListening.value || ownsRecording)) {
             try {
                 wxRecordManager.stop()
             } catch (e) {}
@@ -59,6 +150,7 @@ export function useSpeechToText({ onResult, showToast } = {}) {
         // #endif
 
         startRequested = false
+        sttHolding.value = false
         sttListening.value = false
     }
 
@@ -95,8 +187,8 @@ export function useSpeechToText({ onResult, showToast } = {}) {
         // #endif
     }
 
-    function startWechatRecord(session) {
-        // #ifdef MP-WEIXIN
+    // #ifdef MP-WEIXIN
+    function actuallyStartWechat(session) {
         if (!wxRecordManager || session !== holdSessionId || !sttHolding.value) {
             return
         }
@@ -108,9 +200,28 @@ export function useSpeechToText({ onResult, showToast } = {}) {
             })
         } catch (e) {
             startRequested = false
+            sharedRecording = false
             sttHolding.value = false
             notify('无法开始录音')
         }
+    }
+    // #endif
+
+    function startWechatRecord(session) {
+        // #ifdef MP-WEIXIN
+        if (!wxRecordManager || session !== holdSessionId || !sttHolding.value) {
+            return
+        }
+        // 上一段会话还没结束（含全局单例残留）：先停止并排队，
+        // 待 onStop 回调后再真正开始，避免 "please stop after start"
+        if (sharedRecording || startRequested) {
+            pendingStartSession = session
+            try {
+                wxRecordManager.stop()
+            } catch (e) {}
+            return
+        }
+        actuallyStartWechat(session)
         // #endif
     }
 
@@ -123,6 +234,7 @@ export function useSpeechToText({ onResult, showToast } = {}) {
         }
         try {
             startRequested = true
+            h5GotResult = false
             h5Recognition.start()
             sttListening.value = true
         } catch (e) {
@@ -146,6 +258,8 @@ export function useSpeechToText({ onResult, showToast } = {}) {
         sttHolding.value = true
 
         // #ifdef MP-WEIXIN
+        // 把全局录音回调切到当前实例
+        activeCtl = controller
         ensureRecordAuth(() => startWechatRecord(session))
         // #endif
         // #ifdef H5
@@ -159,50 +273,95 @@ export function useSpeechToText({ onResult, showToast } = {}) {
         // #endif
     }
 
-    /** 松手结束：手指抬起 */
-    function endHoldSpeech() {
-        if (!sttHolding.value && !sttListening.value && !startRequested) {
+    /** 松手结束：手指抬起；force=true 时强制取消尚未真正开始的按住会话 */
+    function endHoldSpeech(force = false) {
+        let recording = false
+        // #ifdef MP-WEIXIN
+        recording = sharedRecording && activeCtl === controller
+        // #endif
+        if (!force && !sttHolding.value && !sttListening.value && !startRequested && !recording) {
             return
         }
         sttHolding.value = false
-        if (sttListening.value || startRequested) {
+        // 松手后不再补开排队的录音
+        pendingStartSession = 0
+        if (sttListening.value || recording) {
             stopListening()
             return
         }
+        if (startRequested) {
+            // start 已发出但 onStart 未到：取消会话，勿调 stop()
+            startRequested = false
+            holdSessionId += 1
+            return
+        }
         holdSessionId += 1
     }
 
     // #ifdef MP-WEIXIN
-    try {
-        // eslint-disable-next-line no-undef
-        const plugin = requirePlugin('WechatSI')
-        wxRecordManager = plugin.getRecordRecognitionManager()
-        sttSupported.value = !!wxRecordManager
-
-        wxRecordManager.onStart = () => {
+    // 当前实例的回调控制器：全局单例 manager 的事件由模块级分发器
+    // 转发给 activeCtl（最后一次 beginHoldSpeech 的实例）
+    const controller = {
+        handleStart() {
             if (!sttHolding.value) {
-                try {
-                    wxRecordManager.stop()
-                } catch (e) {}
+                // 用户已松手，忽略迟到的 onStart，不再 stop() 以免触发插件报错
+                startRequested = false
+                sttListening.value = false
                 return
             }
             startRequested = false
             sttListening.value = true
-        }
-        wxRecordManager.onStop = (res) => {
+        },
+        handleRecognize(res) {
+            if (typeof onPartial !== 'function') return
+            const t = String(res?.result || '').trim()
+            if (t) onPartial(t)
+        },
+        handleStop(res) {
             sttListening.value = false
             startRequested = false
+            // 有排队的开始请求（残留会话已停止 / 用户仍按住）：现在再真正开始
+            if (pendingStartSession && pendingStartSession === holdSessionId && sttHolding.value) {
+                const s = pendingStartSession
+                pendingStartSession = 0
+                actuallyStartWechat(s)
+                return
+            }
+            pendingStartSession = 0
             emitResult(res?.result)
-        }
-        wxRecordManager.onError = (res) => {
+        },
+        handleError(res) {
             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 {
+                    wxRecordManager.stop()
+                } catch (e) {}
+                pendingStartSession = sttHolding.value ? holdSessionId : 0
+                return
+            }
+            pendingStartSession = 0
             sttHolding.value = false
-            notify(res?.msg || '语音识别失败')
+            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
+            }
+            const tip = friendlySttError(msg)
+            if (tip) notify(tip)
         }
-    } catch (e) {
-        console.warn('WechatSI record recognition not available', e)
     }
+
+    wxRecordManager = getSharedRecordManager()
+    sttSupported.value = !!wxRecordManager
     // #endif
 
     // #ifdef H5
@@ -212,27 +371,49 @@ export function useSpeechToText({ onResult, showToast } = {}) {
             if (SR) {
                 h5Recognition = new SR()
                 h5Recognition.lang = 'zh-CN'
-                h5Recognition.interimResults = false
+                h5Recognition.interimResults = true
                 h5Recognition.continuous = false
                 h5Recognition.maxAlternatives = 1
                 sttSupported.value = true
 
                 h5Recognition.onresult = (event) => {
-                    const item = event.results?.[0]?.[0]
-                    emitResult(item?.transcript || '')
+                    let interim = ''
+                    let finalText = ''
+                    for (let i = event.resultIndex; i < event.results.length; i++) {
+                        const r = event.results[i]
+                        const txt = r?.[0]?.transcript || ''
+                        if (r.isFinal) finalText += txt
+                        else interim += txt
+                    }
+                    if (interim && typeof onPartial === 'function') onPartial(interim)
+                    if (finalText) {
+                        h5GotResult = true
+                        emitResult(finalText)
+                    }
                 }
                 h5Recognition.onend = () => {
                     sttListening.value = false
                     startRequested = false
                     sttHolding.value = false
+                    // 无识别结果也要兜底触发一次 settle，便于一问一答流程重试
+                    if (!h5GotResult) {
+                        emitResult('')
+                    }
+                    h5GotResult = false
                 }
                 h5Recognition.onerror = (event) => {
                     sttListening.value = false
                     startRequested = false
                     sttHolding.value = false
-                    if (event?.error === 'not-allowed') {
+                    const err = event?.error || ''
+                    if (err === 'aborted') return
+                    if (typeof onError === 'function') {
+                        const handled = onError(err)
+                        if (handled === true) return
+                    }
+                    if (err === 'not-allowed') {
                         notify('请允许浏览器使用麦克风')
-                    } else if (event?.error !== 'aborted') {
+                    } else {
                         notify('语音识别失败')
                     }
                 }
@@ -246,7 +427,14 @@ export function useSpeechToText({ onResult, showToast } = {}) {
     onUnmounted(() => {
         sttHolding.value = false
         holdSessionId += 1
+        pendingStartSession = 0
         stopListening()
+        // #ifdef MP-WEIXIN
+        // 释放全局回调指向，避免事件继续派发给已销毁的实例
+        if (activeCtl === controller) {
+            activeCtl = null
+        }
+        // #endif
     })
 
     return {
@@ -258,3 +446,5 @@ export function useSpeechToText({ onResult, showToast } = {}) {
         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/pages/game.vue

@@ -923,6 +923,9 @@ function initBoard() {
     commitBoard(next)
     // 注入本关唯一高糖（解锁前固定 2 个，无法三连）
     ensureHighPresence()
+    // 注入高糖可能破坏“有解”性：开局静默兜底，避免出现整盘无法消除的死局
+    // （仅打乱类型、保持高糖数量不变）
+    if (!boardHasSolution()) shuffleTypesUntilPlayable()
     startHintTimer()
 }
 
@@ -1423,6 +1426,38 @@ function startHintTimer() {
     hintTimer = setTimeout(showOperationHint, HINT_DELAY_MS)
 }
 
+/**
+ * 就地打乱棋盘上所有方块的“食物类型”（位置/对象不变），直到棋盘“有解”：
+ * 无现成消除组 + 至少存在一个可用移动。仅交换 type，故高糖数量等多重集不变。
+ * 不带任何 UI 反馈，供初始化等静默场景使用。返回是否成功。
+ */
+function shuffleTypesUntilPlayable(maxRetry = 80) {
+    const tiles = []
+    for (let r = 0; r < ROWS; r++) {
+        for (let c = 0; c < COLS; c++) {
+            const t = board.value[r]?.[c]
+            if (t && !t.isRemoved) tiles.push(t)
+        }
+    }
+    if (tiles.length < 3) return false
+    for (let attempt = 0; attempt < maxRetry; attempt++) {
+        for (let i = tiles.length - 1; i > 0; i--) {
+            const j = Math.floor(Math.random() * (i + 1));
+            [tiles[i].type, tiles[j].type] = [tiles[j].type, tiles[i].type]
+        }
+        if (findMatches().length === 0 && findPossibleMoves().length > 0) {
+            bumpLayout()
+            return true
+        }
+    }
+    return false
+}
+
+/** 当前棋盘是否“有解”（无现成消除组且至少有一个可用移动） */
+function boardHasSolution() {
+    return findMatches().length === 0 && findPossibleMoves().length > 0
+}
+
 /**
  * 棋盘死锁自动被测与修复。
  * 使用 Fisher-Yates 打乱食物类型，最多重试 maxRetry 次。
@@ -1431,7 +1466,7 @@ function startHintTimer() {
 async function reshuffleIfStuck() {
     if (gamePhase.value !== 'playing') return
     // 已有解（无现成消除组 + 存在可用移动）则无需重排
-    if (findMatches().length === 0 && findPossibleMoves().length > 0) return
+    if (boardHasSolution()) return
 
     // 给玩家反馈
     playSfx('reshuffle', 0.75)
@@ -1444,32 +1479,8 @@ async function reshuffleIfStuck() {
         setTimeout(() => { floatingVals.value = floatingVals.value.filter(v => v.id !== id) }, 1400)
     } catch (_) {}
 
-    // 收集棋盘上所有有效方块（保持 tile 对象与位置不变，仅打乱其食物类型）
-    const tiles = []
-    for (let r = 0; r < ROWS; r++) {
-        for (let c = 0; c < COLS; c++) {
-            const t = board.value[r]?.[c]
-            if (t && !t.isRemoved) tiles.push(t)
-        }
-    }
-
-    // 反复打乱类型并就地试写，直到“有解且无现成三连”；
-    // tiles 已是 board.value 中的同一批对象，故 findMatches/findPossibleMoves 可直接复用
-    const MAX_RETRY = 60
-    let ok = false
-    for (let attempt = 0; attempt < MAX_RETRY; attempt++) {
-        for (let i = tiles.length - 1; i > 0; i--) {
-            const j = Math.floor(Math.random() * (i + 1));
-            [tiles[i].type, tiles[j].type] = [tiles[j].type, tiles[i].type]
-        }
-        if (findMatches().length === 0 && findPossibleMoves().length > 0) {
-            ok = true
-            break
-        }
-    }
-
-    if (!ok) {
-        // 就地洗牌无法洗出可玩布局，回退到全棋盘重新生成
+    // 就地打乱类型直到有解；失败则回退到全棋盘重新生成
+    if (!shuffleTypesUntilPlayable(60)) {
         initBoard()
         return
     }
@@ -1754,10 +1765,8 @@ async function processSwap(t1, t2, opts = {}) {
             isProcessing.value = false
             return
         }
-        // 按解锁进度维持高糖数量（到第 7 步起补到可消除的 3 个）
-        ensureHighPresence()
-        // 所有连消结束后，检查棋盘是否死锁并自动重排
-        await reshuffleIfStuck()
+        // 落子算法已保证“下落即有可消除走法”；此处仅作极端兜底（静默、无横幅）
+        if (!boardHasSolution()) shuffleTypesUntilPlayable()
     } else {
         await animateSwapOffset(t1, t2)
         swapTiles(t1, t2)
@@ -1831,9 +1840,134 @@ async function clearAndRefill() {
     return false
 }
 
+/* ——— 落子前在 next 网格上做的辅助判定（不触动可见的 board.value） ——— */
+function gridIsHigh(grid, r, c) {
+    const t = grid[r]?.[c]
+    return t && !t.isRemoved && t.type.gi === 'high'
+}
+
+function gridWouldFormHighRun(grid, r, c) {
+    let h = 1
+    for (let cc = c - 1; cc >= 0 && gridIsHigh(grid, r, cc); cc--) h++
+    for (let cc = c + 1; cc < COLS && gridIsHigh(grid, r, cc); cc++) h++
+    if (h >= 3) return true
+    let v = 1
+    for (let rr = r - 1; rr >= 0 && gridIsHigh(grid, rr, c); rr--) v++
+    for (let rr = r + 1; rr < ROWS && gridIsHigh(grid, rr, c); rr++) v++
+    return v >= 3
+}
+
+/** 在 grid 上是否存在“现成可消除组” */
+function gridHasCurrentMatch(grid) {
+    const saved = board.value
+    board.value = grid
+    const has = findMatches().length > 0
+    board.value = saved
+    return has
+}
+
+/** 在 grid 上是否存在“可交换出消除的走法” */
+function gridHasMove(grid) {
+    const saved = board.value
+    board.value = grid
+    const ok = findPossibleMoves().length > 0
+    board.value = saved
+    return ok
+}
+
+/**
+ * 仅在 next 网格上调整本局高糖数量（只动“新生成的方块”，玩家尚未看到，故无可见突变）：
+ * 解锁前固定 2 个、解锁后 3~HIGH_COUNT_MAX 个；注入时避免直接连成三连。
+ */
+function balanceHighInRefill(next, newTiles) {
+    const highFood = sessionHighFood.value
+    if (!highFood) return
+    const before = playerMoves.value < HIGH_UNLOCK_MOVES
+    const minTarget = before ? HIGH_COUNT_LOCKED : HIGH_COUNT_UNLOCKED
+    const maxCap = before ? HIGH_COUNT_LOCKED : HIGH_COUNT_MAX
+
+    let high = 0
+    for (let r = 0; r < ROWS; r++) {
+        for (let c = 0; c < COLS; c++) if (gridIsHigh(next, r, c)) high++
+    }
+    const lowMidPool = activeFoods.value.filter((f) => f.gi !== 'high')
+
+    if (high > maxCap) {
+        for (const t of shuffleInPlace([...newTiles])) {
+            if (high <= maxCap) break
+            if (t.type.gi !== 'high') continue
+            const repl = lowMidPool.length ? lowMidPool[Math.floor(Math.random() * lowMidPool.length)] : null
+            if (repl) { t.type = cloneFoodType(repl); high-- }
+        }
+    }
+
+    if (high < minTarget) {
+        const cands = shuffleInPlace([...newTiles])
+        for (const t of cands) {
+            if (high >= minTarget) break
+            if (t.type.gi === 'high') continue
+            if (gridWouldFormHighRun(next, t.r, t.c)) continue
+            t.type = cloneFoodType(highFood)
+            high++
+        }
+        for (const t of cands) {
+            if (high >= minTarget) break
+            if (t.type.gi === 'high') continue
+            t.type = cloneFoodType(highFood)
+            high++
+        }
+    }
+}
+
+/**
+ * 保证“落下后必有可消除的走法”：只重 roll 新方块里的非高糖类型（落子前完成，无可见重排）。
+ * 若 next 已有现成消除组（即将触发连锁），则交给连锁处理，最终落子时再保证。
+ */
+function ensureRefillPlayable(next, newTiles) {
+    if (gridHasCurrentMatch(next)) return
+    if (gridHasMove(next)) return
+
+    const nonHighPool = activeFoods.value.filter((f) => f.gi !== 'high')
+    const rerollable = newTiles.filter((t) => t.type.gi !== 'high')
+    if (nonHighPool.length && rerollable.length) {
+        for (let attempt = 0; attempt < 100; attempt++) {
+            rerollable.forEach((t) => {
+                t.type = cloneFoodType(nonHighPool[Math.floor(Math.random() * nonHighPool.length)])
+            })
+            if (gridHasMove(next)) return
+        }
+    }
+
+    // 极端兜底：静默打乱整盘类型（保持多重集/高糖数量），无任何横幅提示
+    silentShuffleGrid(next)
+}
+
+/** 在 next 网格上静默打乱类型直至“无现成消除组且有可用走法”，仅作极端兜底 */
+function silentShuffleGrid(next) {
+    const tiles = []
+    for (let r = 0; r < ROWS; r++) {
+        for (let c = 0; c < COLS; c++) {
+            const t = next[r]?.[c]
+            if (t && !t.isRemoved) tiles.push(t)
+        }
+    }
+    if (tiles.length < 3) return
+    const saved = board.value
+    board.value = next
+    for (let attempt = 0; attempt < 80; attempt++) {
+        for (let i = tiles.length - 1; i > 0; i--) {
+            const j = Math.floor(Math.random() * (i + 1));
+            [tiles[i].type, tiles[j].type] = [tiles[j].type, tiles[i].type]
+        }
+        if (findMatches().length === 0 && findPossibleMoves().length > 0) break
+    }
+    board.value = saved
+}
+
 async function applyGravity() {
     const next = Array.from({ length: ROWS }, () => Array(COLS).fill(null))
     const dropTiles = []
+    const newTiles = []
 
     for (let c = 0; c < COLS; c++) {
         const surviving = []
@@ -1861,10 +1995,15 @@ async function applyGravity() {
             tile.isDropAnimate = false
             next[r][c] = tile
             dropTiles.push(tile)
+            newTiles.push(tile)
         }
     }
 
     ensureBoardFull(next)
+    // 落子前只调整“新方块”：①按解锁进度维持高糖数量 ②保证落下后必有可消除走法
+    // 这样棋盘随下落即更新，无需“无解时整盘自动重排”。
+    balanceHighInRefill(next, newTiles)
+    ensureRefillPlayable(next, newTiles)
     commitBoard(next)
     await nextTick()
 

TUICallKit-Vue3/tongji/pages/weekly.vue

@@ -193,19 +193,26 @@
             <view class="st-float-close" @click="floatAskClosed = true">
                 <text class="st-float-close-icon">×</text>
             </view>
-            <view class="st-float-inner">
+            <view class="st-float-inner" :class="{ 'is-expanded': dietAiAskExpanded }">
                 <view class="st-float-icon">
                     <TongjiIcon name="sparkles" size="sm" color="#006c49" />
                 </view>
-                <input
+                <textarea
                     class="st-float-input"
-                    type="text"
                     :value="dietAiAskText"
-                    placeholder="长按麦克风说话，或输入文字咨询 AI..."
+                    placeholder="输入或语音咨询 AI…"
                     placeholder-class="st-float-placeholder"
+                    :maxlength="-1"
+                    auto-height
+                    :show-confirm-bar="false"
+                    :disable-default-padding="true"
+                    :cursor-spacing="24"
                     confirm-type="send"
+                    :confirm-hold="false"
                     @input="onDietAiAskInput"
                     @confirm="askDietAiFood"
+                    @focus="onDietAiAskFocus"
+                    @blur="onDietAiAskBlur"
                 />
                 <view
                     class="st-float-mic"
@@ -519,6 +526,19 @@ const {
 /** 底部 AI 浮动卡片是否被用户收起 */
 const floatAskClosed = ref(false)
 
+/** AI 输入框是否聚焦：聚焦时输入框变大 */
+const dietAiAskFocused = ref(false)
+function onDietAiAskFocus() {
+    dietAiAskFocused.value = true
+}
+function onDietAiAskBlur() {
+    dietAiAskFocused.value = false
+}
+/** 聚焦或已有内容时展开为多行输入（内容多则自动增高） */
+const dietAiAskExpanded = computed(
+    () => dietAiAskFocused.value || String(dietAiAskText.value || '').length > 0
+)
+
 /** 键盘高度（px）：录入弹窗据此整体上移，避免输入框被键盘遮挡 */
 const keyboardHeight = ref(0)
 function onKeyboardHeightChange(res) {

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/styles/weekly-stitch.scss

@@ -740,13 +740,22 @@
 .weekly-page .st-float-inner {
     display: flex;
     align-items: center;
-    gap: 24rpx;
-    padding: 16rpx 16rpx 16rpx 40rpx;
+    gap: 16rpx;
+    padding: 16rpx 16rpx 16rpx 28rpx;
     border-radius: 999rpx;
     background: rgba(255, 255, 255, 0.9);
     backdrop-filter: blur(20rpx);
     border: 1rpx solid rgba(0, 108, 73, 0.1);
     box-shadow: var(--st-shadow-float);
+    transition: border-radius 0.22s ease, padding 0.22s ease, border-color 0.22s ease;
+}
+
+/* 聚焦/有内容时展开：底部对齐让输入框向上增高，圆角收敛为圆角矩形 */
+.weekly-page .st-float-inner.is-expanded {
+    align-items: flex-end;
+    border-radius: 32rpx;
+    padding: 18rpx 16rpx 18rpx 32rpx;
+    border-color: rgba(0, 108, 73, 0.28);
 }
 
 .weekly-page .st-float-icon {
@@ -763,15 +772,30 @@
 .weekly-page .st-float-input {
     flex: 1;
     min-width: 0;
-    height: 64rpx;
+    width: 100%;
+    min-height: 64rpx;
+    max-height: 240rpx;
     font-size: 28rpx;
+    line-height: 40rpx;
     color: var(--on-surface);
     background: transparent;
+    padding: 12rpx 0;
+    box-sizing: border-box;
+    transition: min-height 0.2s ease;
+}
+
+/* 聚焦时输入框变大；内容超长时由 auto-height 继续向上增高，超过上限可滚动 */
+.weekly-page .st-float-inner.is-expanded .st-float-input {
+    min-height: 104rpx;
 }
 
 .weekly-page .st-float-placeholder {
     color: rgba(60, 74, 66, 0.6);
-    font-size: 28rpx;
+    font-size: 26rpx;
+    line-height: 40rpx;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 .weekly-page .st-float-mic {

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))
+}

TUICallKit-Vue3/tongji/utils/voiceParse.js

@@ -0,0 +1,307 @@
+/**
+ * 健康数据语音文本解析。
+ *
+ * 把语音识别得到的中文口语文本解析为结构化字段：
+ *  - 血糖（空腹 / 餐后 / 其他）
+ *  - 血压（高压 / 低压 / 西药 / 胰岛素）
+ *  - 饮食（早 / 午 / 晚餐 + 备注）
+ *  - 运动（类型 / 时长 / 强度）
+ *
+ * 兼容中文数字（六点五 / 一百二十 / 一百二）与阿拉伯数字（6.5 / 120）。
+ * 纯前端解析，无网络依赖，识别失败时返回空对象。
+ */
+
+const CN_DIGIT = {
+    零: 0, 〇: 0, 一: 1, 壹: 1, 幺: 1, 二: 2, 贰: 2, 两: 2,
+    三: 3, 叁: 3, 四: 4, 肆: 4, 五: 5, 伍: 5, 六: 6, 陆: 6,
+    七: 7, 柒: 7, 八: 8, 捌: 8, 九: 9, 玖: 9
+}
+const CN_UNIT = { 十: 10, 拾: 10, 百: 100, 佰: 100, 千: 1000, 仟: 1000, 万: 10000, 亿: 100000000 }
+
+/** 中文整数串 → 数字，例如 "一百二十" → 120、"八十" → 80、"十" → 10、"一百二" → 120 */
+function cnIntToNumber(s) {
+    let total = 0
+    let section = 0
+    let number = 0
+    let hadUnit = false
+    let lastUnit = 0
+    let sawZeroAfterUnit = false
+    for (const ch of s) {
+        if (CN_DIGIT[ch] !== undefined) {
+            number = CN_DIGIT[ch]
+            if (number === 0) sawZeroAfterUnit = true
+        } else if (CN_UNIT[ch] !== undefined) {
+            hadUnit = true
+            const unit = CN_UNIT[ch]
+            lastUnit = unit
+            sawZeroAfterUnit = false
+            if (unit >= 10000) {
+                section = (section + number) * unit
+                total += section
+                section = 0
+            } else {
+                if (number === 0) number = 1 // 十 = 10
+                section += number * unit
+            }
+            number = 0
+        }
+    }
+    // 没有任何单位且为纯数字串（如 "一二零"）时按位拼接更符合口语
+    if (!hadUnit && s.length > 1) {
+        let joined = ''
+        for (const ch of s) {
+            if (CN_DIGIT[ch] !== undefined) joined += CN_DIGIT[ch]
+        }
+        if (joined) return Number(joined)
+    }
+    // 口语省略尾部单位："一百二" → 120、"一千五" → 1500（避开 "一百零五" 这类带零的）
+    if (number > 0 && lastUnit >= 100 && !sawZeroAfterUnit) {
+        number = number * (lastUnit / 10)
+    }
+    return total + section + number
+}
+
+/** 中文数字串（含小数点）→ 数字，例如 "六点五" → 6.5 */
+function cnSeqToNumber(seq) {
+    if (seq.includes('点')) {
+        const parts = seq.split('点')
+        const intPart = parts[0]
+        const decPart = parts.slice(1).join('')
+        const intVal = intPart ? cnIntToNumber(intPart) : 0
+        let decStr = ''
+        for (const ch of decPart) {
+            if (CN_DIGIT[ch] !== undefined) decStr += CN_DIGIT[ch]
+        }
+        if (!decStr) return intVal
+        return Number(`${intVal}.${decStr}`)
+    }
+    return cnIntToNumber(seq)
+}
+
+/** 是否包含中文数字字符（用于过滤“点”“重点”等误匹配） */
+function hasCnDigit(seq) {
+    for (const ch of seq) {
+        if (CN_DIGIT[ch] !== undefined || CN_UNIT[ch] !== undefined) return true
+    }
+    return false
+}
+
+/** 把文本中的中文数字段落替换为阿拉伯数字 */
+export function normalizeNumbers(text) {
+    const raw = String(text || '')
+    return raw.replace(/[零〇一壹幺二贰两三叁四肆五伍六陆七柒八捌九玖十拾百佰千仟万亿点]+/g, (m) => {
+        if (!hasCnDigit(m)) return m
+        const n = cnSeqToNumber(m)
+        return Number.isFinite(n) ? String(n) : m
+    })
+}
+
+/** 在文本中找到关键词后紧随的第一个数字 */
+function numAfter(text, keys) {
+    for (const k of keys) {
+        const i = text.indexOf(k)
+        if (i >= 0) {
+            const rest = text.slice(i + k.length)
+            const m = rest.match(/-?\d+(?:\.\d+)?/)
+            if (m) return m[0]
+        }
+    }
+    return ''
+}
+
+/** 关键词后紧随的一段文本（截止到标点或下一个分隔关键词） */
+function textAfter(text, keys, stopKeys = []) {
+    for (const k of keys) {
+        const i = text.indexOf(k)
+        if (i >= 0) {
+            let rest = text.slice(i + k.length)
+            // 去掉口语连接词
+            rest = rest.replace(/^[是为吃了喝了吃的喝的有打了用了：:，,、。\s]+/, '')
+            let end = rest.length
+            const mStop = rest.match(/[，,。.；;！!？?\n]/)
+            if (mStop && mStop.index < end) end = mStop.index
+            for (const sk of stopKeys) {
+                const si = rest.indexOf(sk)
+                if (si >= 0 && si < end) end = si
+            }
+            const seg = rest.slice(0, end).trim()
+            if (seg) return seg
+        }
+    }
+    return ''
+}
+
+/**
+ * 解析血糖：返回 { fasting_blood_sugar, postprandial_blood_sugar, other_blood_sugar }
+ * 例："空腹六点五餐后八点二" → { fasting:6.5, postprandial:8.2 }
+ */
+export function parseGlucose(raw) {
+    const t = normalizeNumbers(raw)
+    const result = {}
+    const fasting = numAfter(t, ['空腹'])
+    const post = numAfter(t, ['餐后', '饭后'])
+    const other = numAfter(t, ['其他', '随机', '睡前', '凌晨', '夜间', '晚上'])
+    if (fasting) result.fasting_blood_sugar = fasting
+    if (post) result.postprandial_blood_sugar = post
+    if (other) result.other_blood_sugar = other
+    // 没有关键词但只有一个数字 → 视为“其他血糖”
+    if (!fasting && !post && !other) {
+        const nums = t.match(/\d+(?:\.\d+)?/g)
+        if (nums && nums.length === 1) result.other_blood_sugar = nums[0]
+    }
+    return result
+}
+
+/**
+ * 解析血压：返回 { systolic_pressure, diastolic_pressure, western_medicine, insulin }
+ * 例："高压一百二低压八十" → { systolic:120, diastolic:80 }
+ */
+export function parseBloodPressure(raw) {
+    const t = normalizeNumbers(raw)
+    const result = {}
+    let sys = numAfter(t, ['高压', '收缩压', '收缩'])
+    let dia = numAfter(t, ['低压', '舒张压', '舒张'])
+    if (!sys || !dia) {
+        const nums = (t.match(/\d{2,3}/g) || [])
+            .map(Number)
+            .filter((n) => n >= 30 && n <= 300)
+        if (!sys && !dia && nums.length >= 2) {
+            sys = String(nums[0])
+            dia = String(nums[1])
+        } else if (!sys && nums.length === 1 && nums[0] >= 90) {
+            sys = String(nums[0])
+        }
+    }
+    // 高压应不低于低压，顺序异常时交换
+    if (sys && dia && Number(sys) < Number(dia)) {
+        const tmp = sys
+        sys = dia
+        dia = tmp
+    }
+    if (sys) result.systolic_pressure = sys
+    if (dia) result.diastolic_pressure = dia
+
+    const insulin = textAfter(raw, ['胰岛素'], ['高压', '低压', '血压', '西药', '备注'])
+    if (insulin) result.insulin = insulin
+    const western = textAfter(raw, ['西药', '降糖药', '口服药'], ['胰岛素', '高压', '低压', '血压', '备注'])
+    if (western) result.western_medicine = western
+    return result
+}
+
+const DIET_MARKERS = [
+    { keys: ['早餐', '早饭', '早上', '早点', '早晨'], field: 'breakfast_foods' },
+    { keys: ['午餐', '午饭', '中午'], field: 'lunch_foods' },
+    { keys: ['晚餐', '晚饭', '晚上', '夜宵', '夜里'], field: 'dinner_foods' }
+]
+
+function cleanFoodSeg(seg) {
+    return String(seg || '')
+        .replace(/^[是为吃了吃的喝了喝的有：:，,、。\s]+/, '')
+        .replace(/[。.\s]+$/, '')
+        .trim()
+}
+
+/**
+ * 解析饮食：返回 { breakfast_foods, lunch_foods, dinner_foods, note }
+ * 例："早餐鸡蛋粥中午米饭炒青菜晚上面条" → 分别归位
+ * 无餐别关键词时整句写入 note
+ */
+export function parseDiet(raw) {
+    const t = String(raw || '').trim()
+    const result = {}
+    const hits = []
+    DIET_MARKERS.forEach((m) => {
+        for (const k of m.keys) {
+            const idx = t.indexOf(k)
+            if (idx >= 0) {
+                hits.push({ idx, field: m.field, klen: k.length })
+                break
+            }
+        }
+    })
+    if (!hits.length) {
+        if (t) result.note = t
+        return result
+    }
+    hits.sort((a, b) => a.idx - b.idx)
+    hits.forEach((h, i) => {
+        const start = h.idx + h.klen
+        const end = i + 1 < hits.length ? hits[i + 1].idx : t.length
+        const seg = cleanFoodSeg(t.slice(start, end))
+        if (seg && !result[h.field]) result[h.field] = seg
+    })
+    // 第一个餐别关键词之前的内容作为备注
+    const head = cleanFoodSeg(t.slice(0, hits[0].idx))
+    if (head) result.note = head
+    return result
+}
+
+const EXERCISE_FILLERS = [
+    '今天', '我', '做了', '做', '进行了', '进行', '运动了', '运动', '锻炼了', '锻炼',
+    '了', '大概', '左右', '持续', '差不多', '一共', '总共', '的', '走了', '打了', '跑了'
+]
+
+/**
+ * 解析运动：返回 { exercise_type, duration, intensity }
+ * 例："散步三十分钟中强度" → { type:'散步', duration:30, intensity:2 }
+ */
+export function parseExercise(raw) {
+    const t = normalizeNumbers(raw)
+    const result = {}
+
+    const durMatch = t.match(/(\d+(?:\.\d+)?)\s*(个小时|小时|钟头|时|分钟|分)/)
+    if (durMatch) {
+        const val = parseFloat(durMatch[1])
+        const isHour = /个小时|小时|钟头|时/.test(durMatch[2])
+        result.duration = String(Math.round(isHour ? val * 60 : val))
+    }
+
+    if (/高强度|剧烈|很累|大汗|气喘/.test(t)) result.intensity = 3
+    else if (/中强度|中等强度|中等|有点累|微微出汗|微汗/.test(t)) result.intensity = 2
+    else if (/低强度|轻松|轻微|溜达|缓慢/.test(t)) result.intensity = 1
+
+    // 运动类型：移除时长、强度、填充词后剩余文本
+    let type = t
+    if (durMatch) type = type.replace(durMatch[0], '')
+    type = type
+        .replace(/高强度|中强度|中等强度|低强度|剧烈|很累|大汗|气喘|有点累|微微出汗|微汗|轻松|轻微|缓慢/g, '')
+        .replace(/\d+(?:\.\d+)?/g, '')
+        .replace(/[，,。.；;、\s]+/g, '')
+    EXERCISE_FILLERS.forEach((f) => {
+        type = type.split(f).join('')
+    })
+    type = type.trim()
+    if (type && type.length <= 20) result.exercise_type = type
+    return result
+}
+
+const FIELD_LABELS = {
+    fasting_blood_sugar: '空腹',
+    postprandial_blood_sugar: '餐后',
+    other_blood_sugar: '其他血糖',
+    systolic_pressure: '高压',
+    diastolic_pressure: '低压',
+    western_medicine: '西药',
+    insulin: '胰岛素',
+    breakfast_foods: '早餐',
+    lunch_foods: '午餐',
+    dinner_foods: '晚餐',
+    note: '备注',
+    exercise_type: '运动',
+    duration: '时长',
+    intensity: '强度'
+}
+
+const INTENSITY_LABELS = { 1: '低强度', 2: '中强度', 3: '高强度' }
+
+/** 把解析结果转成可读的反馈文案，例如 "空腹6.5 · 餐后8.2" */
+export function summarizeParsed(parsed) {
+    const parts = []
+    Object.keys(parsed).forEach((k) => {
+        const label = FIELD_LABELS[k] || k
+        let val = parsed[k]
+        if (k === 'intensity') val = INTENSITY_LABELS[val] || val
+        parts.push(`${label}${val}`)
+    })
+    return parts.join(' · ')
+}

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
@@ -181,6 +196,37 @@ export function commissionSettlementConfirmRevoke(params: Record<string, any>) {
     return request.post({ url: '/stats.commissionSettlement/confirmRevoke', params })
 }
 
+/** 复诊接诊率（按月）：当月 N 诊接诊率，部门 → 医助分组 + 合计；剔除「继承」指派 */
+export function revisitRateOverview(params: { month?: string; dept_ids?: string }) {
+    return request.get({ url: '/stats.revisitRate/overview', params })
+}
+
+/** 复诊接诊率：部门下拉（前端组树） */
+export function revisitRateDeptOptions() {
+    return request.get({ url: '/stats.revisitRate/deptOptions' })
+}
+
+/** 复诊接诊率：「被指派数」点击下钻（按诊单聚合明细） */
+export function revisitRateAssignLines(params: {
+    month?: string
+    dept_ids?: string
+    assistant_id?: number
+    dept_id?: number
+}) {
+    return request.get({ url: '/stats.revisitRate/assignLines', params })
+}
+
+/** 复诊接诊率：「N 诊单数」点击下钻（具体订单明细） */
+export function revisitRateVisitOrderLines(params: {
+    month?: string
+    slot: number
+    dept_ids?: string
+    assistant_id?: number
+    dept_id?: number
+}) {
+    return request.get({ url: '/stats.revisitRate/visitOrderLines', params })
+}
+
 /** 医助个人业绩概览 */
 export function assistantPerformanceOverview(params: {
     time_type?: string

admin/src/api/tcm.ts

@@ -61,6 +61,14 @@ export function tcmDiagnosisDetail(params: any) {
     return request.get({ url: '/tcm.diagnosis/detail', params })
 }
 
+/** 设置复诊接诊率统计起始偏移（统计诊次=实单序号+偏移；1=二诊起，2=三诊起） */
+export function tcmDiagnosisSetRevisitSlotStartOffset(params: {
+    id: number
+    revisit_slot_start_offset: number
+}) {
+    return request.post({ url: '/tcm.diagnosis/setRevisitSlotStartOffset', params })
+}
+
 /** 诊单挂号 / 取消挂号 操作日志 */
 export function tcmDiagnosisGuahaoLogList(params: { id: number }) {
     return request.get({ url: '/tcm.diagnosis/guahaoLogList', params })
@@ -425,6 +433,17 @@ export function prescriptionOrderPatchPrescriptionPatient(params: {
     return request.post({ url: '/tcm.prescriptionOrder/patchPrescriptionPatient', params })
 }
 
+export function prescriptionOrderPatchPrescriptionUsage(params: {
+    id: number
+    times_per_day: number
+    usage_days: number
+    medication_days: number
+    aux_times_per_day?: number
+    aux_usage_days?: number
+}) {
+    return request.post({ url: '/tcm.prescriptionOrder/patchPrescriptionUsage', params })
+}
+
 export function prescriptionOrderAuditPrescription(params: {
     id: number
     action: 'approve' | 'reject'
@@ -446,6 +465,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 +492,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 +542,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/components/daterange-picker/index.vue

@@ -7,6 +7,7 @@
         :end-placeholder="endPlaceholder"
         :value-format="valueFormat"
         clearable
+        @change="emit('change', $event)"
     ></el-date-picker>
 </template>
 
@@ -29,7 +30,7 @@ const props = withDefaults(
         endPlaceholder: '结束时间'
     }
 )
-const emit = defineEmits(['update:startTime', 'update:endTime'])
+const emit = defineEmits(['update:startTime', 'update:endTime', 'change'])
 
 const content = computed<any>({
     get: () => {

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">
@@ -92,7 +97,10 @@
                     <el-input v-model="formData.title" placeholder="请输入资源标题" />
                 </el-form-item>
                 <el-form-item label="资源文件" prop="file_url" v-if="!isEdit">
-                    <material-picker v-if="formData.type === 1" v-model="formData.file_url" :limit="1" type="image" />
+                    <div v-if="formData.type === 1" class="w-full">
+                        <material-picker v-model="formData.file_url" :limit="9" type="image" />
+                        <div style="font-size: 12px; color: #909399; margin-top: 4px;">支持批量上传多张图片，一次最多 9 张，每张图片将生成一条独立资源（多张时标题自动追加序号）</div>
+                    </div>
                     <upload v-else-if="formData.type === 2" type="video" direct :multiple="false" :limit="1" :show-progress="true" @success="handleUploadSuccess">
                         <el-button type="primary">上传视频 (OSS直传)</el-button>
                     </upload>
@@ -126,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: '',
@@ -156,6 +165,15 @@ const formData = reactive<any>({
     user_ids: []
 })
 
+const validateFileUrl = (_rule: any, value: any, callback: any) => {
+    if (Array.isArray(value)) {
+        if (!value.length) return callback(new Error('请上传资源文件'))
+    } else if (!value) {
+        return callback(new Error('请输入或上传文件获取链接'))
+    }
+    callback()
+}
+
 const computedRules = computed(() => {
     if (isEdit.value) {
         return {
@@ -164,7 +182,7 @@ const computedRules = computed(() => {
     }
     return {
         title: [{ required: true, message: '请输入标题', trigger: 'blur' }],
-        file_url: [{ required: true, message: '请输入或上传文件获取链接', trigger: 'blur' }]
+        file_url: [{ required: true, validator: validateFileUrl, trigger: 'change' }]
     }
 })
 
@@ -186,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 {
@@ -257,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/prescription-order-utils.ts

@@ -0,0 +1,453 @@
+/**
+ * 处方业务订单——纯展示/格式化工具
+ *
+ * 唯一数据源：order_list.vue（处方业务订单）、PatientOrderList.vue（诊单业务订单 Tab）
+ * 与 PrescriptionOrderDetailDrawer.vue（共享详情抽屉）共用，禁止在页面内重复定义同名函数，
+ * 否则两个详情页面会再次出现文案/口径漂移。
+ */
+
+/** 与诊间医助角色 ID 一致（server 角色表） */
+export const TCM_ASSISTANT_ROLE_ID = 2
+/** 与 server/config/project.php prescription_audit_roles 默认一致，可处方审核的角色 */
+export const PRESCRIPTION_AUDIT_ROLE_IDS = [0, 3, 6]
+
+export function formatTime(v: unknown) {
+    if (v === null || v === undefined || v === '') return '—'
+    if (typeof v === 'number' && v > 1e9 && v < 1e11) {
+        const d = new Date(v * 1000)
+        return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')} ${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}`
+    }
+    return String(v)
+}
+
+export function formatMoney(v: unknown) {
+    const n = Number(v)
+    if (Number.isNaN(n)) return '—'
+    return n.toFixed(2)
+}
+
+export function formatOrderTime(v: unknown) {
+    if (v === null || v === undefined || v === '') return '—'
+    if (typeof v === 'string' && String(v).includes('-')) return String(v)
+    return formatTime(v)
+}
+
+export function feeTypeText(t: number | undefined) {
+    const m: Record<number, string> = {
+        1: '挂号费',
+        2: '问诊费',
+        3: '药品费用',
+        4: '首付费用',
+        5: '尾款费用',
+        6: '其他费用',
+        7: '全部费用',
+        8: '驼奶费用'
+    }
+    return m[Number(t)] ?? '—'
+}
+
+export function fulfillmentText(s: number | undefined) {
+    const m: Record<number, string> = {
+        1: '待双审通过',
+        2: '待发货',
+        3: '已完成',
+        4: '已取消',
+        5: '已发货',
+        6: '已签收',
+        7: '进行中',
+        8: '暂不制药',
+        9: '拒收',
+        10: '退款',
+        11: '保留药方',
+        12: '制药缓发'
+    }
+    return m[Number(s)] ?? '—'
+}
+
+export function fulfillmentTagType(s: number | undefined): 'success' | 'warning' | 'danger' | 'info' | 'primary' {
+    const n = Number(s)
+    if (n === 3) return 'success'
+    if (n === 6) return 'success'
+    if (n === 5) return 'primary'
+    if (n === 4) return 'danger'
+    if (n === 2) return 'warning'
+    if (n === 7) return 'warning'
+    if (n === 8 || n === 11 || n === 12) return 'info'
+    if (n === 9 || n === 10) return 'danger'
+    return 'info'
+}
+
+export function orderStatusText(s: number | undefined) {
+    const m: Record<number, string> = {
+        1: '待支付',
+        2: '已支付',
+        3: '已取消',
+        4: '已退款',
+        5: '待审核'
+    }
+    return m[Number(s)] ?? '—'
+}
+
+export function payOrderStatusTag(s: number | undefined): 'success' | 'warning' | 'danger' | 'info' {
+    const n = Number(s)
+    if (n === 2) return 'success'
+    if (n === 1) return 'warning'
+    return 'info'
+}
+
+export function consumerRxAuditText(s: number | undefined) {
+    const n = Number(s)
+    if (n === 1) return '已通过'
+    if (n === 2) return '已驳回'
+    return '待审核'
+}
+
+export function consumerRxAuditTag(s: number | undefined): 'success' | 'warning' | 'danger' | 'info' {
+    const n = Number(s)
+    if (n === 1) return 'success'
+    if (n === 2) return 'danger'
+    return 'warning'
+}
+
+export function expressCompanyLabel(v: unknown) {
+    const s = String(v || '').toLowerCase()
+    if (s === 'sf') return '顺丰速运'
+    if (s === 'jd') return '京东快递'
+    if (s === 'jt' || s === 'jtexpress') return '极兔速递'
+    return '自动识别'
+}
+
+export function logActionText(act: string) {
+    const m: Record<string, string> = {
+        create: '创建',
+        edit: '编辑',
+        audit_rx_approve: '处方审核',
+        audit_rx_reject: '处方审核',
+        audit_pay_approve: '支付审核',
+        audit_pay_reject: '支付审核',
+        fill_tracking: '填快递单',
+        ship: '确认发货',
+        withdraw: '撤销',
+        link_pay_order: '关联支付单',
+        completion_request: '完单申请',
+        auto_complete: '自动完成',
+        revoke_rx_audit: '撤回处方审核',
+        revoke_pay_audit: '撤回支付审核',
+        gancao_submit: '甘草下单',
+        patch_rx_patient: '处方患者信息',
+        patch_rx_usage: '服用参数',
+        update_amount: '修改订单金额',
+        complete: '完成订单',
+        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]) {
+        return methodMap[paymentMethod]
+    }
+    return '普通订单'
+}
+
+export function normalizeBizPhone(v: unknown): string {
+    if (v === null || v === undefined) return ''
+    return String(v).replace(/\s/g, '').trim()
+}
+
+export function recipientVsPrescriptionPhoneMismatch(recipient: unknown, rxPhone: unknown): boolean {
+    const a = normalizeBizPhone(recipient)
+    const b = normalizeBizPhone(rxPhone)
+    if (!a || !b) return false
+    return a !== b
+}
+
+export function normalizeSlipHerbs(raw: unknown): Array<{ name: string; dosage: number }> {
+    if (!raw) return []
+    if (Array.isArray(raw)) {
+        return raw.map((x: any) => ({
+            name: String(x?.name ?? '').trim(),
+            dosage: Number(x?.dosage) || 0
+        }))
+    }
+    return []
+}
+
+export type SlipFormulaType = '主方' | '辅方'
+
+export interface SlipAuxUsageForm {
+    dosage_amount?: number
+    dosage_bag_count: number
+    need_decoction: boolean
+    bags_per_dose: number
+    times_per_day: number
+    usage_days: number
+}
+
+export function normalizeSlipFormulaType(v: unknown): SlipFormulaType {
+    return v === '辅方' ? '辅方' : '主方'
+}
+
+export function defaultSlipAuxUsage(prescriptionType = '浓缩水丸'): SlipAuxUsageForm {
+    if (prescriptionType === '饮片') {
+        return {
+            dosage_amount: 50,
+            dosage_bag_count: 1,
+            need_decoction: false,
+            bags_per_dose: 1,
+            times_per_day: 3,
+            usage_days: 7
+        }
+    }
+    if (prescriptionType === '浓缩水丸') {
+        return {
+            dosage_amount: 5,
+            dosage_bag_count: 1,
+            need_decoction: false,
+            bags_per_dose: 1,
+            times_per_day: 3,
+            usage_days: 7
+        }
+    }
+    return {
+        dosage_amount: 1,
+        dosage_bag_count: 1,
+        need_decoction: false,
+        bags_per_dose: 1,
+        times_per_day: 3,
+        usage_days: 7
+    }
+}
+
+export function normalizeSlipAuxUsageForm(raw: unknown, prescriptionType: string): SlipAuxUsageForm {
+    const base = defaultSlipAuxUsage(prescriptionType)
+    if (!raw || typeof raw !== 'object') return { ...base }
+    const o = raw as Record<string, unknown>
+    return {
+        dosage_amount:
+            o.dosage_amount !== null && o.dosage_amount !== undefined && o.dosage_amount !== ''
+                ? Number(o.dosage_amount)
+                : base.dosage_amount,
+        dosage_bag_count: o.dosage_bag_count != null ? Number(o.dosage_bag_count) || 1 : base.dosage_bag_count,
+        need_decoction: o.need_decoction === 1 || o.need_decoction === true,
+        bags_per_dose: o.bags_per_dose != null ? Number(o.bags_per_dose) || 1 : base.bags_per_dose,
+        times_per_day: o.times_per_day != null ? Number(o.times_per_day) || 3 : base.times_per_day,
+        usage_days: o.usage_days != null ? Number(o.usage_days) || 7 : base.usage_days
+    }
+}
+
+/** 是否含辅方药材（仅 formula_type=辅方；医助无药材权限时 herbs 被剥离，用后端 has_aux_formula） */
+export function prescriptionHasAuxFormula(rx: Record<string, unknown> | null | undefined): boolean {
+    if (!rx) return false
+    const herbs = rx.herbs
+    if (Array.isArray(herbs)) {
+        return herbs.some((h: any) => normalizeSlipFormulaType(h?.formula_type) === '辅方')
+    }
+    return Number(rx.has_aux_formula) === 1
+}
+
+/** 物流轨迹中需人工立即跟进的常见异常关键词 */
+export const LOGISTICS_URGENT_KEYWORDS = [
+    '拒收',
+    '拒签',
+    '退件',
+    '客户拒收',
+    '拦截退回',
+    '退回发件',
+    '派件退回',
+    '无人签收',
+    '退回快件'
+]
+
+export function logisticsStringHasUrgentKeyword(s: unknown): boolean {
+    const t = String(s ?? '')
+    return LOGISTICS_URGENT_KEYWORDS.some((k) => t.includes(k))
+}
+
+export function logisticsTraceLineUrgent(context: unknown): boolean {
+    return logisticsStringHasUrgentKeyword(context)
+}
+
+/** 根据单次拉取的物流 payload 判断是否含拒收/退回等（详情抽屉、完成订单弹窗共用） */
+export function analyzeLogisticsPayloadUrgent(p: Record<string, any> | null | undefined): {
+    show: boolean
+    keywords: string[]
+    lines: string[]
+} {
+    if (!p) {
+        return { show: false, keywords: [], lines: [] }
+    }
+    const traces = Array.isArray(p.traces)
+        ? (p.traces as Array<{ time?: string; context?: string }>)
+        : []
+    const chunks: string[] = []
+    if (p.state_text) chunks.push(String(p.state_text))
+    if (p.hint) chunks.push(String(p.hint))
+    for (const row of traces) {
+        if (row.context) chunks.push(String(row.context))
+    }
+    const joined = chunks.join('\n')
+    const keywords = LOGISTICS_URGENT_KEYWORDS.filter((k) => joined.includes(k))
+    if (!keywords.length) {
+        return { show: false, keywords: [], lines: [] }
+    }
+    const lines: string[] = []
+    for (const row of traces) {
+        const ctx = String(row.context || '')
+        if (logisticsStringHasUrgentKeyword(ctx)) {
+            lines.push(ctx)
+            if (lines.length >= 5) break
+        }
+    }
+    if (!lines.length && logisticsStringHasUrgentKeyword(p.state_text)) {
+        lines.push(`最新状态：${p.state_text}`)
+    }
+    if (!lines.length && logisticsStringHasUrgentKeyword(p.hint)) {
+        lines.push(String(p.hint))
+    }
+    return { show: true, keywords, lines }
+}
+
+/** 校验物流轨迹响应与请求上下文匹配（防止快速切换订单时旧响应串单） */
+export function parseLogisticsTracePayload(
+    res: unknown,
+    expectedTrackingNumber: string,
+    expectedOrderId: number
+): Record<string, any> | null {
+    const raw = (res as { data?: unknown })?.data ?? res
+    if (!raw || typeof raw !== 'object') return null
+    const payload = raw as Record<string, any>
+    const respNum = String(payload.tracking_number || '').trim()
+    if (respNum && respNum !== expectedTrackingNumber) return null
+    const respOrderId = Number(payload.order_id)
+    if (respOrderId > 0 && respOrderId !== expectedOrderId) return null
+    return payload
+}
+
+export function canUpdateAmount(row: { id?: number; fulfillment_status?: number } | null | undefined) {
+    if (!row?.id) return false
+    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_h5.vue

@@ -858,31 +858,94 @@
                                     </el-tag>
                                 </el-descriptions-item>
                                 <el-descriptions-item label="用量">
-                                    <template v-if="detailPrescription.dosage_amount">
-                                        {{ detailPrescription.dosage_amount }}{{ detailPrescription.dosage_unit || 'g' }}
-                                        <template v-if="detailPrescription.prescription_type === '浓缩水丸'">
-                                            · {{ Number(detailPrescription.dosage_bag_count) > 0 ? Number(detailPrescription.dosage_bag_count) : 1 }}袋
-                                        </template>
-                                        <span v-if="detailPrescription.prescription_type === '饮片' && detailPrescription.need_decoction !== null" class="ml-2 text-gray-500">
-                                            ({{ detailPrescription.need_decoction ? '代煎' : '不代煎' }})
-                                        </span>
-                                    </template>
-                                    <template v-else>—</template>
+                                    <div class="flex flex-col gap-1 text-sm leading-relaxed">
+                                        <div>
+                                            <span v-if="detailHasAuxHerbs" class="text-gray-500 mr-1">主方：</span>
+                                            <template v-if="detailPrescription.dosage_amount">
+                                                {{ detailPrescription.dosage_amount }}{{ detailPrescription.dosage_unit || 'g' }}
+                                                <template v-if="detailPrescription.prescription_type === '浓缩水丸'">
+                                                    · {{ Number(detailPrescription.dosage_bag_count) > 0 ? Number(detailPrescription.dosage_bag_count) : 1 }}袋
+                                                </template>
+                                                <span v-if="detailPrescription.prescription_type === '饮片' && detailPrescription.need_decoction !== null" class="ml-2 text-gray-500">
+                                                    ({{ detailPrescription.need_decoction ? '代煎' : '不代煎' }})
+                                                </span>
+                                            </template>
+                                            <template v-else>—</template>
+                                        </div>
+                                        <div v-if="detailHasAuxHerbs && detailAuxUsage">
+                                            <span class="text-gray-500 mr-1">辅方：</span>
+                                            <template v-if="detailAuxUsage.dosage_amount != null && detailAuxUsage.dosage_amount !== 0">
+                                                {{ detailAuxUsage.dosage_amount }}{{ detailPrescription.dosage_unit || 'g' }}
+                                                <template v-if="detailPrescription.prescription_type === '浓缩水丸'">
+                                                    · {{ Number(detailAuxUsage.dosage_bag_count) > 0 ? Number(detailAuxUsage.dosage_bag_count) : 1 }}袋
+                                                </template>
+                                                <span v-if="detailPrescription.prescription_type === '饮片'" class="ml-2 text-gray-500">
+                                                    ({{ detailAuxUsage.need_decoction ? '代煎' : '不代煎' }})
+                                                </span>
+                                            </template>
+                                            <template v-else>—</template>
+                                        </div>
+                                    </div>
                                 </el-descriptions-item>
-                                <el-descriptions-item label="服用方式">
+                                <el-descriptions-item>
+                                    <template #label>
+                                        <div class="flex items-center gap-1 flex-wrap">
+                                            <span>服用方式</span>
+                                            <el-button
+                                                v-if="
+                                                    detailData.prescription_id &&
+                                                    detailPrescription &&
+                                                    !String(detailData.prescription_detail_error || '').trim()
+                                                "
+                                                v-perms="['tcm.prescriptionOrder/patchPrescriptionUsage']"
+                                                type="primary"
+                                                size="small"
+                                                link
+                                                @click="openPatchUsageDialog"
+                                            >
+                                                修改
+                                            </el-button>
+                                        </div>
+                                    </template>
                                     <div class="flex flex-col gap-1.5 text-sm leading-relaxed">
-                                        <div>
-                                            <span class="text-gray-500">每天次数：</span>
-                                            {{ detailPrescription.times_per_day ? detailPrescription.times_per_day + ' 次' : '—' }}
-                                        </div>
-                                        <div>
-                                            <span class="text-gray-500">处方开立：</span>
-                                            {{
-                                                detailPrescription.usage_days != null && detailPrescription.usage_days !== ''
-                                                    ? detailPrescription.usage_days + ' 天'
-                                                    : '—'
-                                            }}
-                                        </div>
+                                        <template v-if="detailHasAuxHerbs">
+                                            <div>
+                                                <span class="text-gray-500 mr-1">主方：</span>
+                                                每天
+                                                {{ detailPrescription.times_per_day ? detailPrescription.times_per_day + ' 次' : '— 次' }}
+                                                · 处方开立
+                                                {{
+                                                    detailPrescription.usage_days != null && detailPrescription.usage_days !== ''
+                                                        ? detailPrescription.usage_days + ' 天'
+                                                        : '— 天'
+                                                }}
+                                            </div>
+                                            <div v-if="detailAuxUsage">
+                                                <span class="text-gray-500 mr-1">辅方：</span>
+                                                每天
+                                                {{ detailAuxUsage.times_per_day ? detailAuxUsage.times_per_day + ' 次' : '— 次' }}
+                                                · 处方开立
+                                                {{
+                                                    detailAuxUsage.usage_days != null && Number(detailAuxUsage.usage_days) > 0
+                                                        ? detailAuxUsage.usage_days + ' 天'
+                                                        : '— 天'
+                                                }}
+                                            </div>
+                                        </template>
+                                        <template v-else>
+                                            <div>
+                                                <span class="text-gray-500">每天次数：</span>
+                                                {{ detailPrescription.times_per_day ? detailPrescription.times_per_day + ' 次' : '—' }}
+                                            </div>
+                                            <div>
+                                                <span class="text-gray-500">处方开立：</span>
+                                                {{
+                                                    detailPrescription.usage_days != null && detailPrescription.usage_days !== ''
+                                                        ? detailPrescription.usage_days + ' 天'
+                                                        : '—'
+                                                }}
+                                            </div>
+                                        </template>
                                         <div>
                                             <span class="text-gray-500">订单设置：</span>
                                             {{
@@ -894,6 +957,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 ? '已作废' : '正常' }}
@@ -962,6 +1028,11 @@
                                         <el-tag v-if="row.is_exempt === 1" type="warning" size="small" class="ml-1">豁免</el-tag>
                                     </template>
                                 </el-table-column>
+                                <el-table-column label="方式" min-width="120" show-overflow-tooltip>
+                                    <template #default="{ row }">
+                                        {{ formatPayOrderSource(row) }}
+                                    </template>
+                                </el-table-column>
                                 <el-table-column prop="creator_name" label="创建人" width="80" show-overflow-tooltip />
                                 <el-table-column label="创建时间" min-width="136">
                                     <template #default="{ row }">
@@ -1020,6 +1091,11 @@
                                         <el-tag v-if="row.is_exempt === 1" type="warning" size="small" class="ml-1">豁免</el-tag>
                                     </template>
                                 </el-table-column>
+                                <el-table-column label="方式" min-width="120" show-overflow-tooltip>
+                                    <template #default="{ row }">
+                                        {{ formatPayOrderSource(row) }}
+                                    </template>
+                                </el-table-column>
                                 <el-table-column prop="creator_name" label="创建人" width="80" show-overflow-tooltip />
                                 <el-table-column label="创建时间" min-width="136">
                                     <template #default="{ row }">
@@ -1126,7 +1202,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="内部成本">
@@ -1285,7 +1361,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"
@@ -1512,10 +1588,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>
@@ -1555,7 +1632,7 @@
                                         <el-option
                                             v-for="o in editPaidOrders"
                                             :key="o.id"
-                                            :label="`${o.order_no} · ¥${o.amount} · ${formatPoCategory(o.order_type)}`"
+                                            :label="`${o.order_no} · ¥${o.amount} · ${formatPoCategory(o.order_type)} · ${formatPayOrderSource(o)}`"
                                             :value="o.id"
                                             class="!h-auto py-1.5"
                                         >
@@ -1565,7 +1642,7 @@
                                                     <span class="text-orange-500 font-medium ml-4">¥{{ o.amount }}</span>
                                                 </div>
                                                 <div class="flex items-center justify-between text-xs text-gray-400 mt-1">
-                                                    <span class="truncate pr-2">{{ formatPoCategory(o.order_type) }}<template v-if="o.remark"> · {{ o.remark }}</template></span>
+                                                    <span class="truncate pr-2">{{ formatPoCategory(o.order_type) }} · {{ formatPayOrderSource(o) }}<template v-if="o.remark"> · {{ o.remark }}</template></span>
                                                     <span class="shrink-0">{{ String(o.create_time || '').substring(0, 16) }}</span>
                                                 </div>
                                             </div>
@@ -1971,7 +2048,7 @@
             @closed="addPayOrderFormRef?.clearValidate()"
         >
             <el-alert
-                title="可以手动创建新支付单，或关联已存在但未绑定的支付单。"
+                :title="addPayOrderAlertTitle"
                 type="info"
                 :closable="false"
                 show-icon
@@ -1987,13 +2064,15 @@
             >
                 <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">付呗</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" />
@@ -2028,6 +2107,20 @@
                     </el-form-item>
                 </template>
 
+                <!-- 直接完单申请（不创建/关联支付单） -->
+                <template v-else-if="addPayOrderForm.add_mode === 'completion_only'">
+                    <el-alert
+                        type="warning"
+                        :closable="false"
+                        show-icon
+                        class="!mb-0"
+                    >
+                        <template #title>
+                            不新增或关联支付单，仅向审核人员提交「完成订单」申请；提交后支付审核将变为待审核，审核通过后将自动结案。
+                        </template>
+                    </el-alert>
+                </template>
+
                 <!-- 关联已有模式 -->
                 <template v-else>
                     <el-form-item label="选择支付单" prop="link_pay_order_id">
@@ -2043,12 +2136,17 @@
                             <el-option
                                 v-for="o in addPayOrderAvailableList"
                                 :key="o.id"
-                                :label="`${o.order_no} · ¥${o.amount} · ${formatPoCategory(o.order_type)}`"
+                                :label="`${o.order_no} · ¥${o.amount} · ${formatPoCategory(o.order_type)} · ${formatPayOrderSource(o)}`"
                                 :value="o.id"
                             >
-                                <div class="flex items-center justify-between">
-                                    <span class="text-sm">{{ o.order_no }}</span>
-                                    <span class="text-orange-500 font-medium ml-4">¥{{ o.amount }}</span>
+                                <div class="flex flex-col gap-0.5 py-0.5">
+                                    <div class="flex items-center justify-between">
+                                        <span class="text-sm">{{ o.order_no }}</span>
+                                        <span class="text-orange-500 font-medium ml-4">¥{{ o.amount }}</span>
+                                    </div>
+                                    <div class="text-xs text-gray-400">
+                                        {{ formatPoCategory(o.order_type) }} · {{ formatPayOrderSource(o) }}
+                                    </div>
                                 </div>
                             </el-option>
                         </el-select>
@@ -2059,7 +2157,7 @@
                 </template>
 
                 <!-- 完单申请选项 -->
-                <el-form-item label="完单申请">
+                <el-form-item v-if="addPayOrderForm.add_mode !== 'completion_only'" label="完单申请">
                     <el-radio-group v-model="addPayOrderForm.completion_request">
                         <el-radio :value="0">不申请</el-radio>
                         <el-radio :value="1">申请完成订单</el-radio>
@@ -2117,6 +2215,93 @@
             </template>
         </el-dialog>
 
+        <!-- 修改服用参数：主方 / 辅方 / 订单设置 -->
+        <el-dialog
+            v-model="patchUsageVisible"
+            title="修改服用参数"
+            width="92%"
+            :close-on-click-modal="false"
+            destroy-on-close
+            class="po-h5-dialog"
+            @closed="resetPatchUsageForm"
+        >
+            <el-form
+                ref="patchUsageFormRef"
+                :model="patchUsageForm"
+                :rules="patchUsageRules"
+                label-width="96px"
+            >
+                <div v-if="detailHasAuxHerbs" class="text-xs font-medium text-gray-500 mb-3">主方</div>
+                <el-form-item label="每天次数" prop="times_per_day">
+                    <el-input-number
+                        v-model="patchUsageForm.times_per_day"
+                        :min="1"
+                        :max="6"
+                        :step="1"
+                        controls-position="right"
+                        class="w-full"
+                    />
+                </el-form-item>
+                <el-form-item label="处方开立" prop="usage_days">
+                    <div class="flex items-center gap-1 w-full">
+                        <el-input-number
+                            v-model="patchUsageForm.usage_days"
+                            :min="1"
+                            :max="999"
+                            :step="1"
+                            controls-position="right"
+                            class="flex-1 min-w-0"
+                        />
+                        <span class="text-gray-500 shrink-0">天</span>
+                    </div>
+                </el-form-item>
+                <template v-if="detailHasAuxHerbs">
+                    <div class="text-xs font-medium text-gray-500 mb-3 mt-2 pt-2 border-t border-gray-100">辅方</div>
+                    <el-form-item label="每天次数" prop="aux_times_per_day">
+                        <el-input-number
+                            v-model="patchUsageForm.aux_times_per_day"
+                            :min="1"
+                            :max="6"
+                            :step="1"
+                            controls-position="right"
+                            class="w-full"
+                        />
+                    </el-form-item>
+                    <el-form-item label="处方开立" prop="aux_usage_days">
+                        <div class="flex items-center gap-1 w-full">
+                            <el-input-number
+                                v-model="patchUsageForm.aux_usage_days"
+                                :min="1"
+                                :max="999"
+                                :step="1"
+                                controls-position="right"
+                                class="flex-1 min-w-0"
+                            />
+                            <span class="text-gray-500 shrink-0">天</span>
+                        </div>
+                    </el-form-item>
+                </template>
+                <div class="text-xs font-medium text-gray-500 mb-3 mt-2 pt-2 border-t border-gray-100">订单设置</div>
+                <el-form-item label="服用天数" prop="medication_days">
+                    <div class="flex items-center gap-1 w-full">
+                        <el-input-number
+                            v-model="patchUsageForm.medication_days"
+                            :min="1"
+                            :max="999"
+                            :step="1"
+                            controls-position="right"
+                            class="flex-1 min-w-0"
+                        />
+                        <span class="text-gray-500 shrink-0">天</span>
+                    </div>
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <el-button @click="patchUsageVisible = false">取消</el-button>
+                <el-button type="primary" :loading="patchUsageSaving" @click="submitPatchUsage">保存</el-button>
+            </template>
+        </el-dialog>
+
         <!-- 处方详情查看（处方单样式） -->
         <el-drawer
             v-model="prescriptionViewVisible"
@@ -2280,6 +2465,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 }}
@@ -2530,13 +2716,25 @@ import {
     prescriptionOrderRevokeRxAudit,
     prescriptionOrderRevokePayAudit,
     prescriptionOrderPatchPrescriptionPatient,
+    prescriptionOrderPatchPrescriptionUsage,
     prescriptionOrderLinkPayOrder,
+    prescriptionOrderRequestCompletion,
     prescriptionOrderSubmitGancaoRecipel,
     prescriptionOrderPreviewGancaoRecipel,
     prescriptionDetail,
     getDoctors,
     getAssistants
 } from '@/api/tcm'
+import {
+    formatDietaryTaboo,
+    type ServicePackageOption,
+    normalizeServicePackageOptions,
+    parseServicePackageValues,
+    mergeServicePackageSelectOptions,
+    formatServicePackageLabels,
+    normalizeSlipAuxUsageForm,
+    prescriptionHasAuxFormula
+} from './components/prescription-order-utils'
 import html2canvas from 'html2canvas'
 import { jsPDF } from 'jspdf'
 import { getDictData } from '@/api/app'
@@ -2632,7 +2830,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 }>>([])
@@ -2753,8 +2951,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 = []
@@ -3162,28 +3359,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 '已驳回'
@@ -3436,6 +3611,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
@@ -3495,10 +3674,14 @@ const detailLinkedPayOrders = computed(() => {
     return Array.isArray(arr) ? arr : []
 })
 
-/** 需代收：业务订单总金额 − 关联已付总额 */
+/** 需代收：优先用关联时记录的固定快照值；历史单（无快照）回退实时计算 总金额 − 关联已付总额 */
 const detailAgencyToCollect = computed(() => {
     const d = detailData.value
     if (!d) return 0
+    const snap = d.agency_collect_amount
+    if (snap !== null && snap !== undefined && snap !== '') {
+        return Number(snap) || 0
+    }
     const total = Number(d.amount) || 0
     const paid = Number(d.linked_pay_paid_total) || 0
     return Math.round((total - paid) * 100) / 100
@@ -3543,6 +3726,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()
@@ -3586,6 +3771,16 @@ const detailLinkedAppointmentResolvedFromTag = computed(() => {
 
 const detailRxHerbs = computed(() => normalizeSlipHerbs(detailPrescription.value?.herbs))
 
+const detailHasAuxHerbs = computed(() => prescriptionHasAuxFormula(detailPrescription.value as any))
+
+const detailAuxUsage = computed(() => {
+    const rx = detailPrescription.value as any
+    if (!rx || !prescriptionHasAuxFormula(rx)) return null
+    const raw = rx.aux_usage
+    if (raw == null || raw === '' || (Array.isArray(raw) && raw.length === 0)) return null
+    return normalizeSlipAuxUsageForm(raw, rx.prescription_type || '浓缩水丸')
+})
+
 /** false=无权限；true/缺省兼容旧接口（旧版未下发该字段时仍展示药材） */
 const detailHerbsVisible = computed(() => detailData.value?.prescription_detail_herbs_visible !== false)
 
@@ -3690,8 +3885,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()
@@ -3812,6 +4007,101 @@ const patchRxPatientRules: FormRules = {
     phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }]
 }
 
+const patchUsageVisible = ref(false)
+const patchUsageSaving = ref(false)
+const patchUsageFormRef = ref<FormInstance>()
+const patchUsageForm = reactive({
+    times_per_day: 3 as number | undefined,
+    usage_days: 7 as number | undefined,
+    aux_times_per_day: 3 as number | undefined,
+    aux_usage_days: 7 as number | undefined,
+    medication_days: undefined as number | undefined
+})
+const patchUsageRules = computed<FormRules>(() => {
+    const rules: FormRules = {
+        times_per_day: [{ required: true, message: '请填写主方每天次数', trigger: 'change' }],
+        usage_days: [{ required: true, message: '请填写主方开立天数', trigger: 'change' }],
+        medication_days: [{ required: true, message: '请填写订单服用天数', trigger: 'change' }]
+    }
+    if (detailHasAuxHerbs.value) {
+        rules.aux_times_per_day = [{ required: true, message: '请填写辅方每天次数', trigger: 'change' }]
+        rules.aux_usage_days = [{ required: true, message: '请填写辅方开立天数', trigger: 'change' }]
+    }
+    return rules
+})
+
+function openPatchUsageDialog() {
+    const rx = detailPrescription.value
+    const ord = detailData.value
+    if (!rx || !ord?.id || !ord.prescription_id) {
+        feedback.msgWarning('无处方数据')
+        return
+    }
+    const aux = detailAuxUsage.value
+    patchUsageForm.times_per_day =
+        Number(rx.times_per_day) > 0 ? Number(rx.times_per_day) : 3
+    patchUsageForm.usage_days =
+        Number(rx.usage_days) > 0 ? Number(rx.usage_days) : 7
+    patchUsageForm.aux_times_per_day =
+        aux && Number(aux.times_per_day) > 0 ? Number(aux.times_per_day) : 3
+    patchUsageForm.aux_usage_days =
+        aux && Number(aux.usage_days) > 0 ? Number(aux.usage_days) : 7
+    const md = Number(ord.medication_days)
+    patchUsageForm.medication_days = md > 0 ? md : Number(rx.usage_days) > 0 ? Number(rx.usage_days) : 7
+    patchUsageVisible.value = true
+    nextTick(() => patchUsageFormRef.value?.clearValidate())
+}
+
+function resetPatchUsageForm() {
+    patchUsageForm.times_per_day = 3
+    patchUsageForm.usage_days = 7
+    patchUsageForm.aux_times_per_day = 3
+    patchUsageForm.aux_usage_days = 7
+    patchUsageForm.medication_days = undefined
+}
+
+async function submitPatchUsage() {
+    const form = patchUsageFormRef.value
+    if (!form) return
+    try {
+        await form.validate()
+    } catch {
+        return
+    }
+    const ordId = detailData.value?.id
+    if (!ordId) return
+    patchUsageSaving.value = true
+    try {
+        const payload: {
+            id: number
+            times_per_day: number
+            usage_days: number
+            medication_days: number
+            aux_times_per_day?: number
+            aux_usage_days?: number
+        } = {
+            id: ordId,
+            times_per_day: Number(patchUsageForm.times_per_day),
+            usage_days: Number(patchUsageForm.usage_days),
+            medication_days: Number(patchUsageForm.medication_days)
+        }
+        if (detailHasAuxHerbs.value) {
+            payload.aux_times_per_day = Number(patchUsageForm.aux_times_per_day)
+            payload.aux_usage_days = Number(patchUsageForm.aux_usage_days)
+        }
+        await prescriptionOrderPatchPrescriptionUsage(payload)
+        feedback.msgSuccess('保存成功')
+        patchUsageVisible.value = false
+        await refreshCurrentPrescriptionOrderDetail()
+        await fetchLogs(ordId)
+        getLists()
+    } catch {
+        /* 拦截器已提示 */
+    } finally {
+        patchUsageSaving.value = false
+    }
+}
+
 function openPatchRxPatientDialog() {
     const rx = detailPrescription.value
     const ord = detailData.value
@@ -3843,7 +4133,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())
 }
@@ -4016,6 +4307,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()
@@ -4041,7 +4336,7 @@ const editDiagnosisCreatorDeptBreadcrumbs = computed(() => {
         .filter((segs) => segs.length > 0)
 })
 
-const editPaidOrders = ref<Array<{ id: number; order_no?: string; amount?: number | string; order_type?: number | string; remark?: string; create_time?: string }>>([])
+const editPaidOrders = ref<Array<{ id: number; order_no?: string; amount?: number | string; order_type?: number | string; remark?: string; create_time?: string; payment_method?: string; create_type?: string }>>([])
 const editPaidOrdersLoading = ref(false)
 const editDepositMin = ref(0)
 
@@ -4057,6 +4352,26 @@ function formatPoCategory(t: unknown) {
     return m[Number(t)] || '未知'
 }
 
+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]) {
+        return methodMap[paymentMethod]
+    }
+    return '普通订单'
+}
+
 const editLinkedPaidTotal = computed(() => {
     const ids = new Set(editForm.pay_order_ids.map((x) => Number(x)))
     let s = 0
@@ -4246,18 +4561,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
@@ -4898,8 +5202,17 @@ const addPayOrderRowId = ref(0)
 const addPayOrderFormRef = ref<FormInstance>()
 const addPayOrderAvailableLoading = ref(false)
 const addPayOrderAvailableList = ref<any[]>([])
+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',
+    add_mode: 'create' as 'create' | 'create_express' | 'link' | 'completion_only',
     order_type: 3,
     pay_amount: undefined as number | undefined,
     pay_remark: '',
@@ -4907,38 +5220,44 @@ const addPayOrderForm = reactive({
     completion_request: 0
 })
 
-const addPayOrderRules: FormRules = {
-    add_mode: [{ required: true, message: '请选择添加方式', trigger: 'change' }],
-    order_type: [{ required: true, message: '请选择费用类别', trigger: 'change' }],
-    pay_amount: [
-        { required: true, message: '请输入支付金额', trigger: 'blur' },
-        {
-            validator: (_rule, v, cb) => {
-                const n = Number(v)
-                if (!Number.isFinite(n) || n <= 0) {
-                    cb(new Error('金额须大于 0'))
-                } else {
-                    cb()
-                }
-            },
-            trigger: 'blur'
-        }
-    ],
-    link_pay_order_ids: [
-        { 
-            required: true, 
-            message: '请至少选择一个支付单', 
-            trigger: 'change',
-            validator: (_rule, v, cb) => {
-                if (!Array.isArray(v) || v.length === 0) {
-                    cb(new Error('请至少选择一个支付单'))
-                } else {
-                    cb()
+const addPayOrderRules = computed<FormRules>(() => {
+    const rules: FormRules = {
+        add_mode: [{ required: true, message: '请选择添加方式', trigger: 'change' }]
+    }
+    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' },
+            {
+                validator: (_rule, v, cb) => {
+                    const n = Number(v)
+                    if (!Number.isFinite(n) || n <= 0) {
+                        cb(new Error('金额须大于 0'))
+                    } else {
+                        cb()
+                    }
+                },
+                trigger: 'blur'
+            }
+        ]
+    } else if (addPayOrderForm.add_mode === 'link') {
+        rules.link_pay_order_ids = [
+            {
+                required: true,
+                message: '请至少选择一个支付单',
+                trigger: 'change',
+                validator: (_rule, v, cb) => {
+                    if (!Array.isArray(v) || v.length === 0) {
+                        cb(new Error('请至少选择一个支付单'))
+                    } else {
+                        cb()
+                    }
                 }
             }
-        }
-    ]
-}
+        ]
+    }
+    return rules
+})
 
 async function loadAddPayOrderAvailable(diagnosisId: number, currentLinkedIds: number[] = []) {
     if (!diagnosisId) {
@@ -4986,14 +5305,22 @@ async function submitAddPayOrder() {
     await addPayOrderFormRef.value.validate()
     addPayOrderSaving.value = true
     try {
-        if (addPayOrderForm.add_mode === 'create') {
-            // 手动创建新支付单
+        if (addPayOrderForm.add_mode === 'completion_only') {
+            await prescriptionOrderRequestCompletion({ id: addPayOrderRowId.value })
+            feedback.msgSuccess('完单申请已提交，请等待支付审核')
+        } 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 {
@@ -5108,12 +5435,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/qywx.vue

@@ -39,8 +39,16 @@
 
             <div class="grid grid-cols-4 gap-4 mb-4">
                 <el-card shadow="hover">
-                    <div class="text-gray-500 text-sm mb-1">总客户数</div>
+                    <div class="text-gray-500 text-sm mb-1">总客户数（去重）</div>
                     <div class="text-2xl font-bold text-primary">{{ stats.total }}</div>
+                    <el-tooltip
+                        content="企微管理后台「全部客户」按客户×添加人关系计数：同一客户被 N 名员工添加计 N 条。与企微对账请看此数字。"
+                        placement="bottom"
+                    >
+                        <div class="text-xs text-gray-400 mt-1 cursor-help">
+                            跟进关系数（企微口径）：{{ stats.relation_total }}
+                        </div>
+                    </el-tooltip>
                 </el-card>
                 <el-card shadow="hover" class="today-arrival-card cursor-pointer" @click="openArrivalDrawer">
                     <div class="flex items-center justify-between mb-1">
@@ -52,6 +60,9 @@
                     <div class="flex items-end gap-2">
                         <div class="text-2xl font-bold text-success leading-none">{{ stats.today }}</div>
                         <div class="text-xs text-gray-400 pb-1">人</div>
+                        <div v-if="arrival.returning > 0" class="text-xs text-warning pb-1">
+                            含老客户 {{ arrival.returning }}
+                        </div>
                     </div>
                     <!-- 24 小时分布迷你柱：高度相对今日峰值等比 -->
                     <div class="hourly-bars mt-2" :title="hourlyTooltip">
@@ -114,6 +125,24 @@
                         @change="onAddTimeRangeChange"
                     />
                 </el-form-item>
+                <el-form-item>
+                    <template #label>
+                        <el-tooltip
+                            content="首次添加：客户第一次加入企业的时间在所选范围内。任意添加（企微口径）：范围内发生过添加动作即算，含老客户被重加/被其他员工添加，与企微后台时间筛选一致。"
+                            placement="top"
+                        >
+                            <span class="cursor-help">时间口径</span>
+                        </el-tooltip>
+                    </template>
+                    <el-select
+                        v-model="queryParams.add_time_mode"
+                        class="!w-[180px]"
+                        @change="onAddTimeModeChange"
+                    >
+                        <el-option label="首次添加" value="first" />
+                        <el-option label="任意添加（企微口径）" value="any" />
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="标签">
                     <el-select
                         v-model="queryParams.tag_ids"
@@ -158,7 +187,23 @@
                         <div class="flex items-center gap-2">
                             <el-avatar :size="40" :src="row.avatar" />
                             <div>
-                                <div class="font-medium">{{ row.name }}</div>
+                                <div class="font-medium flex items-center gap-1">
+                                    <span>{{ row.name }}</span>
+                                    <el-tooltip
+                                        v-if="row.readd_flag"
+                                        content="这个人以前加过企业：被删除后重新添加，或已是企业客户又被其他员工添加"
+                                        placement="top"
+                                    >
+                                        <el-tag size="small" type="warning" effect="plain">以前加过</el-tag>
+                                    </el-tooltip>
+                                    <el-tooltip
+                                        v-if="row.is_deleted"
+                                        content="该客户已被删除/流失（企微中已不是企业客户），仅在「任意添加」口径下展示"
+                                        placement="top"
+                                    >
+                                        <el-tag size="small" type="danger" effect="plain">已删除</el-tag>
+                                    </el-tooltip>
+                                </div>
                                 <div class="text-xs text-gray-400">{{ row.external_userid }}</div>
                             </div>
                         </div>
@@ -278,6 +323,9 @@
                     <div class="flex items-center gap-3">
                         <span class="text-base font-semibold">今日进入明细</span>
                         <el-tag type="success" effect="plain">共 {{ arrivalList.total }} 人</el-tag>
+                        <el-tag v-if="arrival.returning > 0" type="warning" effect="plain">
+                            老客户 {{ arrival.returning }}
+                        </el-tag>
                     </div>
                     <el-button link type="primary" :loading="arrivalListLoading" @click="loadArrival(true)">
                         <template #icon><Refresh /></template>
@@ -331,8 +379,17 @@
                                 {{ (row.customer_name || '?').slice(0, 1) }}
                             </el-avatar>
                             <div class="flex-1 min-w-0">
-                                <div class="text-sm font-medium truncate">
-                                    {{ row.customer_name || row.external_userid || '（未知客户）' }}
+                                <div class="text-sm font-medium truncate flex items-center gap-1">
+                                    <span class="truncate">
+                                        {{ row.customer_name || row.external_userid || '（未知客户）' }}
+                                    </span>
+                                    <el-tooltip
+                                        v-if="row.is_old_customer"
+                                        content="老客户回流：今天之前就加过企业（删除后重加，或已是其他员工的客户）"
+                                        placement="top"
+                                    >
+                                        <el-tag size="small" type="warning" effect="plain">老客户</el-tag>
+                                    </el-tooltip>
                                 </div>
                                 <div class="text-xs text-gray-500 mt-0.5">
                                     <span>接待：{{ row.admin_name || row.user_id || '—' }}</span>
@@ -469,6 +526,9 @@
                 </el-descriptions-item>
                 <el-descriptions-item label="类型">
                     {{ currentCustomer.type === 1 ? '微信用户' : '企业微信用户' }}
+                    <el-tag v-if="currentCustomer.readd_flag" size="small" type="warning" effect="plain" class="ml-1">
+                        以前加过
+                    </el-tag>
                 </el-descriptions-item>
                 <el-descriptions-item label="企业名称" :span="2">
                     {{ currentCustomer.corp_name || '—' }}
@@ -544,6 +604,7 @@ const currentCustomer = ref<any>(null)
 
 const stats = reactive({
     total: 0,
+    relation_total: 0,
     today: 0,
     today_follow_staff: 0,
     lastSync: '',
@@ -575,12 +636,14 @@ const queryParams = reactive<{
     tag_ids: string[]
     add_time_start: string
     add_time_end: string
+    add_time_mode: 'first' | 'any'
 }>({
     name: '',
     follow_user: '',
     tag_ids: [],
     add_time_start: '',
-    add_time_end: ''
+    add_time_end: '',
+    add_time_mode: 'first'
 })
 
 /** 与列表「添加时间」列口径一致（库内 external_first_add_time / create_time） */
@@ -597,6 +660,13 @@ function onAddTimeRangeChange(val: [string, string] | null) {
     resetPage()
 }
 
+/** 口径切换只在已选时间范围时才需要重查 */
+function onAddTimeModeChange() {
+    if (queryParams.add_time_start || queryParams.add_time_end) {
+        resetPage()
+    }
+}
+
 // ── 标签维度（筛选下拉 + 抽屉面板共用同一份数据） ──────────────────────────
 interface TagItem {
     tag_id: string
@@ -689,6 +759,7 @@ function filterByTag(tagId: string) {
 interface ArrivalStats {
     total: number
     recent_time: number
+    returning: number
     hourly: number[]
     by_state: { state: string; count: number }[]
 }
@@ -702,11 +773,13 @@ interface ArrivalItem {
     customer_avatar: string
     state: string
     welcome_code: number
+    is_old_customer: number
 }
 
 const arrival = reactive<ArrivalStats>({
     total: 0,
     recent_time: 0,
+    returning: 0,
     hourly: new Array(24).fill(0),
     by_state: []
 })
@@ -740,6 +813,7 @@ async function loadArrival(refreshList = false) {
         if (res) {
             arrival.total = Number(res.total ?? 0)
             arrival.recent_time = Number(res.recent_time ?? 0)
+            arrival.returning = Number(res.returning ?? 0)
             arrival.hourly = Array.isArray(res.hourly) && res.hourly.length === 24
                 ? res.hourly.map((n: any) => Number(n) || 0)
                 : new Array(24).fill(0)
@@ -829,6 +903,7 @@ function handleReset() {
     queryParams.tag_ids = []
     queryParams.add_time_start = ''
     queryParams.add_time_end = ''
+    queryParams.add_time_mode = 'first'
     addTimeRange.value = null
     resetParams()
 }

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"
@@ -390,7 +398,7 @@
                                 <el-tooltip placement="top" effect="dark" :show-after="200">
                                     <template #content>
                                         <div style="max-width: 320px; line-height: 1.7; font-size: 12px">
-                                            <b>tcm_diagnosis_assign_log</b> 行数（成功指派：<b>to_assistant_id &gt; 0</b>），**仅按 <b>related_po_create_time</b>** 落在所选区间内（与日志表快照一致；诊单手动指派已写入该字段）。按<b>被指派医助</b>归属展示部门。<template v-if="tb.channel_name">
+                                            <b>tcm_diagnosis_assign_log</b> 中成功指派（<b>to_assistant_id &gt; 0</b>，<b>剔除勾选「继承」的指派</b>）按<b>指派操作时间</b>落在所选区间内，「医助 × 诊单」去重、剔除已删诊单，与「复诊接诊率」页面同口径。按<b>被指派医助</b>归属展示部门。<template v-if="tb.channel_name">
                                                 选定渠道时收窄与「{{ tb.channel_name }}」业绩同口径（标签诊单或 channels EXISTS）。<br />
                                                 <b>二中心及其组织下级</b>在选定渠道下本列计 <b>0</b>。
                                             </template>
@@ -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

@@ -174,9 +174,9 @@
                     </template>
                 </el-table-column>
 
-                <el-table-column label="支付方式" width="100">
+                <el-table-column label="支付方式" width="120">
                     <template #default="{ row }">
-                        {{ getPaymentMethodText(row.payment_method) }}
+                        {{ getCreateTypeText(row) }}
                     </template>
                 </el-table-column>
 
@@ -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
@@ -327,7 +327,7 @@
                     <span class="text-red-500 font-semibold">¥{{ detailData.amount }}</span>
                 </el-descriptions-item>
                 <el-descriptions-item label="支付方式">
-                    {{ getPaymentMethodText(detailData.payment_method) }}
+                    {{ getCreateTypeText(detailData) }}
                 </el-descriptions-item>
                 <el-descriptions-item label="支付时间">
                     {{ detailData.payment_time || '-' }}
@@ -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: '',
@@ -1148,7 +1162,8 @@ const submitCreateOrder = async () => {
                 patient_id: createForm.patient_id,
                 order_type: createForm.order_type,
                 amount: createForm.amount,
-                remark: createForm.remark
+                remark: createForm.remark,
+                create_type: 'wechat_work'
             }
             const res: any = await orderCreateForWechatWork(params)
             const orderNo = res?.order_no ?? res?.data?.order_no
@@ -1160,18 +1175,23 @@ const submitCreateOrder = async () => {
                 patient_id: createForm.patient_id,
                 order_type: createForm.order_type,
                 amount: createForm.amount,
-                remark: createForm.remark
+                remark: createForm.remark,
+                create_type: createForm.createType
             }
             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)
@@ -1247,6 +1267,27 @@ const getPaymentMethodText = (method: string | null) => {
     return methodMap[method] || '未知'
 }
 
+// 支付方式展示：优先按「创建方式」三值显示；历史单/无 create_type 时回退真实支付渠道文案
+const getCreateTypeText = (row: any) => {
+    const createTypeMap: Record<string, string> = {
+        normal: '普通订单',
+        wechat_work: '企业微信对外收款',
+        fubei: '付呗',
+        express_cod: '快递代收'
+    }
+    const ct = row?.create_type
+    if (ct === 'wechat_work' || ct === 'fubei' || ct === 'express_cod') {
+        return createTypeMap[ct]
+    }
+    if (ct === 'normal' && row?.payment_method) {
+        return getPaymentMethodText(row.payment_method)
+    }
+    if (ct && createTypeMap[ct]) {
+        return createTypeMap[ct]
+    }
+    return getPaymentMethodText(row?.payment_method)
+}
+
 // 编辑订单
 const handleEditOrder = (row: any) => {
     editOrderForm.value = {
@@ -1373,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/stats/revisit_rate/index.vue

@@ -0,0 +1,644 @@
+<template>
+    <div class="revisit-rate-page">
+        <el-card class="!border-none" shadow="never">
+            <el-form :inline="true" class="rate-filter-form">
+                <el-form-item label="统计月份">
+                    <el-date-picker
+                        v-model="month"
+                        type="month"
+                        value-format="YYYY-MM"
+                        placeholder="选择月份"
+                        :clearable="false"
+                        :disabled-date="disableFutureMonth"
+                        style="width: 160px"
+                        @change="loadData"
+                    />
+                </el-form-item>
+                <el-form-item label="部门">
+                    <el-tree-select
+                        v-model="deptId"
+                        :data="deptTreeOptions"
+                        placeholder="二中心（全部）"
+                        clearable
+                        filterable
+                        check-strictly
+                        node-key="id"
+                        :default-expand-all="true"
+                        :props="deptTreeProps"
+                        style="width: 220px"
+                        @change="loadData"
+                    />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" :loading="loading" @click="loadData">查询</el-button>
+                    <el-button :disabled="loading" @click="handleReset">重置</el-button>
+                </el-form-item>
+                <el-form-item>
+                    <el-popover placement="bottom-start" :width="500" trigger="hover">
+                        <template #reference>
+                            <span class="rate-caliber-trigger">
+                                <el-icon><InfoFilled /></el-icon>
+                                统计口径
+                            </span>
+                        </template>
+                        <div class="rate-caliber">
+                            <p>
+                                <b>当月被指派总数</b>：当月内诊单被指派给医助（按指派操作时间落月，<b>剔除勾选「继承」的指派</b>)的诊单数，按「医助 × 诊单」去重；部门行 / 合计行按诊单去重；<b>再剔除</b>名下存在履约「拒收 / 退款」业务订单的诊单。
+                            </p>
+                            <p>
+                                <b>诊次（第 N 次下单）</b>：患者（诊单）名下计入业绩的业务订单（剔除已取消 / 拒收 / 退款）按下单时间升序编号为「实单序号」，<b>统计诊次 = 实单序号 + 诊单偏移</b>（默认偏移 0 → 第 1 笔实单为一诊；偏移 1 → 第 1 笔实单为二诊；偏移 2 → 第 1 笔实单为三诊，5 笔实单等价七诊）。诊次<b>跨月累计不重置</b>。诊单可在「业务订单」tab 配置偏移量。
+                            </p>
+                            <p>
+                                <b>当月 N 诊单数</b>：当月内下单且诊次为 N 的订单数，归属下单时点<b>持有该患者的医助</b>（指派可在往月；释放后不再归属；「继承」指派会转移持有人但不计被指派数）。
+                            </p>
+                            <p>
+                                <b>当月 N 诊接诊率</b> = 当月 N 诊单数 ÷ 当月被指派总数。往月指派、当月成交会推高分子，比率可能超过 100%；医助当月无新指派但旗下有成交时，被指派数为 0、比率显示「—」。
+                            </p>
+                            <p>
+                                医助按人事部门归组；<b>仅统计「二中心」及其组织下级</b>；部门下拉与未选时的默认范围均限定在该子树，选定部门时含其组织下级。
+                            </p>
+                        </div>
+                    </el-popover>
+                </el-form-item>
+            </el-form>
+        </el-card>
+
+        <div class="rate-kpi-grid">
+            <div
+                v-for="card in summaryCards"
+                :key="card.key"
+                class="rate-kpi-card"
+                :class="{ 'is-clickable': card.clickable }"
+                @click="card.clickable && card.onClick && card.onClick()"
+            >
+                <div class="rate-kpi-label">{{ card.label }}</div>
+                <div class="rate-kpi-value">{{ card.value }}</div>
+                <div v-if="card.sub" class="rate-kpi-sub">{{ card.sub }}</div>
+            </div>
+        </div>
+
+        <el-card class="!border-none mt-4" shadow="never">
+            <template #header>
+                <div class="rate-card-header">
+                    <span>部门 · 医助明细（{{ monthText }}）</span>
+                    <span class="rate-card-hint">点击「被指派数 / N诊单数」可查看具体诊单与订单；底栏合计的被指派数按诊单去重</span>
+                </div>
+            </template>
+            <el-table
+                v-loading="loading"
+                :data="rows"
+                size="small"
+                border
+                row-key="row_key"
+                :tree-props="{ children: 'children' }"
+                :default-expand-all="true"
+                show-summary
+                :summary-method="getSummaries"
+            >
+                <el-table-column label="部门 / 医助" min-width="200" fixed>
+                    <template #default="{ row }">
+                        <span v-if="row.is_dept" class="rate-dept-cell">
+                            {{ row.dept_name }}
+                            <span class="rate-dept-count">{{ row.assistant_count }} 人</span>
+                        </span>
+                        <span v-else>{{ row.assistant_name }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="assigned_count" label="当月被指派数" min-width="110" align="right">
+                    <template #default="{ row }">
+                        <el-link
+                            v-if="canViewAssignLines && row.assigned_count > 0"
+                            type="primary"
+                            :underline="false"
+                            @click="openAssignDetail(row)"
+                        >
+                            {{ row.assigned_count }}
+                        </el-link>
+                        <span v-else>{{ row.assigned_count }}</span>
+                    </template>
+                </el-table-column>
+                <template v-for="slot in visitSlots" :key="slot">
+                    <el-table-column
+                        :prop="`visit${slot}_count`"
+                        :label="`${slotLabel(slot)}单数`"
+                        min-width="96"
+                        align="right"
+                    >
+                        <template #header>
+                            <span>{{ slotLabel(slot) }}单数</span>
+                            <el-tooltip
+                                effect="dark"
+                                placement="top"
+                                :content="`当月内下单、诊次为第 ${slot} 次的订单数（诊次跨月累计；归属下单时点持有患者的医助）`"
+                            >
+                                <el-icon class="rate-th-hint"><InfoFilled /></el-icon>
+                            </el-tooltip>
+                        </template>
+                        <template #default="{ row }">
+                            <el-link
+                                v-if="canViewOrderLines && row[`visit${slot}_count`] > 0"
+                                type="primary"
+                                :underline="false"
+                                @click="openOrderDetail(slot, row)"
+                            >
+                                {{ row[`visit${slot}_count`] }}
+                            </el-link>
+                            <span v-else>{{ row[`visit${slot}_count`] }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        :prop="`visit${slot}_rate`"
+                        :label="`${slotLabel(slot)}接诊率`"
+                        min-width="96"
+                        align="right"
+                    >
+                        <template #default="{ row }">{{ formatRate(row[`visit${slot}_rate`]) }}</template>
+                    </el-table-column>
+                </template>
+            </el-table>
+        </el-card>
+
+        <!-- 下钻明细 -->
+        <el-dialog
+            v-model="detailVisible"
+            :title="detailTitle"
+            width="980px"
+            top="6vh"
+            destroy-on-close
+        >
+            <el-table
+                v-loading="detailLoading"
+                :data="detailRows"
+                size="small"
+                border
+                stripe
+                max-height="60vh"
+            >
+                <template v-if="detailType === 'assign'">
+                    <el-table-column prop="diagnosis_id" label="诊单ID" width="90" />
+                    <el-table-column prop="patient_name" label="患者" min-width="100">
+                        <template #default="{ row }">
+                            <el-link
+                                v-if="canViewPatientDetail && row.diagnosis_id"
+                                type="primary"
+                                :underline="false"
+                                @click="openPatientDetail(row.diagnosis_id)"
+                            >
+                                {{ row.patient_name || `诊单#${row.diagnosis_id}` }}
+                            </el-link>
+                            <span v-else>{{ row.patient_name || '—' }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="patient_phone" label="联系电话" min-width="120">
+                        <template #default="{ row }">{{ row.patient_phone || '—' }}</template>
+                    </el-table-column>
+                    <el-table-column prop="assistant_names" label="被指派医助" min-width="140" show-overflow-tooltip />
+                    <el-table-column prop="assign_count" label="当月指派次数" width="110" align="right" />
+                    <el-table-column prop="last_assign_time_text" label="最近指派时间" min-width="160" />
+                </template>
+                <template v-else>
+                    <el-table-column prop="order_no" label="订单号" min-width="180" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            <el-link
+                                v-if="canViewOrderDetail && row.order_id"
+                                type="primary"
+                                :underline="false"
+                                @click="openOrderInfo(row.order_id)"
+                            >
+                                {{ row.order_no || `#${row.order_id}` }}
+                            </el-link>
+                            <span v-else>{{ row.order_no || `#${row.order_id}` }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="diagnosis_id" label="诊单ID" width="90" />
+                    <el-table-column prop="patient_name" label="患者" min-width="100">
+                        <template #default="{ row }">
+                            <el-link
+                                v-if="canViewPatientDetail && row.diagnosis_id"
+                                type="primary"
+                                :underline="false"
+                                @click="openPatientDetail(row.diagnosis_id)"
+                            >
+                                {{ row.patient_name || `诊单#${row.diagnosis_id}` }}
+                            </el-link>
+                            <span v-else>{{ row.patient_name || '—' }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="amount" label="金额" width="100" align="right">
+                        <template #default="{ row }">¥ {{ row.amount }}</template>
+                    </el-table-column>
+                    <el-table-column prop="create_time_text" label="下单时间" min-width="160" />
+                    <el-table-column prop="assistant_name" label="持有医助" min-width="100" />
+                    <el-table-column prop="creator_name" label="订单创建人" min-width="100" />
+                </template>
+            </el-table>
+            <div class="rate-detail-footer">共 {{ detailRows.length }} 条</div>
+        </el-dialog>
+
+        <!-- 订单详情抽屉（共享组件，与处方订单列表详情一致；只读） -->
+        <order-detail-drawer ref="orderDetailRef" readonly append-to-body />
+
+        <!-- 诊单（患者）详情：编辑页只读模式 -->
+        <diagnosis-edit-popup ref="diagnosisEditRef" />
+    </div>
+</template>
+
+<script setup lang="ts" name="revisitRateStatsPage">
+import { computed, defineAsyncComponent, onMounted, ref } from 'vue'
+import { InfoFilled } from '@element-plus/icons-vue'
+
+import {
+    revisitRateAssignLines,
+    revisitRateDeptOptions,
+    revisitRateOverview,
+    revisitRateVisitOrderLines
+} from '@/api/stats'
+import { hasPermission } from '@/utils/perm'
+
+/** 业务订单详情抽屉（共享组件，readonly 模式，与 order_list.vue 详情同源） */
+const OrderDetailDrawer = defineAsyncComponent(
+    () => import('@/views/consumer/prescription/components/PrescriptionOrderDetailDrawer.vue')
+)
+/** 诊单编辑弹窗（只读打开） */
+const DiagnosisEditPopup = defineAsyncComponent(() => import('@/views/tcm/diagnosis/edit.vue'))
+
+interface MetricPack extends Record<string, any> {
+    assigned_count: number
+}
+
+interface StatsRow extends MetricPack {
+    row_key: string
+    is_dept: 0 | 1
+    dept_id: number
+    dept_name: string
+    assistant_id?: number
+    assistant_name?: string
+    assistant_count?: number
+    children?: StatsRow[]
+}
+
+interface DeptTreeNode {
+    id: number
+    name: string
+    pid: number
+    children?: DeptTreeNode[]
+}
+
+const canViewAssignLines = hasPermission(['stats.revisitRate/assignLines'])
+const canViewOrderLines = hasPermission(['stats.revisitRate/visitOrderLines'])
+const canViewOrderDetail = hasPermission(['tcm.prescriptionOrder/detail'])
+const canViewPatientDetail = hasPermission(['tcm.diagnosis/detail'])
+
+/** 接口动态返回的诊次分档（最少 2~4，按数据扩展到五诊、六诊…） */
+const visitSlots = ref<number[]>([2, 3, 4])
+
+const cnDigits = ['零', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']
+const slotLabel = (slot: number) => {
+    if (slot >= 2 && slot <= 10) {
+        return `${cnDigits[slot]}诊`
+    }
+    if (slot > 10 && slot < 20) {
+        return `十${cnDigits[slot - 10]}诊`
+    }
+    return `${slot}诊`
+}
+
+const initNow = new Date()
+const currentMonth = `${initNow.getFullYear()}-${String(initNow.getMonth() + 1).padStart(2, '0')}`
+const month = ref<string>(currentMonth)
+const deptId = ref<number | undefined>(undefined)
+const loading = ref(false)
+const rows = ref<StatsRow[]>([])
+const total = ref<MetricPack | null>(null)
+
+const deptTreeOptions = ref<DeptTreeNode[]>([])
+const deptTreeProps = { value: 'id', label: 'name', children: 'children' }
+
+const monthText = computed(() => {
+    const [y, m] = month.value.split('-')
+    return y && m ? `${y}年${Number(m)}月` : month.value
+})
+
+const formatRate = (rate: number | null | undefined) =>
+    rate === null || rate === undefined ? '—' : `${rate}%`
+
+const baseQuery = () => ({
+    month: month.value,
+    dept_ids: deptId.value ? String(deptId.value) : ''
+})
+
+interface SummaryCard {
+    key: string
+    label: string
+    value: string
+    sub: string
+    clickable: boolean
+    onClick?: () => void
+}
+
+const summaryCards = computed<SummaryCard[]>(() => {
+    const t = total.value
+    const cards: SummaryCard[] = [
+        {
+            key: 'assigned',
+            label: '当月被指派总数',
+            value: t ? String(t.assigned_count) : '—',
+            sub: '',
+            clickable: !!(canViewAssignLines && t && t.assigned_count > 0),
+            onClick: () => openAssignDetail(null)
+        }
+    ]
+    for (const slot of visitSlots.value) {
+        const cnt = t ? t[`visit${slot}_count`] : null
+        const rate = t ? t[`visit${slot}_rate`] : null
+        cards.push({
+            key: `visit${slot}`,
+            label: `当月${slotLabel(slot)}接诊率`,
+            value: t ? formatRate(rate) : '—',
+            sub: t ? `${slotLabel(slot)}下单 ${cnt} 单` : '',
+            clickable: !!(canViewOrderLines && cnt > 0),
+            onClick: () => openOrderDetail(slot, null)
+        })
+    }
+    return cards
+})
+
+/** 底栏合计：直接展示后端按诊单去重后的合计，不做各行求和 */
+const getSummaries = ({ columns }: { columns: any[] }) => {
+    const t = total.value
+    return columns.map((col, index) => {
+        if (index === 0) {
+            return '合计'
+        }
+        if (!t) {
+            return ''
+        }
+        const prop = String(col.property || '')
+        if (prop === 'assigned_count') {
+            return String(t.assigned_count)
+        }
+        if (/^visit\d+_count$/.test(prop)) {
+            return String(t[prop] ?? '')
+        }
+        if (/^visit\d+_rate$/.test(prop)) {
+            return formatRate(t[prop])
+        }
+        return ''
+    })
+}
+
+const disableFutureMonth = (date: Date) => {
+    const now = new Date()
+    return date.getFullYear() * 12 + date.getMonth() > now.getFullYear() * 12 + now.getMonth()
+}
+
+const loadData = async () => {
+    loading.value = true
+    try {
+        const res = await revisitRateOverview(baseQuery())
+        rows.value = res?.rows ?? []
+        total.value = res?.total ?? null
+        if (Array.isArray(res?.slots) && res.slots.length) {
+            visitSlots.value = res.slots.map((s: any) => Number(s)).filter((s: number) => s >= 2)
+        }
+        if (res?.month) {
+            month.value = res.month
+        }
+    } finally {
+        loading.value = false
+    }
+}
+
+const buildDeptTree = (flat: Array<{ id: number; pid: number; name: string }>): DeptTreeNode[] => {
+    const map = new Map<number, DeptTreeNode>()
+    for (const d of flat) {
+        map.set(d.id, { ...d, children: [] })
+    }
+    const roots: DeptTreeNode[] = []
+    for (const d of flat) {
+        const node = map.get(d.id)!
+        if (d.pid > 0 && map.has(d.pid)) {
+            map.get(d.pid)!.children!.push(node)
+        } else {
+            roots.push(node)
+        }
+    }
+    const strip = (n: DeptTreeNode) => {
+        if (n.children?.length) {
+            n.children.forEach(strip)
+        } else {
+            delete n.children
+        }
+    }
+    roots.forEach(strip)
+    return roots
+}
+
+const loadDeptOptions = async () => {
+    try {
+        const res = await revisitRateDeptOptions()
+        deptTreeOptions.value = buildDeptTree(res?.rows ?? [])
+    } catch {
+        deptTreeOptions.value = []
+    }
+}
+
+// ── 下钻明细 ──────────────────────────────────────────
+const detailVisible = ref(false)
+const detailType = ref<'assign' | 'orders'>('assign')
+const detailTitle = ref('')
+const detailLoading = ref(false)
+const detailRows = ref<any[]>([])
+
+/** row 为 null 时表示合计（当前部门筛选范围） */
+const rowScope = (row: StatsRow | null): { assistant_id?: number; dept_id?: number; label: string } => {
+    if (!row) {
+        return { label: '合计' }
+    }
+    if (row.is_dept) {
+        return { dept_id: row.dept_id, label: row.dept_name }
+    }
+    return { assistant_id: row.assistant_id, label: row.assistant_name || '' }
+}
+
+const openAssignDetail = async (row: StatsRow | null) => {
+    if (!canViewAssignLines) {
+        return
+    }
+    const scope = rowScope(row)
+    detailType.value = 'assign'
+    detailTitle.value = `${scope.label} · 被指派明细（${monthText.value}）`
+    detailVisible.value = true
+    detailLoading.value = true
+    detailRows.value = []
+    try {
+        const res = await revisitRateAssignLines({
+            ...baseQuery(),
+            assistant_id: scope.assistant_id,
+            dept_id: scope.dept_id
+        })
+        detailRows.value = res?.rows ?? []
+    } finally {
+        detailLoading.value = false
+    }
+}
+
+const openOrderDetail = async (slot: number, row: StatsRow | null) => {
+    if (!canViewOrderLines) {
+        return
+    }
+    const scope = rowScope(row)
+    detailType.value = 'orders'
+    detailTitle.value = `${scope.label} · ${slotLabel(slot)}订单明细（${monthText.value}）`
+    detailVisible.value = true
+    detailLoading.value = true
+    detailRows.value = []
+    try {
+        const res = await revisitRateVisitOrderLines({
+            ...baseQuery(),
+            slot,
+            assistant_id: scope.assistant_id,
+            dept_id: scope.dept_id
+        })
+        detailRows.value = res?.rows ?? []
+    } finally {
+        detailLoading.value = false
+    }
+}
+
+// ── 订单详情（复用处方订单列表的详情抽屉） ──────────────
+const orderDetailRef = ref<{ open: (id: number) => void } | null>(null)
+
+const openOrderInfo = (orderId: number) => {
+    if (!canViewOrderDetail || !orderId) {
+        return
+    }
+    orderDetailRef.value?.open(orderId)
+}
+
+// ── 患者（诊单）详情：诊单编辑页只读打开 ────────────────
+const diagnosisEditRef = ref<{ openViewOnly: (id: number) => void } | null>(null)
+
+const openPatientDetail = (diagnosisId: number) => {
+    if (!canViewPatientDetail || !diagnosisId) {
+        return
+    }
+    diagnosisEditRef.value?.openViewOnly(diagnosisId)
+}
+
+const handleReset = () => {
+    month.value = currentMonth
+    deptId.value = undefined
+    loadData()
+}
+
+onMounted(() => {
+    loadDeptOptions()
+    loadData()
+})
+</script>
+
+<style lang="scss" scoped>
+.revisit-rate-page {
+    .rate-filter-form {
+        :deep(.el-form-item) {
+            margin-bottom: 0;
+        }
+    }
+
+    .rate-caliber-trigger {
+        display: inline-flex;
+        align-items: center;
+        gap: 4px;
+        color: var(--el-text-color-secondary);
+        font-size: 13px;
+        cursor: help;
+    }
+
+    .rate-kpi-grid {
+        display: grid;
+        grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+        gap: 12px;
+        margin-top: 16px;
+    }
+
+    .rate-kpi-card {
+        background: var(--el-bg-color);
+        border-radius: 8px;
+        padding: 16px 20px;
+
+        &.is-clickable {
+            cursor: pointer;
+            transition: box-shadow 0.15s ease;
+
+            &:hover {
+                box-shadow: var(--el-box-shadow-light);
+            }
+        }
+
+        .rate-kpi-label {
+            color: var(--el-text-color-secondary);
+            font-size: 13px;
+        }
+
+        .rate-kpi-value {
+            margin-top: 6px;
+            font-size: 26px;
+            font-weight: 600;
+            color: var(--el-text-color-primary);
+        }
+
+        .rate-kpi-sub {
+            margin-top: 2px;
+            font-size: 12px;
+            color: var(--el-text-color-secondary);
+        }
+    }
+
+    .rate-card-header {
+        display: flex;
+        align-items: baseline;
+        gap: 10px;
+
+        .rate-card-hint {
+            font-size: 12px;
+            color: var(--el-text-color-secondary);
+        }
+    }
+
+    .rate-dept-cell {
+        font-weight: 600;
+
+        .rate-dept-count {
+            margin-left: 6px;
+            font-weight: 400;
+            font-size: 12px;
+            color: var(--el-text-color-secondary);
+        }
+    }
+
+    .rate-th-hint {
+        margin-left: 2px;
+        vertical-align: -2px;
+        color: var(--el-text-color-secondary);
+        cursor: help;
+    }
+}
+
+.rate-detail-footer {
+    margin-top: 10px;
+    text-align: right;
+    font-size: 12px;
+    color: var(--el-text-color-secondary);
+}
+
+.rate-caliber {
+    font-size: 13px;
+    line-height: 1.7;
+    color: var(--el-text-color-regular);
+
+    p + p {
+        margin-top: 6px;
+    }
+}
+</style>

admin/src/views/tcm/appointment/list.vue

@@ -83,6 +83,23 @@
                         <el-radio-button value="0">未确认</el-radio-button>
                     </el-radio-group>
                 </div>
+                <div class="filter-group">
+                    <span class="filter-label">部门</span>
+                    <el-tree-select
+                        v-model="formData.assistant_dept_id"
+                        :data="departmentTreeRaw"
+                        class="filter-dept-select"
+                        clearable
+                        filterable
+                        check-strictly
+                        :default-expand-all="true"
+                        node-key="id"
+                        size="small"
+                        :props="assistantDeptTreeProps"
+                        placeholder="选父级含子级"
+                        @change="handleAssistantDeptChange"
+                    />
+                </div>
             </div>
 
             <el-dialog
@@ -542,6 +559,7 @@
 import { usePaging } from '@/hooks/usePaging'
 import { defineAsyncComponent, onMounted, onUnmounted, watch } from 'vue'
 import { appointmentLists, cancelAppointment, completeAppointment, appointmentDetail } from '@/api/doctor'
+import { deptAll } from '@/api/org/department'
 import { getCallSignature, generateMiniProgramQrcode, tcmDiagnosisDetail, prescriptionGetByAppointment } from '@/api/tcm'
 import { getDictData } from '@/api/app'
 import { addDoctorNote } from '@/api/patient'
@@ -603,10 +621,19 @@ const formData = reactive({
     end_date: '',
     date_preset: 'today' as '' | 'yesterday' | 'day_before' | 'today' | 'tomorrow' | 'day_after',
     diagnosis_confirmed: '' as '' | '0' | '1', // ''=全部 1=已确认 0=未确认
+    /** 接诊医生 / 诊单医助 / 挂号医助所属部门（选父级含子级） */
+    assistant_dept_id: '' as number | '',
     /** 为 1 时后端 extend 返回各状态数量，避免额外 4 次列表请求 */
     include_status_counts: 0 as 0 | 1
 })
 
+const departmentTreeRaw = ref<unknown[]>([])
+const assistantDeptTreeProps = {
+    value: 'id',
+    label: 'name',
+    children: 'children'
+}
+
 const activeTab = ref('1')
 const dateCustomVisible = ref(false)
 const statusCount = ref<Record<number, number>>({
@@ -721,6 +748,12 @@ const handleDiagnosisConfirmedChange = () => {
     loadData()
 }
 
+// 部门筛选变更
+const handleAssistantDeptChange = () => {
+    pager.page = 1
+    loadData()
+}
+
 // 快捷日期变更
 const handleDatePresetChange = (val: string | number | boolean | undefined) => {
     const v = String(val || '')
@@ -770,6 +803,7 @@ const handleReset = () => {
     formData.doctor_name = ''
     formData.date_preset = 'today'
     formData.diagnosis_confirmed = ''
+    formData.assistant_dept_id = ''
     const t = new Date()
     const p = (n: number) => String(n).padStart(2, '0')
     formData.start_date = `${t.getFullYear()}-${p(t.getMonth() + 1)}-${p(t.getDate())}`
@@ -1099,7 +1133,13 @@ formData.start_date = `${_today.getFullYear()}-${_pad(_today.getMonth() + 1)}-${
 formData.end_date = formData.start_date
 formData.status = 1
 
-onMounted(() => {
+onMounted(async () => {
+    try {
+        const deptTree = await deptAll()
+        departmentTreeRaw.value = Array.isArray(deptTree) ? deptTree : []
+    } catch {
+        departmentTreeRaw.value = []
+    }
     loadData()
     listPollTimer = setInterval(() => {
         loadData({ silent: true })
@@ -1228,6 +1268,10 @@ onUnmounted(() => {
                 padding: 6px 14px;
             }
         }
+
+        .filter-dept-select {
+            width: 200px;
+        }
     }
 }
 

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/components/PatientOrderList.vue

@@ -4,6 +4,43 @@
             <el-empty description="当前诊单未携带患者ID，无法列出业务订单" />
         </div>
         <template v-else>
+            <div v-if="diagnosisId > 0" class="po-revisit-offset-bar mb-3">
+                <div class="po-revisit-offset-bar__main">
+                    <span class="text-sm text-gray-600">复诊统计起始偏移</span>
+                    <el-tooltip placement="top">
+                        <template #content>
+                            <div class="max-w-xs leading-relaxed">
+                                在实单诊次序号上叠加偏移量。设为 0（默认）：第 1 笔实单计为一诊；设为 1：第 1 笔实单计为二诊；设为 2：第 1 笔实单计为三诊——若有 5 笔实单且偏移 2，则统计上相当于计至七诊（5+2）。
+                            </div>
+                        </template>
+                        <el-icon class="text-gray-400 align-middle ml-1"><QuestionFilled /></el-icon>
+                    </el-tooltip>
+                    <el-input-number
+                        v-model="revisitSlotStartOffset"
+                        v-perms="['tcm.diagnosis/setRevisitSlotStartOffset']"
+                        :min="0"
+                        :max="20"
+                        :step="1"
+                        controls-position="right"
+                        class="w-[120px] ml-3"
+                        :disabled="offsetSaving"
+                    />
+                    <span class="text-xs text-gray-500 ml-2">
+                        第 1 笔实单计为{{ visitSlotStartLabel }}
+                    </span>
+                </div>
+                <el-button
+                    v-perms="['tcm.diagnosis/setRevisitSlotStartOffset']"
+                    type="primary"
+                    size="small"
+                    :loading="offsetSaving"
+                    :disabled="!offsetDirty"
+                    @click="saveRevisitSlotStartOffset"
+                >
+                    保存
+                </el-button>
+            </div>
+
             <el-table
                 v-loading="pager.loading"
                 :data="pager.lists"
@@ -12,6 +49,23 @@
                 empty-text="暂无业务订单"
             >
                 <el-table-column label="订单编号" prop="order_no" min-width="200" show-overflow-tooltip />
+                <el-table-column label="全局诊次" width="96" align="center">
+                    <template #default="{ row }">
+                        <span v-if="row.global_visit_seq">{{ row.global_visit_seq }}诊</span>
+                        <span v-else class="text-gray-400">—</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="计入统计" width="96" align="center">
+                    <template #default="{ row }">
+                        <el-tag
+                            v-if="row.counts_for_revisit_rate"
+                            type="success"
+                            size="small"
+                            effect="plain"
+                        >是</el-tag>
+                        <el-tag v-else type="info" size="small" effect="plain">否</el-tag>
+                    </template>
+                </el-table-column>
                 <el-table-column label="金额" width="120" align="right">
                     <template #default="{ row }">
                         <span class="text-red-500 font-semibold">¥{{ formatAmount(row.amount) }}</span>
@@ -56,298 +110,23 @@
             </div>
         </template>
 
-        <!-- 业务订单详情抽屉（只读，与 order_list.vue 详情保持一致） -->
-        <el-drawer
-            v-model="detailVisible"
-            size="80%"
-            destroy-on-close
-            :close-on-click-modal="false"
-            append-to-body
-        >
-            <template #header>
-                <div class="flex items-center">
-                    <span class="font-semibold text-lg">业务订单详情</span>
-                    <el-tag v-if="detailData?.order_no" type="primary" effect="plain" round class="ml-3">{{ detailData.order_no }}</el-tag>
-                    <el-tag v-if="detailData?.gancao_reciperl_order_no" type="success" effect="plain" round class="ml-2">甘草 {{ detailData.gancao_reciperl_order_no }}</el-tag>
-                </div>
-            </template>
-            <el-skeleton v-if="detailLoading" :rows="12" animated class="px-6 py-4" />
-            <div v-else-if="detailData" class="px-6 pb-6 overflow-y-auto">
-
-                <!-- 顶部数据概览 -->
-                <el-row :gutter="16" class="mb-5">
-                    <el-col :xs="12" :sm="6">
-                        <el-card shadow="never" class="border border-gray-100 bg-gray-50/50">
-                            <div class="text-gray-500 text-xs mb-1">总金额</div>
-                            <div class="text-red-500 font-bold text-xl">¥{{ detailData.amount }}</div>
-                        </el-card>
-                    </el-col>
-                    <el-col :xs="12" :sm="6">
-                        <el-card shadow="never" class="border border-gray-100 bg-gray-50/50">
-                            <div class="text-gray-500 text-xs mb-1">已付总额</div>
-                            <div class="text-green-600 font-bold text-xl">¥{{ detailData.linked_pay_paid_total || 0 }}</div>
-                        </el-card>
-                    </el-col>
-                    <el-col :xs="12" :sm="6">
-                        <el-card shadow="never" class="border border-gray-100 bg-gray-50/50">
-                            <div class="text-gray-500 text-xs mb-1">需代收</div>
-                            <div class="font-bold text-xl" :class="detailAgencyToCollect > 0 ? 'text-amber-600' : 'text-gray-500'">¥{{ formatMoney(detailAgencyToCollect) }}</div>
-                        </el-card>
-                    </el-col>
-                    <el-col :xs="12" :sm="6">
-                        <el-card shadow="never" class="border border-gray-100 bg-gray-50/50">
-                            <div class="text-gray-500 text-xs mb-1">已付笔数</div>
-                            <div class="text-primary font-bold text-xl">{{ detailLinkedPayOrders.length }} 笔</div>
-                        </el-card>
-                    </el-col>
-                </el-row>
-
-                <div class="grid grid-cols-1 md:grid-cols-2 gap-4 mb-4">
-                    <!-- 左侧：处方单（不含测试价格、改患者信息、药材明细） -->
-                    <el-card shadow="never" class="border-gray-100 h-full relative overflow-hidden">
-                        <div v-if="detailData.prescription_audit_status === 1" class="audit-stamp stamp-pass"><div class="stamp-inner">审核通过</div></div>
-                        <div v-if="detailData.prescription_audit_status === 2" class="audit-stamp stamp-reject"><div class="stamp-inner">已驳回</div></div>
-                        <template #header>
-                            <div class="flex items-center justify-between">
-                                <div class="flex items-center gap-3">
-                                    <span class="font-medium text-[15px]">处方详情</span>
-                                    <span v-if="detailData.doctor_name" class="text-xs text-gray-500">
-                                        开方人：<span class="text-primary font-medium">{{ detailData.doctor_name }}</span>
-                                    </span>
-                                </div>
-                                <span class="text-xs text-gray-400">ID: {{ detailData.prescription_id || '—' }}</span>
-                            </div>
-                        </template>
-                        <template v-if="detailPrescription">
-                            <el-descriptions :column="2" border size="small" class="bg-white">
-                                <el-descriptions-item label="处方编号" :span="2">{{ detailPrescription.sn || '—' }}</el-descriptions-item>
-                                <el-descriptions-item label="患者">{{ detailPrescription.patient_name || '—' }}</el-descriptions-item>
-                                <el-descriptions-item label="性别 / 年龄">{{ detailPrescription.gender_desc || '—' }} · {{ detailPrescription.age ?? '—' }}岁</el-descriptions-item>
-                                <el-descriptions-item label="手机">
-                                    <span :class="detailRecipientRxPhoneMismatch ? 'text-red-600 font-bold' : ''">{{ detailPrescription.phone || '—' }}</span>
-                                    <el-tag v-if="detailRecipientRxPhoneMismatch" type="danger" size="small" effect="dark" class="ml-2">与订单手机不一致</el-tag>
-                                </el-descriptions-item>
-                                <el-descriptions-item label="处方日期">{{ detailPrescription.prescription_date || '—' }}</el-descriptions-item>
-                                <el-descriptions-item label="医师">{{ detailPrescription.doctor_name || '—' }}</el-descriptions-item>
-                                <el-descriptions-item label="类型">{{ detailPrescription.prescription_type || '—' }}</el-descriptions-item>
-                                <el-descriptions-item label="临床诊断" :span="2">{{ detailPrescription.clinical_diagnosis || '—' }}</el-descriptions-item>
-                                <el-descriptions-item label="剂数 / 用法" :span="2" v-if="showPrescriptionAuditFilter">
-                                    {{ detailData.dose_count ?? detailPrescription.dose_count ?? '—' }} {{ detailData.dose_unit || '剂' }} ·
-                                    {{ detailPrescription.usage_instruction || detailPrescription.usage_method || '—' }}
-                                </el-descriptions-item>
-                                <el-descriptions-item label="处方金额">
-                                    <span class="text-red-500 font-medium">¥{{ detailPrescription.amount ?? '—' }}</span>
-                                </el-descriptions-item>
-                                <el-descriptions-item label="消费者审核">
-                                    <el-tag :type="consumerRxAuditTag(detailPrescription.audit_status)" size="small">{{ consumerRxAuditText(detailPrescription.audit_status) }}</el-tag>
-                                </el-descriptions-item>
-                                <el-descriptions-item label="用量">
-                                    <template v-if="detailPrescription.dosage_amount">
-                                        {{ detailPrescription.dosage_amount }}{{ detailPrescription.dosage_unit || 'g' }}
-                                        <template v-if="detailPrescription.prescription_type === '浓缩水丸'">
-                                            · {{ Number(detailPrescription.dosage_bag_count) > 0 ? Number(detailPrescription.dosage_bag_count) : 1 }}袋
-                                        </template>
-                                        <span v-if="detailPrescription.prescription_type === '饮片' && detailPrescription.need_decoction !== null" class="ml-2 text-gray-500">
-                                            ({{ detailPrescription.need_decoction ? '代煎' : '不代煎' }})
-                                        </span>
-                                    </template>
-                                    <template v-else>—</template>
-                                </el-descriptions-item>
-                                <el-descriptions-item label="服用方式">
-                                    <div class="flex flex-col gap-1.5 text-sm leading-relaxed">
-                                        <div>
-                                            <span class="text-gray-500">每天次数：</span>
-                                            {{ detailPrescription.times_per_day ? detailPrescription.times_per_day + ' 次' : '—' }}
-                                        </div>
-                                        <div>
-                                            <span class="text-gray-500">处方开立：</span>
-                                            {{ detailPrescription.usage_days != null && detailPrescription.usage_days !== '' ? detailPrescription.usage_days + ' 天' : '—' }}
-                                        </div>
-                                        <div>
-                                            <span class="text-gray-500">订单设置：</span>
-                                            {{ detailData.medication_days != null && String(detailData.medication_days).trim() !== '' ? detailData.medication_days + ' 天' : '—' }}
-                                        </div>
-                                    </div>
-                                </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 ? '已作废' : '正常' }}</el-tag>
-                                </el-descriptions-item>
-                            </el-descriptions>
-                        </template>
-                        <el-empty v-else description="无处方数据" :image-size="72" />
-                    </el-card>
-
-                    <!-- 右侧：未关联 + 已关联支付单 -->
-                    <div class="flex flex-col gap-4 h-full">
-                        <el-card shadow="never" class="border-gray-100">
-                            <template #header>
-                                <div class="flex items-center justify-between">
-                                    <span class="font-medium text-[15px]">未关联的收款记录</span>
-                                    <span class="text-xs text-gray-400">本诊单下未被占用的支付单</span>
-                                </div>
-                            </template>
-                            <el-table v-if="detailUnlinkedPayOrders.length" :data="detailUnlinkedPayOrders" size="small" border stripe max-height="280">
-                                <el-table-column prop="id" label="ID" width="70" />
-                                <el-table-column prop="order_no" label="单号" min-width="135" show-overflow-tooltip />
-                                <el-table-column label="类型" width="90">
-                                    <template #default="{ row }">{{ row.order_type_desc || feeTypeText(row.order_type) }}</template>
-                                </el-table-column>
-                                <el-table-column label="金额" width="86" align="right">
-                                    <template #default="{ row }"><span class="text-red-500">¥{{ row.amount }}</span></template>
-                                </el-table-column>
-                                <el-table-column label="状态" width="82" align="center">
-                                    <template #default="{ row }">
-                                        <el-tag :type="payOrderStatusTag(row.status)" size="small">{{ row.status_desc || orderStatusText(row.status) }}</el-tag>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column prop="creator_name" label="创建人" width="80" show-overflow-tooltip />
-                                <el-table-column label="创建时间" min-width="136">
-                                    <template #default="{ row }">{{ formatOrderTime(row.create_time) }}</template>
-                                </el-table-column>
-                            </el-table>
-                            <el-empty v-else description="无未关联的收款单" :image-size="60" />
-                        </el-card>
-
-                        <el-card shadow="never" class="border-gray-100 relative overflow-hidden">
-                            <div v-if="detailData.payment_slip_audit_status === 1" class="audit-stamp stamp-pass"><div class="stamp-inner">审核通过</div></div>
-                            <div v-if="detailData.payment_slip_audit_status === 2" class="audit-stamp stamp-reject"><div class="stamp-inner">已驳回</div></div>
-                            <template #header>
-                                <div class="flex items-center gap-3">
-                                    <span class="font-medium text-[15px]">关联收款记录</span>
-                                    <span v-if="detailData.creator_name" class="text-xs text-gray-500">创建人：<span class="text-primary font-medium">{{ detailData.creator_name }}</span></span>
-                                </div>
-                            </template>
-                            <el-table v-if="detailLinkedPayOrders.length" :data="detailLinkedPayOrders" size="small" border stripe max-height="280">
-                                <el-table-column prop="id" label="ID" width="70" />
-                                <el-table-column prop="order_no" label="单号" min-width="135" show-overflow-tooltip />
-                                <el-table-column label="类型" width="90">
-                                    <template #default="{ row }">{{ row.order_type_desc || feeTypeText(row.order_type) }}</template>
-                                </el-table-column>
-                                <el-table-column label="金额" width="86" align="right">
-                                    <template #default="{ row }"><span class="text-red-500">¥{{ row.amount }}</span></template>
-                                </el-table-column>
-                                <el-table-column label="状态" width="82" align="center">
-                                    <template #default="{ row }">
-                                        <el-tag :type="payOrderStatusTag(row.status)" size="small">{{ row.status_desc || orderStatusText(row.status) }}</el-tag>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column prop="creator_name" label="创建人" width="80" show-overflow-tooltip />
-                                <el-table-column label="创建时间" min-width="136">
-                                    <template #default="{ row }">{{ formatOrderTime(row.create_time) }}</template>
-                                </el-table-column>
-                            </el-table>
-                            <el-empty v-else description="未关联收款单" :image-size="60" />
-                        </el-card>
-                    </div>
-                </div>
-
-                <!-- 履约与收货信息 -->
-                <el-card shadow="never" class="border-gray-100 mb-4">
-                    <template #header><span class="font-medium text-[15px]">履约与收货信息</span></template>
-                    <el-descriptions :column="3" border size="small">
-                        <el-descriptions-item label="诊单ID" :span="3"><span class="font-mono">{{ detailData.diagnosis_id }}</span></el-descriptions-item>
-                        <el-descriptions-item label="创建时间">{{ formatTime(detailData.create_time) }}</el-descriptions-item>
-                        <el-descriptions-item label="业务订单创建人" :span="2">
-                            <div v-if="detailData.creator_name" class="text-[13px] space-y-1">
-                                <div><span class="font-medium text-gray-900">{{ detailData.creator_name || '—' }}</span></div>
-                                <div v-if="detailOrderCreatorMetaLine" class="text-gray-600 text-xs">{{ detailOrderCreatorMetaLine }}</div>
-                            </div>
-                            <span v-else class="text-gray-400">—</span>
-                        </el-descriptions-item>
-                        <el-descriptions-item label="创建人所属部门" :span="3">
-                            <div v-if="detailOrderCreatorDeptBreadcrumbs.length" class="space-y-1.5">
-                                <div v-for="(segments, idx) in detailOrderCreatorDeptBreadcrumbs" :key="idx">
-                                    <el-breadcrumb v-if="segments.length" class="text-[13px]" separator="/">
-                                        <el-breadcrumb-item v-for="(name, j) in segments" :key="j"><span class="text-gray-800">{{ name }}</span></el-breadcrumb-item>
-                                    </el-breadcrumb>
-                                </div>
-                            </div>
-                            <span v-else class="text-gray-400">—</span>
-                        </el-descriptions-item>
-                        <el-descriptions-item label="收货人">{{ detailData.recipient_name }}</el-descriptions-item>
-                        <el-descriptions-item label="收货手机">
-                            <span :class="detailRecipientRxPhoneMismatch ? 'text-red-600 font-bold font-mono' : 'font-mono'">{{ detailData.recipient_phone || '—' }}</span>
-                            <el-tag v-if="detailRecipientRxPhoneMismatch" type="danger" size="small" effect="dark" class="ml-2">与处方手机不一致</el-tag>
-                        </el-descriptions-item>
-                        <el-descriptions-item label="收货地址">{{ detailFullAddress }}</el-descriptions-item>
-                        <el-descriptions-item label="复诊">{{ detailData.is_follow_up ? '是' : '否' }}</el-descriptions-item>
-                        <el-descriptions-item label="用药疗程">{{ detailData.medication_days ? detailData.medication_days + ' 天' : '—' }}</el-descriptions-item>
-                        <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="费用类别">{{ feeTypeText(detailData.fee_type) }}</el-descriptions-item>
-                        <el-descriptions-item label="快递单号">{{ detailData.tracking_number || '—' }}</el-descriptions-item>
-                        <el-descriptions-item label="快递公司">{{ expressCompanyLabel(detailData.express_company) }}</el-descriptions-item>
-                        <el-descriptions-item v-perms="['tcm.prescriptionOrder/editRemarkExtra']" label="药房备注" :span="3">{{ detailData.remark_extra || '—' }}</el-descriptions-item>
-                        <el-descriptions-item label="医助备注" :span="3">{{ detailData.remark_assistant || '—' }}</el-descriptions-item>
-                        <el-descriptions-item label="处方审核意见" :span="3">{{ detailData.prescription_audit_remark || '—' }}</el-descriptions-item>
-                        <el-descriptions-item label="支付审核意见" :span="3">{{ detailData.payment_slip_audit_remark || '—' }}</el-descriptions-item>
-                    </el-descriptions>
-                </el-card>
-
-                <!-- 物流轨迹（只读） -->
-                <el-card v-if="String(detailData.tracking_number || '').trim()" shadow="never" class="border-gray-100 mb-4">
-                    <template #header><span class="font-medium text-[15px]">物流轨迹</span></template>
-                    <div class="flex flex-wrap items-center gap-3 mb-4">
-                        <el-input v-model="logisticsTracePhoneTail" clearable maxlength="20" placeholder="收件手机" class="w-[180px]" @keyup.enter="fetchLogisticsTrace" />
-                        <el-select v-model="detailLogisticsExpress" placeholder="承运商" style="width: 140px">
-                            <el-option label="自动识别" value="auto" />
-                            <el-option label="顺丰速运" value="sf" />
-                            <el-option label="京东快递" value="jd" />
-                            <el-option label="极兔速递" value="jt" />
-                        </el-select>
-                        <el-button v-perms="['tcm.prescriptionOrder/logisticsTrace']" type="primary" plain size="default" :loading="logisticsTraceLoading" @click="fetchLogisticsTrace">刷新轨迹</el-button>
-                    </div>
-                    <div v-if="logisticsTraceLoading && !logisticsTracePayload" class="py-6 text-center text-sm text-gray-500">正在加载物流轨迹...</div>
-                    <div v-else-if="logisticsTracePayload" class="bg-gray-50/50 p-4 rounded-md">
-                        <div v-if="logisticsTracePayload.state_text" class="text-sm mb-4 font-medium flex items-center gap-2">
-                            <span class="text-gray-800">状态：{{ logisticsTracePayload.state_text }}</span>
-                            <el-tag v-if="logisticsTracePayload.carrier_label" size="small" type="info">{{ logisticsTracePayload.carrier_label }}</el-tag>
-                        </div>
-                        <el-timeline v-if="logisticsTraceList.length" class="mt-2 pl-2">
-                            <el-timeline-item v-for="(t, idx) in logisticsTraceList" :key="idx" :type="idx === 0 ? 'primary' : 'info'" :hollow="idx !== 0" :timestamp="t.time" placement="top">
-                                <span :class="idx === 0 ? 'text-gray-800 font-medium' : 'text-gray-500'">{{ t.context }}</span>
-                            </el-timeline-item>
-                        </el-timeline>
-                        <el-empty v-else description="暂无轨迹节点记录" :image-size="64" />
-                    </div>
-                </el-card>
-
-                <!-- 操作日志 -->
-                <el-card v-perms="['tcm.prescriptionOrder/logs']" shadow="never" class="border-gray-100">
-                    <template #header><span class="font-medium text-[15px]">操作日志</span></template>
-                    <el-timeline v-if="detailLogs.length" class="mt-2 pl-2">
-                        <el-timeline-item v-for="(log, idx) in detailLogs" :key="log.id" :type="idx === 0 ? 'primary' : 'info'" :hollow="idx !== 0" :timestamp="formatTime(log.create_time)" placement="top">
-                            <div class="flex items-center gap-2 mb-1">
-                                <span class="font-medium text-[13px]">{{ log.admin_name }}</span>
-                                <el-tag size="small" type="info">{{ logActionText(log.action) }}</el-tag>
-                            </div>
-                            <span :class="idx === 0 ? 'text-gray-800 font-medium' : 'text-gray-500'">{{ log.summary }}</span>
-                        </el-timeline-item>
-                    </el-timeline>
-                    <el-empty v-else description="暂无操作日志" :image-size="64" />
-                </el-card>
-            </div>
-        </el-drawer>
+        <!-- 业务订单详情抽屉：共享组件的 readonly 受限版（展示范围由组件内 v-if="!readonly" 门控） -->
+        <prescription-order-detail-drawer ref="detailDrawerRef" readonly append-to-body />
     </div>
 </template>
 
 <script setup lang="ts">
-import { computed, watch, ref, onMounted } from 'vue'
+import { computed, reactive, ref, watch } from 'vue'
+import { QuestionFilled } from '@element-plus/icons-vue'
 import { usePaging } from '@/hooks/usePaging'
-import {
-    prescriptionOrderLists,
-    prescriptionOrderDetail,
-    prescriptionOrderLogs,
-    prescriptionOrderLogisticsTrace,
-    prescriptionOrderPaidPayOrders
-} from '@/api/tcm'
-import { getDictData } from '@/api/app'
-import { hasPermission } from '@/utils/perm'
+import { prescriptionOrderLists, tcmDiagnosisDetail, tcmDiagnosisSetRevisitSlotStartOffset } from '@/api/tcm'
+import PrescriptionOrderDetailDrawer from '@/views/consumer/prescription/components/PrescriptionOrderDetailDrawer.vue'
 import feedback from '@/utils/feedback'
-import useUserStore from '@/stores/modules/user'
-
-const userStore = useUserStore()
+import {
+    formatTime,
+    fulfillmentText,
+    fulfillmentTagType
+} from '@/views/consumer/prescription/components/prescription-order-utils'
 
 const props = defineProps<{
     diagnosisId: number
@@ -368,6 +147,26 @@ const { pager, getLists, resetPage } = usePaging({
     size: 10
 })
 
+const revisitSlotStartOffset = ref(0)
+const savedRevisitSlotStartOffset = ref(0)
+const offsetSaving = ref(false)
+const offsetLoading = ref(false)
+
+const offsetDirty = computed(
+    () => Number(revisitSlotStartOffset.value) !== Number(savedRevisitSlotStartOffset.value)
+)
+
+const visitSlotStartLabel = computed(() => {
+    const raw = Number(revisitSlotStartOffset.value)
+    const offset = Number.isFinite(raw) ? raw : 0
+    const slot = offset + 1
+    const cn = ['', '一', '二', '三', '四', '五', '六', '七', '八', '九', '十']
+    if (slot >= 1 && slot <= 10) {
+        return cn[slot] + '诊'
+    }
+    return `第${slot}诊`
+})
+
 const buildParams = () => {
     Object.keys(queryParams).forEach((k) => delete queryParams[k])
     if (props.diagnosisId > 0) {
@@ -379,175 +178,52 @@ const buildParams = () => {
     queryParams.scene = 'diagnosis_edit'
 }
 
-/** 诊间医助角色（与 DiagnosisLists 等一致） */
-const TCM_ASSISTANT_ROLE_ID = 2
-/** 与 server/config/project.php prescription_audit_roles 默认一致，可处方审核的角色 */
-const PRESCRIPTION_AUDIT_ROLE_IDS = [0, 3, 6]
-
-/**
- * 是否展示「处方审核」相关字段
- */
-const showPrescriptionAuditFilter = 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)) : []
-    if (!ids.includes(TCM_ASSISTANT_ROLE_ID)) return true
-    return ids.some((id) => PRESCRIPTION_AUDIT_ROLE_IDS.includes(id))
-})
-
-// ─── 详情抽屉 ───
-const detailVisible = ref(false)
-const detailLoading = ref(false)
-const detailData = ref<any>(null)
-const detailLogs = ref<any[]>([])
-const detailUnlinkedPayOrders = ref<any[]>([])
-
-const detailPrescription = computed(() => {
-    const p = detailData.value?.prescription
-    return p && typeof p === 'object' ? p : null
-})
-
-const detailLinkedPayOrders = computed(() => {
-    const arr = detailData.value?.linked_pay_orders
-    return Array.isArray(arr) ? arr : []
-})
-
-const detailAgencyToCollect = computed(() => {
-    const d = detailData.value
-    if (!d) return 0
-    const total = Number(d.amount) || 0
-    const paid = Number(d.linked_pay_paid_total) || 0
-    return Math.round((total - paid) * 100) / 100
-})
-
-const detailRecipientRxPhoneMismatch = computed(() => {
-    const rx = normalizeBizPhone(detailPrescription.value?.phone)
-    const biz = normalizeBizPhone(detailData.value?.recipient_phone)
-    if (!rx || !biz) return false
-    return rx !== biz
-})
-
-const detailFullAddress = computed(() => {
-    const d = detailData.value
-    if (!d) return '—'
-    const parts = []
-    if (d.shipping_province) parts.push(d.shipping_province)
-    if (d.shipping_city) parts.push(d.shipping_city)
-    if (d.shipping_district) parts.push(d.shipping_district)
-    if (d.shipping_address) parts.push(d.shipping_address)
-    return parts.length > 0 ? parts.join(' ') : '—'
-})
-
-const detailOrderCreatorMetaLine = computed(() => {
-    const d = detailData.value
-    if (!d) return ''
-    const account = String(d.creator_account ?? '').trim()
-    const mobile = String(d.creator_mobile ?? '').trim()
-    const parts: string[] = []
-    if (account) parts.push(`登录账号：${account}`)
-    if (mobile) parts.push(`手机：${mobile}`)
-    return parts.join(' · ')
-})
-
-const detailOrderCreatorDeptBreadcrumbs = computed(() => {
-    const raw = String(detailData.value?.order_creator_dept_path ?? detailData.value?.diagnosis_creator_dept_path ?? '').trim()
-    if (!raw) return [] as string[][]
-    return raw.split('；').map((s) => s.trim()).filter(Boolean)
-        .map((p) => p.includes(' / ') ? p.split(' / ').map((x) => x.trim()).filter(Boolean) : p.split('/').map((x) => x.trim()).filter(Boolean))
-        .filter((segs) => segs.length > 0)
-})
-
-// ─── 物流轨迹 ───
-const detailLogisticsExpress = ref<string>('auto')
-const logisticsTraceLoading = ref(false)
-const logisticsTracePayload = ref<Record<string, any> | null>(null)
-const logisticsTracePhoneTail = ref('')
-
-const logisticsTraceList = computed(() => {
-    const p = logisticsTracePayload.value
-    if (!p || !Array.isArray(p.traces)) return []
-    return p.traces as Array<{ time: string; context: string }>
-})
-
-async function fetchLogisticsTrace() {
-    const id = Number(detailData.value?.id)
-    if (!id) return
-    logisticsTraceLoading.value = true
+async function loadRevisitSlotStartOffset() {
+    if (props.diagnosisId <= 0) return
+    offsetLoading.value = true
     try {
-        const digits = String(logisticsTracePhoneTail.value || '').replace(/\D/g, '')
-        const params: { id: number; express_company?: string; phone_tail?: string } = {
-            id,
-            express_company: detailLogisticsExpress.value
-        }
-        if (digits.length >= 4) params.phone_tail = digits
-        const res: any = await prescriptionOrderLogisticsTrace(params)
-        logisticsTracePayload.value = (res?.data ?? res) as Record<string, any>
+        const res: any = await tcmDiagnosisDetail({ id: props.diagnosisId })
+        const d = res?.data ?? res ?? {}
+        const offset = Number(d.revisit_slot_start_offset)
+        const val = Number.isFinite(offset) && offset >= 0 && offset <= 20 ? offset : 0
+        revisitSlotStartOffset.value = val
+        savedRevisitSlotStartOffset.value = val
     } catch {
-        logisticsTracePayload.value = null
+        revisitSlotStartOffset.value = 0
+        savedRevisitSlotStartOffset.value = 0
     } finally {
-        logisticsTraceLoading.value = false
+        offsetLoading.value = false
     }
 }
 
-// ─── 打开详情 ───
-async function openDetail(id: number) {
-    detailData.value = null
-    detailUnlinkedPayOrders.value = []
-    logisticsTracePayload.value = null
-    detailLogisticsExpress.value = 'auto'
-    logisticsTracePhoneTail.value = ''
-    detailLogs.value = []
-
-    detailVisible.value = true
-    detailLoading.value = true
+async function saveRevisitSlotStartOffset() {
+    if (props.diagnosisId <= 0) return
+    const offset = Number(revisitSlotStartOffset.value)
+    if (!Number.isFinite(offset) || offset < 0 || offset > 20) {
+        feedback.msgWarning('起始偏移须在 0～20 之间')
+        return
+    }
+    offsetSaving.value = true
     try {
-        const res: any = await prescriptionOrderDetail({ id })
-        const d = res?.data ?? res ?? null
-        detailData.value = d
-        if (d) {
-            detailLogisticsExpress.value = String(d.express_company || 'auto') || 'auto'
-            const dig = String(d.recipient_phone || '').replace(/\D/g, '')
-            logisticsTracePhoneTail.value = dig.length >= 4 ? dig : ''
-            if (String(d.tracking_number || '').trim()) fetchLogisticsTrace()
-            fetchLogs(id)
-            if (d.diagnosis_id) {
-                loadDetailUnlinkedPayOrders(d.diagnosis_id, id, d.pay_order_ids || [])
-            }
-        }
-    } catch (e: any) {
-        feedback.msgError(e?.message || '加载详情失败')
-        detailVisible.value = false
+        await tcmDiagnosisSetRevisitSlotStartOffset({
+            id: props.diagnosisId,
+            revisit_slot_start_offset: offset
+        })
+        savedRevisitSlotStartOffset.value = offset
+        feedback.msgSuccess('保存成功')
+        getLists()
+    } catch {
+        /* 拦截器已提示 */
     } finally {
-        detailLoading.value = false
+        offsetSaving.value = false
     }
 }
 
-async function loadDetailUnlinkedPayOrders(diagnosisId: number, prescriptionOrderId: number, linkedIds: number[]) {
-    if (!diagnosisId) { detailUnlinkedPayOrders.value = []; return }
-    try {
-        const res: any = await prescriptionOrderPaidPayOrders({ diagnosis_id: diagnosisId, prescription_order_id: prescriptionOrderId })
-        const lists = res?.lists ?? res?.data?.lists ?? []
-        detailUnlinkedPayOrders.value = Array.isArray(lists) ? lists.filter((item: any) => !linkedIds.includes(item.id)) : []
-    } catch { detailUnlinkedPayOrders.value = [] }
-}
+// ─── 详情抽屉（共享组件，数据拉取/展示全部在组件内） ───
+const detailDrawerRef = ref<InstanceType<typeof PrescriptionOrderDetailDrawer>>()
 
-function canViewPrescriptionOrderLogs() {
-    const p = userStore.perms || []
-    return p.includes('*') || p.includes('tcm.prescriptionOrder/logs')
-}
-
-async function fetchLogs(id: number) {
-    if (!canViewPrescriptionOrderLogs()) { detailLogs.value = []; return }
-    try {
-        const res: any = await prescriptionOrderLogs({ id })
-        detailLogs.value = res?.data ?? res ?? []
-    } catch { detailLogs.value = [] }
-}
-
-// ─── 工具函数 ───
-function normalizeBizPhone(v: unknown): string {
-    if (v === null || v === undefined) return ''
-    return String(v).replace(/\s/g, '').trim()
+function openDetail(id: number) {
+    detailDrawerRef.value?.open(id)
 }
 
 const formatAmount = (value: unknown) => {
@@ -555,131 +231,16 @@ const formatAmount = (value: unknown) => {
     return Number.isFinite(n) ? n.toFixed(2) : '0.00'
 }
 
-function formatMoney(v: unknown) {
-    const n = Number(v)
-    return Number.isFinite(n) ? n.toFixed(2) : '0.00'
-}
-
-const formatTime = (value: unknown) => {
-    if (value === null || value === undefined || value === '') return '—'
-    if (typeof value === 'number' && value > 1e9 && value < 1e11) {
-        const d = new Date(value * 1000)
-        const pad = (n: number) => String(n).padStart(2, '0')
-        return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`
-    }
-    return String(value)
-}
-
-function formatOrderTime(v: unknown) {
-    if (v === null || v === undefined || v === '') return '—'
-    if (typeof v === 'string' && String(v).includes('-')) return String(v)
-    return formatTime(v)
-}
-
-function feeTypeText(t: number | undefined) {
-    const m: Record<number, string> = { 1: '药费', 2: '诊费', 3: '药费+诊费', 4: '其他' }
-    return m[Number(t)] ?? '—'
-}
-
-// 服务套餐字典选项（与 order_list.vue 数据源一致：dict 类型 server_order）
-const servicePackageOptions = ref<Array<{ name: string; value: string }>>([])
-
-async function loadServicePackageOptions() {
-    try {
-        const data: any = await getDictData({ type: 'server_order' })
-        const list = (data?.server_order || []) as Array<{ name: string; value: string; status?: number }>
-        servicePackageOptions.value = list.filter((item) => item.status !== 0)
-    } catch {
-        servicePackageOptions.value = []
-    }
-}
-
-function formatServicePackage(value: unknown): string {
-    if (value === null || value === undefined || value === '') return '—'
-    let packages: string[] = []
-    if (Array.isArray(value)) {
-        packages = value.map((v) => String(v)).filter((v) => v !== '')
-    } else if (typeof value === 'string') {
-        packages = value.split(',').map((v) => v.trim()).filter((v) => v !== '')
-    }
-    if (packages.length === 0) return '—'
-    const names = packages.map((val) => {
-        const opt = servicePackageOptions.value.find((o) => o.value === val)
-        return opt ? opt.name : val
-    })
-    return names.join('、')
-}
-
-onMounted(() => {
-    loadServicePackageOptions()
-})
-
-function expressCompanyLabel(v: unknown) {
-    const s = String(v || '').toLowerCase()
-    if (s === 'sf') return '顺丰速运'
-    if (s === 'jd') return '京东快递'
-    if (s === 'jt' || s === 'jtexpress') return '极兔速递'
-    return '自动识别'
-}
-
-function consumerRxAuditText(s: number | undefined) {
-    const n = Number(s)
-    if (n === 1) return '已通过'
-    if (n === 2) return '已驳回'
-    return '待审核'
-}
-
-function consumerRxAuditTag(s: number | undefined): 'success' | 'warning' | 'danger' | 'info' {
-    const n = Number(s)
-    if (n === 1) return 'success'
-    if (n === 2) return 'danger'
-    return 'warning'
-}
-
-function payOrderStatusTag(s: number | undefined): 'success' | 'warning' | 'danger' | 'info' {
-    const n = Number(s)
-    if (n === 2) return 'success'
-    if (n === 1) return 'warning'
-    return 'info'
-}
-
-function orderStatusText(s: number | undefined) {
-    const m: Record<number, string> = { 0: '待支付', 1: '待支付', 2: '已支付', 3: '已取消' }
-    return m[Number(s)] ?? '—'
-}
-
-const fulfillmentText = (s: number | undefined) => {
-    const m: Record<number, string> = { 1: '待双审通过', 2: '待发货', 3: '已完成', 4: '已取消', 5: '已发货', 6: '已签收', 7: '进行中', 8: '暂不制药', 9: '拒收', 10: '退款', 11: '保留药方', 12: '制药缓发' }
-    return m[Number(s)] ?? '—'
-}
-
-const fulfillmentTagType = (s: number | undefined): 'success' | 'warning' | 'danger' | 'info' | 'primary' => {
-    const n = Number(s)
-    if (n === 3 || n === 6) return 'success'
-    if (n === 5) return 'primary'
-    if (n === 4 || n === 9 || n === 10) return 'danger'
-    if (n === 2 || n === 7) return 'warning'
-    if (n === 8 || n === 11 || n === 12) return 'info'
-    return 'info'
-}
-
-function logActionText(act: string) {
-    const m: Record<string, string> = {
-        create: '创建', edit: '编辑', audit_rx_approve: '处方审核', audit_rx_reject: '处方审核',
-        audit_pay_approve: '支付审核', audit_pay_reject: '支付审核', fill_tracking: '填快递单',
-        ship: '确认发货', withdraw: '撤销', link_pay_order: '关联支付单',
-        revoke_rx_audit: '撤回处方审核', revoke_pay_audit: '撤回支付审核',
-        gancao_submit: '甘草下单', patch_rx_patient: '处方患者信息',
-        update_amount: '修改订单金额', complete: '完成订单'
-    }
-    return m[act] || act
-}
-
 watch(
     () => [props.diagnosisId, patientIdNum.value] as const,
     () => {
-        if (!patientIdAvailable.value) { pager.lists = []; pager.count = 0; return }
+        if (!patientIdAvailable.value) {
+            pager.lists = []
+            pager.count = 0
+            return
+        }
         buildParams()
+        void loadRevisitSlotStartOffset()
         resetPage()
     },
     { immediate: true }
@@ -695,22 +256,21 @@ defineExpose({ refresh: () => getLists() })
 .po-empty-tip {
     padding: 24px 0;
 }
-.audit-stamp {
-    position: absolute;
-    top: 12px;
-    right: 16px;
-    transform: rotate(15deg);
-    opacity: 0.15;
-    pointer-events: none;
-    z-index: 1;
-}
-.stamp-inner {
-    border: 3px solid currentColor;
+.po-revisit-offset-bar {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 12px;
+    flex-wrap: wrap;
+    padding: 12px 14px;
+    border: 1px solid var(--el-border-color-lighter);
     border-radius: 8px;
-    padding: 4px 12px;
-    font-size: 18px;
-    font-weight: bold;
+    background: var(--el-fill-color-lighter);
+}
+.po-revisit-offset-bar__main {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 4px;
 }
-.stamp-pass { color: #22c55e; }
-.stamp-reject { color: #ef4444; }
 </style>

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

@@ -14,6 +14,7 @@
                                     formData.pending_assign !== '1' &&
                                     formData.pending_booking !== '1' &&
                                     formData.completed_appointment !== '1' &&
+                                    !hasLatestAppointmentFilter() &&
                                     formData.appointment_date === tab.value
                             }
                         ]"
@@ -110,6 +111,42 @@
                 <el-select v-model="formData.assistant_id" placeholder="医助" clearable filterable size="small" @change="doSearch">
                     <el-option v-for="item in assistantOptions" :key="item.id" :label="item.name" :value="Number(item.id)" />
                 </el-select>
+                <daterange-picker
+                    class="latest-appointment-range"
+                    v-model:startTime="formData.latest_appointment_start_date"
+                    v-model:endTime="formData.latest_appointment_end_date"
+                    picker-type="daterange"
+                    value-format="YYYY-MM-DD"
+                    start-placeholder="最近挂号开始"
+                    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="最近挂号渠道"
+                    clearable
+                    filterable
+                    size="small"
+                    class="latest-appointment-channel"
+                    @change="handleLatestAppointmentFilterChange"
+                >
+                    <el-option
+                        v-for="item in channelOptions"
+                        :key="String(item.value)"
+                        :label="item.name"
+                        :value="String(item.value)"
+                    />
+                </el-select>
                 <el-button size="small" @click="handleReset">重置</el-button>
             </div>
         </el-card>
@@ -146,6 +183,7 @@
                 v-loading="pager.loading"
                 @selection-change="handleSelectionChange"
                 @row-dblclick="goReadonly"
+                @sort-change="handleTableSortChange"
                 :row-class-name="getRowClassName"
                 class="diagnosis-table"
                 stripe
@@ -213,6 +251,9 @@
                                     <div class="apt-doctor">{{ row.appointment_doctor_name || '-' }}</div>
                                     <div class="apt-time">{{ row.appointment_time_text || '-' }}</div>
                                 </template>
+                                <div v-if="latestAppointmentChannelText(row)" class="apt-latest-channel">
+                                    最近渠道：{{ latestAppointmentChannelText(row) }}
+                                </div>
                             </template>
                             <span v-else class="apt-none">未挂号</span>
                         </div>
@@ -253,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"
@@ -689,6 +737,7 @@ import useUserStore from '@/stores/modules/user'
 import { useRoute, useRouter } from 'vue-router'
 import { computed, defineAsyncComponent, onMounted, onUnmounted, watch } from 'vue'
 import dayjs from 'dayjs'
+import DaterangePicker from '@/components/daterange-picker/index.vue'
 
 const EditPopup = defineAsyncComponent(() => import('./edit.vue'))
 const DetailPopup = defineAsyncComponent(() => import('./detail.vue'))
@@ -728,6 +777,13 @@ const formData = reactive({
     assistant_id: '',
     start_time: '',
     end_time: '',
+    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',
@@ -760,6 +816,9 @@ const setHasAppointment = (v: string) => {
     formData.has_appointment = v as '' | '0' | '1'
     formData.pending_booking = ''
     formData.completed_appointment = ''
+    if (v === '0') {
+        clearLatestAppointmentFilters()
+    }
     pager.page = 1
     getLists()
     fetchDateCounts()
@@ -812,19 +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: '',
-        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>) =>
@@ -850,6 +940,12 @@ function clearSecondaryFiltersWhenPendingAssignWideSearch() {
     formData.assistant_id = ''
     formData.start_time = ''
     formData.end_time = ''
+    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 !== '') {
@@ -886,6 +982,7 @@ const handleDateTabClick = async (value: string) => {
     formData.pending_booking = ''
     formData.completed_appointment = ''
     formData.has_appointment = ''
+    clearLatestAppointmentFilters()
     formData.appointment_date = value
     pager.page = 1
     await getLists()
@@ -901,6 +998,7 @@ const handlePendingBookingTabClick = async () => {
     formData.completed_appointment = ''
     formData.appointment_date = ''
     formData.has_appointment = '0'
+    clearLatestAppointmentFilters()
     pager.page = 1
     await getLists()
     fetchDateCounts()
@@ -915,6 +1013,7 @@ const handleCompletedVisitTabClick = async () => {
     formData.completed_appointment = '1'
     formData.has_appointment = ''
     formData.appointment_date = ''
+    clearLatestAppointmentFilters()
     pager.page = 1
     await getLists()
     fetchDateCounts()
@@ -926,6 +1025,7 @@ const handlePendingAssignTabClick = async () => {
     formData.completed_appointment = ''
     formData.has_appointment = ''
     formData.appointment_date = ''
+    clearLatestAppointmentFilters()
     if (!formData.pending_assign_order_month) {
         formData.pending_assign_order_month = dayjs().format('YYYY-MM')
     }
@@ -947,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 = {
@@ -1047,16 +1159,29 @@ const handleMoreCommand = (cmd: string) => {
 const diagnosisTypeOptions = ref<any[]>([])
 const syndromeTypeOptions = ref<any[]>([])
 const assistantOptions = ref<any[]>([])
+const channelOptions = ref<Array<{ name: string; value: string }>>([])
 
 const getDictOptions = async () => {
     try {
-        const [diagnosisType, syndromeType, assistants] = await Promise.all([
+        const [diagnosisType, syndromeType, channels, assistants] = await Promise.all([
             getDictData({ type: 'diagnosis_type' }),
             getDictData({ type: 'syndrome_type' }),
+            getDictData({ type: 'channels' }),
             getAssistants()
         ])
         diagnosisTypeOptions.value = diagnosisType?.diagnosis_type || []
         syndromeTypeOptions.value = syndromeType?.syndrome_type || []
+        channelOptions.value = (channels?.channels || [])
+            .filter((row: any) => row.status !== 0)
+            .sort((a: any, b: any) => {
+                const ds = Number(b?.sort ?? 0) - Number(a?.sort ?? 0)
+                if (ds !== 0) return ds
+                return Number(b?.id ?? 0) - Number(a?.id ?? 0)
+            })
+            .map((row: any) => ({
+                name: String(row?.name ?? row?.value ?? ''),
+                value: row?.value != null && row.value !== '' ? String(row.value) : ''
+            }))
         assistantOptions.value = assistants || []
     } catch (error) {
         console.error('获取字典数据失败:', error)
@@ -1069,6 +1194,69 @@ const getDictLabel = (options: any[], value: string) => {
     return item ? item.name : value || '-'
 }
 
+const clearLatestAppointmentFilters = () => {
+    formData.latest_appointment_start_date = ''
+    formData.latest_appointment_end_date = ''
+    formData.latest_appointment_channel_source = ''
+}
+
+const clearLatestAssignFilters = () => {
+    formData.latest_assign_start_date = ''
+    formData.latest_assign_end_date = ''
+}
+
+const hasLatestAppointmentFilter = () =>
+    !!(
+        formData.latest_appointment_start_date ||
+        formData.latest_appointment_end_date ||
+        formData.latest_appointment_channel_source
+    )
+
+const hasLatestAssignFilter = () =>
+    !!(formData.latest_assign_start_date || formData.latest_assign_end_date)
+
+const handleLatestAppointmentFilterChange = () => {
+    if (hasLatestAppointmentFilter()) {
+        formData.appointment_date = ''
+        formData.pending_booking = ''
+        formData.completed_appointment = ''
+        if (formData.has_appointment === '0') {
+            formData.has_appointment = ''
+        }
+    }
+    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()
+    const detail = String(row?.latest_appointment_channel_source_detail || '').trim()
+    const base = desc || raw
+    if (!base) return ''
+    return detail ? `${base}（${detail}）` : base
+}
+
 // 获取医助名称
 const getAssistantName = (assistantId: number | string) => {
     // 如果没有assistant_id，返回"-"
@@ -1103,6 +1291,12 @@ const handleReset = () => {
     formData.diagnosis_type = ''
     formData.syndrome_type = ''
     formData.assistant_id = ''
+    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 = ''
@@ -2190,10 +2384,25 @@ onUnmounted(() => {
 .filter-more {
     display: flex;
     align-items: center;
+    flex-wrap: wrap;
     gap: 10px;
     margin-top: 8px;
     padding-top: 8px;
     border-top: 1px dashed var(--el-border-color-lighter);
+
+    .latest-appointment-range {
+        width: 260px;
+        max-width: 100%;
+    }
+
+    .latest-assign-range {
+        width: 260px;
+        max-width: 100%;
+    }
+
+    .latest-appointment-channel {
+        width: 170px;
+    }
 }
 
 .list-card {
@@ -2363,6 +2572,13 @@ onUnmounted(() => {
         font-size: 13px;
         color: var(--el-text-color-placeholder);
     }
+
+    .apt-latest-channel {
+        margin-top: 6px;
+        font-size: 12px;
+        line-height: 1.35;
+        color: var(--el-text-color-secondary);
+    }
 }
 
 .status-confirmed {

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

@@ -55,34 +55,59 @@ class AssetResourceController extends BaseAdminController
     public function add()
     {
         $params = $this->request->post();
-        if (empty($params['type']) || empty($params['title']) || empty($params['file_url'])) {
+        $type = $params['type'] ?? 0;
+        $title = trim((string)($params['title'] ?? ''));
+
+        // 兼容单图(字符串)与多图批量上传(数组)
+        $fileUrl = $params['file_url'] ?? '';
+        if (is_array($fileUrl)) {
+            $fileUrls = array_values(array_filter($fileUrl, fn($v) => trim((string)$v) !== ''));
+        } else {
+            $fileUrls = trim((string)$fileUrl) !== '' ? [$fileUrl] : [];
+        }
+
+        if (empty($type) || $title === '' || empty($fileUrls)) {
             return $this->fail('请填写完整的资源信息');
         }
-        
+
+        // 仅图片支持批量；视频/语音只取首个
+        if ($type != 1) {
+            $fileUrls = [$fileUrls[0]];
+        }
+
+        $multi = count($fileUrls) > 1;
+
         Db::startTrans();
         try {
-            $resource = AssetResource::create([
-                'type' => $params['type'],
-                'title' => $params['title'],
-                'file_url' => $params['file_url'],
-                'cover_url' => $params['cover_url'] ?? '',
-            ]);
-            
-            // 绑定用户
-            if (!empty($params['user_ids']) && is_array($params['user_ids'])) {
-                $userResources = [];
-                foreach ($params['user_ids'] as $userId) {
-                    $userResources[] = [
-                        'user_id' => $userId,
-                        'resource_id' => $resource->id,
-                        'create_time' => time(),
-                    ];
+            $createdIds = [];
+            $index = 0;
+            foreach ($fileUrls as $url) {
+                $index++;
+                $resource = AssetResource::create([
+                    'type' => $type,
+                    'title' => $multi ? $title . '_' . $index : $title,
+                    'file_url' => $url,
+                    'cover_url' => $params['cover_url'] ?? '',
+                ]);
+
+                // 绑定用户
+                if (!empty($params['user_ids']) && is_array($params['user_ids'])) {
+                    $userResources = [];
+                    foreach ($params['user_ids'] as $userId) {
+                        $userResources[] = [
+                            'user_id' => $userId,
+                            'resource_id' => $resource->id,
+                            'create_time' => time(),
+                        ];
+                    }
+                    (new AssetUserResource())->saveAll($userResources);
                 }
-                (new AssetUserResource())->saveAll($userResources);
+
+                $createdIds[] = $resource->id;
             }
-            
+
             Db::commit();
-            return $this->success('添加并分配成功', ['id' => $resource->id]);
+            return $this->success('添加并分配成功', ['ids' => $createdIds]);
         } catch (\Exception $e) {
             Db::rollback();
             return $this->fail('操作失败: ' . $e->getMessage());
@@ -144,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,6 +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，express_cod→express_cod，其余 normal）
+        $createTypeReq = (string)$this->request->post('create_type', '');
+        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) {
@@ -227,6 +238,7 @@ class OrderController extends BaseAdminController
     {
         $params = (new OrderValidate())->post()->goCheck('create');
         $params['creator_id'] = $this->adminId;
+        $params['create_type'] = 'wechat_work';
         
         $result = OrderLogic::createForWechatWork($params);
         if (!$result) {

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

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace app\adminapi\controller\stats;
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\logic\stats\RevisitRateLogic;
+
+/**
+ * 复诊接诊率统计（按月）
+ *
+ * - GET stats.revisitRate/overview         当月 N 诊接诊率（部门 → 医助分组 + 合计）
+ * - GET stats.revisitRate/deptOptions      部门下拉（前端组树）
+ * - GET stats.revisitRate/assignLines      「被指派数」明细（按诊单聚合）
+ * - GET stats.revisitRate/visitOrderLines  「N 诊单数」订单明细
+ */
+class RevisitRateController extends BaseAdminController
+{
+    public function overview()
+    {
+        // 涉及指派日志 + 全量订单序列扫描，放宽执行时间兜底
+        @set_time_limit(120);
+        $params = $this->request->get();
+
+        return $this->data(RevisitRateLogic::overview($params));
+    }
+
+    public function deptOptions()
+    {
+        return $this->data(RevisitRateLogic::deptOptions());
+    }
+
+    /** 「被指派数」点击下钻：诊单维度明细 */
+    public function assignLines()
+    {
+        @set_time_limit(120);
+        $params = $this->request->get();
+
+        return $this->data(RevisitRateLogic::assignLines($params));
+    }
+
+    /** 「N 诊单数」点击下钻：具体订单明细 */
+    public function visitOrderLines()
+    {
+        @set_time_limit(120);
+        $params = $this->request->get();
+
+        return $this->data(RevisitRateLogic::visitOrderLines($params));
+    }
+}

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,13 +87,31 @@ 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);
         }
         return $this->fail(DiagnosisLogic::getError());
     }
 
+    /**
+     * @notes 设置复诊接诊率统计起始偏移（业务订单 tab）
+     */
+    public function setRevisitSlotStartOffset()
+    {
+        $params = (new DiagnosisValidate())->post()->goCheck('setRevisitSlotStartOffset');
+        $ok = DiagnosisLogic::setRevisitSlotStartOffset(
+            (int) $params['id'],
+            (int) $params['revisit_slot_start_offset'],
+            $this->adminInfo
+        );
+        if (!$ok) {
+            return $this->fail(DiagnosisLogic::getError());
+        }
+
+        return $this->success('保存成功');
+    }
+
     /**
      * @notes 删除诊单
      * @return \think\response\Json
@@ -116,7 +134,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

@@ -181,6 +181,20 @@ class PrescriptionOrderController extends BaseAdminController
         return $this->success('保存成功');
     }
 
+    /**
+     * 修改关联处方服用参数（主方/辅方次数与开立天数）及订单服用天数
+     */
+    public function patchPrescriptionUsage()
+    {
+        $params = (new PrescriptionOrderValidate())->post()->goCheck('patchPrescriptionUsage');
+        $ok = PrescriptionOrderLogic::patchPrescriptionUsage($params, $this->adminId, $this->adminInfo);
+        if (!$ok) {
+            return $this->fail(PrescriptionOrderLogic::getError());
+        }
+
+        return $this->success('保存成功');
+    }
+
     public function auditPrescription()
     {
         $params = (new PrescriptionOrderValidate())->post()->goCheck('auditPrescription');
@@ -286,6 +300,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 +342,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/doctor/AppointmentLists.php

@@ -3,6 +3,8 @@
 namespace app\adminapi\lists\doctor;
 
 use app\adminapi\lists\BaseAdminDataLists;
+use app\adminapi\logic\dept\DeptLogic;
+use app\common\model\auth\AdminDept;
 use app\common\model\DiagnosisViewRecord;
 use app\common\model\doctor\Appointment;
 use app\common\model\tcm\Prescription;
@@ -75,6 +77,35 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
         });
     }
 
+    /**
+     * 按部门筛选：接诊医生、诊单医助或挂号医助所属部门命中子树即可（选父级含子级）
+     *
+     * @param mixed $query
+     */
+    private function applyAssistantDeptIdFilter($query): void
+    {
+        if (!isset($this->params['assistant_dept_id']) || $this->params['assistant_dept_id'] === '' || (int) $this->params['assistant_dept_id'] <= 0) {
+            return;
+        }
+        $rootDeptId = (int) $this->params['assistant_dept_id'];
+        $deptIds    = DeptLogic::getSelfAndDescendantIds($rootDeptId);
+        $deptIds    = array_values(array_filter(array_map('intval', $deptIds), static function (int $id): bool {
+            return $id > 0;
+        }));
+        if ($deptIds === []) {
+            $query->whereRaw('0 = 1');
+
+            return;
+        }
+        $inList = implode(',', $deptIds);
+        $adTbl  = (new AdminDept())->getTable();
+        $query->whereRaw(
+            "(EXISTS (SELECT 1 FROM `{$adTbl}` ad WHERE ad.`admin_id` = a.`doctor_id` AND ad.`dept_id` IN ({$inList}))"
+            . " OR EXISTS (SELECT 1 FROM `{$adTbl}` ad WHERE ad.`admin_id` = u.`assistant_id` AND ad.`dept_id` IN ({$inList}))"
+            . " OR EXISTS (SELECT 1 FROM `{$adTbl}` ad WHERE ad.`admin_id` = a.`assistant_id` AND ad.`dept_id` IN ({$inList})))"
+        );
+    }
+
     /**
      * 渠道筛选：与 AppointmentLogic 一致，兼容仅有 channel_source、仅有 channels、或两者皆有的表结构
      *
@@ -191,6 +222,8 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
 
         $this->applyAssistantIdFilter($query);
 
+        $this->applyAssistantDeptIdFilter($query);
+
         $this->applyChannelSourceFilter($query, $chFilter);
 
         // 是否确认诊单：1=已确认 0=未确认
@@ -373,6 +406,8 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
 
         $this->applyAssistantIdFilter($query);
 
+        $this->applyAssistantDeptIdFilter($query);
+
         $this->applyChannelSourceFilter($query, $chFilter);
 
         if ((int) ($this->params['exclude_cancelled'] ?? 0) === 1) {

server/app/adminapi/lists/qywx/CustomerLists.php

@@ -77,20 +77,37 @@ class CustomerLists extends BaseAdminDataLists implements ListsSearchInterface
             }
         }
 
-        // 添加时间：与 lists 排序口径一致（external_first_add_time 优先，0 则 create_time）
+        // 添加时间筛选，两种口径：
+        //   first（默认）= 首次添加时间在窗口内（external_first_add_time 优先，0 则 create_time）
+        //   any = 企微「全部客户+时间筛选」口径：存在"添加时间在窗口内的现存跟进关系"即命中
+        //         （含老客户被重加/被其他员工添加；关系已解除的不算），数据源为现存关系表
         $addStart = trim((string) ($this->params['add_time_start'] ?? ''));
         $addEnd = trim((string) ($this->params['add_time_end'] ?? ''));
-        $effExpr = 'COALESCE(NULLIF(external_first_add_time, 0), create_time)';
-        if ($addStart !== '') {
-            $t = strtotime($addStart . ' 00:00:00');
-            if ($t !== false) {
-                $query->whereRaw($effExpr . ' > 0 AND ' . $effExpr . ' >= ?', [$t]);
+        $addMode = trim((string) ($this->params['add_time_mode'] ?? 'first'));
+        $startTs = $addStart !== '' ? strtotime($addStart . ' 00:00:00') : false;
+        $endTs = $addEnd !== '' ? strtotime($addEnd . ' 23:59:59') : false;
+
+        if ($addMode === 'any' && ($startTs !== false || $endTs !== false)) {
+            $followQuery = Db::name('qywx_external_contact_follow')->where('createtime', '>', 0);
+            if ($startTs !== false) {
+                $followQuery->where('createtime', '>=', $startTs);
             }
-        }
-        if ($addEnd !== '') {
-            $t = strtotime($addEnd . ' 23:59:59');
-            if ($t !== false) {
-                $query->whereRaw($effExpr . ' > 0 AND ' . $effExpr . ' <= ?', [$t]);
+            if ($endTs !== false) {
+                $followQuery->where('createtime', '<=', $endTs);
+            }
+            $matchedExtIds = $followQuery->group('external_userid')->column('external_userid');
+            if ($matchedExtIds === []) {
+                $query->whereRaw('1=0');
+            } else {
+                $query->whereIn('external_userid', $matchedExtIds);
+            }
+        } else {
+            $effExpr = 'COALESCE(NULLIF(external_first_add_time, 0), create_time)';
+            if ($startTs !== false) {
+                $query->whereRaw($effExpr . ' > 0 AND ' . $effExpr . ' >= ?', [$startTs]);
+            }
+            if ($endTs !== false) {
+                $query->whereRaw($effExpr . ' > 0 AND ' . $effExpr . ' <= ?', [$endTs]);
             }
         }
 
@@ -158,6 +175,9 @@ class CustomerLists extends BaseAdminDataLists implements ListsSearchInterface
             $fromDb = (int) ($item['external_first_add_time'] ?? 0);
             $fromJson = CustomerLogic::minFollowCreatetime($followUsers);
             $item['external_first_add_time'] = $fromDb > 0 ? $fromDb : $fromJson;
+
+            // 「任意添加」口径会带出软删行，前端据此显示"已删除"标记
+            $item['is_deleted'] = !empty($item['delete_time']) ? 1 : 0;
         }
         unset($item);
 

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

@@ -28,8 +28,10 @@ use app\common\model\tcm\CallRecord;
 use app\common\model\auth\Admin;
 use app\common\model\auth\AdminDept;
 use app\common\model\auth\AdminRole;
+use app\common\model\dict\DictData;
 use app\common\lists\ListsSearchInterface;
 use app\common\lists\Traits\HasDataScopeFilter;
+use think\facade\Db;
 
 /**
  * 中医辨房病因诊单列表
@@ -39,6 +41,10 @@ use app\common\lists\Traits\HasDataScopeFilter;
 class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
 {
     use HasDataScopeFilter;
+
+    /** 最近挂号筛选只统计这些有效状态：已预约、已完成、已过号 */
+    private const EFFECTIVE_APPOINTMENT_STATUSES = [1, 3, 4];
+
     /**
      * @notes 设置搜索条件
      * @return array
@@ -133,6 +139,9 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
             $query->whereExists("SELECT 1 FROM {$aptTbl} apt WHERE apt.patient_id = {$diagTbl}.id AND apt.status = 3");
         }
 
+        $this->applyLatestAppointmentFilters($query, $pendingWideSearch);
+        $this->applyLatestAssignFilters($query, $pendingWideSearch);
+
         $this->applyPendingAssignBusinessOrderMonthFilter($query);
 
         // 仅已开方（待分配+关键词检索时不限制）
@@ -159,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'])
@@ -210,6 +196,7 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
                 ->order('appointment_time', 'asc')
                 ->order('id', 'asc');
             $appointments = $subQuery->select()->toArray();
+            $latestAppointmentMap = $this->buildLatestAppointmentMap($diagnosisIds);
              
             foreach ($appointments as $apt) {
                 $did = (int) ($apt['patient_id'] ?? 0);
@@ -240,6 +227,8 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
             }
             // 合并到诊单列表
             foreach ($lists as &$item) {
+                $latestAppointment = $latestAppointmentMap[(int) $item['id']] ?? null;
+                $this->appendLatestAppointmentSummary($item, $latestAppointment);
                 $aptList = $appointmentMap[(int) $item['id']] ?? [];
                 if (!empty($aptList)) {
                     $apt = $aptList[0];
@@ -280,6 +269,7 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
             }
         } else {
             foreach ($lists as &$item) {
+                $this->appendLatestAppointmentSummary($item, null);
                 $item['has_appointment'] = 0;
                 $item['appointment_id'] = null;
                 $item['appointment_status'] = 0;
@@ -558,6 +548,9 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
             $query->whereExists("SELECT 1 FROM {$aptTbl} apt WHERE apt.patient_id = {$diagTbl}.id AND apt.status = 3");
         }
 
+        $this->applyLatestAppointmentFilters($query, $pendingWideSearch);
+        $this->applyLatestAssignFilters($query, $pendingWideSearch);
+
         // 仅已开方（待分配+关键词检索时不限制）
         if (!$pendingWideSearch && isset($this->params['only_has_prescription']) && (string) $this->params['only_has_prescription'] === '1') {
             $rxTbl = (new Prescription())->getTable();
@@ -587,6 +580,297 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
         return $query->count();
     }
 
+    /**
+     * 最近一次有效挂号过滤：按 appointment_date DESC, appointment_time DESC, id DESC 取一条。
+     *
+     * @param mixed $query
+     */
+    private function applyLatestAppointmentFilters($query, bool $pendingWideSearch): void
+    {
+        if ($pendingWideSearch) {
+            return;
+        }
+
+        $startDate = $this->normalizeYmd($this->params['latest_appointment_start_date'] ?? '');
+        $endDate = $this->normalizeYmd($this->params['latest_appointment_end_date'] ?? '');
+        $channelSource = trim((string) ($this->params['latest_appointment_channel_source'] ?? ''));
+
+        if ($startDate === '' && $endDate === '' && $channelSource === '') {
+            return;
+        }
+
+        $aptTbl = (new Appointment())->getTable();
+        $diagTbl = (new Diagnosis())->getTable();
+        $latestIdSql = $this->latestAppointmentIdSubSql($aptTbl, $diagTbl);
+        $conditions = ["latest_apt.id = ({$latestIdSql})"];
+
+        if ($startDate !== '') {
+            $conditions[] = "latest_apt.appointment_date >= '" . addslashes($startDate) . "'";
+        }
+        if ($endDate !== '') {
+            $conditions[] = "latest_apt.appointment_date <= '" . addslashes($endDate) . "'";
+        }
+        if ($channelSource !== '') {
+            $channelCond = $this->appointmentChannelConditionSql('latest_apt', $channelSource);
+            if ($channelCond === '') {
+                $query->whereRaw('0 = 1');
+
+                return;
+            }
+            $conditions[] = $channelCond;
+        }
+
+        $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);
+
+        return "SELECT apt_latest.id FROM {$aptTbl} apt_latest "
+            . "WHERE apt_latest.patient_id = {$diagTbl}.id "
+            . "AND apt_latest.status IN ({$statuses}) "
+            . "ORDER BY apt_latest.appointment_date DESC, "
+            . "IFNULL(NULLIF(TRIM(apt_latest.appointment_time), ''), '00:00:00') DESC, "
+            . "apt_latest.id DESC LIMIT 1";
+    }
+
+    private function appointmentChannelConditionSql(string $alias, string $channelSource): string
+    {
+        $cols = $this->appointmentTableFields();
+        $hasChannelSource = in_array('channel_source', $cols, true);
+        $hasChannels = in_array('channels', $cols, true);
+        if (!$hasChannelSource && !$hasChannels) {
+            return '';
+        }
+
+        $quoted = "'" . addslashes($channelSource) . "'";
+        $parts = [];
+        if ($hasChannelSource) {
+            $parts[] = "{$alias}.channel_source = {$quoted}";
+        }
+        if ($hasChannels) {
+            $parts[] = "{$alias}.channels = {$quoted}";
+            if (is_numeric($channelSource)) {
+                $parts[] = "{$alias}.channels = " . (int) $channelSource;
+            }
+        }
+
+        $parts = array_values(array_unique($parts));
+
+        return $parts === [] ? '' : '(' . implode(' OR ', $parts) . ')';
+    }
+
+    /**
+     * @param array<int|string, mixed> $diagnosisIds
+     * @return array<int, array<string, mixed>>
+     */
+    private function buildLatestAppointmentMap(array $diagnosisIds): array
+    {
+        $diagnosisIds = array_values(array_filter(array_unique(array_map('intval', $diagnosisIds)), static function (int $id): bool {
+            return $id > 0;
+        }));
+        if ($diagnosisIds === []) {
+            return [];
+        }
+
+        $cols = $this->appointmentTableFields();
+        $fields = ['id', 'patient_id', 'appointment_date', 'appointment_time', 'status'];
+        foreach (['channel_source', 'channel_source_detail', 'channels'] as $col) {
+            if (in_array($col, $cols, true)) {
+                $fields[] = $col;
+            }
+        }
+
+        $appointments = Appointment::whereIn('patient_id', $diagnosisIds)
+            ->whereIn('status', self::EFFECTIVE_APPOINTMENT_STATUSES)
+            ->field($fields)
+            ->order('patient_id', 'asc')
+            ->order('appointment_date', 'desc')
+            ->orderRaw("IFNULL(NULLIF(TRIM(appointment_time), ''), '00:00:00') DESC")
+            ->order('id', 'desc')
+            ->select()
+            ->toArray();
+
+        $map = [];
+        $channelNameByValue = DictData::where('type_value', 'channels')->column('name', 'value');
+        foreach ($appointments as $appointment) {
+            $diagnosisId = (int) ($appointment['patient_id'] ?? 0);
+            if ($diagnosisId <= 0 || isset($map[$diagnosisId])) {
+                continue;
+            }
+            $appointment['channel_source_desc'] = $this->appointmentChannelDesc($appointment, $channelNameByValue ?: []);
+            $map[$diagnosisId] = $appointment;
+        }
+
+        return $map;
+    }
+
+    /**
+     * @param array<string, mixed> $item
+     * @param array<string, mixed>|null $appointment
+     */
+    private function appendLatestAppointmentSummary(array &$item, ?array $appointment): void
+    {
+        $item['latest_appointment_id'] = null;
+        $item['latest_appointment_time_text'] = '';
+        $item['latest_appointment_channel_source'] = '';
+        $item['latest_appointment_channel_source_desc'] = '';
+        $item['latest_appointment_channel_source_detail'] = '';
+
+        if ($appointment === null) {
+            return;
+        }
+
+        $timePart = (string) ($appointment['appointment_time'] ?? '');
+        if (strlen($timePart) > 5) {
+            $timePart = substr($timePart, 0, 5);
+        }
+        $rawChannel = trim((string) ($appointment['channel_source'] ?? ''));
+        if ($rawChannel === '' && isset($appointment['channels']) && $appointment['channels'] !== '' && $appointment['channels'] !== null) {
+            $rawChannel = trim((string) $appointment['channels']);
+        }
+
+        $item['latest_appointment_id'] = (int) ($appointment['id'] ?? 0);
+        $item['latest_appointment_time_text'] = trim((string) ($appointment['appointment_date'] ?? '') . ' ' . $timePart);
+        $item['latest_appointment_channel_source'] = $rawChannel;
+        $item['latest_appointment_channel_source_desc'] = (string) ($appointment['channel_source_desc'] ?? '');
+        $item['latest_appointment_channel_source_detail'] = trim((string) ($appointment['channel_source_detail'] ?? ''));
+    }
+
+    /**
+     * @param array<string, mixed> $appointment
+     * @param array<string, string> $channelNameByValue
+     */
+    private function appointmentChannelDesc(array $appointment, array $channelNameByValue): string
+    {
+        $srcKey = trim((string) ($appointment['channel_source'] ?? ''));
+        if ($srcKey === '' && isset($appointment['channels']) && $appointment['channels'] !== '' && $appointment['channels'] !== null) {
+            $srcKey = trim((string) $appointment['channels']);
+        }
+        if ($srcKey === '') {
+            return '';
+        }
+
+        return (string) ($channelNameByValue[$srcKey] ?? $channelNameByValue[(string) (int) $srcKey] ?? $srcKey);
+    }
+
+    /**
+     * @return string[]
+     */
+    private function appointmentTableFields(): array
+    {
+        static $fields = null;
+        if ($fields !== null) {
+            return $fields;
+        }
+
+        $tblFields = Db::name('doctor_appointment')->getTableFields();
+        $fields = is_array($tblFields) ? array_values(array_map('strval', $tblFields)) : [];
+
+        return $fields;
+    }
+
+    private function normalizeYmd($value): string
+    {
+        $date = trim((string) $value);
+
+        return preg_match('/^\d{4}-\d{2}-\d{2}$/', $date) ? $date : '';
+    }
+
     /**
      * 待分配 Tab 且有关键词时：放宽列表条件（与 `applyDiagnosisListKeywordFilter` 判定一致）。
      */

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 一致）。
@@ -700,6 +741,10 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
         }
         unset($item);
 
+        if ($this->shouldBypassListVisibilityForDiagnosisEdit()) {
+            $this->appendDiagnosisEditVisitSeqFields($lists);
+        }
+
         $this->appendPrescriptionOrderAssignSnapshotErCenterFlags($lists);
 
         if ((int) ($this->params['yeji_order_drawer'] ?? 0) === 1) {
@@ -779,10 +824,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 +846,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)）。
@@ -1235,6 +1421,69 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
         );
     }
 
+    /**
+     * 诊单编辑-业务订单 tab：标注全局诊次及是否计入复诊接诊率（与 RevisitRateLogic 同口径）
+     *
+     * @param array<int, array<string, mixed>> $lists
+     */
+    private function appendDiagnosisEditVisitSeqFields(array &$lists): void
+    {
+        if ($lists === []) {
+            return;
+        }
+
+        $diagIds = [];
+        foreach ($lists as $row) {
+            $d = (int) ($row['diagnosis_id'] ?? 0);
+            if ($d > 0) {
+                $diagIds[$d] = true;
+            }
+        }
+        $contextDid = (int) ($this->params['context_diagnosis_id'] ?? 0);
+        if ($contextDid > 0) {
+            $diagIds[$contextDid] = true;
+        }
+        $diagIdList = array_keys($diagIds);
+        if ($diagIdList === []) {
+            return;
+        }
+
+        $offsetRows = Diagnosis::whereIn('id', $diagIdList)
+            ->whereNull('delete_time')
+            ->column('revisit_slot_start_offset', 'id');
+        $offsetMap = [];
+        foreach ($offsetRows as $id => $offset) {
+            $offsetMap[(int) $id] = max(0, min(20, (int) $offset));
+        }
+
+        /** @var array<int, int> $seqByOrderId order_id => global seq within diagnosis */
+        $seqByOrderId = [];
+        foreach ($diagIdList as $did) {
+            $q = PrescriptionOrder::where('diagnosis_id', $did)->whereNull('delete_time');
+            YejiStatsLogic::applyPrescriptionOrderNotCancelledForPerformanceQuery($q, '');
+            $orderIds = $q
+                ->order(['create_time' => 'asc', 'id' => 'asc'])
+                ->column('id');
+            $seq = 0;
+            foreach ($orderIds as $oid) {
+                $seq++;
+                $seqByOrderId[(int) $oid] = $seq;
+            }
+        }
+
+        foreach ($lists as &$row) {
+            $oid = (int) ($row['id'] ?? 0);
+            $did = (int) ($row['diagnosis_id'] ?? 0);
+            $seq = (int) ($seqByOrderId[$oid] ?? 0);
+            $offset = (int) ($offsetMap[$did] ?? 0);
+            $effectiveSlot = $seq > 0 ? $seq + $offset : 0;
+            $row['global_visit_seq'] = $effectiveSlot > 0 ? $effectiveSlot : null;
+            $row['raw_visit_seq'] = $seq > 0 ? $seq : null;
+            $row['counts_for_revisit_rate'] = $effectiveSlot >= 2 ? 1 : 0;
+        }
+        unset($row);
+    }
+
     /**
      * 列表行标注：指派日志快照（related_po_creator_id + related_po_create_time）是否指向本业务单，
      * 以及该次操作的新医助（to_assistant_id）是否归属「二中心」部门子树（与 DeptLogic / 业绩看板一致）。

server/app/adminapi/logic/dept/DeptLogic.php

@@ -151,6 +151,24 @@ class DeptLogic extends BaseLogic
      * @return list<int>
      */
     private static function findErCenterRootDeptIds(): array
+    {
+        return self::findCenterRootDeptIdsByNameKeyword('二中心');
+    }
+
+    /**
+     * 名称含「一中心」的部门 id。
+     *
+     * @return list<int>
+     */
+    private static function findYiCenterRootDeptIds(): array
+    {
+        return self::findCenterRootDeptIdsByNameKeyword('一中心');
+    }
+
+    /**
+     * @return list<int>
+     */
+    private static function findCenterRootDeptIdsByNameKeyword(string $keyword): array
     {
         $rows = Dept::whereNull('delete_time')
             ->field(['id', 'name'])
@@ -159,7 +177,7 @@ class DeptLogic extends BaseLogic
         $out = [];
         foreach ($rows as $r) {
             $name = (string) ($r['name'] ?? '');
-            if ($name !== '' && mb_strpos($name, '二中心') !== false) {
+            if ($name !== '' && mb_strpos($name, $keyword) !== false) {
                 $out[] = (int) $r['id'];
             }
         }
@@ -201,6 +219,19 @@ class DeptLogic extends BaseLogic
         return array_fill_keys($subtreeIds, true);
     }
 
+    /**
+     * 名称含「一中心」的部门及其全部下级 id（map）。
+     *
+     * @return array<int, true>
+     */
+    public static function getYiCenterSubtreeDeptIdSet(): array
+    {
+        $yiRoots = self::findYiCenterRootDeptIds();
+        $subtreeIds = self::unionErCenterSubtreeDeptIds($yiRoots);
+
+        return array_fill_keys($subtreeIds, true);
+    }
+
     /**
      * 二中心复诊统计用的业务订单行（与 rollup 同源 SQL）。
      *

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

@@ -22,6 +22,11 @@ use think\facade\Log;
  */
 class OrderLogic
 {
+    /**
+     * 创建方式：normal 普通订单 / wechat_work 企业微信对外收款 / fubei 付呗 / express_cod 快递代收
+     */
+    private const CREATE_TYPES = ['normal', 'wechat_work', 'fubei', 'express_cod'];
+
     /**
      * @notes 生成订单号
      * @return string
@@ -31,6 +36,43 @@ class OrderLogic
         return 'ORD' . date('YmdHis') . mt_rand(100000, 999999);
     }
 
+    private static function normalizeCreateType(
+        ?string $createType,
+        ?string $paymentMethod = null,
+        ?string $payeeUserid = null,
+        ?string $payerExternalUserid = null,
+        ?string $remark = null
+    ): string {
+        $raw = trim((string) $createType);
+        if (in_array($raw, self::CREATE_TYPES, true)) {
+            return $raw;
+        }
+
+        $paymentMethod = trim((string) $paymentMethod);
+        if ($paymentMethod === 'fubei') {
+            return 'fubei';
+        }
+
+        if (
+            trim((string) $payeeUserid) !== ''
+            || trim((string) $payerExternalUserid) !== ''
+            || str_contains((string) $remark, '企业微信')
+        ) {
+            return 'wechat_work';
+        }
+
+        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
@@ -40,9 +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;
+            // 快递代收：以 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();
@@ -51,10 +100,14 @@ class OrderLogic
             $order->creator_id = $params['creator_id'];
             $order->order_type = $params['order_type'];
             $order->amount = $params['amount'];
-            // 付呗且申请审核支付单：待审核(5)；否则待支付(1)
+            $order->create_type = $createType;
+            // 付呗/快递代收且申请审核支付单：待审核(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; // 待支付
             }
@@ -183,6 +236,10 @@ class OrderLogic
                                 $order->payment_method = 'wechat';
                                 $needSave = true;
                             }
+                            if ((string) ($order->create_type ?? '') !== 'wechat_work') {
+                                $order->create_type = 'wechat_work';
+                                $needSave = true;
+                            }
                             if ($paymentTimeStr !== '' && (string)$order->payment_time !== $paymentTimeStr) {
                                 $order->payment_time = $paymentTimeStr;
                                 $needSave = true;
@@ -235,6 +292,7 @@ class OrderLogic
                             $order->amount = $amount;
                             $order->status = $targetStatus;
                             $order->payment_method = 'wechat';
+                            $order->create_type = 'wechat_work';
                             $order->payment_time = $paymentTimeStr;
                             $order->trade_no = $tradeNo;
                             $remark = '企业微信直接收款同步，待关联患者';
@@ -283,6 +341,7 @@ class OrderLogic
             $order->amount = $amount;
             $order->status = 2; // 已支付
             $order->payment_method = 'wechat';
+            $order->create_type = 'wechat_work';
             $order->payment_time = date('Y-m-d H:i:s');
             $order->trade_no = $tradeNo;
             $order->remark = '企业微信直接收款，待关联患者';
@@ -345,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;
@@ -382,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;
             }
 
@@ -467,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;
         }
@@ -536,8 +595,18 @@ class OrderLogic
                 $n->creator_id = $order->creator_id;
                 $n->order_type = (int) $typeList[$i];
                 $n->amount = $amt;
+                $n->create_type = self::normalizeCreateType(
+                    (string) ($order->create_type ?? ''),
+                    (string) ($order->payment_method ?? ''),
+                    (string) ($order->payee_userid ?? ''),
+                    (string) ($order->payer_external_userid ?? ''),
+                    (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;
@@ -1213,7 +1282,7 @@ class OrderLogic
         }
 
         $rows = $q
-            ->field(['id', 'order_no', 'order_type', 'amount', 'status', 'create_time', 'creator_id', 'remark', 'is_exempt'])
+            ->field(['id', 'order_no', 'order_type', 'amount', 'status', 'create_time', 'creator_id', 'remark', 'is_exempt', 'payment_method', 'create_type'])
             ->order('id', 'desc')
             ->select()
             ->toArray();

server/app/adminapi/logic/qywx/CustomerLogic.php

@@ -585,15 +585,32 @@ class CustomerLogic extends BaseLogic
     /**
      * 客户联系事件回调：按 external_userid 拉取详情并 UPSERT（不走全量同步文件锁）。
      *
+     * @param bool $isAddEvent 是否 add_external_contact 事件：是且本地已有该客户（含软删行）时，
+     *                         新增一行 readd_flag=1（以前加过）的记录，原有行不动
+     * @param string $eventUserId 本次添加人的企微 userid（add 事件回调里的 UserID，用于取本次添加时间）
+     * @param int $eventTime 回调事件时间（企微 CreateTime，秒）
      * @see https://developer.work.weixin.qq.com/document/path/92130
      */
-    public static function upsertSingleExternalContactFromApi(string $externalUserId): void
-    {
+    public static function upsertSingleExternalContactFromApi(
+        string $externalUserId,
+        bool $isAddEvent = false,
+        string $eventUserId = '',
+        int $eventTime = 0
+    ): void {
         $externalUserId = trim($externalUserId);
+        $eventUserId = trim($eventUserId);
         if ($externalUserId === '') {
             return;
         }
 
+        // 必须在写库之前判断"是否已存在"，否则无法区分新客户和重加客户
+        $existedBefore = false;
+        if ($isAddEvent) {
+            $existedBefore = Db::name('qywx_external_contact')
+                ->where('external_userid', $externalUserId)
+                ->count() > 0;
+        }
+
         $service = new WechatWorkService();
         $detail = [];
         $lastError = null;
@@ -619,6 +636,14 @@ class CustomerLogic extends BaseLogic
         if (empty($detail['external_contact']) || !is_array($detail['external_contact'])) {
             $errcode = is_array($lastError) ? ($lastError['errcode'] ?? null) : null;
             $errmsg = is_array($lastError) ? (string) ($lastError['errmsg'] ?? '') : '';
+            // 84061 = 已不是企业客户（双向解除/员工删除后无人跟进）：与企微对齐，本地软删。
+            // 注意：客户单方删除员工（del_follow_user）时企微仍保留客户，get 会成功返回，不会走到这里。
+            if ($errcode === 84061) {
+                self::softDeleteExternalContactRow($externalUserId);
+                Log::info('qywx external contact callback: 企微侧已不存在(84061)，本地软删 ext=' . $externalUserId);
+
+                return;
+            }
             Log::warning(sprintf(
                 'qywx external contact callback: 拉取详情为空，跳过 UPSERT errcode=%s errmsg=%s ext=%s',
                 $errcode === null ? '?' : (string) $errcode,
@@ -634,6 +659,18 @@ class CustomerLogic extends BaseLogic
             $followUsers = [];
         }
 
+        // 重复添加：不动原有行，新增一行并打「以前加过」标记（与企微"每次添加都算一条"对齐）
+        if ($isAddEvent && $existedBefore) {
+            self::insertReaddContactRow(
+                $detail['external_contact'],
+                $followUsers,
+                $eventUserId,
+                $eventTime
+            );
+
+            return;
+        }
+
         $syncCount = 0;
         $newCount = 0;
         $updateCount = 0;
@@ -652,6 +689,48 @@ class CustomerLogic extends BaseLogic
         );
     }
 
+    /**
+     * 重复添加：为已存在的客户新增一行记录（原有行保持不变）。
+     *
+     * 新行的「添加时间」取本次添加动作的时间：优先本次添加人（$eventUserId）在 follow_user
+     * 里的 createtime，其次回调事件时间，最后兜底当前时间——保证这行出现在"本次添加"的日期下。
+     *
+     * @param array<string, mixed> $externalContact
+     * @param array<int, array<string, mixed>> $followUsers
+     */
+    private static function insertReaddContactRow(
+        array $externalContact,
+        array $followUsers,
+        string $eventUserId,
+        int $eventTime
+    ): void {
+        $row = self::buildContactRow($externalContact, $followUsers);
+
+        $addTime = 0;
+        if ($eventUserId !== '') {
+            foreach ($followUsers as $fu) {
+                if (is_array($fu) && trim((string) ($fu['userid'] ?? '')) === $eventUserId) {
+                    $addTime = self::normalizeFollowUserCreatetime($fu);
+                    break;
+                }
+            }
+        }
+        if ($addTime <= 0) {
+            $addTime = $eventTime > 0 ? $eventTime : time();
+        }
+
+        $row['external_first_add_time'] = $addTime;
+        $row['readd_flag'] = 1;
+
+        Db::name('qywx_external_contact')->insert($row);
+
+        $extId = (string) $row['external_userid'];
+        self::syncContactTagsRelation($extId, $followUsers);
+        self::syncContactFollowRelation($extId, $followUsers);
+
+        Log::info('qywx external contact callback: 重复添加，新增一行(readd_flag=1) ext=' . $extId);
+    }
+
     /**
      * 事件流水（零误差进入计数）
      *
@@ -720,7 +799,7 @@ class CustomerLogic extends BaseLogic
     }
 
     /**
-     * 客户联系「删除企业客户」等事件：本地软删除一行。
+     * 客户彻底流失（企微 get 返回 84061）：该客户的所有行（含历史重加行）一并软删。
      */
     public static function softDeleteExternalContactRow(string $externalUserId): void
     {
@@ -739,84 +818,9 @@ class CustomerLogic extends BaseLogic
         Db::name('qywx_external_contact_tag')
             ->where('external_userid', $externalUserId)
             ->delete();
-    }
-
-    /**
-     * `del_follow_user` 事件：某员工不再跟进该客户。
-     * 只更新本地 `follow_users` JSON：移除匹配的 userid；若已无跟进人则软删该行。
-     * 不再回调 /externalcontact/get，避免 84061「not external contact」刷 warning。
-     */
-    public static function removeFollowUserFromLocal(string $externalUserId, string $userId): void
-    {
-        $externalUserId = trim($externalUserId);
-        $userId = trim($userId);
-        if ($externalUserId === '' || $userId === '') {
-            return;
-        }
-
-        $row = Db::name('qywx_external_contact')
+        Db::name('qywx_external_contact_follow')
             ->where('external_userid', $externalUserId)
-            ->find();
-        if (!$row) {
-            return;
-        }
-
-        $followUsers = json_decode((string) ($row['follow_users'] ?? '[]'), true);
-        $followUsers = is_array($followUsers) ? $followUsers : [];
-        $kept = [];
-        $removed = false;
-        foreach ($followUsers as $fu) {
-            if (!is_array($fu)) {
-                continue;
-            }
-            $uid = trim((string) ($fu['userid'] ?? ''));
-            if ($uid === $userId) {
-                $removed = true;
-                continue;
-            }
-            $kept[] = $fu;
-        }
-
-        if (!$removed) {
-            return;
-        }
-
-        $now = time();
-        if ($kept === []) {
-            Db::name('qywx_external_contact')
-                ->where('id', (int) $row['id'])
-                ->update([
-                    'follow_users' => json_encode([], JSON_UNESCAPED_UNICODE),
-                    'tags' => '[]',
-                    'delete_time' => $now,
-                    'update_time' => $now,
-                ]);
-
-            // 整客户已无人跟进 → 关系表清空
-            Db::name('qywx_external_contact_tag')
-                ->where('external_userid', $externalUserId)
-                ->delete();
-
-            return;
-        }
-
-        $minCreate = self::minFollowCreatetime($kept);
-        $update = [
-            'follow_users' => json_encode($kept, JSON_UNESCAPED_UNICODE),
-            'tags' => self::extractFollowUserTags($kept),
-            'update_time' => $now,
-        ];
-        if ($minCreate > 0) {
-            // 移除最早那条跟进人后，首次添加时间可能后移；重新刷新字段以与 JSON 保持一致
-            $update['external_first_add_time'] = $minCreate;
-        }
-
-        Db::name('qywx_external_contact')
-            ->where('id', (int) $row['id'])
-            ->update($update);
-
-        // 关系表按剩余 kept follow_users 同步（自动清掉离开员工那行 + 保留其他员工的标签）
-        self::syncContactTagsRelation($externalUserId, $kept);
+            ->delete();
     }
 
     private static function upsertOneExternalContactBundle(
@@ -845,32 +849,16 @@ class CustomerLogic extends BaseLogic
             }
         }
 
-        $now = time();
-        $row = [
-            'external_userid' => $externalContact['external_userid'] ?? '',
-            'name' => $externalContact['name'] ?? '',
-            'avatar' => $externalContact['avatar'] ?? '',
-            'type' => $externalContact['type'] ?? 1,
-            'gender' => $externalContact['gender'] ?? 0,
-            'unionid' => $externalContact['unionid'] ?? '',
-            'position' => $externalContact['position'] ?? '',
-            'corp_name' => $externalContact['corp_name'] ?? '',
-            'corp_full_name' => $externalContact['corp_full_name'] ?? '',
-            'external_profile' => json_encode($externalContact['external_profile'] ?? [], JSON_UNESCAPED_UNICODE),
-            'follow_users' => json_encode($followUsers, JSON_UNESCAPED_UNICODE),
-            'tags' => self::extractFollowUserTags($followUsers),
-            'follow_admin_ids' => self::resolveFollowAdminIds($followUsers),
-            'external_first_add_time' => self::minFollowCreatetime($followUsers),
-            'create_time' => $now,
-            'update_time' => $now,
-            'delete_time' => null,
-        ];
+        $row = self::buildContactRow($externalContact, $followUsers);
 
         self::upsertExternalContactRow($row, $syncCount, $newCount, $updateCount);
 
         // 同步「客户↔员工↔标签」关系表（用于检索/统计；列表筛选/聚合不必再解析 follow_users JSON）
         self::syncContactTagsRelation((string) $row['external_userid'], $followUsers);
 
+        // 同步「客户↔员工」现存跟进关系表（企微口径的添加时间筛选用）
+        self::syncContactFollowRelation((string) $row['external_userid'], $followUsers);
+
         if (($syncCount % 25) === 0) {
             usleep(8000);
         }
@@ -982,6 +970,67 @@ class CustomerLogic extends BaseLogic
         }
     }
 
+    /**
+     * 同步「客户↔员工」现存跟进关系表（zyt_qywx_external_contact_follow）。
+     *
+     * 与企微后台「全部客户 + 时间筛选」同口径：只保留当前仍存在的跟进关系及其 createtime；
+     * 关系被解除（员工删客户且未重加）后行随之删除，客户在对应日期的筛选下即不再出现。
+     *
+     * @param array<int, mixed> $followUsers /externalcontact/get 返回的 follow_user[]
+     * @internal 仅供 UPSERT / 回填复用
+     */
+    public static function syncContactFollowRelation(string $externalUserId, array $followUsers): void
+    {
+        $externalUserId = trim($externalUserId);
+        if ($externalUserId === '') {
+            return;
+        }
+
+        $rows = [];
+        foreach ($followUsers as $fu) {
+            if (!is_array($fu)) {
+                continue;
+            }
+            $uid = trim((string) ($fu['userid'] ?? ''));
+            if ($uid === '') {
+                continue;
+            }
+            $rows[$uid] = self::normalizeFollowUserCreatetime($fu);
+        }
+
+        try {
+            if ($rows === []) {
+                Db::name('qywx_external_contact_follow')
+                    ->where('external_userid', $externalUserId)
+                    ->delete();
+
+                return;
+            }
+
+            Db::name('qywx_external_contact_follow')
+                ->where('external_userid', $externalUserId)
+                ->whereNotIn('follow_user_id', array_keys($rows))
+                ->delete();
+
+            $now = time();
+            foreach ($rows as $uid => $createtime) {
+                Db::name('qywx_external_contact_follow')
+                    ->duplicate(['createtime' => $createtime, 'update_time' => $now])
+                    ->insert([
+                        'external_userid' => $externalUserId,
+                        'follow_user_id' => $uid,
+                        'createtime' => $createtime,
+                        'create_time' => $now,
+                        'update_time' => $now,
+                    ]);
+            }
+        } catch (\Throwable $e) {
+            Log::warning('qywx contact follow relation sync failed: ' . $e->getMessage(), [
+                'ext' => $externalUserId,
+            ]);
+        }
+    }
+
     /**
      * 把所有 follow_user[].tags 合并去重（按 tag_id），返回 JSON 字符串。
      *
@@ -1062,6 +1111,38 @@ class CustomerLogic extends BaseLogic
         return json_encode(array_values(array_unique($adminIds)), JSON_UNESCAPED_UNICODE);
     }
 
+    /**
+     * 由企微 API 返回的 external_contact + follow_user 组装一行客户表数据
+     *
+     * @param array<string, mixed> $externalContact
+     * @param array<int, array<string, mixed>> $followUsers
+     * @return array<string, mixed>
+     */
+    private static function buildContactRow(array $externalContact, array $followUsers): array
+    {
+        $now = time();
+
+        return [
+            'external_userid' => $externalContact['external_userid'] ?? '',
+            'name' => $externalContact['name'] ?? '',
+            'avatar' => $externalContact['avatar'] ?? '',
+            'type' => $externalContact['type'] ?? 1,
+            'gender' => $externalContact['gender'] ?? 0,
+            'unionid' => $externalContact['unionid'] ?? '',
+            'position' => $externalContact['position'] ?? '',
+            'corp_name' => $externalContact['corp_name'] ?? '',
+            'corp_full_name' => $externalContact['corp_full_name'] ?? '',
+            'external_profile' => json_encode($externalContact['external_profile'] ?? [], JSON_UNESCAPED_UNICODE),
+            'follow_users' => json_encode($followUsers, JSON_UNESCAPED_UNICODE),
+            'tags' => self::extractFollowUserTags($followUsers),
+            'follow_admin_ids' => self::resolveFollowAdminIds($followUsers),
+            'external_first_add_time' => self::minFollowCreatetime($followUsers),
+            'create_time' => $now,
+            'update_time' => $now,
+            'delete_time' => null,
+        ];
+    }
+
     /**
      * 是否 MySQL 锁等待超时 / 死锁（可短重试）
      */
@@ -1073,7 +1154,13 @@ class CustomerLogic extends BaseLogic
     }
 
     /**
-     * INSERT ... ON DUPLICATE KEY UPDATE + 锁冲突重试
+     * 客户行写入 + 锁冲突重试。
+     *
+     * 表允许同一 external_userid 多行（重复添加会新增行），不再依赖唯一键 UPSERT：
+     *   - 已有行 → 只更新"最新一行"（MAX(id)），历史重加行保持原样；
+     *   - 无行  → 插入新行。
+     * 更新时不覆盖 create_time / readd_flag / external_first_add_time
+     * （最新行的添加时间代表"该行那次添加"的时间，由插入时决定，后续详情刷新不应改动）。
      *
      * @param array<string, mixed> $row
      */
@@ -1084,33 +1171,21 @@ class CustomerLogic extends BaseLogic
         while (true) {
             $attempt++;
             try {
-                $affected = Db::name('qywx_external_contact')->duplicate([
-                    'name',
-                    'avatar',
-                    'type',
-                    'gender',
-                    'unionid',
-                    'position',
-                    'corp_name',
-                    'corp_full_name',
-                    'external_profile',
-                    'follow_users',
-                    'tags',
-                    'follow_admin_ids',
-                    'external_first_add_time',
-                    'update_time',
-                    'delete_time',
-                ])->insert($row);
+                $latestId = (int) Db::name('qywx_external_contact')
+                    ->where('external_userid', (string) $row['external_userid'])
+                    ->order('id', 'desc')
+                    ->value('id');
 
-                $syncCount++;
-                // PDO MySQL：新插入 1；更新 2；值完全相同 0
-                if ($affected === 1) {
+                if ($latestId > 0) {
+                    $update = $row;
+                    unset($update['external_userid'], $update['create_time'], $update['external_first_add_time']);
+                    Db::name('qywx_external_contact')->where('id', $latestId)->update($update);
+                    $updateCount++;
+                } else {
+                    Db::name('qywx_external_contact')->insert($row);
                     $newCount++;
-                } elseif ($affected === 2) {
-                    $updateCount++;
-                } elseif ($affected === 0) {
-                    $updateCount++;
                 }
+                $syncCount++;
 
                 return;
             } catch (\Throwable $e) {
@@ -1211,8 +1286,16 @@ class CustomerLogic extends BaseLogic
      */
     public static function getStats()
     {
-        $total = QywxExternalContact::whereNull('delete_time')->count();
-        
+        // 表内同一客户可能多行（重复添加各占一行），去重后才是真实客户数
+        $total = (int) Db::name('qywx_external_contact')
+            ->whereNull('delete_time')
+            ->fieldRaw('COUNT(DISTINCT external_userid) AS c')
+            ->find()['c'];
+
+        // 企微管理后台「全部客户」按"客户×添加人"关系计数（同一客户被 N 名员工添加计 N 条），
+        // 现存跟进关系表与其同口径，便于对账。
+        $relationTotal = (int) Db::name('qywx_external_contact_follow')->count();
+
         $todayStart = strtotime(date('Y-m-d 00:00:00'));
 
         // 今日进入数 = 今日收到的 add_external_contact 事件条数。
@@ -1254,6 +1337,7 @@ class CustomerLogic extends BaseLogic
 
         return [
             'total' => $total,
+            'relation_total' => $relationTotal,
             'today' => $today,
             'today_follow_staff' => $todayFollowStaff,
             'lastSync' => $lastSync,
@@ -1332,14 +1416,74 @@ class CustomerLogic extends BaseLogic
             }
         }
 
+        // 老客户回流数（去重客户维度）：今天有 add 事件，但今天之前就加过——
+        // 依据①事件流水里有更早的 add 事件，或②客户表首次添加时间早于今天（覆盖流水表上线前的老客户）
+        $returning = 0;
+        if ($total > 0) {
+            $todayExtIds = Db::name('qywx_external_contact_event')
+                ->where('change_type', 'add_external_contact')
+                ->where('event_time', '>=', $todayStart)
+                ->where('event_time', '<', $todayEnd)
+                ->group('external_userid')
+                ->column('external_userid');
+            $todayExtIds = array_values(array_filter($todayExtIds));
+            if ($todayExtIds !== []) {
+                $oldSet = self::resolveOldCustomerSet($todayExtIds, $todayStart);
+                $returning = count($oldSet);
+            }
+        }
+
         return [
             'total' => $total,
             'recent_time' => $recent,
+            'returning' => $returning,
             'hourly' => array_values($hourly),
             'by_state' => $byState,
         ];
     }
 
+    /**
+     * 判定"老客户"：在 $beforeTs 之前就已加过企业的客户集合。
+     *
+     * 依据（满足其一即算老客户）：
+     *   ① 事件流水表在 $beforeTs 之前存在该客户的 add_external_contact 记录；
+     *   ② 客户表 external_first_add_time（企微 follow_user 最早 createtime）早于 $beforeTs——
+     *      覆盖事件流水表上线之前就已存在的客户。
+     *
+     * @param string[] $extIds
+     * @return array<string, true> external_userid 为键的集合
+     */
+    private static function resolveOldCustomerSet(array $extIds, int $beforeTs): array
+    {
+        $extIds = array_values(array_unique(array_filter($extIds)));
+        if ($extIds === []) {
+            return [];
+        }
+
+        $old = [];
+
+        $earlierEventIds = Db::name('qywx_external_contact_event')
+            ->whereIn('external_userid', $extIds)
+            ->where('change_type', 'add_external_contact')
+            ->where('event_time', '<', $beforeTs)
+            ->group('external_userid')
+            ->column('external_userid');
+        foreach ($earlierEventIds as $id) {
+            $old[(string) $id] = true;
+        }
+
+        $earlierFirstAddIds = Db::name('qywx_external_contact')
+            ->whereIn('external_userid', $extIds)
+            ->where('external_first_add_time', '>', 0)
+            ->where('external_first_add_time', '<', $beforeTs)
+            ->column('external_userid');
+        foreach ($earlierFirstAddIds as $id) {
+            $old[(string) $id] = true;
+        }
+
+        return $old;
+    }
+
     /**
      * 今日"进入明细"流水（分页，按时间倒序）
      *
@@ -1391,6 +1535,9 @@ class CustomerLogic extends BaseLogic
             $adminMap = Admin::whereIn('work_wechat_userid', $userIds)->column('name', 'work_wechat_userid');
         }
 
+        // 标记老客户：今天之前就加过企业（重加 / 被另一名员工添加的回流客户）
+        $oldSet = self::resolveOldCustomerSet($extIds, $todayStart);
+
         $lists = [];
         foreach ($rows as $r) {
             $ext = (string) ($r['external_userid'] ?? '');
@@ -1405,6 +1552,7 @@ class CustomerLogic extends BaseLogic
                 'customer_avatar' => (string) ($customerMap[$ext]['avatar'] ?? ''),
                 'state' => (string) ($r['state'] ?? ''),
                 'welcome_code' => (int) ($r['welcome_code'] ?? 0),
+                'is_old_customer' => isset($oldSet[$ext]) ? 1 : 0,
             ];
         }
 

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/RevisitRateLogic.php

@@ -0,0 +1,829 @@
+<?php
+
+declare(strict_types=1);
+
+namespace app\adminapi\logic\stats;
+
+use app\adminapi\logic\dept\DeptLogic;
+use think\facade\Db;
+
+/**
+ * 复诊接诊率统计（按月）
+ *
+ * 口径说明：
+ *   - 当月被指派总数 = 当月内 `tcm_diagnosis_assign_log`（按 **指派操作时间 lg.create_time** 落月，to_assistant_id>0，
+ *                      **剔除勾选「继承」的指派 is_inherit=1**，诊单未删除）去重后的「医助 × 诊单」组合；
+ *                      同一诊单当月被多次指派给同一医助只计 1 次；
+ *                      **再剔除**名下存在履约「拒收(9) / 退款(10)」业务订单（未软删）的诊单。
+ *   - 第 N 次下单   = 诊单（患者）名下计入业绩的业务订单（剔除履约 4/9/10、软删）按 create_time 升序的**全局**序列中第 N 笔；
+ *                      诊次**跨月累计不重置**：例如 5 月指派后旗下成交 4 单为二诊~五诊，6 月再成交即为六诊。
+ *                      诊单可配置 `revisit_slot_start_offset`（默认 0：第 1 笔实单计为一诊；设为 1 则第 1 笔实单计为二诊；设为 2 则计为三诊，即在实单序号上叠加偏移，5 笔实单+偏移 2 等价于计至七诊）。
+ *   - 当月 N 诊单数 = **当月内下单**且全局序号为 N 的订单数，归属下单时点的**持有医助**——
+ *                      按指派日志时间线取「订单时间之前最近一次指派」的 to_assistant_id（释放 to=0 即不再归属；
+ *                      「继承」指派会转移持有人用于归属，但不计被指派数）。指派可发生在往月。
+ *   - 当月 N 诊接诊率 = 当月 N 诊单数 ÷ 当月被指派总数；往月指派当月成交会推高分子，故比率可能超过 100%；
+ *                      医助当月无新指派但旗下有成交时，被指派数为 0、比率显示为空。
+ *   - 分档动态产出：N 从 2 起，至当月命中数据的最大序号（至少展示到四诊，上限 MAX_VISIT_SLOT 防御异常数据），
+ *                   返回 `slots` 列表供前端动态渲染「五诊」「六诊」… 列。
+ *   - 部门归类：医助按其人事部门（admin_dept 最小 dept_id）归组；**仅统计「二中心」及其组织下级**（与 DeptLogic::getErCenterSubtreeDeptIdSet 一致）；
+ *                      部门筛选下拉与未选部门时的默认范围均限定在该子树内，选定部门时含其组织下级。
+ *   - 部门行 / 合计行：被指派数按诊单去重（可能小于下级行相加）；N 诊单数为下级行求和（每笔订单唯一归属一名医助）。
+ */
+class RevisitRateLogic
+{
+    /** 至少展示到的复诊序号（二诊/三诊/四诊） */
+    private const MIN_VISIT_SLOT_CEILING = 4;
+
+    /** 复诊序号统计上限（防御脏数据导致列爆炸；诊次跨月累计，上限放宽） */
+    private const MAX_VISIT_SLOT = 50;
+
+    /** 未分配部门的占位分组 */
+    private const UNASSIGNED_DEPT_NAME = '未分配部门';
+
+    /**
+     * @param array{month?:string,dept_ids?:int[]|string} $params
+     *
+     * @return array{
+     *   month:string,start_date:string,end_date:string,
+     *   slots:list<int>,
+     *   total:array<string,int|float|null>,
+     *   rows:list<array<string,mixed>>
+     * }
+     */
+    public static function overview(array $params): array
+    {
+        $ctx = self::buildStatsCore($params);
+        $month = $ctx['month'];
+
+        $minSlots = range(2, self::MIN_VISIT_SLOT_CEILING);
+        $universe = self::assistantUniverse($ctx);
+        if ($universe === []) {
+            return [
+                'month' => $month,
+                'start_date' => $ctx['startDate'],
+                'end_date' => $ctx['endDate'],
+                'slots' => $minSlots,
+                'total' => self::buildMetricPack(0, [], $minSlots),
+                'rows' => [],
+            ];
+        }
+
+        // 分档：2 ~ max(4, 当月命中的最大诊次)
+        $maxHitSlot = 0;
+        foreach ($ctx['slotOrdersByAssistant'] as $slotMap) {
+            foreach ($slotMap as $slot => $_) {
+                if ((int) $slot > $maxHitSlot) {
+                    $maxHitSlot = (int) $slot;
+                }
+            }
+        }
+        $slots = range(2, max(self::MIN_VISIT_SLOT_CEILING, $maxHitSlot));
+
+        $nameMap = Db::name('admin')
+            ->whereIn('id', array_keys($universe))
+            ->column('name', 'id');
+
+        // 医助行（按部门分组收集）
+        /** @var array<int, list<array<string, mixed>>> $assistantRowsByDept */
+        $assistantRowsByDept = [];
+        /** @var array<int, array<int, true>> $deptDiagSet 部门 => 去重被指派诊单集合 */
+        $deptDiagSet = [];
+        /** @var array<int, array<int, int>> $deptSlotCounts 部门 => [slot => 订单数] */
+        $deptSlotCounts = [];
+        /** @var array<int, true> $totalDiagSet */
+        $totalDiagSet = [];
+        /** @var array<int, int> $totalSlotCounts */
+        $totalSlotCounts = [];
+
+        foreach ($universe as $aid => $_) {
+            $deptId = (int) ($ctx['assistantDept'][$aid] ?? 0);
+            $diagSet = $ctx['diagsByAssistant'][$aid] ?? [];
+            foreach ($diagSet as $did => $_d) {
+                $deptDiagSet[$deptId][$did] = true;
+                $totalDiagSet[$did] = true;
+            }
+            $slotCounts = [];
+            foreach ($ctx['slotOrdersByAssistant'][$aid] ?? [] as $slot => $orders) {
+                $cnt = \count($orders);
+                $slotCounts[$slot] = $cnt;
+                $deptSlotCounts[$deptId][$slot] = ($deptSlotCounts[$deptId][$slot] ?? 0) + $cnt;
+                $totalSlotCounts[$slot] = ($totalSlotCounts[$slot] ?? 0) + $cnt;
+            }
+            $deptName = $deptId > 0
+                ? (string) ($ctx['deptNames'][$deptId] ?? ('#' . $deptId))
+                : self::UNASSIGNED_DEPT_NAME;
+            $assistantRowsByDept[$deptId][] = [
+                'row_key' => 'a' . $aid,
+                'is_dept' => 0,
+                'assistant_id' => (int) $aid,
+                'assistant_name' => (string) ($nameMap[$aid] ?? ('#' . $aid)),
+                'dept_id' => $deptId,
+                'dept_name' => $deptName,
+            ] + self::buildMetricPack(\count($diagSet), $slotCounts, $slots);
+        }
+
+        // 部门行 + 子行
+        $rows = [];
+        foreach ($assistantRowsByDept as $deptId => $children) {
+            usort($children, static function (array $a, array $b): int {
+                if ($a['assigned_count'] !== $b['assigned_count']) {
+                    return $b['assigned_count'] <=> $a['assigned_count'];
+                }
+
+                return strcmp((string) $a['assistant_name'], (string) $b['assistant_name']);
+            });
+            $deptName = $deptId > 0
+                ? (string) ($ctx['deptNames'][$deptId] ?? ('#' . $deptId))
+                : self::UNASSIGNED_DEPT_NAME;
+            $rows[] = [
+                'row_key' => 'd' . $deptId,
+                'is_dept' => 1,
+                'dept_id' => (int) $deptId,
+                'dept_name' => $deptName,
+                'assistant_count' => \count($children),
+                'children' => $children,
+            ] + self::buildMetricPack(\count($deptDiagSet[$deptId] ?? []), $deptSlotCounts[$deptId] ?? [], $slots);
+        }
+        usort($rows, static function (array $a, array $b): int {
+            if ($a['assigned_count'] !== $b['assigned_count']) {
+                return $b['assigned_count'] <=> $a['assigned_count'];
+            }
+
+            return strcmp((string) $a['dept_name'], (string) $b['dept_name']);
+        });
+
+        return [
+            'month' => $month,
+            'start_date' => $ctx['startDate'],
+            'end_date' => $ctx['endDate'],
+            'slots' => $slots,
+            'total' => self::buildMetricPack(\count($totalDiagSet), $totalSlotCounts, $slots),
+            'rows' => $rows,
+        ];
+    }
+
+    /**
+     * 被指派明细（按诊单聚合，与「被指派数」同口径可对账）。
+     * scope：assistant_id（医助行）/ dept_id（部门行，含 0=未分配部门）/ 都不传 = 当前部门筛选下合计。
+     *
+     * @param array{month?:string,dept_ids?:int[]|string,assistant_id?:int|string,dept_id?:int|string} $params
+     *
+     * @return array{month:string,count:int,rows:list<array<string,mixed>>}
+     */
+    public static function assignLines(array $params): array
+    {
+        $ctx = self::buildStatsCore($params);
+        $assistantSet = self::applyRowScope($ctx, $params);
+
+        /** @var array<int, array{assistants: array<int, true>, assign_count: int, last_time: int}> $byDiag */
+        $byDiag = [];
+        foreach ($ctx['pairsRaw'] as $p) {
+            $aid = (int) $p['to_assistant_id'];
+            $did = (int) $p['diagnosis_id'];
+            if (!isset($assistantSet[$aid])) {
+                continue;
+            }
+            if (!isset($byDiag[$did])) {
+                $byDiag[$did] = ['assistants' => [], 'assign_count' => 0, 'last_time' => 0];
+            }
+            $byDiag[$did]['assistants'][$aid] = true;
+            $byDiag[$did]['assign_count']++;
+            $byDiag[$did]['last_time'] = max($byDiag[$did]['last_time'], (int) $p['create_time']);
+        }
+
+        if ($byDiag === []) {
+            return ['month' => $ctx['month'], 'count' => 0, 'rows' => []];
+        }
+
+        $diagInfo = self::fetchDiagnosisInfo(array_keys($byDiag));
+        $assistantIds = [];
+        foreach ($byDiag as $d) {
+            foreach ($d['assistants'] as $aid => $_) {
+                $assistantIds[$aid] = true;
+            }
+        }
+        $nameMap = Db::name('admin')
+            ->whereIn('id', array_keys($assistantIds))
+            ->column('name', 'id');
+
+        $rows = [];
+        foreach ($byDiag as $did => $d) {
+            $names = [];
+            foreach ($d['assistants'] as $aid => $_) {
+                $names[] = (string) ($nameMap[$aid] ?? ('#' . $aid));
+            }
+            $rows[] = [
+                'diagnosis_id' => (int) $did,
+                'patient_name' => (string) ($diagInfo[$did]['patient_name'] ?? ''),
+                'patient_phone' => (string) ($diagInfo[$did]['phone'] ?? ''),
+                'assistant_names' => implode('、', $names),
+                'assign_count' => (int) $d['assign_count'],
+                'last_assign_time' => (int) $d['last_time'],
+                'last_assign_time_text' => $d['last_time'] > 0 ? date('Y-m-d H:i:s', $d['last_time']) : '',
+            ];
+        }
+        usort($rows, static fn (array $a, array $b): int => $b['last_assign_time'] <=> $a['last_assign_time']);
+
+        return ['month' => $ctx['month'], 'count' => \count($rows), 'rows' => $rows];
+    }
+
+    /**
+     * N 诊订单明细：scope 内当月下单、全局序号 = slot 的具体订单（归属持有医助），与 visit{slot}_count 同口径可对账。
+     *
+     * @param array{month?:string,slot?:int|string,dept_ids?:int[]|string,assistant_id?:int|string,dept_id?:int|string} $params
+     *
+     * @return array{month:string,slot:int,count:int,rows:list<array<string,mixed>>}
+     */
+    public static function visitOrderLines(array $params): array
+    {
+        $slot = (int) ($params['slot'] ?? 0);
+        if ($slot < 2 || $slot > self::MAX_VISIT_SLOT) {
+            return ['month' => self::normalizeMonth((string) ($params['month'] ?? '')), 'slot' => $slot, 'count' => 0, 'rows' => []];
+        }
+
+        $ctx = self::buildStatsCore($params);
+        $assistantSet = self::applyRowScope($ctx, $params);
+
+        $orderRows = [];
+        foreach ($assistantSet as $aid => $_) {
+            foreach ($ctx['slotOrdersByAssistant'][$aid][$slot] ?? [] as $r) {
+                $r['holder_assistant_id'] = (int) $aid;
+                $orderRows[] = $r;
+            }
+        }
+        if ($orderRows === []) {
+            return ['month' => $ctx['month'], 'slot' => $slot, 'count' => 0, 'rows' => []];
+        }
+
+        $diagIds = array_values(array_unique(array_map(
+            static fn (array $r): int => (int) $r['diagnosis_id'],
+            $orderRows
+        )));
+        $diagInfo = self::fetchDiagnosisInfo($diagIds);
+        $adminIds = [];
+        foreach ($orderRows as $r) {
+            if ((int) $r['creator_id'] > 0) {
+                $adminIds[(int) $r['creator_id']] = true;
+            }
+            $adminIds[(int) $r['holder_assistant_id']] = true;
+        }
+        $adminNames = $adminIds !== []
+            ? Db::name('admin')->whereIn('id', array_keys($adminIds))->column('name', 'id')
+            : [];
+
+        $rows = [];
+        foreach ($orderRows as $r) {
+            $did = (int) $r['diagnosis_id'];
+            $cid = (int) $r['creator_id'];
+            $hid = (int) $r['holder_assistant_id'];
+            $ct = (int) $r['create_time'];
+            $rows[] = [
+                'order_id' => (int) $r['id'],
+                'order_no' => (string) ($r['order_no'] ?? ''),
+                'diagnosis_id' => $did,
+                'patient_name' => (string) ($diagInfo[$did]['patient_name'] ?? ''),
+                'patient_phone' => (string) ($diagInfo[$did]['phone'] ?? ''),
+                'amount' => round((float) ($r['amount'] ?? 0), 2),
+                'create_time' => $ct,
+                'create_time_text' => $ct > 0 ? date('Y-m-d H:i:s', $ct) : '',
+                'creator_id' => $cid,
+                'creator_name' => $cid > 0 ? (string) ($adminNames[$cid] ?? ('#' . $cid)) : '—',
+                'assistant_id' => $hid,
+                'assistant_name' => $hid > 0 ? (string) ($adminNames[$hid] ?? ('#' . $hid)) : '—',
+            ];
+        }
+        usort($rows, static fn (array $a, array $b): int => $b['create_time'] <=> $a['create_time']);
+
+        return ['month' => $ctx['month'], 'slot' => $slot, 'count' => \count($rows), 'rows' => $rows];
+    }
+
+    /**
+     * 部门下拉：仅「二中心」及其组织下级（与业绩看板 ErCenter 子树一致）。
+     *
+     * @return array{rows: list<array{id:int,pid:int,name:string}>}
+     */
+    public static function deptOptions(): array
+    {
+        $erSet = DeptLogic::getErCenterSubtreeDeptIdSet();
+        if ($erSet === []) {
+            return ['rows' => []];
+        }
+        $rows = Db::name('dept')
+            ->whereNull('delete_time')
+            ->whereIn('id', array_keys($erSet))
+            ->field(['id', 'pid', 'name'])
+            ->order('sort', 'desc')
+            ->order('id', 'asc')
+            ->select()
+            ->toArray();
+
+        return [
+            'rows' => array_map(static fn (array $r): array => [
+                'id' => (int) $r['id'],
+                'pid' => (int) $r['pid'],
+                'name' => (string) $r['name'],
+            ], $rows),
+        ];
+    }
+
+    // ─────────────────────────── 内部实现 ───────────────────────────
+
+    /**
+     * 核心统计上下文：
+     *   1. 全量指派日志（≤ 月末）构建持有时间线；
+     *   2. 分母：当月非继承指派的「医助 × 诊单」，再剔除名下存在拒收(9)/退款(10) 订单的诊单；
+     *   3. 分子：曾被指派诊单的当月订单，统计诊次 = 实单序号 + 诊单偏移（默认第 1 笔实单为一诊）；
+     *   4. 应用部门筛选：默认限定「二中心」子树；选定部门时再收窄到该部门及其下级（且须落在二中心子树内）。
+     *
+     * @param array{month?:string,dept_ids?:int[]|string} $params
+     *
+     * @return array{
+     *   month:string,startDate:string,endDate:string,startTs:int,endTs:int,
+     *   pairsRaw:list<array{diagnosis_id:int,to_assistant_id:int,create_time:int}>,
+     *   diagsByAssistant:array<int,array<int,true>>,
+     *   slotOrdersByAssistant:array<int,array<int,list<array<string,mixed>>>>,
+     *   assistantDept:array<int,int>,
+     *   deptNames:array<int,string>
+     * }
+     */
+    private static function buildStatsCore(array $params): array
+    {
+        $month = self::normalizeMonth((string) ($params['month'] ?? ''));
+        $startTs = (int) strtotime($month . '-01 00:00:00');
+        $endTs = (int) strtotime(date('Y-m-t', $startTs) . ' 23:59:59');
+
+        // 全量指派日志（≤ 月末，诊单未删除）：含释放(to=0)与继承行，用于持有时间线
+        $logRows = Db::name('tcm_diagnosis_assign_log')
+            ->alias('lg')
+            ->join('tcm_diagnosis dg', 'dg.id = lg.diagnosis_id AND dg.delete_time IS NULL', 'INNER')
+            ->where('lg.create_time', '<=', $endTs)
+            ->where('lg.diagnosis_id', '>', 0)
+            ->field(['lg.id', 'lg.diagnosis_id', 'lg.to_assistant_id', 'lg.create_time', 'lg.is_inherit'])
+            ->order(['lg.diagnosis_id' => 'asc', 'lg.create_time' => 'asc', 'lg.id' => 'asc'])
+            ->select()
+            ->toArray();
+
+        /** @var array<int, list<array{t:int,to:int}>> $timeline 诊单 => 持有变更时间线（升序） */
+        $timeline = [];
+        $pairsRaw = [];
+        /** @var array<int, array<int, true>> $diagsByAssistant 分母：医助 => 诊单集合 */
+        $diagsByAssistant = [];
+        /** @var array<int, true> $candidateDiagSet 曾被指派（to>0，含继承）的诊单 */
+        $candidateDiagSet = [];
+        foreach ($logRows as $r) {
+            $did = (int) ($r['diagnosis_id'] ?? 0);
+            $aid = (int) ($r['to_assistant_id'] ?? 0);
+            $t = (int) ($r['create_time'] ?? 0);
+            $timeline[$did][] = ['t' => $t, 'to' => $aid];
+            if ($aid > 0) {
+                $candidateDiagSet[$did] = true;
+                if ((int) ($r['is_inherit'] ?? 0) === 0 && $t >= $startTs && $t <= $endTs) {
+                    $pairsRaw[] = ['diagnosis_id' => $did, 'to_assistant_id' => $aid, 'create_time' => $t];
+                    $diagsByAssistant[$aid][$did] = true;
+                }
+            }
+        }
+
+        // 分母：剔除名下存在拒收(9)/退款(10) 业务订单的诊单（与明细 assignLines 同口径）
+        $assignedDiagIds = [];
+        foreach ($diagsByAssistant as $diagSet) {
+            foreach ($diagSet as $did => $_) {
+                $assignedDiagIds[(int) $did] = true;
+            }
+        }
+        $refundRejectDiagSet = self::fetchRefundOrRejectDiagnosisSet(array_keys($assignedDiagIds));
+        if ($refundRejectDiagSet !== []) {
+            foreach ($diagsByAssistant as $aid => $diagSet) {
+                foreach ($diagSet as $did => $_) {
+                    if (isset($refundRejectDiagSet[$did])) {
+                        unset($diagsByAssistant[$aid][$did]);
+                    }
+                }
+                if ($diagsByAssistant[$aid] === []) {
+                    unset($diagsByAssistant[$aid]);
+                }
+            }
+            $pairsRaw = array_values(array_filter(
+                $pairsRaw,
+                static fn (array $p): bool => !isset($refundRejectDiagSet[(int) $p['diagnosis_id']])
+            ));
+        }
+
+        // 分子：曾被指派诊单的当月订单，统计诊次 = 实单全局序号 + 诊单偏移（默认偏移 0 → 第 1 笔实单为一诊）
+        /** @var array<int, array<int, list<array<string, mixed>>>> $slotOrdersByAssistant */
+        $slotOrdersByAssistant = [];
+        $offsetMap = self::fetchRevisitSlotStartOffsetMap(array_keys($candidateDiagSet));
+        foreach (array_chunk(array_keys($candidateDiagSet), 2000) as $chunk) {
+            $orderRows = self::fetchOrderSeqRows(
+                $chunk,
+                ['o.id', 'o.order_no', 'o.diagnosis_id', 'o.create_time', 'o.amount', 'o.creator_id']
+            );
+            $curDid = 0;
+            $seq = 0;
+            $ptr = 0;
+            $holder = 0;
+            $offset = 0;
+            foreach ($orderRows as $r) {
+                $did = (int) ($r['diagnosis_id'] ?? 0);
+                if ($did <= 0) {
+                    continue;
+                }
+                if ($did !== $curDid) {
+                    $curDid = $did;
+                    $seq = 0;
+                    $ptr = 0;
+                    $holder = 0;
+                    $offset = self::resolveRevisitSlotStartOffset($did, $offsetMap);
+                }
+                $seq++;
+                $effectiveSlot = $seq + $offset;
+                $ct = (int) ($r['create_time'] ?? 0);
+                // 推进时间线指针：订单时间之前（含同刻）最近一次指派的持有人
+                $tl = $timeline[$did] ?? [];
+                $tlCount = \count($tl);
+                while ($ptr < $tlCount && $tl[$ptr]['t'] <= $ct) {
+                    $holder = (int) $tl[$ptr]['to'];
+                    $ptr++;
+                }
+                if ($effectiveSlot < 2 || $effectiveSlot > self::MAX_VISIT_SLOT) {
+                    continue;
+                }
+                if ($ct < $startTs || $ct > $endTs) {
+                    continue;
+                }
+                if ($holder > 0) {
+                    $slotOrdersByAssistant[$holder][$effectiveSlot][] = $r;
+                }
+            }
+        }
+
+        // 医助归属部门 + 部门筛选（默认仅二中心子树；选定部门时再收窄，含组织下级）
+        $universeIds = array_keys($diagsByAssistant + $slotOrdersByAssistant);
+        [$assistantDept, $deptNames] = self::buildAssistantDeptIndex($universeIds);
+        $subtreeSet = self::resolveDeptFilterSet($params['dept_ids'] ?? null);
+        if ($subtreeSet === []) {
+            // 无二中心部门时整表为空，避免误展示其它中心数据
+            $diagsByAssistant = [];
+            $slotOrdersByAssistant = [];
+        } else {
+            foreach ($universeIds as $aid) {
+                $deptId = (int) ($assistantDept[$aid] ?? 0);
+                if ($deptId <= 0 || !isset($subtreeSet[$deptId])) {
+                    unset($diagsByAssistant[$aid], $slotOrdersByAssistant[$aid]);
+                }
+            }
+        }
+
+        return [
+            'month' => $month,
+            'startDate' => date('Y-m-d', $startTs),
+            'endDate' => date('Y-m-d', $endTs),
+            'startTs' => $startTs,
+            'endTs' => $endTs,
+            'pairsRaw' => $pairsRaw,
+            'diagsByAssistant' => $diagsByAssistant,
+            'slotOrdersByAssistant' => $slotOrdersByAssistant,
+            'assistantDept' => $assistantDept,
+            'deptNames' => $deptNames,
+        ];
+    }
+
+    /**
+     * 统计涉及的医助全集：分母（被指派）∪ 分子（持有成交）。
+     *
+     * @param array{diagsByAssistant:array<int,array<int,true>>,slotOrdersByAssistant:array<int,array<int,list<array<string,mixed>>>>} $ctx
+     *
+     * @return array<int, true>
+     */
+    private static function assistantUniverse(array $ctx): array
+    {
+        $set = [];
+        foreach (array_keys($ctx['diagsByAssistant']) as $aid) {
+            $set[(int) $aid] = true;
+        }
+        foreach (array_keys($ctx['slotOrdersByAssistant']) as $aid) {
+            $set[(int) $aid] = true;
+        }
+
+        return $set;
+    }
+
+    /**
+     * 行级 scope：assistant_id（医助行）优先；其次 dept_id（部门归组行，0=未分配部门）；都不传 = 全部（已含部门筛选）。
+     *
+     * @return array<int, true> scope 内医助集合
+     */
+    private static function applyRowScope(array $ctx, array $params): array
+    {
+        $assistantId = (int) ($params['assistant_id'] ?? 0);
+        $hasDeptScope = isset($params['dept_id']) && $params['dept_id'] !== '' && $params['dept_id'] !== null;
+        $deptScopeId = $hasDeptScope ? (int) $params['dept_id'] : -1;
+
+        $assistantSet = [];
+        foreach (self::assistantUniverse($ctx) as $aid => $_) {
+            if ($assistantId > 0) {
+                if ((int) $aid === $assistantId) {
+                    $assistantSet[$aid] = true;
+                }
+                continue;
+            }
+            if ($hasDeptScope) {
+                if ((int) ($ctx['assistantDept'][$aid] ?? 0) === $deptScopeId) {
+                    $assistantSet[$aid] = true;
+                }
+                continue;
+            }
+            $assistantSet[$aid] = true;
+        }
+
+        return $assistantSet;
+    }
+
+    /**
+     * 医助 → 归属部门 + 部门名称表。
+     *
+     * @param list<int> $adminIds
+     *
+     * @return array{0: array<int,int>, 1: array<int,string>}
+     */
+    private static function buildAssistantDeptIndex(array $adminIds): array
+    {
+        if ($adminIds === []) {
+            return [[], []];
+        }
+        // admin_dept 为 (admin_id, dept_id) 联合主键、无自增 id；取最小 dept_id 作为归属部门保证确定性
+        $relRows = Db::name('admin_dept')
+            ->whereIn('admin_id', $adminIds)
+            ->order(['admin_id' => 'asc', 'dept_id' => 'asc'])
+            ->field(['admin_id', 'dept_id'])
+            ->select()
+            ->toArray();
+
+        $deptNames = Db::name('dept')
+            ->whereNull('delete_time')
+            ->column('name', 'id');
+
+        $canonical = [];
+        foreach ($relRows as $r) {
+            $aid = (int) ($r['admin_id'] ?? 0);
+            $deptId = (int) ($r['dept_id'] ?? 0);
+            if ($aid <= 0 || $deptId <= 0 || isset($canonical[$aid])) {
+                continue;
+            }
+            if (!isset($deptNames[$deptId])) {
+                continue;
+            }
+            $canonical[$aid] = $deptId;
+        }
+
+        $names = [];
+        foreach ($deptNames as $id => $name) {
+            $names[(int) $id] = (string) $name;
+        }
+
+        return [$canonical, $names];
+    }
+
+    /**
+     * 部门筛选集合：始终落在「二中心」子树内。
+     * - 未传 dept_ids：整棵二中心子树
+     * - 已传：所选部门及其下级 ∩ 二中心子树（非法/非二中心 id 被忽略）
+     *
+     * @param mixed $raw
+     *
+     * @return array<int, true>
+     */
+    private static function resolveDeptFilterSet(mixed $raw): array
+    {
+        $erSet = DeptLogic::getErCenterSubtreeDeptIdSet();
+        if ($erSet === []) {
+            return [];
+        }
+        $deptFilterIds = self::parseDeptIds($raw);
+        if ($deptFilterIds === []) {
+            return $erSet;
+        }
+        $allowedRoots = [];
+        foreach ($deptFilterIds as $id) {
+            if (isset($erSet[$id])) {
+                $allowedRoots[] = $id;
+            }
+        }
+        if ($allowedRoots === []) {
+            return [];
+        }
+        $expanded = self::expandDeptSubtreeSet($allowedRoots);
+        $out = [];
+        foreach ($expanded as $id => $_) {
+            if (isset($erSet[$id])) {
+                $out[$id] = true;
+            }
+        }
+
+        return $out;
+    }
+
+    /**
+     * @param mixed $raw int[] | 逗号分隔字符串
+     *
+     * @return list<int>
+     */
+    private static function parseDeptIds(mixed $raw): array
+    {
+        if ($raw === null || $raw === '' || $raw === []) {
+            return [];
+        }
+        $list = \is_array($raw) ? $raw : explode(',', (string) $raw);
+
+        return array_values(array_unique(array_filter(
+            array_map('intval', $list),
+            static fn (int $v): bool => $v > 0
+        )));
+    }
+
+    /**
+     * 选中部门 + 全部组织下级的 id 集合。
+     *
+     * @param list<int> $deptIds
+     *
+     * @return array<int, true>
+     */
+    private static function expandDeptSubtreeSet(array $deptIds): array
+    {
+        $rows = Db::name('dept')
+            ->whereNull('delete_time')
+            ->field(['id', 'pid'])
+            ->select()
+            ->toArray();
+        $childrenByPid = [];
+        foreach ($rows as $r) {
+            $childrenByPid[(int) $r['pid']][] = (int) $r['id'];
+        }
+
+        $set = [];
+        $queue = $deptIds;
+        while ($queue !== []) {
+            $id = (int) array_shift($queue);
+            if ($id <= 0 || isset($set[$id])) {
+                continue;
+            }
+            $set[$id] = true;
+            foreach ($childrenByPid[$id] ?? [] as $childId) {
+                $queue[] = $childId;
+            }
+        }
+
+        return $set;
+    }
+
+    /**
+     * 名下存在履约「拒收(9) / 退款(10)」业务订单（未软删）的诊单集合。
+     * 用于「当月被指派总数」分母过滤；不限订单创建月份。
+     *
+     * @param list<int> $diagIds
+     *
+     * @return array<int, true>
+     */
+    private static function fetchRefundOrRejectDiagnosisSet(array $diagIds): array
+    {
+        if ($diagIds === []) {
+            return [];
+        }
+        $out = [];
+        foreach (array_chunk($diagIds, 2000) as $chunk) {
+            $ids = Db::name('tcm_prescription_order')
+                ->whereIn('diagnosis_id', $chunk)
+                ->whereNull('delete_time')
+                ->whereIn('fulfillment_status', [9, 10])
+                ->group('diagnosis_id')
+                ->column('diagnosis_id');
+            foreach ($ids as $id) {
+                $out[(int) $id] = true;
+            }
+        }
+
+        return $out;
+    }
+
+    /**
+     * 诊单订单序列源查询（与业绩口径一致），统一排序保证序号稳定。
+     *
+     * @param list<int>    $diagIds
+     * @param list<string> $fields
+     *
+     * @return list<array<string, mixed>>
+     */
+    private static function fetchOrderSeqRows(array $diagIds, array $fields): array
+    {
+        $q = Db::name('tcm_prescription_order')
+            ->alias('o')
+            ->whereIn('o.diagnosis_id', $diagIds)
+            ->whereNull('o.delete_time');
+        YejiStatsLogic::applyPrescriptionOrderNotCancelledForPerformanceQuery($q, 'o');
+
+        return $q
+            ->field($fields)
+            ->order(['o.diagnosis_id' => 'asc', 'o.create_time' => 'asc', 'o.id' => 'asc'])
+            ->select()
+            ->toArray();
+    }
+
+    /**
+     * @param list<int> $diagIds
+     *
+     * @return array<int, int> diagnosis_id => revisit_slot_start_offset
+     */
+    private static function fetchRevisitSlotStartOffsetMap(array $diagIds): array
+    {
+        if ($diagIds === []) {
+            return [];
+        }
+        $out = [];
+        foreach (array_chunk($diagIds, 2000) as $chunk) {
+            $rows = Db::name('tcm_diagnosis')
+                ->whereIn('id', $chunk)
+                ->whereNull('delete_time')
+                ->column('revisit_slot_start_offset', 'id');
+            foreach ($rows as $id => $offset) {
+                $out[(int) $id] = (int) $offset;
+            }
+        }
+
+        return $out;
+    }
+
+    /**
+     * 诊单复诊统计起始偏移（默认 0：第 1 笔实单计为一诊；统计诊次 = 实单序号 + 偏移）
+     *
+     * @param array<int, int> $offsetMap
+     */
+    private static function resolveRevisitSlotStartOffset(int $diagId, array $offsetMap): int
+    {
+        $offset = (int) ($offsetMap[$diagId] ?? 0);
+        if ($offset < 0) {
+            $offset = 0;
+        }
+        if ($offset > 20) {
+            $offset = 20;
+        }
+
+        return $offset;
+    }
+
+    /**
+     * @param list<int> $diagIds
+     *
+     * @return array<int, array{patient_name:string,phone:string}>
+     */
+    private static function fetchDiagnosisInfo(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;
+    }
+
+    /**
+     * @param array<int, int> $slotCounts [slot => n]
+     * @param list<int>       $slots      需输出的分档列表（保证各行键齐全）
+     *
+     * @return array<string, int|float|null>
+     */
+    private static function buildMetricPack(int $assigned, array $slotCounts, array $slots): array
+    {
+        $pack = ['assigned_count' => $assigned];
+        foreach ($slots as $slot) {
+            $cnt = (int) ($slotCounts[$slot] ?? 0);
+            $pack['visit' . $slot . '_count'] = $cnt;
+            $pack['visit' . $slot . '_rate'] = $assigned > 0
+                ? round($cnt / $assigned * 100, 2)
+                : null;
+        }
+
+        return $pack;
+    }
+
+    /** 归一化月份参数为 YYYY-MM，非法时回退当前月 */
+    private static function normalizeMonth(string $month): string
+    {
+        $month = trim($month);
+        if (preg_match('/^\d{4}-(0[1-9]|1[0-2])$/', $month) === 1) {
+            return $month;
+        }
+
+        return date('Y-m');
+    }
+}

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

@@ -21,7 +21,8 @@ use think\facade\Db;
  *
  *   - 进线数据   = 区间内 add_external_contact 事件，按接待员工(user_id) 归属部门
  *                  · 与 qywx.customer/todayArrival、客户列表同源事件表；选定渠道时客户须带对应企微标签（contact_tag）；**二中心及其组织下级在选定渠道下进线计 0**
- *   - 被指派数   = 区间内 `tcm_diagnosis_assign_log` 且 **to_assistant_id>0**，且 **related_po_create_time>0** 并落在区间（**一律按快照字段统计**，与履约释放写入一致；诊单后台指派时会回填该字段，见 DiagnosisLogic::assign）
+ *   - 被指派数   = 区间内 `tcm_diagnosis_assign_log` 且 **to_assistant_id>0**，**剔除勾选「继承」的指派 is_inherit=1**，按**指派操作时间 lg.create_time** 落区间，
+ *                  「医助 × 诊单」去重、剔除已删诊单 —— 与「复诊接诊率」页面「当月被指派总数」完全同口径（见 RevisitRateLogic）
  *                  · **二中心及其组织下级在选定渠道下计 0**（与进线一致）
  *   - 复诊统计   = 仅**名称含「二中心」的部门及其组织架构下级**：区间内业务单按患者 create_time 排序，第 1 笔不计，第 2 笔起分列「复诊2」「复诊3」…；口径同业绩单条件；按**订单创建人**所在部门在组织树内 rollup（含下级），与排行榜复诊一致
  *   - 已完成挂号 = status=3 挂号条数（appointment_date），列「已完成挂号」；部门归属：有效医助→接诊医生→展示行映射。
@@ -857,7 +858,7 @@ class YejiStatsLogic
             ? ('排行诊金 = 选定渠道「' . $channelName . '」业绩中「订单创建人 = 该医助」的部分；与部门表该渠道业绩列同口径（按订单创建人归属）。被指派数与部门表同口径。接诊率 = 诊金 ÷ 进线（元/进线）。'
             . '「二中心」及其组织下级医助在该渠道下诊金、进线与被指派计 0。'
                 . ' 预约诊单：预约表按「预约日期」落在区间内、有效医助口径同接诊，状态含已预约/已完成/已过号（不含已取消）；科室下医助全量展示。')
-            : '排行诊金 = 业务订单中「订单创建人 = 该医助」的金额合计；与部门表「合计业绩」同口径（按订单创建人归属）。被指派数为指派至该医助的次数。接诊率 = 诊金 ÷ 进线（元/进线；进线为 0 时为 0）。'
+            : '排行诊金 = 业务订单中「订单创建人 = 该医助」的金额合计；与部门表「合计业绩」同口径（按订单创建人归属）。被指派数为指派至该医助的次数（剔除勾选「继承」的指派）。接诊率 = 诊金 ÷ 进线（元/进线；进线为 0 时为 0）。'
                 . ' 预约诊单：预约表按「预约日期」落在区间内、有效医助口径同接诊，状态含已预约/已完成/已过号（不含已取消）；科室下医助全量展示。';
 
         $leaderboards = [];
@@ -1777,8 +1778,9 @@ class YejiStatsLogic
     }
 
     /**
-     * 被指派数：统计 `tcm_diagnosis_assign_log`（to_assistant_id>0），**仅**按 **related_po_create_time** 落入区间（须 >0）。
-     * 选定字典渠道时 INNER JOIN 诊单以满足挂号 channels EXISTS；tag 退化口径只过滤日志字段，不强制挂诊单。
+     * 被指派数：统计 `tcm_diagnosis_assign_log`（to_assistant_id>0，**剔除勾选「继承」的指派 is_inherit=1**），
+     * 按**指派操作时间 lg.create_time** 落入区间，「医助 × 诊单」去重（COUNT DISTINCT diagnosis_id）、剔除已删诊单，
+     * 与「复诊接诊率」页面同口径。选定字典渠道时按挂号 channels EXISTS 收窄；tag 退化口径按日志字段过滤。
      *
      * @param array<int, int> $adminToPrimary
      * @param int[]|null $tagDiagIds
@@ -1801,11 +1803,13 @@ class YejiStatsLogic
             return [];
         }
 
+        $diagTable = self::tableWithPrefix('tcm_diagnosis');
         $query = Db::name('tcm_diagnosis_assign_log')
             ->alias('lg')
-            ->where('lg.related_po_create_time', '>', 0)
-            ->where('lg.related_po_create_time', 'between', [$startTs, $endTs])
-            ->where('lg.to_assistant_id', '>', 0);
+            ->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);
         if ($channelFilterActive) {
             if ($appointmentChannelValues !== []) {
                 $norm = self::normalizeAppointmentChannelValues($appointmentChannelValues);
@@ -1816,8 +1820,6 @@ class YejiStatsLogic
                 if ($pack === null) {
                     return [];
                 }
-                $diagTable = self::tableWithPrefix('tcm_diagnosis');
-                $query->join("{$diagTable} dg", 'dg.id = lg.diagnosis_id AND dg.delete_time IS NULL', 'INNER');
                 $query->whereRaw($pack[0], $pack[1]);
             } elseif ($tagDiagIds !== null || $tagAssistantIds !== null) {
                 if ($tagDiagIds !== null && $tagDiagIds === []) {
@@ -1837,7 +1839,7 @@ class YejiStatsLogic
             }
         }
 
-        $query->field(['lg.to_assistant_id', Db::raw('COUNT(*) AS cnt')])
+        $query->field(['lg.to_assistant_id', Db::raw('COUNT(DISTINCT lg.diagnosis_id) AS cnt')])
             ->group('lg.to_assistant_id');
 
         $rows = $query->select()->toArray();
@@ -1869,7 +1871,7 @@ class YejiStatsLogic
     }
 
     /**
-     * 医助维度被指派次数：与 countDiagnosisAssignsByDept 同过滤与区间，按 to_assistant_id 汇总（供排行榜）。
+     * 医助维度被指派次数：与 countDiagnosisAssignsByDept 同过滤与区间（同样剔除 is_inherit=1），按 to_assistant_id 汇总（供排行榜）。
      *
      * @return array<int, int>
      */
@@ -1883,11 +1885,13 @@ class YejiStatsLogic
         ?array $dataScopeAdminIds = null,
         ?array $channelInfo = null
     ): array {
+        $diagTable = self::tableWithPrefix('tcm_diagnosis');
         $query = Db::name('tcm_diagnosis_assign_log')
             ->alias('lg')
-            ->where('lg.related_po_create_time', '>', 0)
-            ->where('lg.related_po_create_time', 'between', [$startTs, $endTs])
-            ->where('lg.to_assistant_id', '>', 0);
+            ->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);
 
         if ($channelFilterActive) {
             if ($appointmentChannelValues !== []) {
@@ -1899,8 +1903,6 @@ class YejiStatsLogic
                 if ($pack === null) {
                     return [];
                 }
-                $diagTable = self::tableWithPrefix('tcm_diagnosis');
-                $query->join("{$diagTable} dg", 'dg.id = lg.diagnosis_id AND dg.delete_time IS NULL', 'INNER');
                 $query->whereRaw($pack[0], $pack[1]);
             } elseif ($tagDiagIds !== null || $tagAssistantIds !== null) {
                 if ($tagDiagIds !== null && $tagDiagIds === []) {
@@ -1920,7 +1922,7 @@ class YejiStatsLogic
             }
         }
 
-        $query->field(['lg.to_assistant_id', Db::raw('COUNT(*) AS cnt')])
+        $query->field(['lg.to_assistant_id', Db::raw('COUNT(DISTINCT lg.diagnosis_id) AS cnt')])
             ->group('lg.to_assistant_id');
 
         $rows = $query->select()->toArray();
@@ -2614,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：视为上一任持有人（库未同步时的兜底）
@@ -649,6 +748,49 @@ class DiagnosisLogic extends BaseLogic
         }
     }
 
+    /**
+     * @notes 诊单指派医助操作记录列表
+     */
+    public static function setRevisitSlotStartOffset(int $diagnosisId, int $offset, array $adminInfo): bool
+    {
+        self::$error = '';
+        if ($diagnosisId <= 0) {
+            self::setError('诊单不存在');
+
+            return false;
+        }
+        if ($offset < 0 || $offset > 20) {
+            self::setError('起始偏移须在 0～20 之间');
+
+            return false;
+        }
+        $diagnosis = Diagnosis::where('id', $diagnosisId)->whereNull('delete_time')->find();
+        if (!$diagnosis) {
+            self::setError('诊单不存在');
+
+            return false;
+        }
+        $old = (int) ($diagnosis->revisit_slot_start_offset ?? 0);
+        if ($old < 0) {
+            $old = 0;
+        }
+        if ($old > 20) {
+            $old = 20;
+        }
+        if ($old === $offset) {
+            return true;
+        }
+        try {
+            $diagnosis->save(['revisit_slot_start_offset' => $offset]);
+
+            return true;
+        } catch (\Exception $e) {
+            self::setError($e->getMessage());
+
+            return false;
+        }
+    }
+
     /**
      * @notes 诊单指派医助操作记录列表
      */
@@ -3092,8 +3234,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 +3266,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/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',
@@ -43,6 +44,7 @@ class DiagnosisValidate extends BaseValidate
         'end_date' => 'date|checkDateRange',
         'diagnosis_id' => 'require|integer|checkDiagnosisId',
         'tracking_content' => 'require|length:1,1000',
+        'revisit_slot_start_offset' => 'integer|between:0,20',
     ];
 
     protected $message = [
@@ -50,6 +52,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 +61,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个字符',
@@ -135,6 +140,13 @@ class DiagnosisValidate extends BaseValidate
         return $this->only(['id']);
     }
 
+    /** 业务订单 tab：设置复诊接诊率统计起始偏移 */
+    public function sceneSetRevisitSlotStartOffset()
+    {
+        return $this->only(['id', 'revisit_slot_start_offset'])
+            ->append('revisit_slot_start_offset', 'require|integer|between:0,20');
+    }
+
     protected function checkDiagnosis($value)
     {
         $diagnosis = Diagnosis::findOrEmpty($value);

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'],
@@ -83,6 +89,7 @@ class PrescriptionOrderValidate extends BaseValidate
         'submitGancaoRecipel' => ['id'],
         'previewGancaoRecipel' => ['id'],
         'patchPrescriptionPatient' => ['id', 'patient_name', 'phone'],
+        'patchPrescriptionUsage' => ['id', 'times_per_day', 'usage_days', 'medication_days', 'aux_times_per_day', 'aux_usage_days'],
         'updateAmount' => ['id', 'amount'],
         'setShipMode' => ['id', 'ship_mode'],
     ];
@@ -91,6 +98,17 @@ 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');
+    }
+
+    public function patchPrescriptionUsage(): PrescriptionOrderValidate
+    {
+        return $this->only(['id', 'times_per_day', 'usage_days', 'medication_days', 'aux_times_per_day', 'aux_usage_days'])
+            ->append('id', 'require|integer|gt:0')
+            ->append('times_per_day', 'require|integer|between:1,6')
+            ->append('usage_days', 'require|integer|between:1,999')
+            ->append('medication_days', 'require|integer|between:1,999')
+            ->append('aux_times_per_day', 'integer|between:1,6')
+            ->append('aux_usage_days', 'integer|between:1,999');
     }
 }

server/app/api/controller/QywxExternalContactCallbackController.php

@@ -133,12 +133,6 @@ class QywxExternalContactCallbackController extends BaseApiController
             $failReason !== '' ? $failReason : '-'
         ));
 
-        if ($changeType === 'del_external_contact') {
-            CustomerLogic::softDeleteExternalContactRow($extId);
-
-            return;
-        }
-
         if ($changeType === 'add_half_external_contact') {
             // 半客户：客户尚未通过验证，/externalcontact/get 通常返回 84061「客户尚未通过」之类，
             // 这里只 log 不写库，避免产生 noise；客户通过后会再触发 add_external_contact 事件再走 UPSERT。
@@ -153,17 +147,17 @@ class QywxExternalContactCallbackController extends BaseApiController
             return;
         }
 
-        if ($changeType === 'del_follow_user') {
-            // 某员工不再跟进该客户：只需把本地 follow_users 里对应 userid 移除；
-            // 若已无跟进人则软删；不再回调 /externalcontact/get（最后一个跟进人被删时会稳定返回 84061）。
-            if ($userId !== '') {
-                CustomerLogic::removeFollowUserFromLocal($extId, $userId);
-            }
-
-            return;
-        }
-
-        // 其余变更（添加/编辑/转接成功/标签变化等）：以 get 详情为准 UPSERT，避免遗漏未枚举的 ChangeType
-        CustomerLogic::upsertSingleExternalContactFromApi($extId);
+        // 其余全部变更（添加/编辑/删除/被删/转接/标签变化等）：一律以 /externalcontact/get 的真实状态为准。
+        //   - 仍是企业客户（含"客户单方删除员工"，企微会保留客户与跟进关系）→ UPSERT 最新数据；
+        //   - 已彻底不是企业客户（84061）→ 本地软删。
+        // 实测验证：del_follow_user（客户删员工）后 get 依然成功返回且 follow_user 保留，
+        // 本地自行推断移除跟进人/软删会导致客户数持续少于企微，故删除类事件不再走本地推断。
+        // 添加事件若命中已有客户（含软删行）：不动原有行，新增一行 readd_flag=1（以前加过）的记录。
+        CustomerLogic::upsertSingleExternalContactFromApi(
+            $extId,
+            $changeType === 'add_external_contact',
+            $userId,
+            $eventTime
+        );
     }
 }

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

@@ -1 +1 @@
-import r from"./error-Baib8GsN.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-lurTijPg.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-HOEUG8sr.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-DKxtBL_b.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};
+import r from"./error-DFSD5l9g.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-d3j0BX4t.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-BjGrgNAa.js

@@ -1 +1 @@
-import o from"./error-Baib8GsN.js";import{f as r,ak as t,I as m,a as p}from"./@vue/runtime-core-C6bnekPw.js";import"./element-plus-lurTijPg.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-HOEUG8sr.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-DKxtBL_b.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};
+import o from"./error-DFSD5l9g.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-d3j0BX4t.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/AssignLogPanel-BTMYDew1.js

@@ -1 +1 @@
-import{M as T,N as C,T as $,r as D,d as L,L as k}from"./element-plus-lurTijPg.js";import{W as E}from"./@element-plus/icons-vue-HOEUG8sr.js";import{a4 as P}from"./tcm-GRQUYn2R.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-DKxtBL_b.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 q={class:"assign-log-panel"},z={key:1,class:"text-gray-400"},G=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",q,[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",z,"否"))]),_: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(G,[["__scopeId","data-v-f670e3e6"]]);export{Ct as default};
+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{a8 as P}from"./tcm-Dsvdp1dm.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-d3j0BX4t.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};