更新

- tcm.diagnosis/lists 新增最近有效挂号时间区间与渠道筛选，lists/count 共用过滤逻辑

- 诊单患者列表更多筛选增加最近挂号时间和渠道，并与顶部挂号快捷筛选互斥

- 明确 daterange-picker change 事件转发，列表补充最近挂号渠道摘要展示

.gitignore

@@ -26,11 +26,8 @@ bin-release/
 /.cursor
 /.codex
 /.agents
-/.claude
-/.claude
-/.claude
-/.kbctx
 /server/.spool
 /server/.claude
 /.spool
 TUICallKit-Vue3/.env
+/.codegraph

.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/components/dev-training-entry/index.vue

@@ -1,42 +1,65 @@
 <template>
     <!-- 页面内嵌模块（如 weekly 统计页主内容区） -->
-    <view v-if="visible && props.inline" class="dev-entry-inline">
-        <view class="inline-head">
-            <view class="inline-head-text">
-                <text class="inline-title">居家耗糖训练</text>
-                <text class="inline-sub">低强度动起来，配合血糖管理</text>
+    <view
+        v-if="visible && props.inline"
+        class="dev-entry-inline"
+        :class="{ 'dev-entry-inline--weekly': props.tone === 'weekly' }"
+    >
+        <view class="inline-hero">
+            <view class="inline-hero-icon" aria-hidden="true">
+                <view class="inline-hero-wave" />
             </view>
-            <view class="inline-wave" aria-hidden="true" />
-        </view>
-        <view class="inline-grid">
-            <view
-                v-for="item in trainingItems"
-                :key="item.url"
-                class="inline-item"
-                @click="goto(item.url)"
-            >
-                <view class="menu-icon" :class="item.iconClass">
-                    <view v-if="item.icon === 'dumbbell'" class="dumbbell-shape">
-                        <view class="dumbbell-plate dumbbell-plate-left" />
-                        <view class="dumbbell-bar" />
-                        <view class="dumbbell-plate dumbbell-plate-right" />
-                    </view>
-                    <view v-else-if="item.icon === 'pedal'" class="foot-pedal-shape">
-                        <view class="pedal-bar pedal-bar-left" />
-                        <view class="pedal-bar pedal-bar-right" />
-                    </view>
-                    <view v-else-if="item.icon === 'pilates'" class="pilates-ring-shape" />
-                    <view v-else-if="item.icon === 'grip'" class="grip-ring-shape" />
-                    <view v-else-if="item.icon === 'metro'" class="menu-icon--metro-inner">
-                        <view class="metro-bar metro-bar-1" />
-                        <view class="metro-bar metro-bar-2" />
-                        <view class="metro-bar metro-bar-3" />
-                    </view>
+            <view class="inline-hero-text">
+                <view class="inline-hero-title-row">
+                    <text class="inline-title">居家耗糖训练</text>
+                    <text v-if="props.tone === 'weekly'" class="inline-pill">体验</text>
                 </view>
-                <text class="inline-item-title">{{ item.title }}</text>
-                <text class="inline-item-sub">{{ item.sub }}</text>
+                <text class="inline-sub">低强度动起来，帮助身体消耗糖分</text>
             </view>
         </view>
+
+        <scroll-view
+            scroll-x
+            class="inline-scroll"
+            :show-scrollbar="false"
+            :enable-flex="true"
+        >
+            <view class="inline-scroll-track">
+                <view
+                    v-for="item in inlineItems"
+                    :key="item.url"
+                    class="inline-card"
+                    @click="goto(item.url)"
+                >
+                    <view v-if="item.featured" class="inline-card-badge">
+                        <text>推荐</text>
+                    </view>
+                    <view class="menu-icon" :class="item.iconClass">
+                        <view v-if="item.icon === 'dumbbell'" class="dumbbell-shape">
+                            <view class="dumbbell-plate dumbbell-plate-left" />
+                            <view class="dumbbell-bar" />
+                            <view class="dumbbell-plate dumbbell-plate-right" />
+                        </view>
+                        <view v-else-if="item.icon === 'pedal'" class="foot-pedal-shape">
+                            <view class="pedal-bar pedal-bar-left" />
+                            <view class="pedal-bar pedal-bar-right" />
+                        </view>
+                        <view v-else-if="item.icon === 'pilates'" class="pilates-ring-shape" />
+                        <view v-else-if="item.icon === 'grip'" class="grip-ring-shape" />
+                        <view v-else-if="item.icon === 'metro'" class="menu-icon--metro-inner">
+                            <view class="metro-bar metro-bar-1" />
+                            <view class="metro-bar metro-bar-2" />
+                            <view class="metro-bar metro-bar-3" />
+                        </view>
+                    </view>
+                    <text class="inline-card-title">{{ item.title }}</text>
+                    <text class="inline-card-sub">{{ item.sub }}</text>
+                    <text class="inline-card-go" aria-hidden="true">进入</text>
+                </view>
+            </view>
+        </scroll-view>
+
+        <text v-if="props.tone === 'weekly'" class="inline-scroll-hint">左右滑动，选择适合您的训练</text>
     </view>
 
     <view v-else-if="visible" class="dev-entry-wrap" :style="{ bottom: props.bottom + 'rpx' }">
@@ -124,15 +147,24 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { computed, ref } from 'vue'
 
-const trainingItems = [
+type TrainingItem = {
+    url: string
+    title: string
+    sub: string
+    icon: 'dumbbell' | 'pedal' | 'pilates' | 'grip' | 'metro'
+    iconClass: string
+    featured?: boolean
+}
+
+const trainingItems: TrainingItem[] = [
     { url: '/training/pages/dumbbell', title: '哑铃', sub: '力量塑形', icon: 'dumbbell', iconClass: 'menu-icon--dumbbell' },
     { url: '/training/pages/foot-pedal', title: '脚蹬器', sub: '下肢有氧', icon: 'pedal', iconClass: 'menu-icon--pedal' },
     { url: '/training/pages/pilates-ring', title: '瑜伽环', sub: '核心塑形', icon: 'pilates', iconClass: 'menu-icon--pilates' },
     { url: '/training/pages/grip-ring', title: '握力环', sub: '握力训练', icon: 'grip', iconClass: 'menu-icon--grip' },
-    { url: '/training/pages/metronome', title: '耗糖节拍器', sub: '健走配速', icon: 'metro', iconClass: 'menu-icon--metro' },
-] as const
+    { url: '/training/pages/metronome', title: '耗糖节拍器', sub: '健走配速', icon: 'metro', iconClass: 'menu-icon--metro', featured: true },
+]
 
 const props = withDefaults(
     defineProps<{
@@ -140,10 +172,20 @@ const props = withDefaults(
         bottom?: number
         /** 内嵌到页面主内容区，非 fixed 悬浮 */
         inline?: boolean
+        /** weekly 页：与统计页 Vital Mint 视觉一致 */
+        tone?: 'default' | 'weekly'
     }>(),
-    { bottom: 200, inline: false },
+    { bottom: 200, inline: false, tone: 'default' },
 )
 
+/** weekly 将健走节拍器置前并标推荐 */
+const inlineItems = computed(() => {
+    if (props.tone !== 'weekly') return trainingItems
+    const metro = trainingItems.find((i) => i.icon === 'metro')
+    const rest = trainingItems.filter((i) => i.icon !== 'metro')
+    return metro ? [metro, ...rest] : trainingItems
+})
+
 const isDevMode = (): boolean => {
     /* HBuilderX 工程：发行(release)模式下 NODE_ENV === 'production' */
     try {
@@ -515,28 +557,59 @@ $brand-light: #34d399;
  * ============================================================ */
 .dev-entry-inline {
     width: 100%;
-    padding: 24rpx 24rpx 20rpx;
-    border-radius: 48rpx;
-    background: #fff;
-    border: 1rpx solid rgba(0, 108, 73, 0.12);
-    box-shadow: 0 24rpx 60rpx -20rpx rgba(0, 108, 73, 0.08), 0 8rpx 20rpx -8rpx rgba(0, 0, 0, 0.03);
     box-sizing: border-box;
 }
 
-.inline-head {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    gap: 16rpx;
-    margin-bottom: 20rpx;
+.dev-entry-inline--weekly {
+    padding: 32rpx 28rpx 24rpx;
+    border-radius: 48rpx;
+    background: var(--surface-container-lowest, #fff);
+    border: 1rpx solid rgba(0, 108, 73, 0.12);
+    box-shadow:
+        0 24rpx 60rpx -20rpx rgba(0, 108, 73, 0.08),
+        0 8rpx 20rpx -8rpx rgba(0, 0, 0, 0.03);
 }
 
-.inline-head-text {
+.inline-hero {
+    display: flex;
+    align-items: center;
+    gap: 20rpx;
+    margin-bottom: 24rpx;
+}
+
+.inline-hero-icon {
+    width: 88rpx;
+    height: 88rpx;
+    border-radius: 24rpx;
+    background: rgba(0, 108, 73, 0.1);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+}
+
+.inline-hero-wave {
+    width: 52rpx;
+    height: 52rpx;
+    background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%23006c49' stroke-width='2.4' stroke-linecap='round' stroke-linejoin='round'><polyline points='2,12 7,12 9.5,7 12,17 14.5,9 16.5,12 22,12'/></svg>");
+    background-size: contain;
+    background-repeat: no-repeat;
+    background-position: center;
+}
+
+.inline-hero-text {
     flex: 1;
     min-width: 0;
     display: flex;
     flex-direction: column;
-    gap: 4rpx;
+    gap: 6rpx;
+}
+
+.inline-hero-title-row {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 10rpx;
 }
 
 .inline-title {
@@ -546,75 +619,119 @@ $brand-light: #34d399;
     line-height: 1.25;
 }
 
+.inline-pill {
+    font-size: 20rpx;
+    font-weight: 700;
+    color: #006c49;
+    padding: 4rpx 12rpx;
+    border-radius: 999rpx;
+    background: rgba(0, 108, 73, 0.1);
+    line-height: 1.2;
+}
+
 .inline-sub {
-    font-size: 24rpx;
+    font-size: 26rpx;
     font-weight: 500;
-    color: #64748b;
-    line-height: 1.35;
+    color: #475569;
+    line-height: 1.4;
 }
 
-.inline-wave {
-    width: 120rpx;
-    height: 48rpx;
-    flex-shrink: 0;
-    background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 120 40' fill='none'><path d='M0 20 H18 L26 8 L34 32 L42 14 L50 26 L58 20 H120' stroke='%23006c49' stroke-width='3' stroke-linecap='round' stroke-linejoin='round' opacity='0.85'/></svg>");
-    background-size: contain;
-    background-repeat: no-repeat;
-    background-position: center right;
+.inline-scroll {
+    width: 100%;
+    white-space: nowrap;
 }
 
-/* 五行并列，一屏展示完整（不横向滑动） */
-.inline-grid {
-    display: flex;
+.inline-scroll-track {
+    display: inline-flex;
     flex-direction: row;
     align-items: stretch;
-    justify-content: space-between;
-    gap: 8rpx;
-    width: 100%;
+    gap: 16rpx;
+    padding: 4rpx 2rpx 8rpx;
 }
 
-.inline-item {
-    flex: 1;
-    min-width: 0;
-    display: flex;
+.inline-card {
+    position: relative;
+    display: inline-flex;
     flex-direction: column;
-    align-items: center;
-    padding: 14rpx 4rpx 12rpx;
-    border-radius: 20rpx;
-    background: #f0fdf4;
+    align-items: flex-start;
+    width: 212rpx;
+    min-height: 220rpx;
+    padding: 20rpx 18rpx 18rpx;
+    border-radius: 28rpx;
+    background: #f4f7f5;
     border: 1rpx solid rgba(0, 108, 73, 0.1);
     box-sizing: border-box;
+    flex-shrink: 0;
+    transition: transform 0.2s ease, background 0.2s ease;
 
     &:active {
-        transform: scale(0.97);
-        opacity: 0.9;
+        transform: scale(0.98);
+        background: #e8f3ee;
     }
 
     .menu-icon {
-        width: 56rpx;
-        height: 56rpx;
-        margin-bottom: 8rpx;
+        width: 72rpx;
+        height: 72rpx;
+        margin-bottom: 14rpx;
         flex-shrink: 0;
     }
 }
 
-.inline-item-title {
-    font-size: 22rpx;
-    font-weight: 700;
-    color: #0f172a;
-    text-align: center;
-    line-height: 1.2;
-    width: 100%;
-    word-break: break-all;
+.inline-card-badge {
+    position: absolute;
+    top: 12rpx;
+    right: 12rpx;
+    padding: 4rpx 10rpx;
+    border-radius: 8rpx;
+    background: #006c49;
+
+    text {
+        font-size: 18rpx;
+        font-weight: 700;
+        color: #fff;
+        line-height: 1.2;
+    }
 }
 
-.inline-item-sub {
-    margin-top: 2rpx;
-    font-size: 18rpx;
+.inline-card-title {
+    font-size: 28rpx;
+    font-weight: 700;
+    color: #0f172a;
+    line-height: 1.25;
+    width: 100%;
+}
+
+.inline-card-sub {
+    margin-top: 6rpx;
+    font-size: 22rpx;
+    font-weight: 500;
+    color: #64748b;
+    line-height: 1.35;
+    width: 100%;
+}
+
+.inline-card-go {
+    margin-top: auto;
+    padding-top: 12rpx;
+    font-size: 22rpx;
+    font-weight: 700;
+    color: #006c49;
+    line-height: 1.2;
+}
+
+.inline-scroll-hint {
+    display: block;
+    margin-top: 14rpx;
+    font-size: 22rpx;
+    font-weight: 600;
     color: #94a3b8;
     text-align: center;
-    line-height: 1.2;
-    width: 100%;
-    word-break: break-all;
+    line-height: 1.35;
+}
+
+@media (prefers-reduced-motion: reduce) {
+    .inline-card:active {
+        transform: none;
+    }
 }
 </style>

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

@@ -5,7 +5,7 @@
             v-if="src && !imageFailed"
             class="food-tile-icon__img"
             :src="src"
-            :mode="size === 'tile' ? 'aspectFill' : 'aspectFit'"
+            mode="aspectFit"
             @error="onImageError"
         />
     </view>
@@ -66,11 +66,16 @@ function onImageError() {
     left: 50%;
     top: 50%;
     transform: translate(-50%, -50%);
-    width: 58%;
-    height: 58%;
+    width: 75%;
+    height: 75%;
     z-index: 2;
 }
 
+/* 玻璃格上的食材图片：投影增强立体感（参考稿） */
+.food-tile-icon--tile .food-tile-icon__img {
+    filter: drop-shadow(0 6rpx 10rpx rgba(0, 0, 0, 0.16));
+}
+
 .food-tile-icon--goal {
     width: 40rpx;
     height: 40rpx;

TUICallKit-Vue3/tongji/composables/useBloodCareAi.js

@@ -0,0 +1,203 @@
+import { ref, computed } from 'vue'
+import { requestAiStream, parsePartialBloodCarePlainText } from '../utils/aiStreamRequest.js'
+
+const emptyBloodCarePlan = () => ({
+    summary: '',
+    blood_advice: '',
+    tcm_plan: '',
+    watch_points: [],
+    next_steps: '',
+    control_level: '',
+    control_label: '',
+    disclaimer: '',
+    analysis: [],
+    source: '',
+    date: ''
+})
+
+/** AI 血糖照护建议（累计 7 天有记录后） */
+export function useBloodCareAi(proxy, { diagnosisId, chartUseMockData, showUserToast, formatUserMessage }) {
+    const bloodCarePlan = ref(emptyBloodCarePlan())
+    const bloodCareLoading = ref(false)
+    const bloodCareStreaming = ref(false)
+    const bloodCareStreamField = ref('')
+    let careStreamBuffer = ''
+    /** 用户点击后才展开照护建议卡片 */
+    const bloodCarePanelOpen = ref(false)
+
+    const bloodCareEligible = computed(() => {
+        return !!diagnosisId.value && !chartUseMockData.value
+    })
+
+    const hasBloodCareContent = computed(() => {
+        const p = bloodCarePlan.value
+        return !!(p.summary || p.blood_advice || p.tcm_plan)
+    })
+
+    const bloodCareAnalysis = computed(() => {
+        const list = bloodCarePlan.value?.analysis
+        return Array.isArray(list) ? list : []
+    })
+
+    const bloodCareControlLabel = computed(() => {
+        const label = String(bloodCarePlan.value?.control_label || '').trim()
+        return label
+    })
+
+    const bloodCareDisclaimer = computed(() => {
+        return String(bloodCarePlan.value?.disclaimer || '').trim()
+    })
+
+    function detectCareStreamField(text) {
+        const tail = String(text || '').match(/(?:^|\n)(总评|血糖|中医|留意|复诊)[：:]\s*([^\n]*)$/)
+        if (!tail) return 'summary'
+        const map = { '总评': 'summary', '血糖': 'blood_advice', '中医': 'tcm_plan', '留意': 'watch_points', '复诊': 'next_steps' }
+        return map[tail[1]] || 'summary'
+    }
+
+    function mergePartialCareFromStream() {
+        const partial = parsePartialBloodCarePlainText(careStreamBuffer)
+        const next = { ...bloodCarePlan.value }
+        for (const key of ['summary', 'blood_advice', 'tcm_plan', 'next_steps']) {
+            if (partial[key] != null) next[key] = partial[key]
+        }
+        if (Array.isArray(partial.watch_points)) next.watch_points = partial.watch_points
+        bloodCarePlan.value = next
+        bloodCareStreamField.value = detectCareStreamField(careStreamBuffer)
+    }
+
+    function applyBloodCarePayload(payload) {
+        if (!payload) return
+        const prevAnalysis = bloodCarePlan.value.analysis
+        bloodCarePlan.value = {
+            ...emptyBloodCarePlan(),
+            ...payload,
+            watch_points: Array.isArray(payload.watch_points) ? payload.watch_points : [],
+            analysis: Array.isArray(payload.analysis) && payload.analysis.length
+                ? payload.analysis
+                : (Array.isArray(prevAnalysis) ? prevAnalysis : [])
+        }
+    }
+
+    function onBloodCareStreamEvent(event, payload) {
+        if (event === 'analysis') {
+            if (Array.isArray(payload?.analysis)) {
+                bloodCarePlan.value = { ...bloodCarePlan.value, analysis: payload.analysis }
+            }
+        } else if (event === 'delta') {
+            bloodCareStreaming.value = true
+            if (payload.buffer != null) {
+                careStreamBuffer = payload.buffer
+            } else {
+                careStreamBuffer += payload.text || ''
+            }
+            mergePartialCareFromStream()
+        } else if (event === 'done') {
+            applyBloodCarePayload(payload)
+            careStreamBuffer = ''
+            bloodCareStreamField.value = ''
+        } else if (event === 'error') {
+            showUserToast(formatUserMessage(payload?.message, '照护建议加载失败'))
+        }
+    }
+
+    async function fetchBloodCareAiFallback(refresh) {
+        const res = await proxy.apiUrl({
+            url: '/api/tcm/dailyBloodCareAiRecommend',
+            method: 'GET',
+            timeout: 35000,
+            data: {
+                diagnosis_id: diagnosisId.value,
+                refresh: refresh ? 1 : 0,
+                ...(refresh ? { _t: Date.now() } : {})
+            }
+        }, false)
+        if (res?.code === 1 && res.data) {
+            applyBloodCarePayload(res.data)
+        } else if (res?.msg) {
+            showUserToast(res.msg)
+        }
+    }
+
+    function closeBloodCarePanel() {
+        bloodCarePanelOpen.value = false
+    }
+
+    /** 趋势图 AI 按钮：未展开则打开并生成；已展开则收起 */
+    async function toggleBloodCareFromChart() {
+        if (!bloodCareEligible.value || bloodCareLoading.value) return
+        if (bloodCarePanelOpen.value) {
+            closeBloodCarePanel()
+            return
+        }
+        bloodCarePanelOpen.value = true
+        if (!hasBloodCareContent.value) {
+            await fetchBloodCareAi(false)
+        }
+    }
+
+    async function fetchBloodCareAi(refresh = false) {
+        if (!bloodCareEligible.value || bloodCareLoading.value) return
+        bloodCareLoading.value = true
+        bloodCareStreaming.value = false
+        careStreamBuffer = ''
+        bloodCareStreamField.value = ''
+        if (refresh) {
+            applyBloodCarePayload(emptyBloodCarePlan())
+        }
+        try {
+            await requestAiStream({
+                baseUrl: proxy.$url,
+                url: '/api/tcm/dailyBloodCareAiRecommendStream',
+                method: 'GET',
+                data: {
+                    diagnosis_id: diagnosisId.value,
+                    refresh: refresh ? 1 : 0,
+                    ...(refresh ? { _t: Date.now() } : {})
+                },
+                onEvent: onBloodCareStreamEvent,
+                fallback: () => fetchBloodCareAiFallback(refresh)
+            })
+        } catch (e) {
+            try {
+                await fetchBloodCareAiFallback(refresh)
+            } catch (e2) {
+                showUserToast('照护建议加载失败')
+            }
+        } finally {
+            bloodCareLoading.value = false
+            bloodCareStreaming.value = false
+            bloodCareStreamField.value = ''
+        }
+    }
+
+    function refreshBloodCareAi() {
+        if (bloodCareLoading.value) return
+        fetchBloodCareAi(true)
+    }
+
+    function resetBloodCarePlan() {
+        applyBloodCarePayload(emptyBloodCarePlan())
+        careStreamBuffer = ''
+        bloodCareStreamField.value = ''
+        bloodCarePanelOpen.value = false
+    }
+
+    return {
+        bloodCarePlan,
+        bloodCareLoading,
+        bloodCareStreaming,
+        bloodCareStreamField,
+        bloodCareEligible,
+        bloodCarePanelOpen,
+        hasBloodCareContent,
+        bloodCareAnalysis,
+        bloodCareControlLabel,
+        bloodCareDisclaimer,
+        fetchBloodCareAi,
+        toggleBloodCareFromChart,
+        closeBloodCarePanel,
+        refreshBloodCareAi,
+        resetBloodCarePlan
+    }
+}

TUICallKit-Vue3/tongji/composables/useDietAi.js

@@ -5,6 +5,7 @@ const DIET_AI_PREFILL_KEY = 'tongji_diet_ai_prefill'
 
 const emptyDietAiRecommend = () => ({
     breakfast: '',
+    drinks: '',
     lunch: '',
     dinner: '',
     tips: '',
@@ -31,20 +32,20 @@ export function useDietAi(proxy, { diagnosisId, showUserToast, formatUserMessage
 
     const hasDietAiMealContent = computed(() => {
         const r = dietAiRecommend.value
-        return !!(r.breakfast || r.lunch || r.dinner || r.tips)
+        return !!(r.breakfast || r.drinks || r.lunch || r.dinner || r.tips)
     })
 
     function detectDietStreamField(text) {
-        const tail = String(text || '').match(/(?:^|\n)(早餐|午餐|晚餐|提示|少碰)[：:]\s*([^\n]*)$/)
+        const tail = String(text || '').match(/(?:^|\n)(早餐|喝的|午餐|晚餐|提示|少碰)[：:]\s*([^\n]*)$/)
         if (!tail) return 'breakfast'
-        const map = { '早餐': 'breakfast', '午餐': 'lunch', '晚餐': 'dinner', '提示': 'tips', '少碰': 'tips' }
+        const map = { '早餐': 'breakfast', '喝的': 'drinks', '午餐': 'lunch', '晚餐': 'dinner', '提示': 'tips', '少碰': 'tips' }
         return map[tail[1]] || 'breakfast'
     }
 
     function mergePartialDietFromStream() {
         const partial = parsePartialDietPlainText(dietStreamBuffer)
         const next = { ...dietAiRecommend.value }
-        for (const key of ['breakfast', 'lunch', 'dinner', 'tips']) {
+        for (const key of ['breakfast', 'drinks', 'lunch', 'dinner', 'tips']) {
             if (partial[key] != null) next[key] = partial[key]
         }
         if (Array.isArray(partial.avoid)) next.avoid = partial.avoid
@@ -80,6 +81,7 @@ export function useDietAi(proxy, { diagnosisId, showUserToast, formatUserMessage
             ...emptyDietAiRecommend(),
             ...payload,
             breakfast: streamed.breakfast,
+            drinks: streamed.drinks || payload.drinks || '',
             lunch: streamed.lunch || payload.lunch || '',
             dinner: streamed.dinner || payload.dinner || '',
             tips: streamed.tips || payload.tips || '',
@@ -205,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 {
@@ -259,6 +263,7 @@ export function useDietAi(proxy, { diagnosisId, showUserToast, formatUserMessage
         try {
             uni.setStorageSync(DIET_AI_PREFILL_KEY, {
                 breakfast: r.breakfast,
+                drinks: r.drinks || '',
                 lunch: r.lunch,
                 dinner: r.dinner,
                 tips: r.tips || ''

TUICallKit-Vue3/tongji/composables/useSpeechToText.js

@@ -2,22 +2,85 @@ import { ref, onUnmounted } from 'vue'
 
 const MIN_HOLD_MS = 280
 
+// #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 +94,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 +111,8 @@ export function useSpeechToText({ onResult, showToast } = {}) {
 
     function stopListening() {
         // #ifdef MP-WEIXIN
-        if (wxRecordManager && (sttListening.value || startRequested)) {
+        const ownsRecording = sharedRecording && activeCtl === controller
+        if (wxRecordManager && (sttListening.value || startRequested || ownsRecording)) {
             try {
                 wxRecordManager.stop()
             } catch (e) {}
@@ -95,22 +164,42 @@ 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
         }
         try {
             startRequested = true
+            sharedRecording = true
             wxRecordManager.start({
                 duration: 60000,
                 lang: 'zh_CN'
             })
         } 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 +212,7 @@ export function useSpeechToText({ onResult, showToast } = {}) {
         }
         try {
             startRequested = true
+            h5GotResult = false
             h5Recognition.start()
             sttListening.value = true
         } catch (e) {
@@ -146,6 +236,8 @@ export function useSpeechToText({ onResult, showToast } = {}) {
         sttHolding.value = true
 
         // #ifdef MP-WEIXIN
+        // 把全局录音回调切到当前实例
+        activeCtl = controller
         ensureRecordAuth(() => startWechatRecord(session))
         // #endif
         // #ifdef H5
@@ -161,11 +253,17 @@ export function useSpeechToText({ onResult, showToast } = {}) {
 
     /** 松手结束：手指抬起 */
     function endHoldSpeech() {
-        if (!sttHolding.value && !sttListening.value && !startRequested) {
+        let recording = false
+        // #ifdef MP-WEIXIN
+        recording = sharedRecording && activeCtl === controller
+        // #endif
+        if (!sttHolding.value && !sttListening.value && !startRequested && !recording) {
             return
         }
         sttHolding.value = false
-        if (sttListening.value || startRequested) {
+        // 松手后不再补开排队的录音
+        pendingStartSession = 0
+        if (sttListening.value || startRequested || recording) {
             stopListening()
             return
         }
@@ -173,13 +271,10 @@ export function useSpeechToText({ onResult, showToast } = {}) {
     }
 
     // #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()
@@ -188,21 +283,50 @@ export function useSpeechToText({ onResult, showToast } = {}) {
             }
             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) || ''
+            // 上一段未停止就再次 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 || '语音识别失败')
+            // 上层（如一问一答流程）可接管错误并自行重试，返回 true 时不再弹默认提示
+            if (typeof onError === 'function') {
+                const handled = onError(msg || '')
+                if (handled === true) return
+            }
+            notify(msg || '语音识别失败')
         }
-    } catch (e) {
-        console.warn('WechatSI record recognition not available', e)
     }
+
+    wxRecordManager = getSharedRecordManager()
+    sttSupported.value = !!wxRecordManager
     // #endif
 
     // #ifdef H5
@@ -212,27 +336,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 +392,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 {

TUICallKit-Vue3/tongji/data/gameFoodImg.js

@@ -32,7 +32,8 @@ export function warmUpFoodImgs(foods) {
     const list = Array.isArray(foods) ? foods : []
     list.forEach((f) => {
         const icon = typeof f === 'string' ? f : f?.icon
-        const url = getFoodImgUrl(icon)
+        // 优先预热自定义图片素材，缺省回退 emoji PNG
+        const url = (typeof f === 'object' && f?.img) ? f.img : getFoodImgUrl(icon)
         if (!url) return
         // #ifdef MP-WEIXIN
         try {

TUICallKit-Vue3/tongji/data/gameFoodLibrary.js

@@ -58,7 +58,12 @@ const FOOD_TIP_OVERRIDE = {
     apple: '带皮整果，升糖较慢',
     milk: '低糖，含蛋白，适量喝好',
     fish: '优质蛋白，升糖低',
-    beef: '蛋白为主，升糖低'
+    beef: '蛋白为主，升糖低',
+    milkOats: '燕麦加奶，升糖中等，选无糖燕麦更好',
+    grainMantou: '杂粮做的，比白馒头稳，仍要控量',
+    riceNoodleSoup: '米粉升糖快，汤粉要少吃',
+    friedNoodles: '油多又是精面，升糖快',
+    centuryEggCongee: '白粥熬得软烂，升糖很快，糖友要少喝'
 }
 
 /** 含糖等级通用科普文案 */
@@ -76,6 +81,9 @@ export function getFoodTip(food) {
     return GI_TIP_DEFAULT[food.gi] || ''
 }
 
+/** 自定义图片素材目录（腾讯云 COS，优先使用真实图片而非 emoji） */
+const GAMES_IMG_BASE = 'https://gz-1349751149.cos.ap-guangzhou.myqcloud.com/games'
+
 const RAW_FOODS = [
     // 低 GI
     { key: 'lettuce', icon: '🥬', name: '生菜', gi: 'low', val: -3, color: '#8BC34A' },
@@ -120,6 +128,8 @@ const RAW_FOODS = [
     { key: 'coffee', icon: '☕', name: '咖啡', gi: 'mid', val: 2, color: '#6F4E37' },
     { 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' },
@@ -136,7 +146,10 @@ const RAW_FOODS = [
     { key: 'maltose', icon: '🍬', name: '麦芽糖', gi: 'high', val: 24, color: '#FFA726' },
     { key: 'soda', icon: '🥤', name: '汽水', gi: 'high', val: 25, color: '#C62828' },
     { key: 'orangeJuice', icon: '🧃', name: '柳橙汁', gi: 'high', val: 22, color: '#FF9F1C' },
-    { key: 'stickyRice', icon: '🍡', name: '糯米饭', gi: 'high', val: 19, color: '#F2A7B8' }
+    { key: 'stickyRice', icon: '🍡', name: '糯米饭', gi: 'high', val: 19, color: '#F2A7B8' },
+    { key: 'riceNoodleSoup', icon: '🍜', name: '汤粉', gi: 'high', val: 16, color: '#E8C9A0', img: `${GAMES_IMG_BASE}/%E6%B1%A4%E7%B2%89.png` },
+    { key: 'friedNoodles', icon: '🍝', name: '炒面', gi: 'high', val: 18, color: '#C8843C', img: `${GAMES_IMG_BASE}/%E7%82%92%E9%9D%A2.png` },
+    { key: 'centuryEggCongee', icon: '🥣', name: '皮蛋瘦肉粥', gi: 'high', val: 15, color: '#D9CBB0', img: `${GAMES_IMG_BASE}/%E7%9A%AE%E8%9B%8B%E7%98%A6%E8%82%89%E7%B2%A5.png` }
 ]
 
 export const FOOD_LIBRARY = RAW_FOODS.map((f, i) => {
@@ -149,7 +162,8 @@ export const FOOD_LIBRARY = RAW_FOODS.map((f, i) => {
         clearVal,
         giLabel: GI_LABEL[f.gi],
         get img() {
-            return getFoodImgUrl(f.icon)
+            // 优先使用自定义图片素材，缺省回退到 emoji PNG
+            return f.img || getFoodImgUrl(f.icon)
         }
     }
 })
@@ -170,6 +184,6 @@ export function cloneFoodType(food) {
         giLabel: food.giLabel,
         val: food.val,
         color: food.color,
-        img: getFoodImgUrl(food.icon)
+        img: food.img || getFoodImgUrl(food.icon)
     }
 }

TUICallKit-Vue3/tongji/data/gameLevels.js

@@ -2,6 +2,14 @@
  * 关卡配置：面向 45+ 的认知练习，节奏放慢、无失败惩罚。
  * 每组目标只比上一组略增，步数充裕（仅展示，不会因耗尽判负）。
  */
+/**
+ * 指定关卡固定食材（按 key）。未配置的关卡走随机抽取逻辑。
+ * 第一关固定为这 5 种带真实图片素材的食物。
+ */
+const FIXED_LEVEL_FOODS = {
+    1: ['milkOats', 'grainMantou', 'riceNoodleSoup', 'friedNoodles', 'centuryEggCongee']
+}
+
 export function getLevelConfig(levelId) {
     const lv = Math.max(1, Math.min(999, Number(levelId) || 1))
     const tier = Math.floor((lv - 1) / 5)
@@ -14,6 +22,8 @@ export function getLevelConfig(levelId) {
         goalTargets: [6 + tier, 8 + tier],
         scoreTarget: 2000 + lv * 300,
         startGlucose: 50,
+        // 固定食材（可选）：存在时本关只用这些食物
+        foods: FIXED_LEVEL_FOODS[lv] || null,
         boosters: {
             insulin: 3,
             fiber: 1,

TUICallKit-Vue3/tongji/pages/index.vue

@@ -419,7 +419,7 @@
 
             <view v-else class="ai-diet-body" :class="{ 'is-streaming': dietAiStreaming }">
                 <view class="ai-diet-section-head">
-                    <text class="ai-diet-section-title">今日三餐</text>
+                    <text class="ai-diet-section-title">今日饮食</text>
                     <text v-if="dietAiStreaming" class="ai-diet-section-tag">生成中…</text>
                 </view>
                 <view class="ai-diet-meal-list">
@@ -434,6 +434,20 @@
                             {{ dietAiRecommend.breakfast || (dietAiLoading ? '…' : '—') }}<text v-if="dietAiLoading && dietAiStreamField === 'breakfast'" class="ai-stream-cursor">▍</text>
                         </text>
                     </view>
+                    <view
+                        v-if="dietAiRecommend.drinks || (dietAiLoading && dietAiStreamField === 'drinks')"
+                        class="ai-diet-meal-card meal-drinks"
+                    >
+                        <view class="ai-diet-meal-head">
+                            <view class="ai-diet-meal-icon" aria-hidden="true">
+                                <TongjiIcon name="droplet" size="sm" color="#ffffff" />
+                            </view>
+                            <text class="ai-diet-meal-label">喝的</text>
+                        </view>
+                        <text class="ai-diet-meal-text">
+                            {{ dietAiRecommend.drinks || '…' }}<text v-if="dietAiLoading && dietAiStreamField === 'drinks'" class="ai-stream-cursor">▍</text>
+                        </text>
+                    </view>
                     <view class="ai-diet-meal-card meal-lunch">
                         <view class="ai-diet-meal-head">
                             <view class="ai-diet-meal-icon" aria-hidden="true">
@@ -2657,16 +2671,13 @@ async function bootstrap(options) {
         if (!target) target = list[0]
         await applyCard(target)
     } else {
-        if (passedDiagnosisId) diagnosisId.value = passedDiagnosisId
-        if (passedPatientId) patientId.value = passedPatientId
-        if (passedPatientName) patientName.value = passedPatientName
-        if (passedAge) age.value = passedAge
-        if (passedGender) gender.value = passedGender
-        if (!diagnosisId.value || !patientId.value) {
-            readUserContext()
-        }
+        diagnosisId.value = 0
+        patientId.value = 0
+        patientName.value = ''
+        age.value = 0
+        gender.value = 0
         readUserMobile()
-        if (!diagnosisId.value && userMobile.value) {
+        if (userMobile.value) {
             await ensureDailyContextByPhone()
         }
     }
@@ -6558,6 +6569,12 @@ async function onFamilyLike() {
 .ai-diet-meal-card.meal-breakfast::before {
     background: linear-gradient(180deg, #fbbf24 0%, #f59e0b 100%);
 }
+.ai-diet-meal-card.meal-drinks {
+    background: linear-gradient(120deg, rgba(14, 165, 233, 0.14) 0%, rgba(255, 255, 255, 0) 45%);
+}
+.ai-diet-meal-card.meal-drinks::before {
+    background: linear-gradient(180deg, #38bdf8 0%, #0ea5e9 100%);
+}
 .ai-diet-meal-card.meal-lunch {
     background: linear-gradient(120deg, rgba(16, 185, 129, 0.16) 0%, rgba(255, 255, 255, 0) 45%);
 }
@@ -6588,6 +6605,9 @@ async function onFamilyLike() {
 .meal-breakfast .ai-diet-meal-icon {
     background: linear-gradient(150deg, #fde68a 0%, #fbbf24 100%);
 }
+.meal-drinks .ai-diet-meal-icon {
+    background: linear-gradient(150deg, #7dd3fc 0%, #0ea5e9 100%);
+}
 .meal-lunch .ai-diet-meal-icon {
     background: linear-gradient(150deg, #6ee7b7 0%, #10b981 100%);
 }

TUICallKit-Vue3/tongji/pages/weekly.vue

@@ -48,13 +48,15 @@
        
 
         <view class="st-main">
-            <!-- 1. 录入今日血糖 -->
-          
+            <!-- 快捷建档失败提示（toast 字数有限，完整文案展示在页面） -->
+            <view v-if="dailyContextError && !diagnosisId" class="st-daily-context-error" role="alert">
+                <text class="st-daily-context-error-text">{{ dailyContextError }}</text>
+            </view>
 
-            <!-- 2. 血糖趋势（无就诊卡或录入不足 7 天显示示例曲线） -->
+            <!-- 2. 血糖趋势（无就诊卡或累计录入不足 7 天显示示例曲线） -->
             <view class="st-chart-card">
                 <view class="st-chart-head">
-                    <view>
+                    <view style="padding: 0 20rpx;">
                         <text class="st-chart-title">血糖趋势</text>
                         <text class="st-chart-sub">{{ rangeText }} · mmol/L</text>
                        
@@ -94,9 +96,9 @@
                     </view>
                 </view>
                 <view v-if="chartUseMockData" class="st-chart-foot">
-                    <text class="st-chart-mock-hint">示例数据，连续记录满 7 天后显示您的真实趋势</text>
+                    <text class="st-chart-mock-hint">示例数据，累计记录满 7 天后显示您的真实趋势</text>
                 </view>
-                <view class="st-game-entry st-game-entry--in-card" @click="goGamePage">
+                <view class="st-game-entry st-game-entry--in-card" @click="goGamePage" style="margin: 0 20rpx 0 20rpx;">
                     <view class="st-game-entry-icon">
                         <TongjiIcon name="activity" size="sm" color="#006c49" />
                     </view>
@@ -107,9 +109,9 @@
                     <TongjiIcon name="chevron-right" size="sm" color="#64748b" />
                 </view>
             </view>
-            <view class="st-training-module">
-            <dev-training-entry inline />
-        </view>
+            <view class="st-training-section">
+                <dev-training-entry inline tone="weekly" />
+            </view>
             <!-- 3. AI 饮食建议 -->
             <view v-if="diagnosisId" class="st-ai-section">
                 <view class="st-ai-deco" aria-hidden="true" />
@@ -129,7 +131,7 @@
                         <text>{{ dietAiLoading ? '生成中' : '换一换' }}</text>
                     </view>
                 </view>
-                <text class="st-ai-sub">读您近 7 天 · 30 天血糖，定制今日三餐</text>
+                <text class="st-ai-sub">读您近 7 天 · 30 天血糖，定制早餐（含驼奶粉）、喝的与三餐</text>
 
                 <view v-if="dietAiLoading && !hasDietAiMealContent && !dietAiStreaming && !dietAiReplacing" class="st-skeleton">
                     <view v-for="n in 2" :key="'sk-' + n" class="st-skeleton-line" />
@@ -145,6 +147,18 @@
                             {{ dietAiRecommend.breakfast || (dietAiLoading ? '…' : '—') }}<text v-if="dietAiLoading && dietAiStreamField === 'breakfast'" class="ai-stream-cursor">▍</text>
                         </text>
                     </view>
+                    <view
+                        v-if="dietAiRecommend.drinks || (dietAiLoading && dietAiStreamField === 'drinks')"
+                        class="st-meal-glass st-meal-glass--drinks"
+                    >
+                        <view class="st-meal-head">
+                            <TongjiIcon name="droplet" size="sm" color="#0ea5e9" />
+                            <text class="st-meal-label">喝的</text>
+                        </view>
+                        <text class="st-meal-text">
+                            {{ dietAiRecommend.drinks || '…' }}<text v-if="dietAiLoading && dietAiStreamField === 'drinks'" class="ai-stream-cursor">▍</text>
+                        </text>
+                    </view>
                     <view class="st-meal-glass">
                         <view class="st-meal-head">
                             <TongjiIcon name="leaf" size="sm" color="#006c49" />
@@ -179,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"
@@ -248,6 +269,9 @@
                     </view>
                 </view>
                 <view class="phone-gate-body">
+                    <view v-if="dailyContextError" class="phone-gate-error" role="alert">
+                        <text>{{ dailyContextError }}</text>
+                    </view>
                     <text class="phone-gate-tip">微信仅提供手机号，请选择性别以便写入就诊档案。</text>
                     <view class="phone-gate-gender">
                         <text class="phone-gate-gender-label">性别</text>
@@ -432,11 +456,42 @@ function showUserToast(title, options = {}) {
     uni.showToast({
         title: text,
         icon: options.icon || 'none',
-        duration: options.duration
+        duration: options.duration || 2800
     })
 }
 
+/** 解析接口错误文案（兼容 msg / message / data.error） */
+function extractApiError(res, fallback = '') {
+    if (!res) return fallback
+    const raw = res.msg ?? res.message ?? res.data?.error ?? res.data?.msg ?? res.errMsg
+    return formatUserMessage(raw, fallback)
+}
+
 const diagnosisId = ref(0)
+/** 手机号快捷建档失败：页面常驻提示（避免 toast 被 7 字截断） */
+const dailyContextError = ref('')
+
+function clearDailyContextError() {
+    dailyContextError.value = ''
+}
+
+function reportDailyContextError(res, fallback = '无法开始录入', options = {}) {
+    const text = extractApiError(res, fallback)
+    if (!text) return
+    dailyContextError.value = text
+    if (options.alert) {
+        uni.showModal({
+            title: '无法录入血糖',
+            content: text,
+            showCancel: false,
+            confirmText: '知道了'
+        })
+    } else {
+        const short = text.length > 14 ? `${text.slice(0, 14)}…` : text
+        showUserToast(short, { duration: 3200 })
+    }
+}
+
 const patientId = ref(0)
 const patientName = ref('')
 const displayPatientName = computed(() => {
@@ -471,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) {
@@ -632,6 +700,19 @@ const currentRange = computed(() => {
     return { start: formatDate(start), end: formatDate(end) }
 })
 
+/** 拉取血糖时向前多看几天，用于判断「累计满 7 天」是否达标（图表仍只画 currentRange） */
+const BLOOD_LOOKBACK_DAYS = 30
+
+const fetchRange = computed(() => {
+    const displayDays = rangeMode.value === '30' ? 30 : 7
+    const lookback = Math.max(BLOOD_LOOKBACK_DAYS, displayDays)
+    const end = new Date()
+    end.setHours(0, 0, 0, 0)
+    const start = new Date(end)
+    start.setDate(start.getDate() - (lookback - 1))
+    return { start: formatDate(start), end: formatDate(end) }
+})
+
 const visibleDates = computed(() => {
     const { start, end } = currentRange.value
     if (!start || !end) return []
@@ -794,27 +875,37 @@ const recordDays = computed(() => {
     return result
 })
 
+function bloodDayHasSugar(b) {
+    if (!b) return false
+    return toNumber(b.fasting_blood_sugar) !== null
+        || toNumber(b.postprandial_blood_sugar) !== null
+        || toNumber(b.other_blood_sugar) !== null
+}
+
 const bloodHasData = computed(() => {
-    return chartDates.value.some((date) => {
-        const b = bloodByDate.value[date]
-        return b && (toNumber(b.fasting_blood_sugar) !== null || toNumber(b.postprandial_blood_sugar) !== null)
-    })
+    return chartDates.value.some((date) => bloodDayHasSugar(bloodByDate.value[date]))
 })
 
-/** 当前时间范围内有真实录入的天数 */
+/** 当前图表时间范围内有真实录入的天数（用于小结统计） */
 const bloodRecordDayCount = computed(() => {
-    return chartDates.value.filter((date) => {
-        const b = bloodByDate.value[date]
-        return b && (toNumber(b.fasting_blood_sugar) !== null || toNumber(b.postprandial_blood_sugar) !== null)
-    }).length
+    return chartDates.value.filter((date) => bloodDayHasSugar(bloodByDate.value[date])).length
+})
+
+/** 拉取窗口内累计有血糖录入的天数（不要求连续） */
+const bloodCumulativeDayCount = computed(() => {
+    let n = 0
+    for (const date of Object.keys(bloodByDate.value)) {
+        if (bloodDayHasSugar(bloodByDate.value[date])) n++
+    }
+    return n
 })
 
 const REAL_BLOOD_DAYS_MIN = 7
 
-/** 无就诊卡或真实录入不足 7 天时，图表用示例数据 */
+/** 无就诊卡或累计录入不足 7 天时，图表用示例数据 */
 const chartUseMockData = computed(() => {
     if (!diagnosisId.value) return true
-    return bloodRecordDayCount.value < REAL_BLOOD_DAYS_MIN
+    return bloodCumulativeDayCount.value < REAL_BLOOD_DAYS_MIN
 })
 
 /** 示例曲线：7 天内有波动的空腹/餐后，便于老人理解趋势图形态 */
@@ -1154,8 +1245,14 @@ function syncPhoneGateSexFromUser() {
     }
 }
 
-function openPhoneGate() {
+async function openPhoneGate() {
     syncPhoneGateSexFromUser()
+    readUserMobile()
+    if (userMobile.value) {
+        phoneGateVisible.value = false
+        await resolveDailyPhoneContext(false)
+        return
+    }
     phoneGateVisible.value = true
 }
 
@@ -1172,8 +1269,11 @@ async function refreshUserMobile() {
     return userMobile.value
 }
 
-async function ensureDailyContextByPhone(sex) {
-    if (diagnosisId.value) return true
+async function ensureDailyContextByPhone(sex, options = {}) {
+    if (diagnosisId.value) {
+        clearDailyContextError()
+        return true
+    }
 
     const payload = {}
     const sexVal = sex ?? phoneGateSex.value
@@ -1188,6 +1288,7 @@ async function ensureDailyContextByPhone(sex) {
     }, false)
 
     if (res && res.code === 1 && res.data && res.data.diagnosis_id) {
+        clearDailyContextError()
         await applyCard({
             id: res.data.diagnosis_id,
             patient_id: res.data.patient_id,
@@ -1195,17 +1296,32 @@ async function ensureDailyContextByPhone(sex) {
             age: res.data.age || 0,
             gender: res.data.gender || 0
         })
-        if (res.data.created) {
+        if (res.data.created || res.data.linked_existing) {
             await fetchCardList()
         }
         return true
     }
 
     if (res && res.data && res.data.need_mobile) {
+        clearDailyContextError()
         return 'need_mobile'
     }
 
-    showUserToast(formatUserMessage(res?.msg, '无法开始录入'))
+    reportDailyContextError(res, '无法开始录入', options)
+    return false
+}
+
+/** 已绑定手机号时直接关联档案，不再弹出授权建档 */
+async function resolveDailyPhoneContext(openFormAfter = false) {
+    const ok = await ensureDailyContextByPhone(phoneGateSex.value, { alert: true })
+    if (ok === true) {
+        if (openFormAfter) await openInputForm(true)
+        return true
+    }
+    if (ok === 'need_mobile') {
+        syncPhoneGateSexFromUser()
+        phoneGateVisible.value = true
+    }
     return false
 }
 
@@ -1218,7 +1334,7 @@ async function ensureCanRecordGlucose() {
         return false
     }
 
-    const ok = await ensureDailyContextByPhone()
+    const ok = await ensureDailyContextByPhone(undefined, { alert: true })
     if (ok === 'need_mobile') {
         openPhoneGate()
         return false
@@ -1251,6 +1367,13 @@ async function onPhoneGateAuthorize(e) {
 
     phoneBinding.value = true
     try {
+        readUserMobile()
+        if (userMobile.value) {
+            phoneGateVisible.value = false
+            await resolveDailyPhoneContext(true)
+            return
+        }
+
         const res = await proxy.apiUrl({
             url: '/api/user/getMobileByMnp',
             method: 'POST',
@@ -1262,12 +1385,7 @@ async function onPhoneGateAuthorize(e) {
         }
         await refreshUserMobile()
         phoneGateVisible.value = false
-        const ok = await ensureDailyContextByPhone(phoneGateSex.value)
-        if (ok === true) {
-            await openInputForm(true)
-        } else if (ok === 'need_mobile') {
-            openPhoneGate()
-        }
+        await resolveDailyPhoneContext(true)
     } catch (err) {
         showUserToast('网络异常，请稍后再试')
     } finally {
@@ -1290,7 +1408,7 @@ async function onSelectCard(card) {
 async function fetchAll() {
     if (!hasAuthToken() || !diagnosisId.value) return
     loading.value = true
-    const { start, end } = currentRange.value
+    const { start, end } = fetchRange.value
     try {
         const [winRes, noteRes] = await Promise.all([
             proxy.apiUrl({
@@ -2490,15 +2608,15 @@ async function bootstrap(options) {
         if (!target) target = list[0]
         await applyCard(target)
     } else {
-        diagnosisId.value = passedDiagnosisId || 0
-        patientId.value = passedPatientId || 0
-        if (passedPatientName) patientName.value = passedPatientName
-        if (passedAge) age.value = passedAge
-        if (passedGender) gender.value = passedGender
-        if (!patientName.value) readUserContext()
+        // 无可见就诊卡：勿用 URL/缓存里的隐藏诊单 ID
+        diagnosisId.value = 0
+        patientId.value = 0
+        patientName.value = ''
+        age.value = 0
+        gender.value = 0
         readUserMobile()
-        if (!diagnosisId.value && userMobile.value) {
-            await ensureDailyContextByPhone()
+        if (userMobile.value) {
+            await ensureDailyContextByPhone(undefined, { alert: false })
         }
     }
 

TUICallKit-Vue3/tongji/styles/weekly-input-modal.scss

@@ -89,6 +89,22 @@
     padding: 32rpx;
 }
 
+.weekly-page .phone-gate-error {
+    margin-bottom: 20rpx;
+    padding: 20rpx 22rpx;
+    border-radius: 16rpx;
+    background: #fef2f2;
+    border: 1rpx solid rgba(220, 38, 38, 0.2);
+    box-sizing: border-box;
+
+    text {
+        font-size: 26rpx;
+        font-weight: 600;
+        color: #991b1b;
+        line-height: 1.45;
+    }
+}
+
 .weekly-page .phone-gate-tip {
     display: block;
     font-size: 28rpx;

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

@@ -108,10 +108,25 @@
     color: var(--on-primary);
 }
 
-/* ===== 居家训练（DEV 内嵌，与 user 页同源入口） ===== */
-.weekly-page .st-training-module {
-    padding: 10rpx var(--st-container-margin);
-    margin: -10rpx -30rpx 10rpx -30rpx;
+/* ===== 居家训练（DEV 内嵌） ===== */
+.weekly-page .st-training-section {
+    width: 100%;
+    box-sizing: border-box;
+}
+
+.weekly-page .st-training-section .dev-entry-inline--weekly {
+    overflow: hidden;
+}
+
+.weekly-page .st-training-section .inline-scroll {
+    margin-left: -4rpx;
+    margin-right: -4rpx;
+    width: calc(100% + 8rpx);
+}
+
+.weekly-page .st-training-section .inline-card:first-child {
+    border-color: rgba(0, 108, 73, 0.22);
+    background: linear-gradient(160deg, rgba(0, 108, 73, 0.08) 0%, #f4f7f5 55%);
 }
 
 /* ===== Main ===== */
@@ -123,6 +138,21 @@
     margin-top: 16rpx;
 }
 
+.weekly-page .st-daily-context-error {
+    padding: 24rpx 28rpx;
+    border-radius: 24rpx;
+    background: #fef2f2;
+    border: 1rpx solid rgba(220, 38, 38, 0.22);
+    box-sizing: border-box;
+}
+
+.weekly-page .st-daily-context-error-text {
+    font-size: 28rpx;
+    font-weight: 600;
+    color: #991b1b;
+    line-height: 1.5;
+}
+
 .weekly-page .st-main-spacer {
     height: 32rpx;
 }
@@ -149,7 +179,7 @@
 
 /* 糖分突袭游戏入口 */
 .weekly-page .st-game-entry {
-    width: 100%;
+  
     margin-top: 24rpx;
     padding: 28rpx 32rpx;
     display: flex;
@@ -626,6 +656,11 @@
     box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.04);
 }
 
+.weekly-page .st-meal-glass--drinks {
+    background: rgba(224, 242, 254, 0.65);
+    border-color: rgba(14, 165, 233, 0.15);
+}
+
 .weekly-page .st-meal-head {
     display: flex;
     align-items: center;
@@ -705,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 {
@@ -728,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/aiStreamRequest.js

@@ -64,10 +64,10 @@ export function parsePartialDietPlainText(text) {
     const out = {}
     if (!text) return out
 
-    const lineRe = /^(早餐|午餐|晚餐|提示|少碰)[：:]\s*(.*)$/gm
+    const lineRe = /^(早餐|喝的|午餐|晚餐|提示|少碰)[：:]\s*(.*)$/gm
     let match
     while ((match = lineRe.exec(text)) !== null) {
-        const key = { '早餐': 'breakfast', '午餐': 'lunch', '晚餐': 'dinner', '提示': 'tips', '少碰': 'avoid' }[match[1]]
+        const key = { '早餐': 'breakfast', '喝的': 'drinks', '午餐': 'lunch', '晚餐': 'dinner', '提示': 'tips', '少碰': 'avoid' }[match[1]]
         const val = (match[2] || '').trim()
         if (key === 'avoid') {
             out.avoid = val.split(/[、,，;；\s]+/).map((s) => s.trim()).filter(Boolean)
@@ -76,9 +76,9 @@ export function parsePartialDietPlainText(text) {
         }
     }
 
-    const tail = text.match(/(?:^|\n)(早餐|午餐|晚餐|提示|少碰)[：:]\s*([^\n]*)$/)
+    const tail = text.match(/(?:^|\n)(早餐|喝的|午餐|晚餐|提示|少碰)[：:]\s*([^\n]*)$/)
     if (tail) {
-        const key = { '早餐': 'breakfast', '午餐': 'lunch', '晚餐': 'dinner', '提示': 'tips', '少碰': 'avoid' }[tail[1]]
+        const key = { '早餐': 'breakfast', '喝的': 'drinks', '午餐': 'lunch', '晚餐': 'dinner', '提示': 'tips', '少碰': 'avoid' }[tail[1]]
         const val = (tail[2] || '').trim()
         if (key === 'avoid') {
             if (val) out.avoid = val.split(/[、,，;；\s]+/).map((s) => s.trim()).filter(Boolean)

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/tcm.ts

@@ -403,6 +403,11 @@ export function prescriptionOrderLogisticsTrace(params: {
     return request.get({ url: '/tcm.prescriptionOrder/logisticsTrace', params })
 }
 
+/** 直接调用京东官方物流接口刷新轨迹并落库（绕过快递100缓存） */
+export function prescriptionOrderLogisticsJdUpdate(params: { id: number }) {
+    return request.post({ url: '/tcm.prescriptionOrder/logisticsJdUpdate', params })
+}
+
 export function prescriptionOrderDetail(params: { id: number }) {
     return request.get({ url: '/tcm.prescriptionOrder/detail', params })
 }
@@ -482,13 +487,13 @@ export function prescriptionOrderRequestCompletion(params: { id: number }) {
     return request.post({ url: '/tcm.prescriptionOrder/requestCompletion', params })
 }
 
-/** 将「已发货/已签收」且支付审核通过的订单结案（3=已完成 或 7-12 业务状态，不含退款） */
+/** 将「已发货/已签收」且支付审核通过的订单结案（3=已完成 或 7-12 业务状态；退款请走 refund 或完成弹窗选「退款」） */
 export function prescriptionOrderComplete(params: { id: number; fulfillment_status: number }) {
     return request.post({ url: '/tcm.prescriptionOrder/complete', params })
 }
 
-/** 业务订单退款（须填写原因；关联收款单标记已退款、已付总额清零） */
-export function prescriptionOrderRefund(params: { id: number; reason: string }) {
+/** 业务订单退款（须填写原因；refund_amount 可选，不传则退满可退上限） */
+export function prescriptionOrderRefund(params: { id: number; reason: string; refund_amount?: number }) {
     return request.post({ url: '/tcm.prescriptionOrder/refund', 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/components/list-time-filter/index.vue

@@ -0,0 +1,96 @@
+<template>
+    <template v-if="variant === 'split'">
+        <el-form-item :label="label" :class="{ 'is-compact': compact }">
+            <el-radio-group v-model="timeType" :size="compact ? 'small' : 'default'" @change="emit('time-type-change')">
+                <el-radio-button v-if="showAll" label="all">全部</el-radio-button>
+                <el-radio-button label="today">今天</el-radio-button>
+                <el-radio-button label="yesterday">昨天</el-radio-button>
+                <el-radio-button label="week">最近7天</el-radio-button>
+                <el-radio-button label="month">本月</el-radio-button>
+                <el-radio-button label="custom">自定义</el-radio-button>
+            </el-radio-group>
+        </el-form-item>
+        <el-form-item v-if="timeType === 'custom'">
+            <el-date-picker
+                v-model="dateRangeModel"
+                type="daterange"
+                value-format="YYYY-MM-DD"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :size="compact ? 'small' : 'default'"
+                :style="{ width: pickerWidth }"
+                @change="emit('custom-change')"
+            />
+        </el-form-item>
+    </template>
+    <el-form-item v-else :label="label" :class="{ 'is-compact': compact }">
+        <div class="list-time-filter-inline">
+            <el-radio-group v-model="timeType" :size="compact ? 'small' : 'default'" @change="emit('time-type-change')">
+                <el-radio-button v-if="showAll" label="all">全部</el-radio-button>
+                <el-radio-button label="today">今天</el-radio-button>
+                <el-radio-button label="yesterday">昨天</el-radio-button>
+                <el-radio-button label="week">最近7天</el-radio-button>
+                <el-radio-button label="month">本月</el-radio-button>
+                <el-radio-button label="custom">自定义</el-radio-button>
+            </el-radio-group>
+            <el-date-picker
+                v-if="timeType === 'custom'"
+                v-model="dateRangeModel"
+                type="daterange"
+                value-format="YYYY-MM-DD"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :size="compact ? 'small' : 'default'"
+                :style="{ width: pickerWidth }"
+                @change="emit('custom-change')"
+            />
+        </div>
+    </el-form-item>
+</template>
+
+<script lang="ts" setup>
+import type { ListTimeType } from '@/hooks/useListTimeFilter'
+
+withDefaults(
+    defineProps<{
+        label?: string
+        /** split：与自录统计一致，两个 form-item；inline：处方订单筛选用单行 */
+        variant?: 'split' | 'inline'
+        pickerWidth?: string
+        /** 紧凑模式：small 尺寸 radio / 日期 */
+        compact?: boolean
+        /** 是否显示「全部」（不限时间）选项 */
+        showAll?: boolean
+    }>(),
+    {
+        label: '时间范围',
+        variant: 'split',
+        pickerWidth: '260px',
+        compact: false,
+        showAll: false,
+    }
+)
+
+const timeType = defineModel<ListTimeType>('timeType', { required: true })
+const dateRangeModel = defineModel<string[]>('dateRange', { default: () => [] })
+
+const emit = defineEmits<{
+    'time-type-change': []
+    'custom-change': []
+}>()
+</script>
+
+<style scoped lang="scss">
+.list-time-filter-inline {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    gap: 6px 8px;
+}
+
+:deep(.is-compact.el-form-item) {
+    margin-bottom: 0;
+}
+</style>

admin/src/components/tcm-prescription/index.vue

@@ -88,13 +88,17 @@
                                     共 <strong>{{ formData.herbs.length }}</strong> 味（主方 {{ mainHerbCount }} / 辅方
                                     {{ auxHerbCount }}）· 可手动添加、从处方库或粘贴药方批量录入
                                 </p>
+                                <p v-if="herbsLocked" class="rp-toolbar__lock-tip">
+                                    <el-tag type="danger" size="small" effect="plain">禁用修改</el-tag>
+                                    含「禁用修改」处方库模板，药材已锁定，不可增删改，如需调整请重新「从处方库导入」覆盖
+                                </p>
                             </div>
                         </div>
                         <div class="rp-toolbar__actions" role="toolbar" aria-label="处方药材快捷操作">
-                            <el-button type="primary" size="small" :icon="CirclePlus" @click="handleAddHerb('主方')">
+                            <el-button type="primary" size="small" :icon="CirclePlus" :disabled="herbsLocked" @click="handleAddHerb('主方')">
                                 添加主方
                             </el-button>
-                            <el-button type="primary" plain size="small" @click="handleAddHerb('辅方')">
+                            <el-button type="primary" plain size="small" :disabled="herbsLocked" @click="handleAddHerb('辅方')">
                                 添加辅方
                             </el-button>
                             <el-button
@@ -135,7 +139,7 @@
                                 :class="{ 'herb-editor-card--dup': isDuplicateHerbName(row.index) }"
                             >
                                 <div class="herb-editor-card__title">主方 {{ row.index + 1 }}</div>
-                                <MedicineNameSelect v-model="formData.herbs[row.index].name" class="herb-editor-card__select" />
+                                <MedicineNameSelect v-model="formData.herbs[row.index].name" :disabled="herbsLocked" class="herb-editor-card__select" />
                                 <div
                                     v-if="isDuplicateHerbName(row.index)"
                                     class="herb-editor-card__dup-hint text-amber-600 text-xs mb-1"
@@ -148,11 +152,12 @@
                                         :min="0.1"
                                         :step="1"
                                         :precision="1"
+                                        :disabled="herbsLocked"
                                         placeholder="剂量(克)"
                                         class="herb-editor-card__dose"
                                     />
                                     <span class="text-gray-500 shrink-0">克</span>
-                                    <el-button type="danger" size="small" link @click="handleRemoveHerb(row.index)">
+                                    <el-button v-if="!herbsLocked" type="danger" size="small" link @click="handleRemoveHerb(row.index)">
                                         删除
                                     </el-button>
                                 </div>
@@ -171,7 +176,7 @@
                                 :class="{ 'herb-editor-card--dup': isDuplicateHerbName(row.index) }"
                             >
                                 <div class="herb-editor-card__title">辅方</div>
-                                <MedicineNameSelect v-model="formData.herbs[row.index].name" class="herb-editor-card__select" />
+                                <MedicineNameSelect v-model="formData.herbs[row.index].name" :disabled="herbsLocked" class="herb-editor-card__select" />
                                 <div
                                     v-if="isDuplicateHerbName(row.index)"
                                     class="herb-editor-card__dup-hint text-amber-600 text-xs mb-1"
@@ -184,11 +189,12 @@
                                         :min="0.1"
                                         :step="1"
                                         :precision="1"
+                                        :disabled="herbsLocked"
                                         placeholder="剂量(克)"
                                         class="herb-editor-card__dose"
                                     />
                                     <span class="text-gray-500 shrink-0">克</span>
-                                    <el-button type="danger" size="small" link @click="handleRemoveHerb(row.index)">
+                                    <el-button v-if="!herbsLocked" type="danger" size="small" link @click="handleRemoveHerb(row.index)">
                                         删除
                                     </el-button>
                                 </div>
@@ -553,7 +559,11 @@
                 <div class="rx-title">{{ prescriptionTabType === 'internal' ? '药房联' : SLIP_TITLE }}</div>
                 <div class="rx-notice">
                     <span class="rx-notice-text">
-                        服药前请核对姓名、电话、医生等信息以及服法、医嘱等要点
+                        {{
+                            prescriptionTabType === 'user'
+                                ? '服药前请核对姓名、电话、医生等信息以及医嘱等要点'
+                                : '服药前请核对姓名、电话、医生等信息以及服法、医嘱等要点'
+                        }}
                     </span>
                     <span class="rx-notice-meta">
                         <span>日期：{{ rxDateText }}</span>
@@ -672,22 +682,30 @@
                 </div>
 
                 <div class="rx-text">
-                    <p v-if="prescriptionTabType === 'internal' || savedAuxUsageText">主方服法：{{ rxUsageText }}</p>
-                    <p v-else>服法：{{ rxUsageText }}</p>
-                    <p v-if="savedAuxUsageText">{{ prescriptionTabType === 'user' ? '辅服法' : '辅方服法' }}：{{ savedAuxUsageText }}</p>
+                    <template v-if="prescriptionTabType === 'internal'">
+                        <p v-if="savedAuxUsageText">主方服法：{{ rxUsageText }}</p>
+                        <p v-else>服法：{{ rxUsageText }}</p>
+                        <p v-if="savedAuxUsageText">辅方服法：{{ savedAuxUsageText }}</p>
+                    </template>
                     <p v-if="rxAdviceText">医嘱：{{ rxAdviceText }}</p>
-                    <p v-if="rxRemarkText">备注：{{ rxRemarkText }}</p>
+                    <p v-if="prescriptionTabType === 'internal' && rxRemarkText">备注：{{ rxRemarkText }}</p>
                     <p v-if="savedPrescription.dietary_taboo && savedPrescription.dietary_taboo.length">
                         忌口：{{ Array.isArray(savedPrescription.dietary_taboo) ? savedPrescription.dietary_taboo.join('、') : savedPrescription.dietary_taboo }}
                     </p>
                     <p v-if="rxPharmacyRemarkText" class="rx-text-warn">药房备注：{{ rxPharmacyRemarkText }}</p>
-                    <p v-if="rxOutPelletText && savedPrescription.prescription_type !== '饮片'" class="rx-text-warn">
+                    <p
+                        v-if="prescriptionTabType === 'internal' && rxOutPelletText && savedPrescription.prescription_type !== '饮片'"
+                        class="rx-text-warn"
+                    >
                         出丸：{{ rxOutPelletText }}
                     </p>
                 </div>
 
                 <div class="rx-bottom">
-                    <div class="rx-bot-row rx-bot-row-1">
+                    <div
+                        class="rx-bot-row rx-bot-row-1"
+                        :class="{ 'rx-bot-row-1--user': prescriptionTabType === 'user' }"
+                    >
                         <div class="rx-bot-cell rx-bot-stack rx-bot-doctor">
                             <div class="rx-bot-label">医师</div>
                             <div class="rx-bot-doctor-body">
@@ -697,10 +715,12 @@
                                     alt="医师签名"
                                     class="rx-bot-sign-img"
                                 />
-                                <div class="rx-bot-doctor-name">{{ savedPrescription.doctor_name || '—' }}</div>
+                                <div v-if="!savedPrescription.doctor_signature" class="rx-bot-doctor-name">
+                                    {{ savedPrescription.doctor_name || '—' }}
+                                </div>
                             </div>
                         </div>
-                        <div class="rx-bot-cell rx-bot-meta">
+                        <div v-if="prescriptionTabType === 'internal'" class="rx-bot-cell rx-bot-meta">
                             <span class="rx-bot-meta-key">类型:</span>
                             <span class="rx-bot-meta-val">{{ rxTypeText }}</span>
                         </div>
@@ -708,7 +728,7 @@
                             <span class="rx-bot-meta-key">天数:</span>
                             <span class="rx-bot-meta-val">{{ rxSlipMedicationDaysText }}</span>
                         </div>
-                        <div class="rx-bot-cell rx-bot-meta">
+                        <div v-if="prescriptionTabType === 'internal'" class="rx-bot-cell rx-bot-meta">
                             <span class="rx-bot-meta-key">剂量:</span>
                             <span class="rx-bot-meta-val">{{ rxPerDoseAmount }}克</span>
                         </div>
@@ -1028,6 +1048,8 @@ interface Herb {
     name: string
     dosage: number
     formula_type?: FormulaType
+    /** 来自「禁用修改」处方库模板：锁定后不可增删改，只能再次导入覆盖 */
+    locked?: boolean
 }
 
 type AuxUsageForm = {
@@ -1044,11 +1066,15 @@ function normalizeFormulaType(v: unknown): FormulaType {
 }
 
 function normalizeHerbRow(raw: any): Herb {
-    return {
+    const row: Herb = {
         name: String(raw?.name ?? '').trim(),
         dosage: Number(raw?.dosage) || 0,
         formula_type: normalizeFormulaType(raw?.formula_type)
     }
+    if (raw?.locked === true || raw?.locked === 1) {
+        row.locked = true
+    }
+    return row
 }
 
 function defaultAuxUsage(prescriptionType = '浓缩水丸'): AuxUsageForm {
@@ -1430,6 +1456,12 @@ const auxHerbRows = computed(() =>
 const mainHerbCount = computed(() => mainHerbRows.value.length)
 const auxHerbCount = computed(() => auxHerbRows.value.length)
 
+/**
+ * 整张处方是否被锁定：只要任一药材来自「禁用修改」模板即锁定。
+ * 锁定后：不可增删改任意药材，仅可再次「从处方库导入」覆盖。
+ */
+const herbsLocked = computed(() => formData.herbs.some((h) => (h as Herb).locked === true))
+
 const libraryDoctorId = computed(() => {
     const uid = Number(userStore.userInfo?.id)
     return uid > 0 ? uid : 0
@@ -2029,10 +2061,18 @@ function findDuplicateHerbNames(): string[] {
 }
 
 const handleAddHerb = (formulaType: FormulaType = '主方') => {
+    if (herbsLocked.value) {
+        feedback.msgWarning('该处方含「禁用修改」模板，药材已锁定，请重新从处方库导入覆盖')
+        return
+    }
     formData.herbs.push({ name: '', dosage: 6, formula_type: formulaType })
 }
 
 const handleRemoveHerb = (index: number) => {
+    if (herbsLocked.value) {
+        feedback.msgWarning('该处方含「禁用修改」模板，药材已锁定，不可删除')
+        return
+    }
     formData.herbs.splice(index, 1)
 }
 
@@ -2089,10 +2129,18 @@ const handleImportLibrary = (row: any) => {
     }
 
     const formulaType = normalizeFormulaType(row.formula_type)
-    const imported = (JSON.parse(JSON.stringify(row.herbs)) as any[]).map((h) => ({
-        ...normalizeHerbRow(h),
-        formula_type: formulaType
-    }))
+    // 「禁用修改」模板：导入的药材打上锁定标记 → 整张处方锁定（不可增删改，只能再次导入覆盖）
+    const isLockedTemplate = Number(row?.disable_edit) === 1
+    const imported = (JSON.parse(JSON.stringify(row.herbs)) as any[]).map((h) => {
+        const herb = normalizeHerbRow(h)
+        herb.formula_type = formulaType
+        if (isLockedTemplate) {
+            herb.locked = true
+        } else {
+            delete herb.locked
+        }
+        return herb
+    })
     if (libraryImportMode.value === 'replace') {
         const kept = formData.herbs.filter((h) => normalizeFormulaType(h.formula_type) !== formulaType)
         formData.herbs = [...kept, ...imported]
@@ -2532,6 +2580,17 @@ defineExpose({
             color: var(--el-text-color-regular);
         }
 
+        .rp-toolbar__lock-tip {
+            display: flex;
+            align-items: center;
+            gap: 6px;
+            flex-wrap: wrap;
+            margin: 6px 0 0;
+            font-size: 12px;
+            line-height: 1.55;
+            color: var(--el-color-danger);
+        }
+
         .rp-toolbar__actions {
             display: flex;
             flex-wrap: wrap;
@@ -2925,6 +2984,10 @@ defineExpose({
     min-height: 70px;
 }
 
+.rx-bot-row-1--user {
+    grid-template-columns: 1.4fr 0.6fr;
+}
+
 .rx-hospital-row {
     display: flex;
     flex-direction: column;

admin/src/hooks/useListTimeFilter.ts

@@ -0,0 +1,88 @@
+export type ListTimeType = 'all' | 'today' | 'yesterday' | 'week' | 'month' | 'custom'
+
+export function formatYmd(d: Date): string {
+    const y = d.getFullYear()
+    const m = String(d.getMonth() + 1).padStart(2, '0')
+    const day = String(d.getDate()).padStart(2, '0')
+    return `${y}-${m}-${day}`
+}
+
+/** 列表时间筛选：month 为本自然月 1 日～月末 */
+export function resolveListTimeRange(timeType: ListTimeType, dateRange: string[]): [string, string] {
+    const today = formatYmd(new Date())
+
+    switch (timeType) {
+        case 'all':
+            return ['', '']
+        case 'yesterday': {
+            const d = new Date()
+            d.setDate(d.getDate() - 1)
+            const y = formatYmd(d)
+            return [y, y]
+        }
+        case 'week': {
+            const end = new Date()
+            const start = new Date()
+            start.setDate(start.getDate() - 6)
+            return [formatYmd(start), formatYmd(end)]
+        }
+        case 'month': {
+            const now = new Date()
+            const start = new Date(now.getFullYear(), now.getMonth(), 1)
+            const end = new Date(now.getFullYear(), now.getMonth() + 1, 0)
+            return [formatYmd(start), formatYmd(end)]
+        }
+        case 'custom': {
+            let start = dateRange[0] || today
+            let end = dateRange[1] || today
+            if (start > end) {
+                ;[start, end] = [end, start]
+            }
+            return [start, end]
+        }
+        case 'today':
+        default:
+            return [today, today]
+    }
+}
+
+export function useListTimeFilter(defaultType: ListTimeType = 'today') {
+    const time_type = ref<ListTimeType>(defaultType)
+    const dateRange = ref<string[]>([])
+
+    const resolve = () => resolveListTimeRange(time_type.value, dateRange.value)
+
+    const handleTimeTypeChange = (onQuery: () => void) => {
+        if (time_type.value !== 'custom') {
+            dateRange.value = []
+            onQuery()
+        }
+    }
+
+    const handleCustomDateChange = (onQuery: () => void) => {
+        if (dateRange.value.length === 2) {
+            onQuery()
+        }
+    }
+
+    const resetTimeFilter = () => {
+        time_type.value = defaultType
+        dateRange.value = []
+    }
+
+    const applyCustomRange = (start: string, end: string) => {
+        if (!start || !end) return
+        time_type.value = 'custom'
+        dateRange.value = [start, end]
+    }
+
+    return {
+        time_type,
+        dateRange,
+        resolve,
+        handleTimeTypeChange,
+        handleCustomDateChange,
+        resetTimeFilter,
+        applyCustomRange,
+    }
+}

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

@@ -92,7 +92,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>
@@ -156,6 +159,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 +176,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' }]
     }
 })
 

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

@@ -27,6 +27,20 @@
             <el-table :data="tableData" v-loading="loading">
                 <!-- <el-table-column prop="id" label="ID" width="80" /> -->
                 <el-table-column prop="phone" label="手机号"  />
+                <el-table-column label="备注" min-width="200">
+                    <template #default="{ row }">
+                        <div class="flex items-center gap-1 min-w-0">
+                            <span class="truncate text-gray-600" :title="row.remark || ''">
+                                {{ row.remark || '—' }}
+                            </span>
+                            <el-tooltip content="编辑备注" placement="top">
+                                <el-icon class="shrink-0 cursor-pointer text-gray-400 hover:text-primary" @click="openQuickRemark(row)">
+                                    <Edit />
+                                </el-icon>
+                            </el-tooltip>
+                        </div>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="create_time" label="创建时间" width="180" />
                          <el-table-column prop="status" label="状态" width="100">
                     <template #default="{ row }">
@@ -70,6 +84,16 @@
                 <el-form-item label="密码" prop="password">
                     <el-input v-model="formData.password" placeholder="为空则默认为 123456" show-password />
                 </el-form-item>
+                <el-form-item label="备注" prop="remark">
+                    <el-input
+                        v-model="formData.remark"
+                        type="textarea"
+                        :rows="3"
+                        maxlength="500"
+                        show-word-limit
+                        placeholder="可填写用户相关信息，仅管理员可见"
+                    />
+                </el-form-item>
                 <el-form-item label="状态" prop="status">
                     <el-switch v-model="formData.status" :active-value="1" :inactive-value="0" />
                 </el-form-item>
@@ -79,12 +103,30 @@
                 <el-button type="primary" @click="submitForm" :loading="submitLoading">确定</el-button>
             </template>
         </el-dialog>
+
+        <!-- 快捷备注 -->
+        <el-dialog v-model="remarkDialogVisible" title="快捷备注" width="420px" destroy-on-close>
+            <div class="text-sm text-gray-500 mb-3">账号：{{ remarkTargetPhone }}</div>
+            <el-input
+                v-model="remarkDraft"
+                type="textarea"
+                :rows="4"
+                maxlength="500"
+                show-word-limit
+                placeholder="可填写用户相关信息，仅管理员可见"
+            />
+            <template #footer>
+                <el-button @click="remarkDialogVisible = false">取消</el-button>
+                <el-button type="primary" :loading="remarkSaving" @click="saveQuickRemark">保存</el-button>
+            </template>
+        </el-dialog>
     </div>
 </template>
 
 <script setup lang="ts">
 import { ref, reactive, onMounted } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { Edit } from '@element-plus/icons-vue'
 import { apiAssetUserList, apiAssetUserAdd, apiAssetUserEdit, apiAssetUserDelete } from '@/api/asset'
 
 const loading = ref(false)
@@ -105,10 +147,17 @@ const dialogTitle = ref('')
 const submitLoading = ref(false)
 const formRef = ref()
 
+const remarkDialogVisible = ref(false)
+const remarkSaving = ref(false)
+const remarkDraft = ref('')
+const remarkTargetId = ref<number | string>('')
+const remarkTargetPhone = ref('')
+
 const formData = reactive({
     id: '',
     phone: '',
     password: '',
+    remark: '',
     status: 1
 })
 
@@ -154,16 +203,41 @@ const handleStatusChange = async (row: any) => {
 
 const handleAdd = () => {
     dialogTitle.value = '新增账号'
-    Object.assign(formData, { id: '', phone: '', password: '', status: 1 })
+    Object.assign(formData, { id: '', phone: '', password: '', remark: '', status: 1 })
     dialogVisible.value = true
 }
 
 const handleEdit = (row: any) => {
     dialogTitle.value = '编辑账号'
-    Object.assign(formData, { id: row.id, phone: row.phone, password: '', status: row.status })
+    Object.assign(formData, { id: row.id, phone: row.phone, password: '', remark: row.remark || '', status: row.status })
     dialogVisible.value = true
 }
 
+const openQuickRemark = (row: any) => {
+    remarkTargetId.value = row.id
+    remarkTargetPhone.value = row.phone || ''
+    remarkDraft.value = row.remark || ''
+    remarkDialogVisible.value = true
+}
+
+const saveQuickRemark = async () => {
+    if (!remarkTargetId.value) return
+    remarkSaving.value = true
+    try {
+        await apiAssetUserEdit({ id: remarkTargetId.value, remark: remarkDraft.value })
+        const target = tableData.value.find((item: any) => item.id === remarkTargetId.value)
+        if (target) {
+            target.remark = remarkDraft.value
+        }
+        ElMessage.success('备注已保存')
+        remarkDialogVisible.value = false
+    } catch (e) {
+        console.error(e)
+    } finally {
+        remarkSaving.value = false
+    }
+}
+
 const handleDelete = async (row: any) => {
     try {
         await ElMessageBox.confirm('确定要删除该账号及其关联资源吗？', '提示', { type: 'warning' })

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

@@ -458,7 +458,9 @@
                                         alt="医师签名"
                                         class="rx-bot-sign-img"
                                     />
-                                    <div class="rx-bot-doctor-name">{{ slipView.doctor_name || '—' }}</div>
+                                    <div v-if="!slipView.doctor_signature" class="rx-bot-doctor-name">
+                                        {{ slipView.doctor_name || '—' }}
+                                    </div>
                                 </div>
                             </div>
                           <div class="rx-bot-cell rx-bot-meta">
@@ -679,17 +681,21 @@
                                 粘贴文本解析药名与剂量；须与药品库名称完全一致才录入（导入至主方）
                             </span>
                         </div>
+                        <div v-if="herbsLocked" class="flex items-center gap-2 flex-wrap mt-2 text-xs text-[var(--el-color-danger)]">
+                            <el-tag type="danger" size="small" effect="plain">禁用修改</el-tag>
+                            含「禁用修改」处方库模板，药材已锁定，不可增删改，如需调整请重新「从处方库导入」覆盖
+                        </div>
 
                         <div class="herb-formula-block mt-3">
                             <div class="herb-formula-block__head">
                                 <el-tag type="primary" size="small">主方</el-tag>
-                                <el-button type="primary" size="small" @click="addHerb('主方')">添加主方药材</el-button>
+                                <el-button type="primary" size="small" :disabled="herbsLocked" @click="addHerb('主方')">添加主方药材</el-button>
                             </div>
                             <el-table :data="mainHerbRows" class="mt-2" border empty-text="暂无主方药材">
                                 <el-table-column label="序号" type="index" width="60" />
                                 <el-table-column label="药材名称" min-width="220">
                                     <template #default="{ row }">
-                                        <MedicineNameSelect v-model="editForm.herbs[row.index].name" class="w-full" />
+                                        <MedicineNameSelect v-model="editForm.herbs[row.index].name" :disabled="herbsLocked" class="w-full" />
                                     </template>
                                 </el-table-column>
                                 <el-table-column label="剂量(克)" min-width="120">
@@ -699,6 +705,7 @@
                                             :min="0"
                                             :precision="1"
                                             :step="0.5"
+                                            :disabled="herbsLocked"
                                             placeholder="剂量"
                                             class="w-full"
                                         />
@@ -706,7 +713,8 @@
                                 </el-table-column>
                                 <el-table-column label="操作" width="80">
                                     <template #default="{ row }">
-                                        <el-button type="danger" link @click="removeHerb(row.index)">删除</el-button>
+                                        <el-button v-if="!herbsLocked" type="danger" link @click="removeHerb(row.index)">删除</el-button>
+                                        <span v-else class="text-gray-400 text-xs">已锁定</span>
                                     </template>
                                 </el-table-column>
                             </el-table>
@@ -715,7 +723,7 @@
                         <div class="herb-formula-block mt-4">
                             <div class="herb-formula-block__head">
                                 <el-tag type="warning" size="small">辅方</el-tag>
-                                <el-button type="primary" size="small" plain @click="addHerb('辅方')">
+                                <el-button type="primary" size="small" plain :disabled="herbsLocked" @click="addHerb('辅方')">
                                     添加辅方药材
                                 </el-button>
                             </div>
@@ -723,7 +731,7 @@
                                 <el-table-column label="序号" type="index" width="60" />
                                 <el-table-column label="药材名称" min-width="220">
                                     <template #default="{ row }">
-                                        <MedicineNameSelect v-model="editForm.herbs[row.index].name" class="w-full" />
+                                        <MedicineNameSelect v-model="editForm.herbs[row.index].name" :disabled="herbsLocked" class="w-full" />
                                     </template>
                                 </el-table-column>
                                 <el-table-column label="剂量(克)" min-width="120">
@@ -733,6 +741,7 @@
                                             :min="0"
                                             :precision="1"
                                             :step="0.5"
+                                            :disabled="herbsLocked"
                                             placeholder="剂量"
                                             class="w-full"
                                         />
@@ -740,7 +749,8 @@
                                 </el-table-column>
                                 <el-table-column label="操作" width="80">
                                     <template #default="{ row }">
-                                        <el-button type="danger" link @click="removeHerb(row.index)">删除</el-button>
+                                        <el-button v-if="!herbsLocked" type="danger" link @click="removeHerb(row.index)">删除</el-button>
+                                        <span v-else class="text-gray-400 text-xs">已锁定</span>
                                     </template>
                                 </el-table-column>
                             </el-table>
@@ -1698,7 +1708,7 @@ import jsPDF from 'jspdf'
 const TcmDiagnosisEditView = defineAsyncComponent(() => import('@/views/tcm/diagnosis/edit.vue'))
 
 type FormulaType = '主方' | '辅方'
-type HerbRow = { name: string; dosage: number; formula_type: FormulaType }
+type HerbRow = { name: string; dosage: number; formula_type: FormulaType; locked?: boolean }
 
 type AuxUsageForm = {
     dosage_amount?: number
@@ -1798,11 +1808,15 @@ function normalizeFormulaType(v: unknown): FormulaType {
 }
 
 function normalizeHerbRow(raw: any): HerbRow {
-    return {
+    const row: HerbRow = {
         name: String(raw?.name ?? '').trim(),
         dosage: Number(raw?.dosage) || 0,
         formula_type: normalizeFormulaType(raw?.formula_type)
     }
+    if (raw?.locked === true || raw?.locked === 1) {
+        row.locked = true
+    }
+    return row
 }
 
 function normalizeSlipHerbs(raw: unknown): HerbRow[] {
@@ -2481,6 +2495,12 @@ const auxHerbRows = computed(() =>
         .filter(({ herb }) => normalizeFormulaType(herb.formula_type) === '辅方')
 )
 
+/**
+ * 整张处方是否被锁定：只要任一药材来自「禁用修改」处方库模板即锁定。
+ * 锁定后不可增删改任意药材，只能再次「从处方库导入」覆盖。
+ */
+const herbsLocked = computed(() => editForm.herbs.some((h) => (h as HerbRow).locked === true))
+
 const slipDietaryText = computed(() => {
     const d = slipView.value?.dietary_taboo
     if (Array.isArray(d)) return d.filter(Boolean).join('、')
@@ -3441,10 +3461,18 @@ const handleImportLibrary = (row: any) => {
         return
     }
     const formulaType = normalizeFormulaType(row.formula_type)
-    const imported = (JSON.parse(JSON.stringify(row.herbs)) as any[]).map((h) => ({
-        ...normalizeHerbRow(h),
-        formula_type: formulaType
-    }))
+    // 「禁用修改」模板：导入药材打上锁定标记 → 整张处方锁定（不可增删改，只能再次导入覆盖）
+    const isLockedTemplate = Number(row?.disable_edit) === 1
+    const imported = (JSON.parse(JSON.stringify(row.herbs)) as any[]).map((h) => {
+        const herb = normalizeHerbRow(h)
+        herb.formula_type = formulaType
+        if (isLockedTemplate) {
+            herb.locked = true
+        } else {
+            delete herb.locked
+        }
+        return herb
+    })
     if (libraryImportMode.value === 'replace') {
         const kept = editForm.herbs.filter((h) => normalizeFormulaType(h.formula_type) !== formulaType)
         editForm.herbs = [...kept, ...imported]
@@ -3650,6 +3678,10 @@ async function handlePasteRecipeImport() {
 
 // 添加药材（主方 / 辅方）
 const addHerb = (formulaType: FormulaType = '主方') => {
+    if (herbsLocked.value) {
+        feedback.msgWarning('该处方含「禁用修改」模板，药材已锁定，请重新从处方库导入覆盖')
+        return
+    }
     editForm.herbs.push({
         name: '',
         dosage: 0,
@@ -3659,6 +3691,10 @@ const addHerb = (formulaType: FormulaType = '主方') => {
 
 // 删除药材
 const removeHerb = (index: number) => {
+    if (herbsLocked.value) {
+        feedback.msgWarning('该处方含「禁用修改」模板，药材已锁定，不可删除')
+        return
+    }
     editForm.herbs.splice(index, 1)
 }
 

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

@@ -71,6 +71,13 @@
                             </el-tag>
                         </template>
                     </el-table-column>
+                    <el-table-column label="禁用修改" min-width="100">
+                        <template #default="{ row }">
+                            <el-tag :type="row.disable_edit ? 'danger' : 'info'">
+                                {{ row.disable_edit ? '已禁用' : '可修改' }}
+                            </el-tag>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="创建人" prop="creator_name" min-width="100" />
                     <el-table-column label="创建时间" prop="create_time" min-width="160" />
                     <el-table-column label="操作" width="180" fixed="right">
@@ -193,6 +200,21 @@
                         勾选后，所有医生都可以查看和使用此处方模板
                     </div>
                 </el-form-item>
+
+                <el-form-item label="禁用修改" prop="disable_edit">
+                    <div class="flex flex-col gap-1 leading-none">
+                        <el-switch
+                            v-model="editForm.disable_edit"
+                            :active-value="1"
+                            :inactive-value="0"
+                            active-text="开启"
+                            inactive-text="关闭"
+                        />
+                        <div class="text-xs text-gray-400 leading-relaxed">
+                            开启后，导入此模板到处方时将锁定整张处方的药材，不可增删改，只能再次导入覆盖
+                        </div>
+                    </div>
+                </el-form-item>
             </el-form>
             
             <template #footer v-if="editMode !== 'view'">
@@ -236,7 +258,8 @@ const editForm = reactive({
     prescription_name: '',
     formula_type: '主方',
     herbs: [] as Array<{ name: string; dosage: number }>,
-    is_public: 0
+    is_public: 0,
+    disable_edit: 0
 })
 
 // 表单验证规则
@@ -293,6 +316,7 @@ const resetForm = () => {
     editForm.formula_type = '主方'
     editForm.herbs = []
     editForm.is_public = 0
+    editForm.disable_edit = 0
 }
 
 // 新增处方
@@ -310,6 +334,7 @@ const handleView = (row: any) => {
     editForm.formula_type = row.formula_type || '主方'
     editForm.herbs = row.herbs ? JSON.parse(JSON.stringify(row.herbs)) : []
     editForm.is_public = row.is_public ?? 0
+    editForm.disable_edit = row.disable_edit ?? 0
     showEdit.value = true
 }
 
@@ -321,6 +346,7 @@ const handleEdit = (row: any) => {
     editForm.formula_type = row.formula_type || '主方'
     editForm.herbs = row.herbs ? JSON.parse(JSON.stringify(row.herbs)) : []
     editForm.is_public = row.is_public ?? 0
+    editForm.disable_edit = row.disable_edit ?? 0
     showEdit.value = true
 }
 

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

@@ -173,17 +173,16 @@
                 </div>
             </div>
             <el-form class="ls-form" :model="queryParams" inline>
-                <el-form-item class="w-[360px] min-w-[240px] max-w-full" label="创建时间">
-                    <DaterangePicker
-                        v-model:startTime="queryParams.start_time"
-                        v-model:endTime="queryParams.end_time"
-                        picker-type="daterange"
-                        value-format="YYYY-MM-DD"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        class="!w-full"
-                    />
-                </el-form-item>
+                <list-time-filter
+                    v-model:time-type="time_type"
+                    v-model:date-range="dateRange"
+                    label="创建时间"
+                    variant="inline"
+                    show-all
+                    picker-width="230px"
+                    @time-type-change="onTimeTypeChange"
+                    @custom-change="onCustomDateChange"
+                />
                 <el-form-item class="w-[260px]" label="订单号">
                     <el-input
                         v-model="queryParams.order_no"
@@ -797,49 +796,50 @@
                 </div>
 
                 <!-- 顶部数据概览卡片 -->
-                <el-row :gutter="16" class="mb-5">
-                    <el-col :xs="12" :sm="6">
-                        <el-card shadow="never" class="stat-card border border-gray-100 bg-gray-50/50">
-                            <div class="flex items-center justify-between mb-1">
-                                <div class="stat-title text-gray-500 text-xs">总金额</div>
-                                <el-button
-                                    v-if="canUpdateAmount(detailData)"
-                                    v-perms="['tcm.prescriptionOrder/updateAmount']"
-                                    type="primary"
-                                    size="small"
-                                    link
-                                    @click="openUpdateAmount"
-                                >
-                                    修改
-                                </el-button>
-                            </div>
-                            <div class="stat-value 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="stat-card border border-gray-100 bg-gray-50/50">
-                            <div class="stat-title text-gray-500 text-xs mb-1">已付总额</div>
-                            <div class="stat-value 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="stat-card border border-gray-100 bg-gray-50/50">
-                            <div class="stat-title text-gray-500 text-xs mb-1">需代收</div>
-                            <div
-                                class="stat-value font-bold text-xl"
-                                :class="detailAgencyToCollect > 0 ? 'text-amber-600' : 'text-gray-500'"
+                <div class="grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-5 gap-4 mb-5">
+                    <el-card shadow="never" class="stat-card border border-gray-100 bg-gray-50/50">
+                        <div class="flex items-center justify-between mb-1">
+                            <div class="stat-title text-gray-500 text-xs">总金额</div>
+                            <el-button
+                                v-if="canUpdateAmount(detailData)"
+                                v-perms="['tcm.prescriptionOrder/updateAmount']"
+                                type="primary"
+                                size="small"
+                                link
+                                @click="openUpdateAmount"
                             >
-                                ¥{{ formatMoney(detailAgencyToCollect) }}
-                            </div>
-                        </el-card>
-                    </el-col>
-                    <el-col :xs="12" :sm="6">
-                        <el-card shadow="never" class="stat-card border border-gray-100 bg-gray-50/50">
-                            <div class="stat-title text-gray-500 text-xs mb-1">已付笔数</div>
-                            <div class="stat-value text-primary font-bold text-xl">{{ detailLinkedPayOrders.length }} 笔</div>
-                        </el-card>
-                    </el-col>
-                </el-row>
+                                修改
+                            </el-button>
+                        </div>
+                        <div class="stat-value text-red-500 font-bold text-xl">¥{{ detailData.amount }}</div>
+                    </el-card>
+                    <el-card shadow="never" class="stat-card border border-gray-100 bg-gray-50/50">
+                        <div class="stat-title text-gray-500 text-xs mb-1">已付总额</div>
+                        <div class="stat-value text-green-600 font-bold text-xl">¥{{ detailData.linked_pay_paid_total || 0 }}</div>
+                    </el-card>
+                    <el-card shadow="never" class="stat-card border border-gray-100 bg-gray-50/50">
+                        <div class="stat-title text-gray-500 text-xs mb-1">退款金额</div>
+                        <div
+                            class="stat-value font-bold text-xl"
+                            :class="Number(detailData.refund_amount) > 0 ? 'text-rose-500' : 'text-gray-400'"
+                        >
+                            ¥{{ formatMoney(detailData.refund_amount || 0) }}
+                        </div>
+                    </el-card>
+                    <el-card shadow="never" class="stat-card border border-gray-100 bg-gray-50/50">
+                        <div class="stat-title text-gray-500 text-xs mb-1">需代收</div>
+                        <div
+                            class="stat-value font-bold text-xl"
+                            :class="detailAgencyToCollect > 0 ? 'text-amber-600' : 'text-gray-500'"
+                        >
+                            ¥{{ formatMoney(detailAgencyToCollect) }}
+                        </div>
+                    </el-card>
+                    <el-card shadow="never" class="stat-card border border-gray-100 bg-gray-50/50">
+                        <div class="stat-title text-gray-500 text-xs mb-1">已付笔数</div>
+                        <div class="stat-value text-primary font-bold text-xl">{{ detailLinkedPayOrders.length }} 笔</div>
+                    </el-card>
+                </div>
 
                 <div class="grid grid-cols-1 md:grid-cols-2 gap-4 mb-4">
                     <!-- 左侧：处方单 -->
@@ -1096,6 +1096,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 }">
@@ -1154,6 +1159,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 }">
@@ -1353,6 +1363,17 @@
                             <template #icon><el-icon><Refresh /></el-icon></template>
                             刷新轨迹
                         </el-button>
+                        <el-button
+                            v-perms="['tcm.prescriptionOrder/logisticsTrace']"
+                            type="warning"
+                            plain
+                            size="default"
+                            :loading="jdLogisticsUpdating"
+                            @click="updateJdLogistics"
+                        >
+                            <template #icon><el-icon><Van /></el-icon></template>
+                            京东接口更新
+                        </el-button>
                         <div class="ml-2 flex items-center gap-4 border-l pl-4 border-gray-200">
                             <el-link :href="detailOfficialUrls.sf" target="_blank" type="primary" :underline="false" class="text-[13px]">顺丰官网</el-link>
                             <el-link :href="detailOfficialUrls.jd" target="_blank" type="primary" :underline="false" class="text-[13px]">京东物流</el-link>
@@ -1772,7 +1793,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"
                                         >
@@ -1782,7 +1803,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>
@@ -2099,7 +2120,9 @@
                         </div>
                     </template>
                 </el-alert>
-                <p class="text-sm text-gray-600 mb-3">请选择本单结案状态。选择「已完成」时，实付将按已关联的支付单金额汇总。</p>
+                <p class="text-sm text-gray-600 mb-3">
+                    请选择本单结案状态。选择「已完成」时，实付将按已关联的支付单金额汇总；选择「退款」时将关联收款单标记为已退款并清零本单已付。
+                </p>
                 <el-select
                     v-model="completeFulfillmentStatus"
                     class="w-full"
@@ -2112,11 +2135,90 @@
                         :value="opt.value"
                     />
                 </el-select>
+
+                <template v-if="completeFulfillmentStatus === 10">
+                    <el-alert
+                        type="warning"
+                        :closable="false"
+                        show-icon
+                        class="mt-3 !items-start"
+                        title="退款将处理本单全部关联收款单，已付总额清零，且不可撤销。"
+                    />
+                    <div v-loading="completeOrderPayLoading" class="mt-3">
+                        <div
+                            v-if="completeOrderLinkedPays.length"
+                            class="rounded-lg border border-amber-200/80 bg-amber-50/50 p-3"
+                        >
+                            <div class="text-xs font-semibold text-amber-900 mb-2">
+                                将退款的关联收款（{{ completeOrderLinkedPays.length }} 笔 · 合计 ¥{{ formatMoney(completeOrderRefundTotal) }}）
+                            </div>
+                            <el-table :data="completeOrderLinkedPays" size="small" border stripe max-height="200">
+                                <el-table-column prop="order_no" label="单号" min-width="120" show-overflow-tooltip />
+                                <el-table-column label="类型" width="88">
+                                    <template #default="{ row }">
+                                        {{ row.order_type_desc || feeTypeText(row.order_type) }}
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="金额" width="88" align="right">
+                                    <template #default="{ row }">
+                                        <span class="text-red-500">¥{{ row.amount }}</span>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="状态" width="92" 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>
+                        </div>
+                        <p v-else-if="!completeOrderPayLoading" class="text-xs text-gray-500 mt-2">
+                            当前无已关联的收款单；提交后仍将本单标记为「退款」并清零已付。
+                        </p>
+                    </div>
+                    <el-form
+                        ref="completeRefundFormRef"
+                        :model="completeRefundForm"
+                        :rules="completeRefundRules"
+                        label-width="88px"
+                        class="mt-3"
+                    >
+                        <el-form-item label="退款金额" prop="refund_amount">
+                            <el-input-number
+                                v-model="completeRefundForm.refund_amount"
+                                :min="0.01"
+                                :max="completeOrderRefundMax > 0 ? completeOrderRefundMax : undefined"
+                                :step="0.01"
+                                :precision="2"
+                                class="w-full"
+                                controls-position="right"
+                            />
+                            <div class="text-xs text-gray-500 mt-1">
+                                可退上限 ¥{{ formatMoney(completeOrderRefundMax) }}
+                            </div>
+                        </el-form-item>
+                        <el-form-item label="退款原因" prop="reason">
+                            <el-input
+                                v-model="completeRefundForm.reason"
+                                type="textarea"
+                                :rows="3"
+                                maxlength="500"
+                                show-word-limit
+                                placeholder="请填写退款原因（必填）"
+                            />
+                        </el-form-item>
+                    </el-form>
+                </template>
             </div>
             <template #footer>
                 <el-button @click="completeOrderDialogVisible = false">取消</el-button>
-                <el-button type="primary" :loading="completeOrderSubmitting" @click="submitCompleteOrder">
-                    确定
+                <el-button
+                    :type="completeFulfillmentStatus === 10 ? 'danger' : 'primary'"
+                    :loading="completeOrderSubmitting"
+                    @click="submitCompleteOrder"
+                >
+                    {{ completeFulfillmentStatus === 10 ? '确认退款' : '确定' }}
                 </el-button>
             </template>
         </el-dialog>
@@ -2134,9 +2236,23 @@
                 :closable="false"
                 show-icon
                 class="mb-4 !items-start"
-                title="确认退款后，关联收款记录将全部标记为「已退款」，已付总额清零，且不可撤销。"
+                :title="refundOrderAlertTitle"
             />
             <el-form ref="refundOrderFormRef" :model="refundOrderForm" :rules="refundOrderRules" label-width="88px">
+                <el-form-item label="退款金额" prop="refund_amount">
+                    <el-input-number
+                        v-model="refundOrderForm.refund_amount"
+                        :min="0.01"
+                        :max="refundOrderMaxAmount > 0 ? refundOrderMaxAmount : undefined"
+                        :step="0.01"
+                        :precision="2"
+                        class="w-full"
+                        controls-position="right"
+                    />
+                    <div class="text-xs text-gray-500 mt-1">
+                        可退上限 ¥{{ formatMoney(refundOrderMaxAmount) }}（默认全额）；部分退款时按金额从关联收款单依次标记已退款，并扣减本单已付。
+                    </div>
+                </el-form-item>
                 <el-form-item label="退款原因" prop="reason">
                     <el-input
                         v-model="refundOrderForm.reason"
@@ -2181,13 +2297,13 @@
             >
                 <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="link">关联已有</el-radio>
                         <el-radio value="completion_only">直接完单申请</el-radio>
                     </el-radio-group>
                 </el-form-item>
 
-                <!-- 手动创建模式 -->
+                <!-- 付呗（手动创建支付单） -->
                 <template v-if="addPayOrderForm.add_mode === 'create'">
                     <el-form-item label="费用类别" prop="order_type">
                         <el-select v-model="addPayOrderForm.order_type" class="w-full">
@@ -2252,12 +2368,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>
@@ -2418,7 +2539,11 @@
                     <div class="rx-title">{{ prescriptionTabType === 'internal' ? '药房联' : SLIP_TITLE }}</div>   
                     <div class="rx-notice">
                         <span class="rx-notice-text">
-                            服药前请核对姓名、电话、医生等信息以及服法、医嘱等要点
+                            {{
+                                prescriptionTabType === 'user'
+                                    ? '服药前请核对姓名、电话、医生等信息以及医嘱等要点'
+                                    : '服药前请核对姓名、电话、医生等信息以及服法、医嘱等要点'
+                            }}
                         </span>
                         <div class="rx-notice-meta">
                             <div class="rx-meta-item">
@@ -2542,21 +2667,29 @@
                     </div>
 
                     <div class="rx-text">
-                        <p v-if="prescriptionTabType === 'internal' || rxAuxUsageText">主服法：{{ rxUsageText }}</p>
-                        <p v-else>服法：{{ rxUsageText }}</p>
-                        <p v-if="rxAuxUsageText">辅服法：{{ rxAuxUsageText }}</p>
+                        <template v-if="prescriptionTabType === 'internal'">
+                            <p v-if="rxAuxUsageText">主服法：{{ rxUsageText }}</p>
+                            <p v-else>服法：{{ rxUsageText }}</p>
+                            <p v-if="rxAuxUsageText">辅服法：{{ rxAuxUsageText }}</p>
+                        </template>
                         <p v-if="rxAdviceText">医嘱：{{ rxAdviceText }}</p>
-                        <p v-if="rxRemarkText">备注：{{ rxRemarkText }}</p>
+                        <p v-if="prescriptionTabType === 'internal' && rxRemarkText">备注：{{ rxRemarkText }}</p>
                         <p v-if="rxPharmacyRemarkText" class="rx-text-warn">
                             药房备注：{{ rxPharmacyRemarkText }}
                         </p>
-                        <p v-if="rxOutPelletText && prescriptionViewData?.prescription_type !== '饮片'" class="rx-text-warn">
+                        <p
+                            v-if="prescriptionTabType === 'internal' && rxOutPelletText && prescriptionViewData?.prescription_type !== '饮片'"
+                            class="rx-text-warn"
+                        >
                             出丸：{{ rxOutPelletText }}
                         </p>
                     </div>
 
                     <div class="rx-bottom">
-                        <div class="rx-bot-row rx-bot-row-1">
+                        <div
+                            class="rx-bot-row rx-bot-row-1"
+                            :class="{ 'rx-bot-row-1--user': prescriptionTabType === 'user' }"
+                        >
                             <div class="rx-bot-cell rx-bot-doctor">
                                 <div class="rx-bot-label rx-bot-label--doctor">医师</div>
                                 <div class="rx-bot-doctor-body">
@@ -2566,11 +2699,14 @@
                                         alt="医师签名"
                                         class="rx-bot-sign-img"
                                     />
-                                    <!-- <span class="rx-bot-doctor-name">{{ prescriptionViewData.doctor_name || '—' }}</span> -->
+                                    <span
+                                        v-if="!prescriptionViewData.doctor_signature"
+                                        class="rx-bot-doctor-name"
+                                    >{{ prescriptionViewData.doctor_name || '—' }}</span>
                                 </div>
                             </div>
                           
-                            <div class="rx-bot-cell rx-bot-meta">
+                            <div v-if="prescriptionTabType === 'internal'" class="rx-bot-cell rx-bot-meta">
                                 <span class="rx-bot-meta-key">类型:</span>
                                 <span class="rx-bot-meta-val">{{ rxTypeText }}</span>
                             </div>
@@ -2584,7 +2720,7 @@
                                                     : '—'
                                             }} </span>
                             </div>
-                            <div class="rx-bot-cell rx-bot-meta">
+                            <div v-if="prescriptionTabType === 'internal'" class="rx-bot-cell rx-bot-meta">
                                 <span class="rx-bot-meta-key">剂量:</span>
                                 <span class="rx-bot-meta-val">{{ rxPerDoseAmount }}克</span>
                             </div>
@@ -2760,8 +2896,9 @@
 <script lang="ts" setup name="prescriptionOrderList">
 import { computed, onMounted, reactive, ref, nextTick, watch, defineAsyncComponent } from 'vue'
 import { useRoute } from 'vue-router'
-import { Refresh, Loading, ArrowDown, InfoFilled, QuestionFilled, Search, Calendar, Document, Link as LinkIcon, Wallet } from '@element-plus/icons-vue'
-import DaterangePicker from '@/components/daterange-picker/index.vue'
+import { Refresh, Loading, ArrowDown, InfoFilled, QuestionFilled, Search, Calendar, Document, Link as LinkIcon, Wallet, Van } from '@element-plus/icons-vue'
+import ListTimeFilter from '@/components/list-time-filter/index.vue'
+import { useListTimeFilter } from '@/hooks/useListTimeFilter'
 import {
     prescriptionOrderAuditPayment,
     prescriptionOrderAuditPrescription,
@@ -2772,6 +2909,7 @@ import {
     prescriptionOrderPaidPayOrders,
     prescriptionOrderWithdraw,
     prescriptionOrderLogisticsTrace,
+    prescriptionOrderLogisticsJdUpdate,
     prescriptionOrderShip,
     prescriptionOrderLogs,
     prescriptionOrderUpdateAmount,
@@ -3067,9 +3205,6 @@ function handleExpressCompanyTabClick(value: '' | 'sf' | 'jd') {
 }
 
 const queryParams = reactive({
-    /** 创建时间区间（与列表筛选一致；不影响「今日」统计） */
-    start_time: '' as string,
-    end_time: '' as string,
     order_no: '',
     prescription_id: '' as string | number,
     /** 诊单患者姓名/手机号（后台关联 diagnosis） */
@@ -3157,6 +3292,24 @@ function handleFocusBoardSearch(key: 'pendingRx' | 'pendingPay' | 'pendingShip'
     resetPage()
 }
 
+const {
+    time_type,
+    dateRange,
+    resolve: resolveCreateTimeRange,
+    handleTimeTypeChange,
+    handleCustomDateChange,
+    resetTimeFilter,
+    applyCustomRange,
+} = useListTimeFilter('all')
+
+const handleQuery = () => {
+    pager.page = 1
+    getLists()
+}
+
+const onTimeTypeChange = () => handleTimeTypeChange(handleQuery)
+const onCustomDateChange = () => handleCustomDateChange(handleQuery)
+
 function normalizePrescriptionOrderListQuery(params: Record<string, unknown>): Record<string, unknown> {
     const p: Record<string, unknown> = { ...params }
     if (p.prescription_id === '' || p.prescription_id === undefined) {
@@ -3236,11 +3389,15 @@ function normalizePrescriptionOrderListQuery(params: Record<string, unknown>): R
 }
 
 async function fetchLists(params: Record<string, unknown>) {
-    const p = normalizePrescriptionOrderListQuery({ ...params })
+    const [start_time, end_time] = resolveCreateTimeRange()
+    const p = normalizePrescriptionOrderListQuery({ ...params, start_time, end_time })
     return prescriptionOrderLists(p)
 }
 
-const prescriptionOrderExportParams = computed(() => normalizePrescriptionOrderListQuery({ ...queryParams }))
+const prescriptionOrderExportParams = computed(() => {
+    const [start_time, end_time] = resolveCreateTimeRange()
+    return normalizePrescriptionOrderListQuery({ ...queryParams, start_time, end_time })
+})
 
 const { pager, getLists, resetPage, resetParams } = usePaging({
     fetchFun: fetchLists,
@@ -3275,8 +3432,9 @@ function applyRouteQueryToPrescriptionOrderList() {
     }
     const st = normDate(q.start_time)
     const et = normDate(q.end_time)
-    if (st) queryParams.start_time = st
-    if (et) queryParams.end_time = et
+    if (st && et) {
+        applyCustomRange(st, et)
+    }
     const ad = q.assistant_dept_id
     if (ad !== undefined && ad !== null && String(ad) !== '') {
         const n = Number(ad)
@@ -3367,9 +3525,7 @@ const listStats = computed(() => {
         scopeHint =
             '统计口径：本人创建的订单 + 关联处方开方人为本人的订单（含医助代建）；与下方筛选项（不含「创建时间」）一致'
     }
-    const hasCustomTime =
-        String(queryParams.start_time || '').trim() !== '' && String(queryParams.end_time || '').trim() !== ''
-    const headPrefix = hasCustomTime ? '区间' : '今日'
+    const headPrefix = time_type.value === 'all' ? '全部' : time_type.value === 'today' ? '今日' : '区间'
     return {
         order: n(o),
         pay: n(pay),
@@ -3441,8 +3597,7 @@ watch(
 
 function handleReset() {
     activeFocusKey.value = ''
-    queryParams.start_time = ''
-    queryParams.end_time = ''
+    resetTimeFilter()
     queryParams.order_no = ''
     queryParams.prescription_id = ''
     queryParams.patient_keyword = ''
@@ -3740,7 +3895,9 @@ function canCompleteRow(row: { fulfillment_status?: number; payment_slip_audit_s
 }
 
 function canRefundRow(row: { fulfillment_status?: number; payment_slip_audit_status?: number }) {
-    return canCompleteRow(row)
+    // 已发货(5) / 已签收(6) / 已完成(3) / 拒收(9)，且支付审核已通过(1) 可退款
+    const fs = Number(row.fulfillment_status)
+    return (fs === 5 || fs === 6 || fs === 3 || fs === 9) && Number(row.payment_slip_audit_status) === 1
 }
 
 function canQuickTrackRow(row: { fulfillment_status?: number }) {
@@ -3838,10 +3995,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
@@ -3978,18 +4139,25 @@ const detailLinkedAppointmentChannelText = computed(() => {
 
 const detailRxHerbs = computed(() => normalizeSlipHerbs(detailPrescription.value?.herbs))
 
-/** 详情：是否含辅方药材（用于决定是否展示辅方用量 / 用法） */
-const detailHasAuxHerbs = computed(() => {
-    const herbs = detailPrescription.value?.herbs
-    if (!Array.isArray(herbs)) return false
-    return herbs.some((h: any) => normalizeSlipFormulaType(h?.formula_type) === '辅方')
-})
+/** 详情：是否含辅方药材（仅 formula_type=辅方；医助无药材权限时 herbs 被剥离，用后端 has_aux_formula） */
+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
+}
+
+const detailHasAuxHerbs = computed(() => prescriptionHasAuxFormula(detailPrescription.value as any))
 
 /** 详情：辅方用法（aux_usage JSON 经规范化后的对象，与处方类型一致） */
 const detailAuxUsage = computed(() => {
     const rx = detailPrescription.value as any
-    if (!rx) return null
-    return normalizeSlipAuxUsageForm(rx.aux_usage, rx.prescription_type || '浓缩水丸')
+    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/缺省兼容旧接口（旧版未下发该字段时仍展示药材） */
@@ -4044,6 +4212,7 @@ function formatOrderTime(v: unknown) {
 
 const detailLogisticsExpress = ref<string>('auto')
 const logisticsTraceLoading = ref(false)
+const jdLogisticsUpdating = ref(false)
 const logisticsTracePayload = ref<Record<string, any> | null>(null)
 /** 顺丰/快递100：与运单一致的收件手机后四位（可覆盖订单收货手机） */
 const logisticsTracePhoneTail = ref('')
@@ -4277,6 +4446,26 @@ async function fetchLogisticsTrace() {
     }
 }
 
+// 直接请求京东官方物流接口，刷新并落库轨迹后重新读取展示
+async function updateJdLogistics() {
+    const orderId = Number(detailData.value?.id)
+    const trackingNumber = String(detailData.value?.tracking_number || '').trim()
+    if (!orderId || !trackingNumber) {
+        feedback.msgWarning('当前订单未填写快递单号')
+        return
+    }
+    jdLogisticsUpdating.value = true
+    try {
+        const res: any = await prescriptionOrderLogisticsJdUpdate({ id: orderId })
+        feedback.msgSuccess(res?.message || '京东物流轨迹已更新')
+        await fetchLogisticsTrace()
+    } catch (e: any) {
+        feedback.msgError(e?.message || '京东物流更新失败')
+    } finally {
+        jdLogisticsUpdating.value = false
+    }
+}
+
 const patchRxPatientVisible = ref(false)
 const patchRxPatientSaving = ref(false)
 const patchRxPatientFormRef = ref<FormInstance>()
@@ -4522,7 +4711,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)
 
@@ -4538,6 +4727,24 @@ 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 '付呗'
+    const paymentMethod = String(row?.payment_method || '')
+    const methodMap: Record<string, string> = {
+        alipay: '支付宝',
+        wechat: '微信',
+        wechat_work: '企业微信',
+        fubei: '付呗',
+        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
@@ -5251,6 +5458,7 @@ const completeOrderStatusOptions = [
     { value: 7, label: '进行中' },
     { value: 8, label: '暂不制药' },
     { value: 9, label: '拒收' },
+    { value: 10, label: '退款' },
     { value: 11, label: '保留药方' },
     { value: 12, label: '制药缓发' }
 ] as const
@@ -5259,15 +5467,72 @@ const completeOrderDialogVisible = ref(false)
 const completeOrderId = ref(0)
 const completeFulfillmentStatus = ref<number>(3)
 const completeOrderSubmitting = ref(false)
+const completeOrderPayLoading = ref(false)
+const completeOrderLinkedPays = ref<any[]>([])
+const completeRefundFormRef = ref<FormInstance>()
+const completeRefundForm = reactive({ reason: '', refund_amount: undefined as number | undefined })
+const completeOrderRefundMax = ref(0)
+const completeOrderRefundTotal = computed(() => calcRefundableFromLinkedPays(completeOrderLinkedPays.value))
+const completeRefundRules = computed<FormRules>(() => ({
+    refund_amount: [
+        { required: true, message: '请输入退款金额', trigger: 'change' },
+        {
+            validator: (_rule, v, cb) => {
+                const n = Number(v)
+                const cap = completeOrderRefundMax.value
+                if (!Number.isFinite(n) || n <= 0) {
+                    cb(new Error('退款金额须大于 0'))
+                    return
+                }
+                if (cap > 0 && n > cap + 0.009) {
+                    cb(new Error(`不能超过可退上限 ¥${formatMoney(cap)}`))
+                    return
+                }
+                cb()
+            },
+            trigger: 'change'
+        }
+    ],
+    reason: [{ required: true, message: '请填写退款原因', trigger: 'blur' }]
+}))
 let completeOrderLogisticsRequestSeq = 0
 
 function onCompleteOrderDialogClosed() {
     completeOrderId.value = 0
+    completeOrderLinkedPays.value = []
+    completeOrderPayLoading.value = false
+    completeRefundForm.reason = ''
+    completeRefundForm.refund_amount = undefined
+    completeOrderRefundMax.value = 0
+    completeRefundFormRef.value?.clearValidate()
     completeOrderLogisticsRequestSeq += 1
     completeOrderLogisticsPayload.value = null
     completeOrderLogisticsLoading.value = false
 }
 
+async function loadCompleteOrderPayContext(orderId: number) {
+    if (!orderId) {
+        completeOrderLinkedPays.value = []
+        return
+    }
+    completeOrderPayLoading.value = true
+    try {
+        const r: any = await prescriptionOrderDetail({ id: orderId })
+        const d = r?.data ?? r ?? null
+        const arr = d?.linked_pay_orders
+        completeOrderLinkedPays.value = Array.isArray(arr) ? arr : []
+        const linkedMax = calcRefundableFromLinkedPays(completeOrderLinkedPays.value)
+        const paid = Number(d?.paid) || 0
+        completeOrderRefundMax.value = linkedMax > 0 ? linkedMax : paid
+        completeRefundForm.refund_amount = completeOrderRefundMax.value
+    } catch {
+        completeOrderLinkedPays.value = []
+        completeOrderRefundMax.value = 0
+    } finally {
+        completeOrderPayLoading.value = false
+    }
+}
+
 async function fetchCompleteOrderLogisticsForDialog(row: {
     id: number
     tracking_number?: unknown
@@ -5306,6 +5571,36 @@ async function fetchCompleteOrderLogisticsForDialog(row: {
 async function submitCompleteOrder() {
     const id = completeOrderId.value
     if (!id) return
+
+    if (completeFulfillmentStatus.value === 10) {
+        const valid = await completeRefundFormRef.value?.validate().catch(() => false)
+        if (!valid) return
+        completeOrderSubmitting.value = true
+        try {
+            await prescriptionOrderRefund({
+                id,
+                reason: completeRefundForm.reason.trim(),
+                refund_amount: Number(completeRefundForm.refund_amount)
+            })
+            feedback.msgSuccess('退款成功')
+            completeOrderDialogVisible.value = false
+            getLists()
+            if (detailVisible.value && detailData.value?.id === id) {
+                try {
+                    const r: any = await prescriptionOrderDetail({ id })
+                    const nd = r?.data ?? r ?? null
+                    if (nd) detailData.value = nd
+                    await fetchLogs(id)
+                } catch { /* 静默 */ }
+            }
+        } catch {
+            /* 拦截器已提示 */
+        } finally {
+            completeOrderSubmitting.value = false
+        }
+        return
+    }
+
     completeOrderSubmitting.value = true
     try {
         await prescriptionOrderComplete({ id, fulfillment_status: completeFulfillmentStatus.value })
@@ -5327,25 +5622,79 @@ async function submitCompleteOrder() {
 }
 
 // ─── 订单退款（已发货/已签收 + 支付审核通过）────────────────────────────────────────────
+function calcRefundableFromLinkedPays(list: any[]) {
+    let sum = 0
+    for (const o of list || []) {
+        const st = Number(o?.status)
+        if (st === 2 || st === 5) {
+            sum += Number(o?.amount) || 0
+        }
+    }
+    return Math.round(sum * 100) / 100
+}
+
 const refundOrderDialogVisible = ref(false)
 const refundOrderId = ref(0)
 const refundOrderSubmitting = ref(false)
 const refundOrderFormRef = ref<FormInstance>()
-const refundOrderForm = reactive({ reason: '' })
-const refundOrderRules: FormRules = {
+const refundOrderMaxAmount = ref(0)
+const refundOrderForm = reactive({ reason: '', refund_amount: undefined as number | undefined })
+const refundOrderAlertTitle = computed(() => {
+    const cap = formatMoney(refundOrderMaxAmount.value)
+    const amt = formatMoney(refundOrderForm.refund_amount)
+    if (Number(refundOrderForm.refund_amount) >= refundOrderMaxAmount.value - 0.009) {
+        return `确认全额退款 ¥${cap}：关联收款将标记已退款，本单已付清零，且不可撤销。`
+    }
+    return `确认部分退款 ¥${amt}（可退上限 ¥${cap}）：将扣减本单已付，并按金额依次标记关联收款已退款。`
+})
+const refundOrderRules = computed<FormRules>(() => ({
+    refund_amount: [
+        { required: true, message: '请输入退款金额', trigger: 'change' },
+        {
+            validator: (_rule, v, cb) => {
+                const n = Number(v)
+                const cap = refundOrderMaxAmount.value
+                if (!Number.isFinite(n) || n <= 0) {
+                    cb(new Error('退款金额须大于 0'))
+                    return
+                }
+                if (cap > 0 && n > cap + 0.009) {
+                    cb(new Error(`不能超过可退上限 ¥${formatMoney(cap)}`))
+                    return
+                }
+                cb()
+            },
+            trigger: 'change'
+        }
+    ],
     reason: [{ required: true, message: '请填写退款原因', trigger: 'blur' }]
-}
+}))
 
 function onRefundOrderDialogClosed() {
     refundOrderId.value = 0
     refundOrderForm.reason = ''
+    refundOrderForm.refund_amount = undefined
+    refundOrderMaxAmount.value = 0
     refundOrderFormRef.value?.clearValidate()
 }
 
-function openRefundOrder(row: { id: number }) {
+async function openRefundOrder(row: { id: number }) {
     refundOrderId.value = row.id
     refundOrderForm.reason = ''
+    refundOrderForm.refund_amount = undefined
+    refundOrderMaxAmount.value = 0
     refundOrderDialogVisible.value = true
+    try {
+        const r: any = await prescriptionOrderDetail({ id: row.id })
+        const d = r?.data ?? r ?? null
+        const linked = Array.isArray(d?.linked_pay_orders) ? d.linked_pay_orders : []
+        const linkedMax = calcRefundableFromLinkedPays(linked)
+        const paid = Number(d?.paid) || 0
+        refundOrderMaxAmount.value = linkedMax > 0 ? linkedMax : paid
+        refundOrderForm.refund_amount = refundOrderMaxAmount.value
+    } catch {
+        refundOrderMaxAmount.value = 0
+    }
 }
 
 async function submitRefundOrder() {
@@ -5355,7 +5704,11 @@ async function submitRefundOrder() {
     if (!valid) return
     refundOrderSubmitting.value = true
     try {
-        await prescriptionOrderRefund({ id, reason: refundOrderForm.reason.trim() })
+        await prescriptionOrderRefund({
+            id,
+            reason: refundOrderForm.reason.trim(),
+            refund_amount: Number(refundOrderForm.refund_amount)
+        })
         feedback.msgSuccess('退款成功')
         refundOrderDialogVisible.value = false
         getLists()
@@ -5385,7 +5738,7 @@ const addPayOrderAlertTitle = computed(() => {
     if (addPayOrderForm.add_mode === 'completion_only') {
         return '不创建或关联支付单，仅提交完单申请，由审核人员在支付审核时处理。'
     }
-    return '可以手动创建新支付单，或关联已存在但未绑定的支付单。'
+    return '可以通过付呗创建新支付单，或关联已存在但未绑定的支付单。'
 })
 
 const addPayOrderForm = reactive({
@@ -5540,8 +5893,12 @@ function confirmComplete(row: {
 }) {
     completeOrderId.value = row.id
     completeFulfillmentStatus.value = 3
+    completeRefundForm.reason = ''
+    completeRefundForm.refund_amount = undefined
+    completeOrderLinkedPays.value = []
     completeOrderLogisticsPayload.value = null
     completeOrderDialogVisible.value = true
+    void loadCompleteOrderPayContext(row.id)
     if (String(row.tracking_number || '').trim()) {
         void fetchCompleteOrderLogisticsForDialog(row)
     }
@@ -6837,6 +7194,10 @@ async function downloadPrescriptionSlipPdf() {
     min-height: 70px;
 }
 
+.rx-bot-row-1--user {
+    grid-template-columns: 1.6fr 0.6fr;
+}
+
 .rx-bot-row-2 {
     grid-template-columns: repeat(6, 1fr);
 }

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

@@ -190,18 +190,17 @@
                     <ArrowDown />
                 </el-icon>
             </div>
-            <el-form v-show="!h5FilterCollapsed" class="ls-form" :model="queryParams" inline>
-                <el-form-item class="w-[360px] min-w-[240px] max-w-full" label="创建时间">
-                    <DaterangePicker
-                        v-model:startTime="queryParams.start_time"
-                        v-model:endTime="queryParams.end_time"
-                        picker-type="daterange"
-                        value-format="YYYY-MM-DD"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        class="!w-full"
-                    />
-                </el-form-item>
+            <el-form v-show="!h5FilterCollapsed" class="ls-form stats-filter-form" :model="queryParams" inline>
+                <list-time-filter
+                    v-model:time-type="time_type"
+                    v-model:date-range="dateRange"
+                    label="创建时间"
+                    variant="inline"
+                    show-all
+                    picker-width="260px"
+                    @time-type-change="onTimeTypeChange"
+                    @custom-change="onCustomDateChange"
+                />
                 <el-form-item class="w-[260px]" label="订单号">
                     <el-input
                         v-model="queryParams.order_no"
@@ -703,49 +702,50 @@
                 </div>
 
                 <!-- 顶部数据概览卡片 -->
-                <el-row :gutter="16" class="mb-5">
-                    <el-col :xs="12" :sm="6">
-                        <el-card shadow="never" class="stat-card border border-gray-100 bg-gray-50/50">
-                            <div class="flex items-center justify-between mb-1">
-                                <div class="stat-title text-gray-500 text-xs">总金额</div>
-                                <el-button
-                                    v-if="canUpdateAmount(detailData)"
-                                    v-perms="['tcm.prescriptionOrder/updateAmount']"
-                                    type="primary"
-                                    size="small"
-                                    link
-                                    @click="openUpdateAmount"
-                                >
-                                    修改
-                                </el-button>
-                            </div>
-                            <div class="stat-value 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="stat-card border border-gray-100 bg-gray-50/50">
-                            <div class="stat-title text-gray-500 text-xs mb-1">已付总额</div>
-                            <div class="stat-value 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="stat-card border border-gray-100 bg-gray-50/50">
-                            <div class="stat-title text-gray-500 text-xs mb-1">需代收</div>
-                            <div
-                                class="stat-value font-bold text-xl"
-                                :class="detailAgencyToCollect > 0 ? 'text-amber-600' : 'text-gray-500'"
+                <div class="grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-5 gap-4 mb-5">
+                    <el-card shadow="never" class="stat-card border border-gray-100 bg-gray-50/50">
+                        <div class="flex items-center justify-between mb-1">
+                            <div class="stat-title text-gray-500 text-xs">总金额</div>
+                            <el-button
+                                v-if="canUpdateAmount(detailData)"
+                                v-perms="['tcm.prescriptionOrder/updateAmount']"
+                                type="primary"
+                                size="small"
+                                link
+                                @click="openUpdateAmount"
                             >
-                                ¥{{ formatMoney(detailAgencyToCollect) }}
-                            </div>
-                        </el-card>
-                    </el-col>
-                    <el-col :xs="12" :sm="6">
-                        <el-card shadow="never" class="stat-card border border-gray-100 bg-gray-50/50">
-                            <div class="stat-title text-gray-500 text-xs mb-1">已付笔数</div>
-                            <div class="stat-value text-primary font-bold text-xl">{{ detailLinkedPayOrders.length }} 笔</div>
-                        </el-card>
-                    </el-col>
-                </el-row>
+                                修改
+                            </el-button>
+                        </div>
+                        <div class="stat-value text-red-500 font-bold text-xl">¥{{ detailData.amount }}</div>
+                    </el-card>
+                    <el-card shadow="never" class="stat-card border border-gray-100 bg-gray-50/50">
+                        <div class="stat-title text-gray-500 text-xs mb-1">已付总额</div>
+                        <div class="stat-value text-green-600 font-bold text-xl">¥{{ detailData.linked_pay_paid_total || 0 }}</div>
+                    </el-card>
+                    <el-card shadow="never" class="stat-card border border-gray-100 bg-gray-50/50">
+                        <div class="stat-title text-gray-500 text-xs mb-1">退款金额</div>
+                        <div
+                            class="stat-value font-bold text-xl"
+                            :class="Number(detailData.refund_amount) > 0 ? 'text-rose-500' : 'text-gray-400'"
+                        >
+                            ¥{{ formatMoney(detailData.refund_amount || 0) }}
+                        </div>
+                    </el-card>
+                    <el-card shadow="never" class="stat-card border border-gray-100 bg-gray-50/50">
+                        <div class="stat-title text-gray-500 text-xs mb-1">需代收</div>
+                        <div
+                            class="stat-value font-bold text-xl"
+                            :class="detailAgencyToCollect > 0 ? 'text-amber-600' : 'text-gray-500'"
+                        >
+                            ¥{{ formatMoney(detailAgencyToCollect) }}
+                        </div>
+                    </el-card>
+                    <el-card shadow="never" class="stat-card border border-gray-100 bg-gray-50/50">
+                        <div class="stat-title text-gray-500 text-xs mb-1">已付笔数</div>
+                        <div class="stat-value text-primary font-bold text-xl">{{ detailLinkedPayOrders.length }} 笔</div>
+                    </el-card>
+                </div>
 
                 <div class="grid grid-cols-1 md:grid-cols-2 gap-4 mb-4">
                     <!-- 左侧：处方单 -->
@@ -962,6 +962,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 +1025,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 }">
@@ -1555,7 +1565,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 +1575,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>
@@ -1845,9 +1855,11 @@
             :close-on-click-modal="false"
             destroy-on-close
             class="po-h5-dialog"
-            @closed="completeOrderId = 0"
+            @closed="onCompleteOrderDialogClosed"
         >
-            <p class="text-sm text-gray-600 mb-3">请选择本单结案状态。选择「已完成」时，实付将按已关联的支付单金额汇总。</p>
+            <p class="text-sm text-gray-600 mb-3">
+                选择「已完成」按关联收款汇总实付；选择「退款」将关联收款标记已退款并清零已付。
+            </p>
             <el-select
                 v-model="completeFulfillmentStatus"
                 class="w-full"
@@ -1860,10 +1872,54 @@
                     :value="opt.value"
                 />
             </el-select>
+            <template v-if="completeFulfillmentStatus === 10">
+                <el-alert
+                    type="warning"
+                    :closable="false"
+                    show-icon
+                    class="mt-3"
+                    title="关联收款将标记已退款，本单已付清零，不可撤销。"
+                />
+                <p v-if="completeOrderLinkedPays.length" class="text-xs text-amber-800 mt-2">
+                    将退款 {{ completeOrderLinkedPays.length }} 笔关联收款，合计 ¥{{ formatMoney(completeOrderRefundTotal) }}
+                </p>
+                <el-form
+                    ref="completeRefundFormRef"
+                    :model="completeRefundForm"
+                    :rules="completeRefundRules"
+                    label-width="80px"
+                    class="mt-2"
+                >
+                    <el-form-item label="退款金额" prop="refund_amount">
+                        <el-input-number
+                            v-model="completeRefundForm.refund_amount"
+                            :min="0.01"
+                            :max="completeOrderRefundMax > 0 ? completeOrderRefundMax : undefined"
+                            :step="0.01"
+                            :precision="2"
+                            class="w-full"
+                        />
+                        <div class="text-xs text-gray-500 mt-1">可退上限 ¥{{ formatMoney(completeOrderRefundMax) }}</div>
+                    </el-form-item>
+                    <el-form-item label="退款原因" prop="reason">
+                        <el-input
+                            v-model="completeRefundForm.reason"
+                            type="textarea"
+                            :rows="3"
+                            maxlength="500"
+                            placeholder="必填"
+                        />
+                    </el-form-item>
+                </el-form>
+            </template>
             <template #footer>
                 <el-button @click="completeOrderDialogVisible = false">取消</el-button>
-                <el-button type="primary" :loading="completeOrderSubmitting" @click="submitCompleteOrder">
-                    确定
+                <el-button
+                    :type="completeFulfillmentStatus === 10 ? 'danger' : 'primary'"
+                    :loading="completeOrderSubmitting"
+                    @click="submitCompleteOrder"
+                >
+                    {{ completeFulfillmentStatus === 10 ? '确认退款' : '确定' }}
                 </el-button>
             </template>
         </el-dialog>
@@ -1882,9 +1938,20 @@
                 :closable="false"
                 show-icon
                 class="mb-4 !items-start"
-                title="确认退款后，关联收款记录将全部标记为「已退款」，已付总额清零，且不可撤销。"
+                :title="refundOrderAlertTitle"
             />
             <el-form ref="refundOrderFormRef" :model="refundOrderForm" :rules="refundOrderRules" label-width="88px">
+                <el-form-item label="退款金额" prop="refund_amount">
+                    <el-input-number
+                        v-model="refundOrderForm.refund_amount"
+                        :min="0.01"
+                        :max="refundOrderMaxAmount > 0 ? refundOrderMaxAmount : undefined"
+                        :step="0.01"
+                        :precision="2"
+                        class="w-full"
+                    />
+                    <div class="text-xs text-gray-500 mt-1">可退上限 ¥{{ formatMoney(refundOrderMaxAmount) }}</div>
+                </el-form-item>
                 <el-form-item label="退款原因" prop="reason">
                     <el-input
                         v-model="refundOrderForm.reason"
@@ -1914,7 +1981,7 @@
             @closed="addPayOrderFormRef?.clearValidate()"
         >
             <el-alert
-                title="可以手动创建新支付单，或关联已存在但未绑定的支付单。"
+                :title="addPayOrderAlertTitle"
                 type="info"
                 :closable="false"
                 show-icon
@@ -1930,12 +1997,13 @@
             >
                 <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="link">关联已有</el-radio>
+                        <el-radio value="completion_only">直接完单申请</el-radio>
                     </el-radio-group>
                 </el-form-item>
 
-                <!-- 手动创建模式 -->
+                <!-- 付呗（手动创建支付单） -->
                 <template v-if="addPayOrderForm.add_mode === 'create'">
                     <el-form-item label="费用类别" prop="order_type">
                         <el-select v-model="addPayOrderForm.order_type" class="w-full">
@@ -1971,6 +2039,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">
@@ -1986,12 +2068,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>
@@ -2002,7 +2089,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>
@@ -2243,7 +2330,10 @@
                                         alt="医师签名"
                                         class="rx-bot-sign-img"
                                     />
-                                    <!-- <span class="rx-bot-doctor-name">{{ prescriptionViewData.doctor_name || '—' }}</span> -->
+                                    <span
+                                        v-if="!prescriptionViewData.doctor_signature"
+                                        class="rx-bot-doctor-name"
+                                    >{{ prescriptionViewData.doctor_name || '—' }}</span>
                                 </div>
                             </div>
                           
@@ -2450,7 +2540,8 @@ import {
     Wallet,
     User
 } from '@element-plus/icons-vue'
-import DaterangePicker from '@/components/daterange-picker/index.vue'
+import ListTimeFilter from '@/components/list-time-filter/index.vue'
+import { useListTimeFilter } from '@/hooks/useListTimeFilter'
 import {
     prescriptionOrderAuditPayment,
     prescriptionOrderAuditPrescription,
@@ -2470,6 +2561,7 @@ import {
     prescriptionOrderRevokePayAudit,
     prescriptionOrderPatchPrescriptionPatient,
     prescriptionOrderLinkPayOrder,
+    prescriptionOrderRequestCompletion,
     prescriptionOrderSubmitGancaoRecipel,
     prescriptionOrderPreviewGancaoRecipel,
     prescriptionDetail,
@@ -2748,9 +2840,6 @@ function handleExpressCompanyTabClick(value: '' | 'sf' | 'jd') {
 }
 
 const queryParams = reactive({
-    /** 创建时间区间（与列表筛选一致；不影响「今日」统计） */
-    start_time: '' as string,
-    end_time: '' as string,
     order_no: '',
     prescription_id: '' as string | number,
     /** 诊单患者姓名/手机号（后台关联 diagnosis） */
@@ -2829,8 +2918,26 @@ function handleFocusBoardSearch(key: 'pendingRx' | 'pendingPay' | 'pendingShip'
     resetPage()
 }
 
+const {
+    time_type,
+    dateRange,
+    resolve: resolveCreateTimeRange,
+    handleTimeTypeChange,
+    handleCustomDateChange,
+    resetTimeFilter,
+} = useListTimeFilter('all')
+
+const handleQuery = () => {
+    pager.page = 1
+    getLists()
+}
+
+const onTimeTypeChange = () => handleTimeTypeChange(handleQuery)
+const onCustomDateChange = () => handleCustomDateChange(handleQuery)
+
 async function fetchLists(params: Record<string, unknown>) {
-    const p: Record<string, unknown> = { ...params }
+    const [start_time, end_time] = resolveCreateTimeRange()
+    const p: Record<string, unknown> = { ...params, start_time, end_time }
     if (p.prescription_id === '' || p.prescription_id === undefined) {
         delete p.prescription_id
     } else {
@@ -2984,9 +3091,7 @@ const listStats = computed(() => {
         scopeHint =
             '统计口径：本人创建的订单 + 关联处方开方人为本人的订单（含医助代建）；与下方筛选项（不含「创建时间」）一致'
     }
-    const hasCustomTime =
-        String(queryParams.start_time || '').trim() !== '' && String(queryParams.end_time || '').trim() !== ''
-    const headPrefix = hasCustomTime ? '区间' : '今日'
+    const headPrefix = time_type.value === 'all' ? '全部' : time_type.value === 'today' ? '今日' : '区间'
     return {
         order: n(o),
         pay: n(pay),
@@ -3057,8 +3162,7 @@ watch(
 
 function handleReset() {
     activeFocusKey.value = ''
-    queryParams.start_time = ''
-    queryParams.end_time = ''
+    resetTimeFilter()
     queryParams.order_no = ''
     queryParams.prescription_id = ''
     queryParams.patient_keyword = ''
@@ -3288,7 +3392,8 @@ function canCompleteRow(row: { fulfillment_status?: number; payment_slip_audit_s
 }
 
 function canRefundRow(row: { fulfillment_status?: number; payment_slip_audit_status?: number }) {
-    return canCompleteRow(row)
+    const fs = Number(row.fulfillment_status)
+    return (fs === 5 || fs === 6 || fs === 3 || fs === 9) && Number(row.payment_slip_audit_status) === 1
 }
 
 function canQuickTrackRow(row: { fulfillment_status?: number }) {
@@ -3323,11 +3428,11 @@ const h5FilterCollapsed = ref(true)
 const h5ActiveFilterCount = computed(() => {
     const q = queryParams as any
     const keys = [
-        'start_time', 'end_time', 'order_no', 'prescription_id',
+        'order_no', 'prescription_id',
         'patient_keyword', 'express_keyword', 'doctor_id',
         'assistant_dept_id', 'assistant_id'
     ]
-    let n = 0
+    let n = time_type.value !== 'all' ? 1 : 0
     for (const k of keys) {
         const v = q[k]
         if (v === null || v === undefined) continue
@@ -3421,10 +3526,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
@@ -3967,7 +4076,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)
 
@@ -3983,6 +4092,24 @@ 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 '付呗'
+    const paymentMethod = String(row?.payment_method || '')
+    const methodMap: Record<string, string> = {
+        alipay: '支付宝',
+        wechat: '微信',
+        wechat_work: '企业微信',
+        fubei: '付呗',
+        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
@@ -4609,6 +4736,7 @@ const completeOrderStatusOptions = [
     { value: 7, label: '进行中' },
     { value: 8, label: '暂不制药' },
     { value: 9, label: '拒收' },
+    { value: 10, label: '退款' },
     { value: 11, label: '保留药方' },
     { value: 12, label: '制药缓发' }
 ] as const
@@ -4617,10 +4745,98 @@ const completeOrderDialogVisible = ref(false)
 const completeOrderId = ref(0)
 const completeFulfillmentStatus = ref<number>(3)
 const completeOrderSubmitting = ref(false)
+const completeOrderLinkedPays = ref<any[]>([])
+const completeRefundFormRef = ref<FormInstance>()
+function calcRefundableFromLinkedPays(list: any[]) {
+    let sum = 0
+    for (const o of list || []) {
+        const st = Number(o?.status)
+        if (st === 2 || st === 5) sum += Number(o?.amount) || 0
+    }
+    return Math.round(sum * 100) / 100
+}
+
+const completeRefundForm = reactive({ reason: '', refund_amount: undefined as number | undefined })
+const completeOrderRefundMax = ref(0)
+const completeOrderRefundTotal = computed(() => calcRefundableFromLinkedPays(completeOrderLinkedPays.value))
+const completeRefundRules = computed<FormRules>(() => ({
+    refund_amount: [
+        { required: true, message: '请输入退款金额', trigger: 'change' },
+        {
+            validator: (_r, v, cb) => {
+                const n = Number(v)
+                const cap = completeOrderRefundMax.value
+                if (!Number.isFinite(n) || n <= 0) return cb(new Error('退款金额须大于 0'))
+                if (cap > 0 && n > cap + 0.009) return cb(new Error(`不能超过 ¥${formatMoney(cap)}`))
+                cb()
+            },
+            trigger: 'change'
+        }
+    ],
+    reason: [{ required: true, message: '请填写退款原因', trigger: 'blur' }]
+}))
+
+function onCompleteOrderDialogClosed() {
+    completeOrderId.value = 0
+    completeOrderLinkedPays.value = []
+    completeRefundForm.reason = ''
+    completeRefundForm.refund_amount = undefined
+    completeOrderRefundMax.value = 0
+    completeRefundFormRef.value?.clearValidate()
+}
+
+async function loadCompleteOrderPayContext(orderId: number) {
+    if (!orderId) {
+        completeOrderLinkedPays.value = []
+        return
+    }
+    try {
+        const r: any = await prescriptionOrderDetail({ id: orderId })
+        const d = r?.data ?? r ?? null
+        completeOrderLinkedPays.value = Array.isArray(d?.linked_pay_orders) ? d.linked_pay_orders : []
+        const linkedMax = calcRefundableFromLinkedPays(completeOrderLinkedPays.value)
+        const paid = Number(d?.paid) || 0
+        completeOrderRefundMax.value = linkedMax > 0 ? linkedMax : paid
+        completeRefundForm.refund_amount = completeOrderRefundMax.value
+    } catch {
+        completeOrderLinkedPays.value = []
+        completeOrderRefundMax.value = 0
+    }
+}
 
 async function submitCompleteOrder() {
     const id = completeOrderId.value
     if (!id) return
+
+    if (completeFulfillmentStatus.value === 10) {
+        const valid = await completeRefundFormRef.value?.validate().catch(() => false)
+        if (!valid) return
+        completeOrderSubmitting.value = true
+        try {
+            await prescriptionOrderRefund({
+                id,
+                reason: completeRefundForm.reason.trim(),
+                refund_amount: Number(completeRefundForm.refund_amount)
+            })
+            feedback.msgSuccess('退款成功')
+            completeOrderDialogVisible.value = false
+            getLists()
+            if (detailVisible.value && detailData.value?.id === id) {
+                try {
+                    const r: any = await prescriptionOrderDetail({ id })
+                    const nd = r?.data ?? r ?? null
+                    if (nd) detailData.value = nd
+                    await fetchLogs(id)
+                } catch { /* 静默 */ }
+            }
+        } catch {
+            /* 拦截器已提示 */
+        } finally {
+            completeOrderSubmitting.value = false
+        }
+        return
+    }
+
     completeOrderSubmitting.value = true
     try {
         await prescriptionOrderComplete({ id, fulfillment_status: completeFulfillmentStatus.value })
@@ -4645,21 +4861,57 @@ const refundOrderDialogVisible = ref(false)
 const refundOrderId = ref(0)
 const refundOrderSubmitting = ref(false)
 const refundOrderFormRef = ref<FormInstance>()
-const refundOrderForm = reactive({ reason: '' })
-const refundOrderRules: FormRules = {
+const refundOrderMaxAmount = ref(0)
+const refundOrderForm = reactive({ reason: '', refund_amount: undefined as number | undefined })
+const refundOrderAlertTitle = computed(() => {
+    const cap = formatMoney(refundOrderMaxAmount.value)
+    const amt = formatMoney(refundOrderForm.refund_amount)
+    if (Number(refundOrderForm.refund_amount) >= refundOrderMaxAmount.value - 0.009) {
+        return `全额退款 ¥${cap}：关联收款标记已退款，已付清零。`
+    }
+    return `部分退款 ¥${amt}（上限 ¥${cap}）`
+})
+const refundOrderRules = computed<FormRules>(() => ({
+    refund_amount: [
+        { required: true, message: '请输入退款金额', trigger: 'change' },
+        {
+            validator: (_r, v, cb) => {
+                const n = Number(v)
+                const cap = refundOrderMaxAmount.value
+                if (!Number.isFinite(n) || n <= 0) return cb(new Error('退款金额须大于 0'))
+                if (cap > 0 && n > cap + 0.009) return cb(new Error(`不能超过 ¥${formatMoney(cap)}`))
+                cb()
+            },
+            trigger: 'change'
+        }
+    ],
     reason: [{ required: true, message: '请填写退款原因', trigger: 'blur' }]
-}
+}))
 
 function onRefundOrderDialogClosed() {
     refundOrderId.value = 0
     refundOrderForm.reason = ''
+    refundOrderForm.refund_amount = undefined
+    refundOrderMaxAmount.value = 0
     refundOrderFormRef.value?.clearValidate()
 }
 
-function openRefundOrder(row: { id: number }) {
+async function openRefundOrder(row: { id: number }) {
     refundOrderId.value = row.id
     refundOrderForm.reason = ''
+    refundOrderMaxAmount.value = 0
     refundOrderDialogVisible.value = true
+    try {
+        const r: any = await prescriptionOrderDetail({ id: row.id })
+        const d = r?.data ?? r ?? null
+        const linked = Array.isArray(d?.linked_pay_orders) ? d.linked_pay_orders : []
+        const linkedMax = calcRefundableFromLinkedPays(linked)
+        const paid = Number(d?.paid) || 0
+        refundOrderMaxAmount.value = linkedMax > 0 ? linkedMax : paid
+        refundOrderForm.refund_amount = refundOrderMaxAmount.value
+    } catch {
+        refundOrderMaxAmount.value = 0
+    }
 }
 
 async function submitRefundOrder() {
@@ -4669,7 +4921,11 @@ async function submitRefundOrder() {
     if (!valid) return
     refundOrderSubmitting.value = true
     try {
-        await prescriptionOrderRefund({ id, reason: refundOrderForm.reason.trim() })
+        await prescriptionOrderRefund({
+            id,
+            reason: refundOrderForm.reason.trim(),
+            refund_amount: Number(refundOrderForm.refund_amount)
+        })
         feedback.msgSuccess('退款成功')
         refundOrderDialogVisible.value = false
         getLists()
@@ -4695,8 +4951,14 @@ 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 '不创建或关联支付单，仅提交完单申请，由审核人员在支付审核时处理。'
+    }
+    return '可以通过付呗创建新支付单，或关联已存在但未绑定的支付单。'
+})
 const addPayOrderForm = reactive({
-    add_mode: 'create' as 'create' | 'link',
+    add_mode: 'create' as 'create' | 'link' | 'completion_only',
     order_type: 3,
     pay_amount: undefined as number | undefined,
     pay_remark: '',
@@ -4704,38 +4966,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') {
+        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) {
@@ -4783,7 +5051,10 @@ 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') {
             // 手动创建新支付单
             await prescriptionOrderAddPayOrder({
                 id: addPayOrderRowId.value,
@@ -4830,7 +5101,10 @@ async function submitAddPayOrder() {
 function confirmComplete(row: { id: number }) {
     completeOrderId.value = row.id
     completeFulfillmentStatus.value = 3
+    completeRefundForm.reason = ''
+    completeOrderLinkedPays.value = []
     completeOrderDialogVisible.value = true
+    void loadCompleteOrderPayContext(row.id)
 }
 
 // ─── 撤回处方审核 ────────────────────────────────────────────
@@ -5330,6 +5604,12 @@ async function downloadPrescriptionSlipPdf() {
 </script>
 
 <style scoped lang="scss">
+.stats-filter-form {
+    :deep(.el-form-item) {
+        margin-bottom: 0;
+    }
+}
+
 .prescription-order-page {
    
     margin: 0 auto;

admin/src/views/finance/account_cost/index.vue

@@ -14,13 +14,13 @@
         </el-card>
 
         <el-card class="!border-none" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="日期范围">
-                    <daterange-picker
-                        v-model:startTime="queryParams.start_date"
-                        v-model:endTime="queryParams.end_date"
-                    />
-                </el-form-item>
+            <el-form :inline="true" :model="queryParams" class="stats-filter-form">
+                <list-time-filter
+                    v-model:time-type="time_type"
+                    v-model:date-range="dateRange"
+                    @time-type-change="onTimeTypeChange"
+                    @custom-change="onCustomDateChange"
+                />
                 <el-form-item label="自媒体渠道">
                     <el-select
                         v-model="queryParams.media_channel_code"
@@ -67,11 +67,11 @@
                         v-model="queryParams.remark"
                         placeholder="备注 / 创建人 / 修改人"
                         clearable
-                        @keyup.enter="resetPage"
+                        @keyup.enter="handleQuery"
                     />
                 </el-form-item>
                 <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button type="primary" :loading="pager.loading" @click="handleQuery">查询</el-button>
                     <el-button @click="handleReset">重置</el-button>
                 </el-form-item>
             </el-form>
@@ -148,7 +148,9 @@
 <script lang="ts" setup name="accountCostList">
 import { accountCostDelete, accountCostLists } from '@/api/finance'
 import { usePaging } from '@/hooks/usePaging'
+import { useListTimeFilter } from '@/hooks/useListTimeFilter'
 import feedback from '@/utils/feedback'
+import ListTimeFilter from '@/components/list-time-filter/index.vue'
 
 import EditPopup from './edit.vue'
 
@@ -172,18 +174,40 @@ const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 const showEdit = ref(false)
 
 const queryParams = reactive({
-    start_date: '',
-    end_date: '',
     media_channel_code: '',
     dept_id: '',
     remark: '',
 })
 
-const { pager, getLists, resetPage } = usePaging({
-    fetchFun: accountCostLists,
+const {
+    time_type,
+    dateRange,
+    resolve,
+    handleTimeTypeChange,
+    handleCustomDateChange,
+    resetTimeFilter,
+} = useListTimeFilter('today')
+
+const { pager, getLists } = usePaging({
+    fetchFun: async (params: Record<string, any>) => {
+        const [start_date, end_date] = resolve()
+        return accountCostLists({
+            ...params,
+            start_date,
+            end_date,
+        })
+    },
     params: queryParams,
 })
 
+const handleQuery = () => {
+    pager.page = 1
+    getLists()
+}
+
+const onTimeTypeChange = () => handleTimeTypeChange(handleQuery)
+const onCustomDateChange = () => handleCustomDateChange(handleQuery)
+
 const mediaChannelOptionsFlat = computed<MediaChannelOption[]>(() => {
     const options = pager.extend.media_channel_options
     if (!Array.isArray(options)) return []
@@ -258,18 +282,27 @@ const handleDelete = async (id: number) => {
 }
 
 const handleReset = () => {
-    queryParams.start_date = ''
-    queryParams.end_date = ''
+    resetTimeFilter()
     queryParams.media_channel_code = ''
     queryParams.dept_id = ''
     queryParams.remark = ''
-    resetPage()
+    pager.page = 1
+    pager.size = 15
+    getLists()
 }
 
-getLists()
+onMounted(() => {
+    getLists()
+})
 </script>
 
 <style scoped lang="scss">
+.stats-filter-form {
+    :deep(.el-form-item) {
+        margin-bottom: 0;
+    }
+}
+
 .account-cost-channel-select {
     :deep(.channel-opt-row) {
         display: flex;

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>
 
@@ -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 || '-' }}
@@ -1148,7 +1148,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,7 +1161,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: createForm.createType
             }
             if (createForm.createType === 'fubei') {
                 params.payment_channel = 'fubei'
@@ -1247,6 +1249,26 @@ const getPaymentMethodText = (method: string | null) => {
     return methodMap[method] || '未知'
 }
 
+// 支付方式展示：优先按「创建方式」三值显示；历史单/无 create_type 时回退真实支付渠道文案
+const getCreateTypeText = (row: any) => {
+    const createTypeMap: Record<string, string> = {
+        normal: '普通订单',
+        wechat_work: '企业微信对外收款',
+        fubei: '付呗'
+    }
+    const ct = row?.create_type
+    if (ct === 'wechat_work' || ct === 'fubei') {
+        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 = {

admin/src/views/patient/reception/components/NoteTimeline.vue

@@ -1,6 +1,15 @@
 <template>
     <div class="note-timeline-wrap">
         <div v-if="!readonly && diagnosisId" class="timeline-actions">
+            <el-button
+                v-if="hasAddDoctorNotePermission"
+                type="primary"
+                plain
+                size="small"
+                @click="showNoteDialog = true"
+            >
+                添加备注
+            </el-button>
             <material-picker
                 v-model="tongueModel"
                 :limit="99"
@@ -95,16 +104,32 @@
             </div>
         </div>
         <el-empty v-if="!notes.length && readonly" description="暂无备注" :image-size="48" />
+
+        <el-dialog v-model="showNoteDialog" title="添加备注" width="480px" append-to-body>
+            <el-input
+                v-model="noteContent"
+                type="textarea"
+                :rows="4"
+                placeholder="输入今日备注..."
+                maxlength="500"
+                show-word-limit
+            />
+            <template #footer>
+                <el-button @click="showNoteDialog = false">取消</el-button>
+                <el-button type="primary" :loading="noteSaving" @click="handleSaveNote">保存</el-button>
+            </template>
+        </el-dialog>
     </div>
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import { CircleClose, Document } from '@element-plus/icons-vue'
 import { ElMessageBox } from 'element-plus'
 import useAppStore from '@/stores/modules/app'
 import { addDoctorNote, deleteDoctorNoteImage } from '@/api/patient'
 import feedback from '@/utils/feedback'
+import { hasPermission } from '@/utils/perm'
 
 export interface DoctorNoteItem {
     id: number
@@ -122,6 +147,13 @@ const props = defineProps<{
 
 const emit = defineEmits<{ refresh: [] }>()
 
+/** 与接诊台悬浮「备注」按钮一致 */
+const hasAddDoctorNotePermission = computed(() => hasPermission(['doctor.appointment/addDoctorNote']))
+
+const showNoteDialog = ref(false)
+const noteContent = ref('')
+const noteSaving = ref(false)
+
 const appStore = useAppStore()
 const getImageUrl = (url: string) => appStore.getImageUrl(url)
 
@@ -201,6 +233,30 @@ watch(() => props.notes, () => {
     prevReportCount.value = 0
 })
 
+const handleSaveNote = async () => {
+    if (!props.diagnosisId) {
+        feedback.msgWarning('当前无诊单，无法添加备注')
+        return
+    }
+    const text = noteContent.value.trim()
+    if (!text) {
+        feedback.msgWarning('请输入备注内容')
+        return
+    }
+    noteSaving.value = true
+    try {
+        await addDoctorNote({ diagnosis_id: props.diagnosisId, content: text })
+        feedback.msgSuccess('备注保存成功')
+        noteContent.value = ''
+        showNoteDialog.value = false
+        emit('refresh')
+    } catch (e: any) {
+        feedback.msgError(e?.message || '保存失败')
+    } finally {
+        noteSaving.value = false
+    }
+}
+
 const handleDeleteImage = async (noteId: number, imageType: 'tongue_images' | 'report_files', imagePath: string) => {
     try {
         await ElMessageBox.confirm('确认删除？', '提示', { type: 'warning' })
@@ -217,6 +273,7 @@ const handleDeleteImage = async (noteId: number, imageType: 'tongue_images' | 'r
 .timeline-actions {
     display: flex;
     flex-direction: column;
+    align-items: flex-start;
     gap: 12px;
     margin-bottom: 12px;
     padding-bottom: 12px;

admin/src/views/stats/self_input/account_cost.vue

@@ -14,13 +14,14 @@
         </el-card>
 
         <el-card class="!border-none" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="日期范围">
-                    <daterange-picker
-                        v-model:startTime="queryParams.start_date"
-                        v-model:endTime="queryParams.end_date"
-                    />
-                </el-form-item>
+            <el-form :inline="true" :model="queryParams" class="stats-filter-form">
+                <list-time-filter
+                    v-model:time-type="time_type"
+                    v-model:date-range="dateRange"
+                    @time-type-change="onTimeTypeChange"
+                    @custom-change="onCustomDateChange"
+                />
+
                 <el-form-item label="部门">
                     <el-tree-select
                         v-model="queryParams.dept_id"
@@ -33,7 +34,7 @@
                         clearable
                         filterable
                         class="w-[220px]"
-                        @change="resetPage"
+                        @change="handleQuery"
                     />
                 </el-form-item>
                 <el-form-item label="自媒体来源">
@@ -44,7 +45,7 @@
                         placeholder="全部来源"
                         :allow-create="false"
                         select-class="w-[220px]"
-                        @change="resetPage"
+                        @change="handleQuery"
                         @visible-change="onMediaSourceDropdownVisible"
                     />
                 </el-form-item>
@@ -53,11 +54,11 @@
                         v-model="queryParams.remark"
                         placeholder="备注 / 创建人"
                         clearable
-                        @keyup.enter="resetPage"
+                        @keyup.enter="handleQuery"
                     />
                 </el-form-item>
                 <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button type="primary" :loading="pager.loading" @click="handleQuery">查询</el-button>
                     <el-button @click="handleReset">重置</el-button>
                     <el-button v-if="selfInputPath" class="ml-2" @click="goSelfInput">返回统计</el-button>
                 </el-form-item>
@@ -146,6 +147,8 @@ import feedback from '@/utils/feedback'
 import CostEditPopup from './cost-edit.vue'
 import MediaSourceSelect from './MediaSourceSelect.vue'
 import { useMediaSourceOptions } from './useMediaSourceOptions'
+import ListTimeFilter from '@/components/list-time-filter/index.vue'
+import { useListTimeFilter } from '@/hooks/useListTimeFilter'
 
 const router = useRouter()
 const editRef = shallowRef<InstanceType<typeof CostEditPopup>>()
@@ -173,25 +176,48 @@ const goSelfInput = () => {
 }
 
 const queryParams = reactive({
-    start_date: '',
-    end_date: '',
     media_source: '',
     dept_id: undefined as number | undefined,
     remark: '',
 })
 
+const {
+    time_type,
+    dateRange,
+    resolve,
+    handleTimeTypeChange,
+    handleCustomDateChange,
+    resetTimeFilter,
+} = useListTimeFilter('today')
+
 const { pager, getLists, resetPage } = usePaging({
-    fetchFun: personalAccountCostLists,
+    fetchFun: async (params: Record<string, any>) => {
+        const [start_date, end_date] = resolve()
+        return personalAccountCostLists({
+            ...params,
+            start_date,
+            end_date,
+        })
+    },
     params: queryParams,
 })
 
+const handleQuery = () => {
+    pager.page = 1
+    getLists()
+}
+
+const onTimeTypeChange = () => handleTimeTypeChange(handleQuery)
+const onCustomDateChange = () => handleCustomDateChange(handleQuery)
+
 const handleReset = () => {
-    queryParams.start_date = ''
-    queryParams.end_date = ''
+    resetTimeFilter()
     queryParams.media_source = ''
     queryParams.dept_id = undefined
     queryParams.remark = ''
-    resetPage()
+    pager.page = 1
+    pager.size = 15
+    getLists()
 }
 
 const onMediaSourceDropdownVisible = (visible: boolean) => {
@@ -236,9 +262,10 @@ const loadDeptOptions = async () => {
     }
 }
 
-onMounted(() => {
+onMounted(async () => {
     loadDeptOptions()
     loadMediaSourceOptions()
+    await getLists()
 })
 </script>
 
@@ -247,6 +274,12 @@ onMounted(() => {
     padding: 20px;
 }
 
+.stats-filter-form {
+    :deep(.el-form-item) {
+        margin-bottom: 0;
+    }
+}
+
 .dept-cell {
     cursor: help;
     border-bottom: 1px dashed #c0c4cc;

admin/src/views/tcm/diagnosis/components/PatientOrderList.vue

@@ -415,6 +415,10 @@ const detailLinkedPayOrders = computed(() => {
 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

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

@@ -1262,7 +1262,7 @@ const handleSubmit = async () => {
 }
 
 const handleViewCase = (row: any) => {
-    prescriptionRef.value?.openById(row.id, { slipType: 'user', hideCaseRecord: true })
+    prescriptionRef.value?.openById(row.id, { slipType: 'user' })
 }
 
 // 开方：传入当前诊单数据，包含详细病历（深拷贝避免响应式引用）

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,32 @@
                 <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"
+                />
+                <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>
@@ -213,6 +240,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>
@@ -689,6 +719,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 +759,9 @@ 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,
     diagnosis_confirmed: '' as '' | '0' | '1',
     appointment_date: '' as string,
     has_appointment: '' as '' | '0' | '1',
@@ -760,6 +794,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()
@@ -823,6 +860,9 @@ function buildPendingAssignCountPayload(): Record<string, unknown> {
         has_appointment: '',
         pending_booking: '',
         completed_appointment: '',
+        latest_appointment_start_date: '',
+        latest_appointment_end_date: '',
+        latest_appointment_channel_source: '',
         pending_assign_order_month: resolvePendingAssignOrderMonthForRequest()
     } as Record<string, unknown>) as Record<string, unknown>
 }
@@ -850,6 +890,9 @@ 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.pending_assign_order_month = ''
     activeTab.value = 'all'
     if (kw1 !== '') {
@@ -886,6 +929,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 +945,7 @@ const handlePendingBookingTabClick = async () => {
     formData.completed_appointment = ''
     formData.appointment_date = ''
     formData.has_appointment = '0'
+    clearLatestAppointmentFilters()
     pager.page = 1
     await getLists()
     fetchDateCounts()
@@ -915,6 +960,7 @@ const handleCompletedVisitTabClick = async () => {
     formData.completed_appointment = '1'
     formData.has_appointment = ''
     formData.appointment_date = ''
+    clearLatestAppointmentFilters()
     pager.page = 1
     await getLists()
     fetchDateCounts()
@@ -926,6 +972,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')
     }
@@ -1047,16 +1094,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 +1129,40 @@ 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 hasLatestAppointmentFilter = () =>
+    !!(
+        formData.latest_appointment_start_date ||
+        formData.latest_appointment_end_date ||
+        formData.latest_appointment_channel_source
+    )
+
+const handleLatestAppointmentFilterChange = () => {
+    if (hasLatestAppointmentFilter()) {
+        formData.appointment_date = ''
+        formData.pending_booking = ''
+        formData.completed_appointment = ''
+        if (formData.has_appointment === '0') {
+            formData.has_appointment = ''
+        }
+    }
+    doSearch()
+}
+
+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 +1197,9 @@ 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.diagnosis_confirmed = ''
     formData.appointment_date = ''
     formData.has_appointment = ''
@@ -2190,10 +2287,20 @@ 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-appointment-channel {
+        width: 170px;
+    }
 }
 
 .list-card {
@@ -2363,6 +2470,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());

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

@@ -57,6 +57,7 @@ class AssetUserController extends BaseAdminController
             'phone' => $params['phone'],
             'password' => $passwordHash,
             'status' => $params['status'] ?? 1,
+            'remark' => trim((string)($params['remark'] ?? '')),
         ]);
         
         return $this->success('添加成功', ['id' => $user->id]);
@@ -92,6 +93,10 @@ class AssetUserController extends BaseAdminController
         if (isset($params['status'])) {
             $user->status = $params['status'];
         }
+
+        if (array_key_exists('remark', $params)) {
+            $user->remark = trim((string)$params['remark']);
+        }
         
         $user->save();
         return $this->success('修改成功');

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

@@ -207,6 +207,11 @@ class OrderController extends BaseAdminController
         $params['creator_id'] = $this->adminId;
         $params['payment_channel'] = (string)$this->request->post('payment_channel', 'normal');
         $params['require_payment_slip_audit'] = (int)$this->request->post('require_payment_slip_audit', 0);
+        // 创建方式：优先取前端透传的 create_type，否则按 payment_channel 派生（fubei→fubei，其余 normal）
+        $createTypeReq = (string)$this->request->post('create_type', '');
+        $params['create_type'] = in_array($createTypeReq, ['normal', 'wechat_work', 'fubei'], true)
+            ? $createTypeReq
+            : ($params['payment_channel'] === 'fubei' ? 'fubei' : 'normal');
 
         $result = OrderLogic::create($params);
         if (!$result) {
@@ -227,6 +232,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/tcm/PrescriptionOrderController.php

@@ -102,6 +102,24 @@ class PrescriptionOrderController extends BaseAdminController
         return $this->success('', $data);
     }
 
+    /**
+     * 直接调用京东官方物流接口刷新轨迹并落库（绕过快递100缓存）
+     */
+    public function logisticsJdUpdate()
+    {
+        $params = (new PrescriptionOrderValidate())->post()->goCheck('logisticsJdUpdate');
+        $data = PrescriptionOrderLogic::logisticsJdUpdate(
+            (int) $params['id'],
+            $this->adminId,
+            $this->adminInfo
+        );
+        if ($data === null) {
+            return $this->fail(PrescriptionOrderLogic::getError());
+        }
+
+        return $this->success((string) ($data['message'] ?? '京东物流轨迹已更新'), $data);
+    }
+
     public function edit()
     {
         $params = (new PrescriptionOrderValidate())->post()->goCheck('edit');
@@ -351,11 +369,17 @@ class PrescriptionOrderController extends BaseAdminController
     public function refund()
     {
         $params = (new PrescriptionOrderValidate())->post()->goCheck('refund');
+        $rawRefundAmount = $params['refund_amount'] ?? null;
+        $refundAmount    = ($rawRefundAmount === null || $rawRefundAmount === '')
+            ? null
+            : round((float) $rawRefundAmount, 2);
+
         $result = PrescriptionOrderLogic::refund(
             (int) $params['id'],
             (string) ($params['reason'] ?? ''),
             $this->adminId,
-            $this->adminInfo
+            $this->adminInfo,
+            $refundAmount
         );
         if ($result === false) {
             return $this->fail(PrescriptionOrderLogic::getError());

server/app/adminapi/http/middleware/AuthMiddleware.php

@@ -126,6 +126,12 @@ class AuthMiddleware
             return true;
         }
 
+        // 京东物流接口刷新：与「物流轨迹」同一数据域，复用 logisticsTrace 权限
+        if ($accessUri === 'tcm.prescriptionorder/logisticsjdupdate'
+            && in_array('tcm.prescriptionorder/logisticstrace', $adminUris, true)) {
+            return true;
+        }
+
         // 挂号列表批量改渠道：与单条编辑同一数据域，复用 doctor.appointment/edit
         if ($accessUri === 'doctor.appointment/batcheditchannel'
             && in_array('doctor.appointment/edit', $adminUris, true)) {

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,8 @@ 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->applyPendingAssignBusinessOrderMonthFilter($query);
 
         // 仅已开方（待分配+关键词检索时不限制）
@@ -210,6 +218,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 +249,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 +291,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 +570,8 @@ 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);
+
         // 仅已开方（待分配+关键词检索时不限制）
         if (!$pendingWideSearch && isset($this->params['only_has_prescription']) && (string) $this->params['only_has_prescription'] === '1') {
             $rxTbl = (new Prescription())->getTable();
@@ -587,6 +601,204 @@ 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));
+    }
+
+    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/PrescriptionLibraryLists.php

@@ -56,7 +56,7 @@ class PrescriptionLibraryLists extends BaseAdminDataLists implements ListsSearch
     public function lists(): array
     {
         $field = [
-            'id', 'prescription_name', 'formula_type', 'herbs', 'is_public',
+            'id', 'prescription_name', 'formula_type', 'herbs', 'is_public', 'disable_edit',
             'creator_id', 'creator_name', 'create_time', 'update_time'
         ];
 

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

@@ -778,10 +778,12 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
             'export_channel'                   => '渠道',
             'export_guahao_channel_source'     => '自媒体渠道（挂号渠道来源）',
             'export_medication_form'           => '药品形态',
+            'export_prescription_name'         => '药方名称',
             'export_service_package'           => '服务套餐',
             'export_medication_days'           => '天数',
             'export_amount'                    => '总金额',
             'export_paid_amount'               => '已付金额',
+            'export_refund_amount'             => '退款金额',
             'export_agency_collect'           => '代收金额',
             'export_tracking_number'           => '快递单号',
             'export_sign_time'                 => '签收日期',

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

@@ -22,6 +22,11 @@ use think\facade\Log;
  */
 class OrderLogic
 {
+    /**
+     * 创建方式统一三值：normal 普通订单 / wechat_work 企业微信对外收款 / fubei 付呗
+     */
+    private const CREATE_TYPES = ['normal', 'wechat_work', 'fubei'];
+
     /**
      * @notes 生成订单号
      * @return string
@@ -31,6 +36,34 @@ 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';
+    }
+
     /**
      * @notes 创建订单
      * @param array $params
@@ -43,6 +76,8 @@ class OrderLogic
             if (!in_array($channel, ['normal', 'fubei'], true)) {
                 $channel = 'normal';
             }
+            $paymentMethod = $channel === 'fubei' ? 'fubei' : null;
+            $createType = self::normalizeCreateType((string)($params['create_type'] ?? ''), $paymentMethod);
             $requirePaymentSlipAudit = (int)($params['require_payment_slip_audit'] ?? 0) === 1;
 
             $order = new Order();
@@ -51,6 +86,7 @@ class OrderLogic
             $order->creator_id = $params['creator_id'];
             $order->order_type = $params['order_type'];
             $order->amount = $params['amount'];
+            $order->create_type = $createType;
             // 付呗且申请审核支付单：待审核(5)；否则待支付(1)
             if ($channel === 'fubei') {
                 $order->payment_method = 'fubei';
@@ -183,6 +219,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 +275,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 +324,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 = '企业微信直接收款，待关联患者';
@@ -536,6 +578,13 @@ 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';
                     $n->status = 5;
@@ -1213,7 +1262,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/tcm/DiagnosisLogic.php

@@ -210,6 +210,10 @@ class DiagnosisLogic extends BaseLogic
                 $params['diagnosis_date'] = strtotime($params['diagnosis_date']);
             }
 
+            if (array_key_exists('show_card', $params)) {
+                $params['show_card'] = (int) $params['show_card'] === 0 ? 0 : 1;
+            }
+
             Diagnosis::update($params);
 
             // 如果是编辑，也确保患者有 TRTC 账号

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

@@ -11,6 +11,7 @@ use app\common\model\Order;
 use app\common\model\tcm\Diagnosis;
 use app\common\model\tcm\DiagnosisAssignLog;
 use app\common\model\tcm\Prescription;
+use app\common\model\tcm\PrescriptionLibrary;
 use app\common\model\tcm\PrescriptionOrder;
 use app\common\model\tcm\PrescriptionOrderLog;
 use app\common\model\tcm\PrescriptionOrderPayOrder;
@@ -695,6 +696,8 @@ class PrescriptionOrderLogic
     {
         PrescriptionOrderPayOrder::where('prescription_order_id', (int) $order->id)->delete();
         $order->linked_pay_order_id = null;
+        // 解除关联后刷新「需代收」固定快照（已付归零 → 需代收=总金额）
+        self::refreshAgencyCollectSnapshot((int) $order->id);
     }
 
     /**
@@ -767,7 +770,7 @@ class PrescriptionOrderLogic
             return [];
         }
         $rows = Order::whereIn('id', $ids)->whereNull('delete_time')
-            ->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', 'asc')
             ->whereIn('status', [2, 4, 5])
             ->select()
@@ -836,6 +839,35 @@ class PrescriptionOrderLogic
         $arr['deposit_min_amount'] = self::depositMinAmount();
     }
 
+    /**
+     * 刷新「需代收」固定快照：按当前 总金额 − 关联已付总额（支付单 status ∈ {2 已支付, 5 待审核}）写入 agency_collect_amount。
+     * 在关联/新增支付单、建单、改总金额、解除关联等写操作末尾调用；之后退款/审核状态变化不再影响该值。
+     */
+    private static function refreshAgencyCollectSnapshot(int $id): void
+    {
+        if ($id <= 0) {
+            return;
+        }
+        $order = PrescriptionOrder::where('id', $id)->whereNull('delete_time')->find();
+        if (!$order) {
+            return;
+        }
+        $amount = round((float) $order->amount, 2);
+        $paid = 0.0;
+        $ids = self::linkedPayOrderIdList($id);
+        if ($ids !== []) {
+            $payOrders = Order::whereIn('id', $ids)->whereNull('delete_time')->field(['amount', 'status'])->select();
+            foreach ($payOrders as $po) {
+                $st = (int) $po->status;
+                if ($st === 2 || $st === 5) {
+                    $paid += (float) $po->amount;
+                }
+            }
+        }
+        $order->agency_collect_amount = round($amount - $paid, 2);
+        $order->save();
+    }
+
     /**
      * @param array<string,mixed> $params
      * @return array<string,mixed>|false
@@ -968,7 +1000,9 @@ class PrescriptionOrderLogic
             self::replacePayOrderLinks((int) $order->id, $payOrderIds);
         }
 
-        $out = $order->toArray();
+        self::refreshAgencyCollectSnapshot((int) $order->id);
+
+        $out = PrescriptionOrder::where('id', (int) $order->id)->find()->toArray();
         self::maskInternalCostIfNeeded($out, $adminInfo);
         self::maskRemarkExtraIfNeeded($out, $adminInfo);
         self::attachLinkedPayOrders($out);
@@ -1036,7 +1070,17 @@ class PrescriptionOrderLogic
         $canHerbs = self::canViewPrescriptionHerbsInOrderDetail($adminInfo);
         $arr['prescription_detail_herbs_visible'] = $canHerbs;
         if (! $canHerbs && isset($arr['prescription']) && is_array($arr['prescription'])) {
-            unset($arr['prescription']['herbs']);
+            $rx = &$arr['prescription'];
+            $herbs = is_array($rx['herbs'] ?? null) ? $rx['herbs'] : [];
+            $hasAux = false;
+            foreach ($herbs as $h) {
+                if (is_array($h) && (string) ($h['formula_type'] ?? '') === '辅方') {
+                    $hasAux = true;
+                    break;
+                }
+            }
+            $rx['has_aux_formula'] = $hasAux ? 1 : 0;
+            unset($rx['herbs']);
         }
 
         // 诊单医助 / 诊单创建人姓名（tcm_diagnosis.admin_id）；部门见下方：优先业务订单 creator_id
@@ -1514,6 +1558,48 @@ class PrescriptionOrderLogic
         return $payload;
     }
 
+    /**
+     * 直接调用京东官方物流接口刷新轨迹并落库（后台「京东接口更新」按钮）。
+     *
+     * @return array{success:bool, message:string, traces_count:int, state:string}|null
+     */
+    public static function logisticsJdUpdate(int $id, int $adminId, array $adminInfo): ?array
+    {
+        self::$error = '';
+        $row = PrescriptionOrder::where('id', $id)->whereNull('delete_time')->find();
+        if (!$row) {
+            self::$error = '订单不存在';
+
+            return null;
+        }
+        if (!self::canAccessOrder($row, $adminId, $adminInfo)) {
+            self::$error = '无权限操作';
+
+            return null;
+        }
+        $num = trim((string) ($row->tracking_number ?? ''));
+        if ($num === '') {
+            self::$error = '未填写快递单号';
+
+            return null;
+        }
+       
+        $ret = \app\common\service\ExpressTrackingService::queryJdOfficialAndUpdate($num);
+      
+        if (empty($ret['success'])) {
+            self::$error = (string) ($ret['message'] ?? '京东物流更新失败');
+
+            return null;
+        }
+
+        return [
+            'success' => true,
+            'message' => (string) ($ret['message'] ?? '京东物流轨迹已更新'),
+            'traces_count' => (int) ($ret['traces_count'] ?? 0),
+            'state' => (string) ($ret['state'] ?? ''),
+        ];
+    }
+
     /**
      * @param array<string,mixed> $params
      * @return array<string,mixed>|false
@@ -1684,7 +1770,9 @@ class PrescriptionOrderLogic
 
         self::writeLog((int) $order->id, $adminId, $adminInfo, 'edit', '编辑了业务订单及相关信息');
 
-        $out = $order->toArray();
+        self::refreshAgencyCollectSnapshot((int) $order->id);
+
+        $out = PrescriptionOrder::where('id', (int) $order->id)->find()->toArray();
         self::maskInternalCostIfNeeded($out, $adminInfo);
         self::maskRemarkExtraIfNeeded($out, $adminInfo);
         self::attachLinkedPayOrders($out);
@@ -2228,12 +2316,16 @@ class PrescriptionOrderLogic
         $order->payment_slip_audit_remark = '';
         self::syncFulfillmentStatus($order);
         
-        // 将关联的已支付支付单（status=2，且payment_method='manual'）恢复为待审核（status=5）
+        // 将关联的已支付补齐支付单恢复为待审核：兼容旧 manual 与新 fubei/create_type=fubei 两种标记
         $payOrderIds = self::linkedPayOrderIdList($id);
         if (!empty($payOrderIds)) {
             Order::whereIn('id', $payOrderIds)
                 ->where('status', 2)  // 只恢复已支付状态的
-                ->where('payment_method', 'manual')  // 只恢复手动创建的
+                ->where(function ($query) {
+                    $query->where('payment_method', 'manual')
+                        ->whereOr('payment_method', 'fubei')
+                        ->whereOr('create_type', 'fubei');
+                })
                 ->update([
                     'status' => 5,  // 待审核
                     'payment_time' => null
@@ -2325,7 +2417,8 @@ class PrescriptionOrderLogic
         $payOrder->order_type      = $orderType;
         $payOrder->amount          = $amount;
         $payOrder->status          = 5;  // 待审核
-        $payOrder->payment_method  = 'manual';
+        $payOrder->payment_method  = 'fubei';  // 补齐支付单按「付呗」记账
+        $payOrder->create_type     = 'fubei';
         $payOrder->payment_time    = null;  // 审核通过后再设置支付时间
         $payOrder->remark          = $remark;
 
@@ -2367,7 +2460,9 @@ class PrescriptionOrderLogic
         }
         self::writeLog($id, $adminId, $adminInfo, 'add_pay_order', $logMsg);
 
-        $out = $order->toArray();
+        self::refreshAgencyCollectSnapshot($id);
+
+        $out = PrescriptionOrder::where('id', $id)->find()->toArray();
         self::maskInternalCostIfNeeded($out, $adminInfo);
         self::maskRemarkExtraIfNeeded($out, $adminInfo);
         self::attachLinkedPayOrders($out);
@@ -2478,7 +2573,9 @@ class PrescriptionOrderLogic
         }
         self::writeLog($id, $adminId, $adminInfo, 'link_pay_order', $logMsg);
 
-        $out = $order->toArray();
+        self::refreshAgencyCollectSnapshot($id);
+
+        $out = PrescriptionOrder::where('id', $id)->find()->toArray();
         self::maskInternalCostIfNeeded($out, $adminInfo);
         self::maskRemarkExtraIfNeeded($out, $adminInfo);
         self::attachLinkedPayOrders($out);
@@ -2626,11 +2723,43 @@ class PrescriptionOrderLogic
     }
 
     /**
-     * 业务订单退款：须填写原因；关联收款单标记为已退款，实付清零。
+     * 关联收款单中可退款的记录（已支付/待审核）
      *
+     * @return array<int, array<string, mixed>>
+     */
+    private static function linkedPayRefundableRows(int $prescriptionOrderId): array
+    {
+        $ids = self::linkedPayOrderIdList($prescriptionOrderId);
+        if ($ids === []) {
+            return [];
+        }
+
+        return Order::whereIn('id', $ids)
+            ->whereNull('delete_time')
+            ->whereIn('status', [2, 5])
+            ->field(['id', 'amount'])
+            ->order('id', 'asc')
+            ->select()
+            ->toArray();
+    }
+
+    private static function linkedPayRefundableTotal(int $prescriptionOrderId): float
+    {
+        $sum = 0.0;
+        foreach (self::linkedPayRefundableRows($prescriptionOrderId) as $row) {
+            $sum += (float) ($row['amount'] ?? 0);
+        }
+
+        return round($sum, 2);
+    }
+
+    /**
+     * 业务订单退款：须填写原因；可指定退款金额（部分退）或退满可退上限（全额）。
+     *
+     * @param float|null $refundAmount 为空或 0 表示退满可退上限
      * @return array<string,mixed>|false
      */
-    public static function refund(int $id, string $reason, int $adminId, array $adminInfo)
+    public static function refund(int $id, string $reason, int $adminId, array $adminInfo, ?float $refundAmount = null)
     {
         self::$error = '';
         $reason = trim($reason);
@@ -2652,8 +2781,8 @@ class PrescriptionOrderLogic
             return false;
         }
         $curFs = (int) $order->fulfillment_status;
-        if ($curFs !== 5 && $curFs !== 6) {
-            self::$error = '仅「已发货」或「已签收」状态可退款';
+        if (!in_array($curFs, [3, 5, 6, 9], true)) {
+            self::$error = '仅「已发货」「已签收」「已完成」或「拒收」状态可退款';
 
             return false;
         }
@@ -2663,17 +2792,72 @@ class PrescriptionOrderLogic
             return false;
         }
 
-        $linkedPayOrderIds = self::linkedPayOrderIdList($id);
-        $refundedPayCount  = 0;
+        $maxRefundable = self::linkedPayRefundableTotal($id);
+        $currentPaid   = round((float) $order->paid, 2);
+        $cap           = $maxRefundable > 0 ? $maxRefundable : $currentPaid;
+        if ($cap <= 0) {
+            self::$error = '当前无可退金额';
+
+            return false;
+        }
+
+        if ($refundAmount === null || $refundAmount <= 0) {
+            $refundAmount = $cap;
+        } else {
+            $refundAmount = round($refundAmount, 2);
+            if ($refundAmount > $cap + 0.009) {
+                self::$error = '退款金额不能超过可退上限 ¥' . $cap;
+
+                return false;
+            }
+        }
+
+        $isFullRefund    = $refundAmount >= $cap - 0.009;
+        $toRefundRows    = self::linkedPayRefundableRows($id);
+        $refundedPayCount = 0;
+        $markedPayTotal   = 0.0;
 
         try {
-            if ($linkedPayOrderIds !== []) {
-                $refundedPayCount = Order::whereIn('id', $linkedPayOrderIds)
+            if ($isFullRefund && $toRefundRows !== []) {
+                $ids = array_map('intval', array_column($toRefundRows, 'id'));
+                $refundedPayCount = Order::whereIn('id', $ids)
                     ->whereNull('delete_time')
                     ->update(['status' => 4]);
+                foreach ($toRefundRows as $pr) {
+                    $markedPayTotal += (float) ($pr['amount'] ?? 0);
+                }
+                $markedPayTotal = round($markedPayTotal, 2);
+            } elseif (!$isFullRefund && $toRefundRows !== []) {
+                $remaining = $refundAmount;
+                foreach ($toRefundRows as $pr) {
+                    if ($remaining < 0.01) {
+                        break;
+                    }
+                    $amt = round((float) ($pr['amount'] ?? 0), 2);
+                    if ($amt <= $remaining + 0.001) {
+                        Order::where('id', (int) $pr['id'])
+                            ->whereNull('delete_time')
+                            ->update(['status' => 4]);
+                        $remaining -= $amt;
+                        $markedPayTotal += $amt;
+                        $refundedPayCount++;
+                    }
+                }
+                $markedPayTotal = round($markedPayTotal, 2);
             }
-            $order->fulfillment_status = 10;
-            $order->paid                 = 0;
+
+            if ($isFullRefund) {
+                $order->fulfillment_status = 10;
+                $order->paid                 = 0;
+            } else {
+                $order->paid = round(max(0, $currentPaid - $refundAmount), 2);
+                if ($order->paid <= 0.009) {
+                    $order->paid                 = 0;
+                    $order->fulfillment_status = 10;
+                }
+            }
+            $prevStoredRefund = round((float) ($order->refund_amount ?? 0), 2);
+            $order->refund_amount = round($prevStoredRefund + $refundAmount, 2);
             $order->save();
         } catch (\Throwable $e) {
             self::$error = $e->getMessage();
@@ -2681,16 +2865,34 @@ class PrescriptionOrderLogic
             return false;
         }
 
-        $unassignSummary = self::clearDiagnosisAssistantOnComplete((int) $order->diagnosis_id);
-        $logLine         = '订单退款，状态变更为「退款」；原因：' . $reason;
+        $unassignSummary = '';
+        if ($isFullRefund || (float) $order->paid <= 0.009) {
+            $unassignSummary = self::clearDiagnosisAssistantOnComplete((int) $order->diagnosis_id);
+        }
+
+        if ($isFullRefund) {
+            $logLine = '订单全额退款，状态变更为「退款」；原因：' . $reason . '；退款金额 ¥' . $refundAmount;
+        } else {
+            $logLine = '订单部分退款；原因：' . $reason . '；本次退款 ¥' . $refundAmount . '；已付余额 ¥' . $order->paid;
+        }
         if ($refundedPayCount > 0) {
-            $logLine .= '；关联支付单 ' . $refundedPayCount . ' 笔已标记为已退款';
+            $logLine .= '；关联收款单 ' . $refundedPayCount . ' 笔已标记为已退款';
+            if ($markedPayTotal > 0) {
+                $logLine .= '（收款侧合计 ¥' . $markedPayTotal . '）';
+            }
+        } elseif ($toRefundRows !== []) {
+            $logLine .= '；关联收款单无匹配的已支付/待审核记录可标记';
+        }
+        if ($isFullRefund) {
+            $logLine .= '；已付总额清零' . $unassignSummary;
         }
-        $logLine .= '；已付总额清零' . $unassignSummary;
 
         self::writeLog($id, $adminId, $adminInfo, 'refund', $logLine);
 
         $out = $order->toArray();
+        $out['this_refund_amount'] = $refundAmount;
+        $out['refund_full']        = $isFullRefund;
+        $out['refundable_cap']     = $cap;
         self::maskInternalCostIfNeeded($out, $adminInfo);
         self::maskRemarkExtraIfNeeded($out, $adminInfo);
         self::attachLinkedPayOrders($out);
@@ -3001,7 +3203,7 @@ class PrescriptionOrderLogic
         $rxById = [];
         if ($rxIdList !== []) {
             $rxRows = Prescription::whereIn('id', $rxIdList)->whereNull('delete_time')
-                ->field(['id', 'prescription_type', 'need_decoction', 'dose_unit', 'assistant_id', 'appointment_id'])
+                ->field(['id', 'prescription_type', 'need_decoction', 'dose_unit', 'assistant_id', 'appointment_id', 'prescription_name', 'aux_usage', 'herbs', 'creator_id'])
                 ->select()
                 ->toArray();
             foreach ($rxRows as $xr) {
@@ -3009,6 +3211,10 @@ class PrescriptionOrderLogic
             }
         }
 
+        // 药方名称反查：处方库（开方医师 creator_id + 公开模板），按 formula_type + 药材集合匹配，
+        // 复刻前端 resolveSlipAuxLibraryName 口径（主方/辅方均如此；处方记录 prescription_name 仅做兜底）。
+        [$libByDoctor, $libPublic] = self::buildPrescriptionLibraryNameIndexForExport($rxById);
+
         if ($needGuahaoChannel) {
             $yejiChannelHighlightByDiag = [];
             if (
@@ -3214,6 +3420,22 @@ class PrescriptionOrderLogic
             }
 
             $item['export_medication_form'] = self::formatMedicationFormForExport(\is_array($rx) ? $rx : []);
+
+            // 药方名称：主方/辅方均反查处方库取名称（与处方笺一致），带标签；甘草/无匹配留空
+            [$mainRxName, $auxRxName] = self::resolvePrescriptionNamesForExport(
+                \is_array($rx) ? $rx : [],
+                $libByDoctor,
+                $libPublic
+            );
+            $rxNameParts = [];
+            if ($mainRxName !== '') {
+                $rxNameParts[] = '主方：' . $mainRxName;
+            }
+            if ($auxRxName !== '') {
+                $rxNameParts[] = '辅方：' . $auxRxName;
+            }
+            $item['export_prescription_name'] = implode(' ', $rxNameParts);
+
             $item['export_service_package'] = self::formatServicePackageForExport(
                 $item['service_package'] ?? '',
                 $packageNameByValue
@@ -3233,7 +3455,15 @@ class PrescriptionOrderLogic
             $paid = round((float) ($item['linked_pay_paid_total'] ?? 0), 2);
             $item['export_amount'] = number_format($amt, 2, '.', '');
             $item['export_paid_amount'] = number_format($paid, 2, '.', '');
-            $item['export_agency_collect'] = number_format(round($amt - $paid, 2), 2, '.', '');
+            $refundStored = round((float) ($item['refund_amount'] ?? 0), 2);
+            $item['export_refund_amount'] = $refundStored > 0
+                ? number_format($refundStored, 2, '.', '')
+                : '';
+            // 需代收：优先用固定快照值 agency_collect_amount；历史单为 NULL 时回退实时 amt − paid
+            $agencySnap = $item['agency_collect_amount'] ?? null;
+            $item['export_agency_collect'] = ($agencySnap !== null && $agencySnap !== '')
+                ? number_format(round((float) $agencySnap, 2), 2, '.', '')
+                : number_format(round($amt - $paid, 2), 2, '.', '');
 
             $item['export_tracking_number'] = (string) ($item['tracking_number'] ?? '');
             $signTs = $poId > 0 ? (int) ($signTsByPoId[$poId] ?? 0) : 0;
@@ -3282,6 +3512,186 @@ class PrescriptionOrderLogic
         unset($item);
     }
 
+    /**
+     * 导出药方名称反查：批量加载相关开方医师处方库（creator_id 命中 + 公开模板），
+     * 建立 [creator_id][formula_type][herbKey] => name 与 公开 [formula_type][herbKey] => name 两级索引。
+     *
+     * @param array<int, array> $rxById 处方 id => 处方行（需含 herbs / creator_id）
+     *
+     * @return array{0: array<int, array<string, array<string, string>>>, 1: array<string, array<string, string>>}
+     */
+    private static function buildPrescriptionLibraryNameIndexForExport(array $rxById): array
+    {
+        $libByDoctor = [];
+        $libPublic   = [];
+        if ($rxById === []) {
+            return [$libByDoctor, $libPublic];
+        }
+
+        $doctorIds = [];
+        foreach ($rxById as $rx) {
+            $cid = (int) ($rx['creator_id'] ?? 0);
+            if ($cid > 0) {
+                $doctorIds[$cid] = true;
+            }
+        }
+        $doctorIdList = array_keys($doctorIds);
+
+        try {
+            $libRows = PrescriptionLibrary::whereNull('delete_time')
+                ->where(function ($q) use ($doctorIdList) {
+                    if ($doctorIdList !== []) {
+                        $q->whereIn('creator_id', $doctorIdList)->whereOr('is_public', 1);
+                    } else {
+                        $q->where('is_public', 1);
+                    }
+                })
+                ->field(['prescription_name', 'formula_type', 'herbs', 'creator_id', 'is_public'])
+                ->select()
+                ->toArray();
+        } catch (\Throwable $e) {
+            Log::warning('buildPrescriptionLibraryNameIndexForExport failed: ' . $e->getMessage());
+
+            return [$libByDoctor, $libPublic];
+        }
+
+        foreach ($libRows as $lib) {
+            $name = trim((string) ($lib['prescription_name'] ?? ''));
+            if ($name === '') {
+                continue;
+            }
+            $herbsRaw = $lib['herbs'] ?? null;
+            if (\is_string($herbsRaw) && $herbsRaw !== '') {
+                $decoded = json_decode($herbsRaw, true);
+                $herbsRaw = \is_array($decoded) ? $decoded : [];
+            }
+            if (!\is_array($herbsRaw) || $herbsRaw === []) {
+                continue;
+            }
+            $key = self::herbSetMatchKeyForExport($herbsRaw);
+            if ($key === '') {
+                continue;
+            }
+            $ft = ((string) ($lib['formula_type'] ?? '')) === '辅方' ? '辅方' : '主方';
+
+            if ((int) ($lib['is_public'] ?? 0) === 1) {
+                $libPublic[$ft][$key] ??= $name;
+            }
+            $cid = (int) ($lib['creator_id'] ?? 0);
+            if ($cid > 0) {
+                $libByDoctor[$cid][$ft][$key] ??= $name;
+            }
+        }
+
+        return [$libByDoctor, $libPublic];
+    }
+
+    /**
+     * 反查单张处方的主方 / 辅方名称（与处方笺展示一致）：
+     * - 主方：主方药材集合匹配开方医师/公开处方库（formula_type=主方）；兜底取处方 prescription_name。
+     * - 辅方：优先 aux_usage.prescription_name / library_name，否则辅方药材集合匹配（formula_type=辅方）。
+     *
+     * @param array $rx 处方行（含 herbs / creator_id / prescription_name / aux_usage）
+     * @param array<int, array<string, array<string, string>>> $libByDoctor
+     * @param array<string, array<string, string>> $libPublic
+     *
+     * @return array{0: string, 1: string} [主方名称, 辅方名称]
+     */
+    private static function resolvePrescriptionNamesForExport(array $rx, array $libByDoctor, array $libPublic): array
+    {
+        if ($rx === []) {
+            return ['', ''];
+        }
+
+        $doctorId = (int) ($rx['creator_id'] ?? 0);
+
+        $herbs = $rx['herbs'] ?? null;
+        if (\is_string($herbs) && $herbs !== '') {
+            $decoded = json_decode($herbs, true);
+            $herbs = \is_array($decoded) ? $decoded : [];
+        }
+        if (!\is_array($herbs)) {
+            $herbs = [];
+        }
+
+        $mainHerbs = [];
+        $auxHerbs  = [];
+        foreach ($herbs as $h) {
+            if (!\is_array($h)) {
+                continue;
+            }
+            if (((string) ($h['formula_type'] ?? '')) === '辅方') {
+                $auxHerbs[] = $h;
+            } else {
+                $mainHerbs[] = $h;
+            }
+        }
+
+        $lookup = static function (string $ft, array $hs) use ($doctorId, $libByDoctor, $libPublic): string {
+            if ($hs === []) {
+                return '';
+            }
+            $key = self::herbSetMatchKeyForExport($hs);
+            if ($key === '') {
+                return '';
+            }
+            if ($doctorId > 0 && isset($libByDoctor[$doctorId][$ft][$key])) {
+                return $libByDoctor[$doctorId][$ft][$key];
+            }
+
+            return (string) ($libPublic[$ft][$key] ?? '');
+        };
+
+        // 主方
+        $mainName = $lookup('主方', $mainHerbs);
+        if ($mainName === '') {
+            $mainName = trim((string) ($rx['prescription_name'] ?? ''));
+        }
+
+        // 辅方：先读持久化字段
+        $auxName = '';
+        $auxUsage = $rx['aux_usage'] ?? null;
+        if (\is_string($auxUsage) && $auxUsage !== '') {
+            $decodedAux = json_decode($auxUsage, true);
+            $auxUsage = \is_array($decodedAux) ? $decodedAux : null;
+        }
+        if (\is_array($auxUsage)) {
+            $auxName = trim((string) ($auxUsage['prescription_name'] ?? ($auxUsage['library_name'] ?? '')));
+        }
+        if ($auxName === '') {
+            $auxName = $lookup('辅方', $auxHerbs);
+        }
+
+        return [$mainName, $auxName];
+    }
+
+    /**
+     * 药材集合匹配 key：每味 name:dosage（dosage 规整去尾零）排序后拼接，与处方库反查双方同口径。
+     */
+    private static function herbSetMatchKeyForExport(array $herbs): string
+    {
+        $parts = [];
+        foreach ($herbs as $h) {
+            if (!\is_array($h)) {
+                continue;
+            }
+            $name = trim((string) ($h['name'] ?? ''));
+            if ($name === '') {
+                continue;
+            }
+            $dosage = (float) ($h['dosage'] ?? 0);
+            if (floor($dosage) === $dosage) {
+                $dStr = (string) (int) $dosage;
+            } else {
+                $dStr = rtrim(rtrim(number_format($dosage, 4, '.', ''), '0'), '.');
+            }
+            $parts[] = $name . ':' . $dStr;
+        }
+        sort($parts);
+
+        return implode('|', $parts);
+    }
+
     /**
      * 完成订单时把关联诊单的 assistant_id 清空，让患者回到「待分配」状态
      * 仅当该患者没有其它进行中的处方订单且无指派日志时才清空，避免误覆盖
@@ -3787,6 +4197,9 @@ class PrescriptionOrderLogic
             return false;
         }
 
+        // 总金额变化后刷新「需代收」固定快照，保持与新总额一致
+        self::refreshAgencyCollectSnapshot($id);
+
         // 记录日志
         $summary = sprintf('将订单金额从 ¥%.2f 修改为 ¥%.2f', $oldAmount, $newAmount);
         self::writeLog($id, $adminId, $adminInfo, 'update_amount', $summary);

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

@@ -33,6 +33,7 @@ class DiagnosisValidate extends BaseValidate
         'age' => 'require|number|between:0,150',
         'diagnosis_type' => 'require',
         'status' => 'in:0,1',
+        'show_card' => 'in:0,1',
         'create_source' => 'max:32',
         'current_medications' => 'max:2000',
         'tongue_images' => 'array',
@@ -78,7 +79,7 @@ class DiagnosisValidate extends BaseValidate
 
     public function sceneEdit()
     {
-        return $this->only(['id', 'patient_name', 'id_card', 'phone', 'gender', 'age', 'diagnosis_date', 'diagnosis_type', 'syndrome_type', 'marital_status', 'height', 'weight', 'region', 'systolic_pressure', 'diastolic_pressure', 'fasting_blood_sugar', 'diabetes_discovery_year', 'local_hospital_diagnosis', 'local_hospital_name', 'past_history', 'symptoms', 'tongue_coating', 'pulse', 'treatment_principle', 'prescription', 'doctor_advice', 'remark', 'current_medications', 'status', 'create_source']);
+        return $this->only(['id', 'patient_name', 'id_card', 'phone', 'gender', 'age', 'diagnosis_date', 'diagnosis_type', 'syndrome_type', 'marital_status', 'height', 'weight', 'region', 'systolic_pressure', 'diastolic_pressure', 'fasting_blood_sugar', 'diabetes_discovery_year', 'local_hospital_diagnosis', 'local_hospital_name', 'past_history', 'symptoms', 'tongue_coating', 'pulse', 'treatment_principle', 'prescription', 'doctor_advice', 'remark', 'current_medications', 'status', 'show_card', 'create_source']);
     }
 
     public function sceneId()

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

@@ -16,7 +16,8 @@ class PrescriptionLibraryValidate extends BaseValidate
         'prescription_name' => 'require|max:100',
         'formula_type' => 'in:主方,辅方',
         'herbs' => 'require|array',
-        'is_public' => 'in:0,1'
+        'is_public' => 'in:0,1',
+        'disable_edit' => 'in:0,1'
     ];
 
     protected $message = [
@@ -27,7 +28,8 @@ class PrescriptionLibraryValidate extends BaseValidate
         'formula_type.in' => '处方类型只能是主方或辅方',
         'herbs.require' => '药材列表不能为空',
         'herbs.array' => '药材列表格式错误',
-        'is_public.in' => '是否公开参数错误'
+        'is_public.in' => '是否公开参数错误',
+        'disable_edit.in' => '禁用修改参数错误'
     ];
 
     /**
@@ -35,7 +37,7 @@ class PrescriptionLibraryValidate extends BaseValidate
      */
     public function sceneAdd()
     {
-        return $this->only(['prescription_name', 'formula_type', 'herbs', 'is_public']);
+        return $this->only(['prescription_name', 'formula_type', 'herbs', 'is_public', 'disable_edit']);
     }
 
     /**
@@ -43,7 +45,7 @@ class PrescriptionLibraryValidate extends BaseValidate
      */
     public function sceneEdit()
     {
-        return $this->only(['id', 'prescription_name', 'formula_type', 'herbs', 'is_public']);
+        return $this->only(['id', 'prescription_name', 'formula_type', 'herbs', 'is_public', 'disable_edit']);
     }
 
     /**

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

@@ -34,6 +34,7 @@ class PrescriptionOrderValidate extends BaseValidate
         'remark'           => 'max:500',
         'fulfillment_status' => 'require|integer|in:3,7,8,9,11,12',
         'reason'             => 'require|max:500',
+        'refund_amount'      => 'float|egt:0',
         'patient_name'     => 'require|max:50',
         'phone'            => 'require|max:20',
         'phone_tail'       => 'max:20|regex:/^\\d*$/',
@@ -67,6 +68,7 @@ class PrescriptionOrderValidate extends BaseValidate
             'tracking_number', 'express_company', 'fee_type', 'amount', 'remark_extra', 'remark_assistant', 'pay_order_ids',
         ],
         'logisticsTrace' => ['id', 'phone_tail'],
+        'logisticsJdUpdate' => ['id'],
         'auditPrescription' => ['id', 'action', 'remark'],
         'auditPayment' => ['id', 'action', 'remark'],
         'withdraw' => ['id'],
@@ -77,7 +79,7 @@ class PrescriptionOrderValidate extends BaseValidate
         'linkPayOrder' => ['id', 'pay_order_id'],
         'requestCompletion' => ['id'],
         'complete' => ['id', 'fulfillment_status'],
-        'refund' => ['id', 'reason'],
+        'refund' => ['id', 'reason', 'refund_amount'],
         'submitGancaoRecipel' => ['id'],
         'previewGancaoRecipel' => ['id'],
         'patchPrescriptionPatient' => ['id', 'patient_name', 'phone'],

server/app/api/controller/TcmController.php

@@ -457,6 +457,10 @@ class TcmController extends BaseApiController
             return ['ok' => false, 'error' => '诊单不存在'];
         }
 
+        if ((int) ($diagnosis['show_card'] ?? 1) !== 1) {
+            return ['ok' => false, 'error' => '该就诊卡已在统计端隐藏'];
+        }
+
         // 通过 diagnosis_view_records 校验当前小程序用户与该诊单的归属关系
         // 该表是「就诊卡列表」的来源（参考 DiagnosisLogic::getCardList）
         $owned = \think\facade\Db::name('diagnosis_view_records')

server/app/api/logic/tcm/DailyBloodCareAiLogic.php

@@ -0,0 +1,442 @@
+<?php
+
+namespace app\api\logic\tcm;
+
+use app\common\model\tcm\Diagnosis;
+use app\common\service\AiChatService;
+use think\facade\Cache;
+
+/**
+ * 日常护理 - 血糖照护 AI（累计 7 天有记录后：血糖建议 + 中医调理方向）
+ */
+class DailyBloodCareAiLogic
+{
+    private const CACHE_TTL = 86400;
+
+    private const MIN_RECORD_DAYS = 7;
+
+    private const AI_TIMEOUT_SEC = 14;
+
+    private const AI_STREAM_TIMEOUT_SEC = 22;
+
+    /**
+     * @return array{ok:bool,error?:string,data?:array}
+     */
+    public static function getDailyCarePlan(int $diagnosisId, bool $refresh = false): array
+    {
+        if ($diagnosisId <= 0) {
+            return ['ok' => false, 'error' => '缺少就诊卡'];
+        }
+
+        $context = self::buildCareContext($diagnosisId);
+        if (!$context['ok']) {
+            return ['ok' => false, 'error' => $context['error'] ?? '获取档案失败'];
+        }
+
+        $gate = self::ensureEnoughBloodDays($context['data']);
+        if (!$gate['ok']) {
+            return ['ok' => false, 'error' => $gate['error']];
+        }
+
+        $analysis = self::buildAnalysisPayload($context['data']);
+        $cacheKey = self::careCacheKey($diagnosisId);
+
+        if (!$refresh) {
+            $cached = Cache::get($cacheKey);
+            if (is_array($cached) && !empty($cached['summary'])) {
+                $cached['cached']   = true;
+                $cached['analysis'] = $analysis;
+                return ['ok' => true, 'data' => $cached];
+            }
+        }
+
+        $data = null;
+        if (AiChatService::isEnabled()) {
+            $raw = self::aiDailyCarePlan($context['data'], $refresh);
+            if (is_array($raw) && !empty($raw['summary'])) {
+                $data = self::finalizeCarePlan($raw);
+            }
+        }
+
+        if (!$data) {
+            $data = GiKnowledge::fallbackBloodCarePlan(
+                $context['data']['stats_7d'] ?? [],
+                $context['data']['stats_30d'] ?? [],
+                $context['data']
+            );
+        }
+
+        $data['date']     = date('Y-m-d');
+        $data['cached']   = false;
+        $data['analysis'] = $analysis;
+        Cache::set($cacheKey, $data, self::CACHE_TTL);
+
+        return ['ok' => true, 'data' => $data];
+    }
+
+    /**
+     * @param callable(string, array<string, mixed>):void $emit
+     */
+    public static function streamDailyCarePlan(int $diagnosisId, bool $refresh, callable $emit): void
+    {
+        if ($diagnosisId <= 0) {
+            $emit('error', ['message' => '缺少就诊卡']);
+            return;
+        }
+
+        $context = self::buildCareContext($diagnosisId);
+        if (!$context['ok']) {
+            $emit('error', ['message' => $context['error'] ?? '获取档案失败']);
+            return;
+        }
+
+        $gate = self::ensureEnoughBloodDays($context['data']);
+        if (!$gate['ok']) {
+            $emit('error', ['message' => $gate['error']]);
+            return;
+        }
+
+        $analysis = self::buildAnalysisPayload($context['data']);
+        $emit('analysis', ['analysis' => $analysis]);
+
+        $cacheKey = self::careCacheKey($diagnosisId);
+        if (!$refresh) {
+            $cached = Cache::get($cacheKey);
+            if (is_array($cached) && !empty($cached['summary'])) {
+                $cached['cached']   = true;
+                $cached['analysis'] = $analysis;
+                $emit('done', $cached);
+                return;
+            }
+        }
+
+        $data     = null;
+        $fullText = '';
+
+        if (AiChatService::isEnabled()) {
+            [$system, $user] = self::buildCareStreamPrompts($context['data'], $refresh);
+            $streamRes = AiChatService::streamChat([
+                ['role' => 'system', 'content' => $system],
+                ['role' => 'user', 'content' => $user],
+            ], static function (string $delta) use (&$fullText, $emit): void {
+                $fullText .= $delta;
+                $emit('delta', ['text' => $delta, 'buffer' => $fullText]);
+            }, [
+                'temperature' => $refresh ? 0.75 : 0.4,
+                'max_tokens'  => 720,
+                'timeout'     => self::AI_STREAM_TIMEOUT_SEC,
+            ]);
+
+            if ($streamRes['ok'] && trim($fullText) !== '') {
+                $parsed = self::parseCarePlainText(trim($fullText));
+                if ($parsed && !empty($parsed['summary'])) {
+                    $data = self::finalizeCarePlan($parsed);
+                }
+            }
+        }
+
+        if (!$data) {
+            $data = GiKnowledge::fallbackBloodCarePlan(
+                $context['data']['stats_7d'] ?? [],
+                $context['data']['stats_30d'] ?? [],
+                $context['data']
+            );
+        }
+
+        $data['date']     = date('Y-m-d');
+        $data['cached']   = false;
+        $data['analysis'] = $analysis;
+        Cache::set($cacheKey, $data, self::CACHE_TTL);
+        $emit('done', $data);
+    }
+
+    private static function careCacheKey(int $diagnosisId): string
+    {
+        return 'daily_blood_care_ai_v1:' . $diagnosisId . ':' . date('Y-m-d');
+    }
+
+    /**
+     * @return array{ok:bool,error?:string,data?:array}
+     */
+    private static function buildCareContext(int $diagnosisId): array
+    {
+        $base = DailyDietAiLogic::getPatientContext($diagnosisId);
+        if (!$base['ok']) {
+            return $base;
+        }
+
+        $diagnosis = Diagnosis::where('id', $diagnosisId)->where('delete_time', null)->find();
+        if ($diagnosis) {
+            $row = $diagnosis->toArray();
+            $base['data']['syndrome_type'] = trim((string) ($row['syndrome_type'] ?? ''));
+            $base['data']['symptoms']      = trim((string) ($row['symptoms'] ?? ''));
+            $base['data']['remark']        = trim((string) ($row['remark'] ?? ''));
+        }
+
+        return $base;
+    }
+
+    /**
+     * @param array<string,mixed> $context
+     * @return array{ok:bool,error?:string}
+     */
+    private static function ensureEnoughBloodDays(array $context): array
+    {
+        $days30 = (int) (($context['stats_30d']['record_days'] ?? 0));
+        $days7  = (int) (($context['stats_7d']['record_days'] ?? 0));
+        $total  = max($days30, $days7);
+        if ($total < self::MIN_RECORD_DAYS) {
+            return ['ok' => false, 'error' => '累计记录满7天后可生成照护建议'];
+        }
+
+        return ['ok' => true];
+    }
+
+    /**
+     * @param array<string,mixed> $context
+     * @return array<int,array<string,mixed>>
+     */
+    private static function buildAnalysisPayload(array $context): array
+    {
+        $out = [];
+        foreach (['stats_7d', 'stats_30d'] as $key) {
+            $s = $context[$key] ?? null;
+            if (is_array($s)) {
+                $out[] = $s;
+            }
+        }
+        return $out;
+    }
+
+    /**
+     * @param array<string,mixed> $context
+     * @return array<string,mixed>|null
+     */
+    private static function aiDailyCarePlan(array $context, bool $refresh): ?array
+    {
+        [$system, $user] = self::buildCareJsonPrompts($context, $refresh);
+        $res = AiChatService::chat([
+            ['role' => 'system', 'content' => $system],
+            ['role' => 'user', 'content' => $user],
+        ], [
+            'temperature'     => $refresh ? 0.7 : 0.35,
+            'max_tokens'      => 650,
+            'timeout'         => self::AI_TIMEOUT_SEC,
+            'response_format' => ['type' => 'json_object'],
+        ]);
+
+        if (empty($res['ok']) || empty($res['content'])) {
+            return null;
+        }
+
+        $json = self::parseJsonObject((string) $res['content']);
+        return is_array($json) ? $json : null;
+    }
+
+    /**
+     * @param array<string,mixed> $context
+     * @return array{0:string,1:string}
+     */
+    private static function buildCareJsonPrompts(array $context, bool $refresh): array
+    {
+        $bloodLine  = self::bloodLine($context);
+        $stat7Line  = self::statsLine($context['stats_7d'] ?? []);
+        $stat30Line = self::statsLine($context['stats_30d'] ?? []);
+        $syndrome   = trim((string) ($context['syndrome_type'] ?? ''));
+        $symptoms   = trim((string) ($context['symptoms'] ?? ''));
+
+        $system = <<<SYS
+你是基层中医糖尿病照护助手，面向农村中老年患者，用通俗中文给「血糖管理 + 中医调理方向」建议。
+
+硬性要求：
+1. 不得开具具体中药处方名、剂量、加减；不得指导自行增减西药/胰岛素。
+2. 中医部分写调理思路、食疗方向、穴位艾灸注意事项，强调需面诊脉诊后由医师定方。
+3. 结合提供的血糖统计与逐日记录，给出可执行的监测与生活方式建议。
+4. 只输出 JSON：
+{"summary":"一句话总评","blood_advice":"血糖监测与饮食运动","tcm_plan":"中医辨证与调理方案","watch_points":["留意1","留意2"],"next_steps":"下一步复诊或就医提醒"}
+SYS;
+
+        $user = sprintf(
+            "患者：%s，%s，%s岁。证型登记：%s。症状摘要：%s。\n日期：%s。\n近7日血糖：%s。\n统计：%s；%s。\n请根据控制好坏给出个性化 JSON。",
+            $context['patient_name'] ?: '患者',
+            $context['gender_text'] ?? '',
+            $context['age'] ?? 0,
+            $syndrome !== '' ? $syndrome : '未登记',
+            $symptoms !== '' ? mb_substr($symptoms, 0, 120) : '无',
+            $context['today'] ?? date('Y-m-d'),
+            $bloodLine,
+            $stat7Line,
+            $stat30Line
+        );
+
+        if ($refresh) {
+            $user .= "\n\n用户点了「换一换」，请换一套不同表述但同样严谨的建议，编号" . substr(md5((string) microtime(true)), 0, 8) . '。';
+        }
+
+        return [$system, $user];
+    }
+
+    /**
+     * @param array<string,mixed> $context
+     * @return array{0:string,1:string}
+     */
+    private static function buildCareStreamPrompts(array $context, bool $refresh): array
+    {
+        $bloodLine  = self::bloodLine($context);
+        $stat7Line  = self::statsLine($context['stats_7d'] ?? []);
+        $stat30Line = self::statsLine($context['stats_30d'] ?? []);
+
+        $system = <<<SYS
+你是基层中医糖尿病照护助手，给农村中老年患者写血糖与中医调理建议。
+
+硬性要求：
+1. 不得写具体中药方名剂量、不得指导自行调药。
+2. 中医写辨证思路与调理方向，强调面诊后由医师定方。
+3. 严格按下面 5 行输出，不要 JSON、不要 markdown：
+总评：（一句话）
+血糖：（监测、饮食、运动，2-4句）
+中医：（辨证思路、食疗艾灸方向，2-4句）
+留意：（用顿号隔开 2-4 条）
+复诊：（下一步）
+SYS;
+
+        $user = sprintf(
+            "患者：%s，%s，%s岁。证型：%s。症状：%s。\n近7日血糖：%s。\n%s；%s。",
+            $context['patient_name'] ?: '患者',
+            $context['gender_text'] ?? '',
+            $context['age'] ?? 0,
+            ($context['syndrome_type'] ?? '') ?: '未登记',
+            mb_substr((string) ($context['symptoms'] ?? ''), 0, 80) ?: '无',
+            $bloodLine,
+            $stat7Line,
+            $stat30Line
+        );
+
+        if ($refresh) {
+            $user .= "\n\n换一换，重新写一套，编号" . substr(md5((string) microtime(true)), 0, 8) . '。';
+        }
+
+        return [$system, $user];
+    }
+
+    /**
+     * @param array<string,mixed> $context
+     */
+    private static function bloodLine(array $context): string
+    {
+        $recent = $context['blood_recent'] ?? [];
+        if (!is_array($recent) || empty($recent)) {
+            return '近7日无逐日明细';
+        }
+
+        return implode('；', $recent);
+    }
+
+    /**
+     * @param array<string,mixed> $stats
+     */
+    private static function statsLine(array $stats): string
+    {
+        $label = (string) ($stats['label'] ?? '统计');
+        if (($stats['record_days'] ?? 0) <= 0) {
+            return $label . '无记录';
+        }
+
+        $parts = [
+            $label . "有记录{$stats['record_days']}天",
+            "偏高{$stats['high_days']}天",
+            "达标率{$stats['compliance']}%",
+        ];
+        if ($stats['fasting_avg'] !== null) {
+            $parts[] = "空腹均值{$stats['fasting_avg']}";
+        }
+        if ($stats['postprandial_avg'] !== null) {
+            $parts[] = "餐后均值{$stats['postprandial_avg']}";
+        }
+
+        return implode('，', $parts);
+    }
+
+    /**
+     * @return array<string,mixed>|null
+     */
+    private static function parseCarePlainText(string $text): ?array
+    {
+        $text = trim($text);
+        if ($text === '') {
+            return null;
+        }
+
+        if ($text[0] === '{') {
+            $json = self::parseJsonObject($text);
+            return is_array($json) ? $json : null;
+        }
+
+        $map = [];
+        if (preg_match('/总评[：:]\s*(.+)$/mu', $text, $m)) {
+            $map['summary'] = trim(preg_split('/\R/u', $m[1])[0] ?? $m[1]);
+        }
+        if (preg_match('/血糖[：:]\s*(.+)$/mu', $text, $m)) {
+            $map['blood_advice'] = trim(preg_split('/\R/u', $m[1])[0] ?? $m[1]);
+        }
+        if (preg_match('/中医[：:]\s*(.+)$/mu', $text, $m)) {
+            $map['tcm_plan'] = trim(preg_split('/\R/u', $m[1])[0] ?? $m[1]);
+        }
+        if (preg_match('/留意[：:]\s*(.+)$/mu', $text, $m)) {
+            $line = trim(preg_split('/\R/u', $m[1])[0] ?? $m[1]);
+            $parts = preg_split('/[、,，;；\s]+/u', $line) ?: [];
+            $map['watch_points'] = array_values(array_filter(array_map('trim', $parts)));
+        }
+        if (preg_match('/复诊[：:]\s*(.+)$/mu', $text, $m)) {
+            $map['next_steps'] = trim(preg_split('/\R/u', $m[1])[0] ?? $m[1]);
+        }
+
+        if (empty($map['summary'])) {
+            return null;
+        }
+
+        return $map;
+    }
+
+    /**
+     * @param array<string,mixed> $raw
+     * @return array<string,mixed>
+     */
+    private static function finalizeCarePlan(array $raw): array
+    {
+        $watch = $raw['watch_points'] ?? [];
+        if (!is_array($watch)) {
+            $watch = preg_split('/[、,，;；\n]+/u', (string) $watch) ?: [];
+        }
+        $watch = array_values(array_filter(array_map('trim', $watch)));
+
+        return [
+            'summary'        => trim((string) ($raw['summary'] ?? '')),
+            'blood_advice'   => trim((string) ($raw['blood_advice'] ?? '')),
+            'tcm_plan'       => trim((string) ($raw['tcm_plan'] ?? '')),
+            'watch_points'   => $watch,
+            'next_steps'     => trim((string) ($raw['next_steps'] ?? '')),
+            'control_level'  => (string) ($raw['control_level'] ?? ''),
+            'control_label'  => (string) ($raw['control_label'] ?? ''),
+            'disclaimer'     => trim((string) ($raw['disclaimer'] ?? 'AI 建议供参考，不能替代医师面诊、开方与调药。')),
+            'source'         => (string) ($raw['source'] ?? 'ai'),
+        ];
+    }
+
+    /**
+     * @return array<string,mixed>|null
+     */
+    private static function parseJsonObject(string $text): ?array
+    {
+        $text = trim($text);
+        if ($text === '') {
+            return null;
+        }
+        if (preg_match('/\{[\s\S]*\}/u', $text, $m)) {
+            $text = $m[0];
+        }
+        $data = json_decode($text, true);
+
+        return is_array($data) ? $data : null;
+    }
+}

server/app/api/logic/tcm/DailyDietAiLogic.php

@@ -499,8 +499,10 @@ class DailyDietAiLogic
 3. 严禁：白馒头、油条、粘豆包、糯米饭、西瓜、含糖饮料、白稀饭（杂面窝头、玉米碴粥除外）。
 4. 低 GI 优先；农村家常；禁止轻食/沙拉/藜麦等词。
 5. lunch 字段写法：蛋白菜放前面，淀粉（如有）放最后且注明「小半碗/一个」。
-6. 只输出 JSON：
-{"breakfast":"...","lunch":"...","dinner":"...","tips":"...","avoid":["...","..."]}
+6. 早餐必须包含「驼奶粉」（温水冲服，适量），可与粥、蛋、菜并列写。
+7. drinks 单独写全天喝什么：温开水为主；可写驼奶粉冲饮时间；严禁含糖饮料、果汁、酒。
+8. 只输出 JSON：
+{"breakfast":"...","drinks":"...","lunch":"...","dinner":"...","tips":"...","avoid":["...","..."]}
 SYS;
 
         $user = sprintf(
@@ -544,9 +546,11 @@ SYS;
 2. 淀粉（粥/饭/面/饼/窝头/薯/南瓜）每餐最多 1 种，早中晚互不相同。
 3. 严禁白馒头、油条、粘豆包、糯米饭、西瓜、含糖饮料。
 4. 农村家常饭，禁止轻食/沙拉/藜麦。
+5. 早餐必须含驼奶粉（温水冲服）；喝的单独一行。
 
-严格按下面 5 行格式输出，不要 JSON、不要 markdown、不要多余解释：
-早餐：（具体食物）
+严格按下面 6 行格式输出，不要 JSON、不要 markdown、不要多余解释：
+早餐：（具体食物，须含驼奶粉）
+喝的：（温开水、驼奶粉冲饮安排等，忌甜饮）
 午餐：（具体食物，蛋白放前）
 晚餐：（具体食物）
 提示：（一句土话提醒）
@@ -593,6 +597,7 @@ SYS;
 
         $map = [
             'breakfast' => null,
+            'drinks'    => null,
             'lunch'     => null,
             'dinner'    => null,
             'tips'      => null,
@@ -602,6 +607,9 @@ SYS;
         if (preg_match('/早餐[：:]\s*(.+)$/mu', $text, $m)) {
             $map['breakfast'] = trim(preg_split('/\R/u', $m[1])[0] ?? $m[1]);
         }
+        if (preg_match('/喝的[：:]\s*(.+)$/mu', $text, $m)) {
+            $map['drinks'] = trim(preg_split('/\R/u', $m[1])[0] ?? $m[1]);
+        }
         if (preg_match('/午餐[：:]\s*(.+)$/mu', $text, $m)) {
             $map['lunch'] = trim(preg_split('/\R/u', $m[1])[0] ?? $m[1]);
         }
@@ -623,6 +631,7 @@ SYS;
 
         $out = [
             'breakfast' => (string) $map['breakfast'],
+            'drinks'    => (string) ($map['drinks'] ?? ''),
             'lunch'     => (string) ($map['lunch'] ?? ''),
             'dinner'    => (string) ($map['dinner'] ?? ''),
             'tips'      => (string) ($map['tips'] ?? ''),
@@ -632,6 +641,29 @@ SYS;
         return $out;
     }
 
+    /**
+     * 产品要求：早餐含驼奶粉，并单独给出「喝的」
+     *
+     * @param array<string, mixed> $plan
+     * @return array<string, mixed>
+     */
+    private static function applyDietProductDefaults(array $plan): array
+    {
+        $breakfast = trim((string) ($plan['breakfast'] ?? ''));
+        if ($breakfast !== '' && mb_strpos($breakfast, '驼奶粉') === false && mb_strpos($breakfast, '驼奶') === false) {
+            $plan['breakfast'] = '驼奶粉（温水冲服）、' . $breakfast;
+        }
+
+        $drinks = trim((string) ($plan['drinks'] ?? ''));
+        if ($drinks === '') {
+            $plan['drinks'] = '白天多喝温开水；早餐按量冲驼奶粉，别喝甜饮料、果汁。';
+        } elseif (mb_strpos($drinks, '驼奶') === false) {
+            $plan['drinks'] = $drinks . '；早餐已安排驼奶粉';
+        }
+
+        return $plan;
+    }
+
     /**
      * 规范化 AI 三餐方案；校验未过也保留 AI 文案（避免流式展示后被规则模板覆盖）
      *
@@ -640,6 +672,7 @@ SYS;
      */
     private static function finalizeAiRecommendPlan(array $parsed): array
     {
+        $parsed  = self::applyDietProductDefaults($parsed);
         $checked = DietMealValidator::validateAndNormalize($parsed);
         $data    = $checked['plan'];
         $data['source'] = 'ai';

server/app/api/logic/tcm/DailyFamilyLikeLogic.php

@@ -4,6 +4,7 @@ namespace app\api\logic\tcm;
 
 use app\common\model\tcm\DailyFamilyLike;
 use app\common\model\tcm\DailyShareInvite;
+use app\common\model\tcm\Diagnosis;
 
 /**
  * 家人点赞（邀请观看页 → 患者日常页展示）
@@ -204,6 +205,11 @@ class DailyFamilyLikeLogic
             return self::setError('无权查看该诊单') ? false : false;
         }
 
+        $diagnosis = Diagnosis::where('id', $diagnosisId)->where('delete_time', null)->field('show_card')->find();
+        if (!$diagnosis || (int) ($diagnosis['show_card'] ?? 1) !== 1) {
+            return self::setError('该就诊卡已在统计端隐藏') ? false : false;
+        }
+
         $likeDate = date('Y-m-d');
         $count    = self::countToday($diagnosisId, $likeDate);
 

server/app/api/logic/tcm/DailyGamifyLogic.php

@@ -49,6 +49,13 @@ class DailyGamifyLogic
         if (!$owned) {
             return self::setError('无权操作该诊单') ? false : false;
         }
+        $diagnosis = \app\common\model\tcm\Diagnosis::where('id', $diagnosisId)
+            ->where('delete_time', null)
+            ->field('show_card')
+            ->find();
+        if (!$diagnosis || (int) ($diagnosis['show_card'] ?? 1) !== 1) {
+            return self::setError('该就诊卡已在统计端隐藏') ? false : false;
+        }
         return true;
     }
 

server/app/api/logic/tcm/DailyPhoneLogic.php

@@ -3,6 +3,8 @@
 namespace app\api\logic\tcm;
 
 use app\adminapi\logic\tcm\DiagnosisLogic;
+use app\common\model\DiagnosisViewRecord;
+use app\common\model\tcm\Diagnosis;
 use app\common\model\user\User;
 
 /**
@@ -74,19 +76,38 @@ class DailyPhoneLogic
 
         if (!empty($cardList)) {
             $card = $cardList[0];
+            return self::buildContextOk($card, $mobile, false, false);
+        }
+
+        // 该手机号已在诊单库建档：关联查看记录，禁止重复创建轻量档案
+        $existing = Diagnosis::where('phone', $mobile)
+            ->where('delete_time', null)
+            ->order('id', 'desc')
+            ->find();
+        if ($existing && (int) ($existing['show_card'] ?? 1) !== 1) {
             return [
-                'ok' => true,
+                'ok' => false,
                 'need_mobile' => false,
-                'created' => false,
-                'diagnosis_id' => (int) $card['id'],
-                'patient_id' => (int) $card['patient_id'],
-                'patient_name' => (string) ($card['patient_name'] ?? ''),
-                'gender' => (int) ($card['gender'] ?? 0),
-                'age' => (int) ($card['age'] ?? 0),
-                'mobile' => $mobile,
-                'create_source' => (string) ($card['create_source'] ?? ''),
+                'error' => '该手机号对应就诊卡因隐私设置已隐藏，请联系医生',
             ];
         }
+        if ($existing) {
+            if (!self::ensureUserViewRecord($userId, (int) $existing['id'], (int) $existing['patient_id'])) {
+                return [
+                    'ok' => false,
+                    'need_mobile' => false,
+                    'error' => '该手机号已建档，暂无法关联到当前账号',
+                ];
+            }
+            return self::buildContextOk([
+                'id' => (int) $existing['id'],
+                'patient_id' => (int) $existing['patient_id'],
+                'patient_name' => (string) ($existing['patient_name'] ?? ''),
+                'gender' => (int) ($existing['gender'] ?? 0),
+                'age' => (int) ($existing['age'] ?? 0),
+                'create_source' => (string) ($existing['create_source'] ?? ''),
+            ], $mobile, false, true);
+        }
 
         $displayName = trim((string) (($user['real_name'] ?? '') ?: ($user['nickname'] ?? '')));
         if ($displayName === '') {
@@ -114,17 +135,66 @@ class DailyPhoneLogic
             ];
         }
 
-        return [
-            'ok' => true,
-            'need_mobile' => false,
-            'created' => true,
-            'diagnosis_id' => (int) $result['id'],
+        return self::buildContextOk([
+            'id' => (int) $result['id'],
             'patient_id' => (int) $result['patient_id'],
             'patient_name' => $displayName,
             'gender' => $gender,
             'age' => max(0, (int) ($user['age'] ?? 0)),
-            'mobile' => $mobile,
             'create_source' => self::CREATE_SOURCE_MNP_DAILY,
+        ], $mobile, true, false);
+    }
+
+    /**
+     * @param array{id:int,patient_id:int,patient_name?:string,gender?:int,age?:int,create_source?:string} $card
+     */
+    private static function buildContextOk(array $card, string $mobile, bool $created, bool $linkedExisting): array
+    {
+        return [
+            'ok' => true,
+            'need_mobile' => false,
+            'created' => $created,
+            'linked_existing' => $linkedExisting,
+            'diagnosis_id' => (int) $card['id'],
+            'patient_id' => (int) $card['patient_id'],
+            'patient_name' => (string) ($card['patient_name'] ?? ''),
+            'gender' => (int) ($card['gender'] ?? 0),
+            'age' => (int) ($card['age'] ?? 0),
+            'mobile' => $mobile,
+            'create_source' => (string) ($card['create_source'] ?? ''),
         ];
     }
+
+    /** 将已有诊单挂到当前小程序用户（diagnosis_view_records） */
+    private static function ensureUserViewRecord(int $userId, int $diagnosisId, int $patientId): bool
+    {
+        if ($userId <= 0 || $diagnosisId <= 0) {
+            return false;
+        }
+        try {
+            $exists = DiagnosisViewRecord::where('user_id', $userId)
+                ->where('diagnosis_id', $diagnosisId)
+                ->where('delete_time', null)
+                ->find();
+            if ($exists) {
+                return true;
+            }
+            $now = time();
+            DiagnosisViewRecord::create([
+                'user_id' => $userId,
+                'diagnosis_id' => $diagnosisId,
+                'patient_id' => $patientId,
+                'share_user_id' => 0,
+                'view_count' => 1,
+                'first_view_time' => $now,
+                'last_view_time' => $now,
+                'is_confirmed' => 0,
+                'create_time' => $now,
+                'update_time' => $now,
+            ]);
+            return true;
+        } catch (\Throwable $e) {
+            return false;
+        }
+    }
 }

server/app/api/logic/tcm/DailyShareLogic.php

@@ -50,6 +50,9 @@ class DailyShareLogic
         if (!$diagnosis) {
             return self::setError('诊单不存在') ? false : false;
         }
+        if ((int) ($diagnosis['show_card'] ?? 1) !== 1) {
+            return self::setError('该就诊卡已在统计端隐藏') ? false : false;
+        }
 
         $inviteDate = date('Y-m-d');
         $code       = self::generateUniqueCode();

server/app/api/logic/tcm/DietMealValidator.php

@@ -114,6 +114,7 @@ class DietMealValidator
 
         $normalized = [
             'breakfast' => $breakfast,
+            'drinks'    => trim((string) ($plan['drinks'] ?? '')),
             'lunch'     => $lunch,
             'dinner'    => $dinner,
             'tips'      => $tips,

server/app/api/logic/tcm/GiKnowledge.php

@@ -18,7 +18,7 @@ class GiKnowledge
             '蔬菜类' => ['魔芋', '粟米', '大白菜', '黄瓜', '芹菜', '茄子', '青椒', '海带', '金针菇', '香菇', '菠菜', '番茄', '豆芽', '芦笋', '花椰菜', '洋葱', '生菜'],
             '豆类'   => ['黄豆', '眉豆', '鸡心豆', '豆腐', '豆角', '绿豆', '扁豆', '四季豆'],
             '水果类' => ['苹果', '水梨', '橙子', '桃', '提子', '沙田柚', '雪梨', '车厘子', '柚子', '草莓', '樱桃', '金桔', '葡萄'],
-            '奶类'   => ['牛奶', '低脂奶', '脱脂奶', '低脂乳酪', '红茶', '优格', '无糖豆浆'],
+            '奶类'   => ['牛奶', '低脂奶', '脱脂奶', '驼奶粉', '驼奶', '低脂乳酪', '红茶', '优格', '无糖豆浆'],
         ],
         self::LEVEL_MEDIUM => [
             '主食类' => ['红米饭', '糙米饭', '西米', '乌冬面', '面包', '麦片', '番薯', '芋头'],
@@ -36,40 +36,46 @@ class GiKnowledge
         ],
     ];
 
-    /** @var list<array{breakfast:string,lunch:string,dinner:string,tips:string}> */
+    /** @var list<array{breakfast:string,drinks:string,lunch:string,dinner:string,tips:string}> */
     private static array $mealTemplates = [
         [
-            'breakfast' => '玉米碴子粥、煮鸡蛋、拌黄瓜',
+            'breakfast' => '驼奶粉（温水冲服）、玉米碴子粥、煮鸡蛋、拌黄瓜',
+            'drinks'    => '白天多喝温开水；早餐冲驼奶粉，别喝甜饮料、果汁。',
             'lunch'     => '清炖鲤鱼、豆腐炖白菜、清炒豆角、米饭小半碗',
             'dinner'    => '玉米面饼一个、瘦肉丝、凉拌茄子',
             'tips'      => '中午鱼豆肉吃足；早中晚淀粉别重复，一顿一种主食就够。',
         ],
         [
-            'breakfast' => '小米粥、煮鸡蛋、小碟咸菜（少盐）',
+            'breakfast' => '驼奶粉（温水冲服）、小米粥、煮鸡蛋、小碟咸菜（少盐）',
+            'drinks'    => '温开水为主；驼奶粉跟早餐一起吃，下午也记得喝水。',
             'lunch'     => '去皮炖鸡肉、芹菜炒豆干、木耳炒鸡蛋',
             'dinner'    => '蒸红薯（小半块）、清炒菠菜、豆腐汤',
             'tips'      => '午餐最讲究蛋白；晚上才吃薯，别跟中午再配大米饭。',
         ],
         [
-            'breakfast' => '豆腐脑（少卤）、鸡蛋、一个苹果',
+            'breakfast' => '驼奶粉（温水冲服）、豆腐脑（少卤）、煮鸡蛋',
+            'drinks'    => '早餐饮驼奶粉；白天喝白开水，别碰含糖饮料。',
             'lunch'     => '清炖鸡肉、炖芸豆、番茄炒蛋、贴饼子一个',
             'dinner'    => '挂面一小碗、清蒸小鱼、拌海带丝',
             'tips'      => '中午饼配肉豆，蛋白管够；面条放晚上，别三顿都是粥饭。',
         ],
         [
-            'breakfast' => '高粱米粥、茶叶蛋、拌萝卜丝',
+            'breakfast' => '驼奶粉（温水冲服）、高粱米粥、茶叶蛋、拌萝卜丝',
+            'drinks'    => '温开水；早餐驼奶粉按说明冲，别加糖。',
             'lunch'     => '炖牛肉（瘦）、豆腐炒韭菜、清炒油菜、杂豆饭小半碗',
             'dinner'    => '蒸南瓜（小半碗）、鸡蛋羹、拍黄瓜',
             'tips'      => '中午肉蛋豆要多吃；南瓜算晚饭主食，别再加馒头稀饭。',
         ],
         [
-            'breakfast' => '棒子面粥、水煮蛋、大拌菜（少油）',
+            'breakfast' => '驼奶粉（温水冲服）、棒子面粥、水煮蛋、大拌菜（少油）',
+            'drinks'    => '多喝温开水；驼奶粉放早餐，忌可乐汽水果汁。',
             'lunch'     => '清炖鲫鱼、番茄炒蛋、炖扁豆、糙米饭小半碗',
             'dinner'    => '玉米面饼一个、清炒豆芽、豆腐脑',
             'tips'      => '午饭鱼蛋豆齐上；玉米面放晚上，跟中午米饭分开。',
         ],
         [
-            'breakfast' => '小米粥、煮鸡蛋、拌生菜',
+            'breakfast' => '驼奶粉（温水冲服）、小米粥、煮鸡蛋、拌生菜',
+            'drinks'    => '白天小口多次喝温水；早餐冲好驼奶粉再吃饭。',
             'lunch'     => '白切鸡（去皮）、炖豆腐、清炒豆角、二米饭小半碗',
             'dinner'    => '杂面馒头一个、瘦肉炒芹菜、凉拌黄瓜',
             'tips'      => '中午蛋白打主力；三顿别都喝粥吃面，一顿一种淀粉。',
@@ -92,7 +98,8 @@ class GiKnowledge
     private static array $aliases = [
         '棒子面' => '荞麦面', '玉米碴' => '粟米', '地瓜' => '番薯', '红薯' => '番薯',
         '洋芋' => '芋头', '土豆' => '芋头', '窝头' => '通心粉', '贴饼子' => '通心粉',
-        '二米饭' => '红米饭', '稀饭' => '白饭', '白稀饭' => '白饭', '糖糕' => '麦芽糖',
+        '二米饭' => '红米饭', '稀饭' => '白饭', '白稀饭' => '白饭',         '糖糕' => '麦芽糖',
+        '驼奶' => '驼奶粉',
     ];
 
     /**
@@ -132,6 +139,8 @@ class GiKnowledge
     public static function ruralMealHints(): string
     {
         return implode("\n", [
+            '【早餐】须安排驼奶粉温水冲服（低 GI 奶类，稳血糖），可与粥、蛋、菜同餐。',
+            '【喝的】单独说明：温开水为主；早餐驼奶粉；严禁含糖饮料、果汁、酒。',
             '【午餐】蛋白质要最高：至少 2 样高蛋白（鱼/鸡鸭/瘦肉/蛋/豆腐/豆干），肉蛋豆是午饭主角。',
             '【淀粉不重复】粥/饭/面/饼/窝头/红薯/土豆/玉米/南瓜等算淀粉；早中晚各最多 1 种，且三顿不能同一种、不要顿顿大主食。',
             '推荐蛋白：鸡蛋、豆腐、豆干、自家鸡鸭蛋、瘦肉、鲫鱼鲤鱼；',
@@ -177,6 +186,7 @@ class GiKnowledge
 
         $plan = [
             'breakfast' => $meal['breakfast'],
+            'drinks'    => $meal['drinks'] ?? '白天多喝温开水；早餐冲驼奶粉，别喝甜饮。',
             'lunch'     => $meal['lunch'],
             'dinner'    => $meal['dinner'],
             'tips'      => $meal['tips'],

server/app/command/ExpressAutoUpdate.php

@@ -15,7 +15,7 @@ use think\console\Output;
  * 使用方法：
  * php think express:auto-update
  * 
- * 配置 crontab（每 10 分钟）：拉快递 100 + 按履约「已发货/已签收」核对释放诊单医助（与是否甘草单无关）
+ * 配置 crontab（每 10 分钟）：拉快递 100 + 按履约「已发货」核对释放诊单医助（跳过已完成/已签收业务单，与是否甘草单无关）
  * 0,10,20,30,40,50 * * * * cd /path/to/server && php think express:auto-update >> /dev/null 2>&1
  *
  * 已对「业务订单创建人非二中心」（或创建人为开方医生时按待释放身份判定）执行发货/签收自动释放的诊单会写入 tcm_diagnosis.shipped_non_er_assistant_cleared_at，
@@ -38,7 +38,8 @@ class ExpressAutoUpdate extends Command
         try {
             $result = ExpressTrackingService::autoUpdateBatch(1000);
             $recon = ExpressTrackingService::reconcileAssistantReleaseForShippedPrescriptionOrders(1000);
-
+       
+            
             $duration = round(microtime(true) - $startTime, 2);
 
             $output->writeln("更新完成！");
@@ -46,7 +47,7 @@ class ExpressAutoUpdate extends Command
             $output->writeln("成功: {$result['success']}");
             $output->writeln("失败: {$result['failed']}");
             $output->writeln("医助已移除(物流任务+指派日志): " . (int) ($result['assistant_cleared'] ?? 0));
-            $output->writeln("医助已移除(履约已发货/签收核对): " . (int) ($recon['cleared'] ?? 0) . " (扫描 " . (int) ($recon['scanned'] ?? 0) . " 单)");
+            $output->writeln("医助已移除(履约已发货核对): " . (int) ($recon['cleared'] ?? 0) . " (扫描 " . (int) ($recon['scanned'] ?? 0) . " 单)");
             $lines = array_merge($result['assistant_lines'] ?? [], $recon['lines'] ?? []);
             if ($lines === []) {
                 $output->writeln('医助明细: （无）');

server/app/command/GancaoSyncLogisticsRoute.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace app\command;
 
+use app\common\model\tcm\PrescriptionOrder;
 use app\common\service\ExpressTrackingService;
 use app\common\service\gancao\GancaoLogisticsRouteService;
 use app\common\service\gancao\GancaoScmRecipelService;
@@ -18,18 +19,21 @@ use think\console\Output;
  * 数据流：
  *   zyt_tcm_prescription_order (甘草已上传)
  *     ↓ 调用 igc_scm.logistics.client_opt.pull / GET_TASK_ROUTE_LIST
+ *     ↓ 甘草报快递任务不存在等（如 10101）且业务单已有运单号 → 降级快递100
  *   zyt_express_tracking + zyt_express_trace + zyt_express_state_log + zyt_express_query_log
  *
  * 使用方法：
- *   php think gancao:sync-logistics                  默认拉 100 单
- *   php think gancao:sync-logistics --limit=200      自定义拉取上限
- *   php think gancao:sync-logistics --order-id=123   只跑指定订单
+ *   php think gancao:sync-logistics                  默认拉 2000 单（跳过已完成/已签收）
+ *   php think gancao:sync-logistics --limit=500      自定义拉取上限
+ *   php think gancao:sync-logistics --order-id=1424              只跑指定订单（数字 id）
+ *   php think gancao:sync-logistics --order-id=PO20260530165158645023  或 PO 业务单号
  *   php think gancao:sync-logistics -t SF1234567890  按快递单号走快递100 查询并落库
  *   php think gancao:sync-logistics --detail         打印每单详细
  *
  * 建议 crontab（每 30 分钟执行一次）：
- *   0,30 * * * * cd /path/to/server && php think gancao:sync-logistics --limit=200 >> runtime/log/gancao_sync.log 2>&1
+ *   0,30 * * * * cd /path/to/server && php think gancao:sync-logistics >> runtime/log/gancao_sync.log 2>&1
  *
+ * 跳过履约状态为已完成(3)、已签收(6) 的业务订单，不再拉取甘草路由。
  * 已对「业务订单创建人非二中心」（发货/签收自动释放规则见 ExpressTrackingService）的诊单会写入 tcm_diagnosis.shipped_non_er_assistant_cleared_at，
  * 后续履约核对不再重复扫描（需先执行 sql/1.9.20260507/add_diagnosis_shipped_non_er_assistant_cleared_at.sql）。
  */
@@ -39,8 +43,8 @@ class GancaoSyncLogisticsRoute extends Command
     {
         $this->setName('gancao:sync-logistics')
             ->setDescription('同步甘草订单的物流路由（GET_TASK_ROUTE_LIST）到本地物流追踪表')
-            ->addOption('limit', 'l', Option::VALUE_OPTIONAL, '本次最多处理多少条订单', 100)
-            ->addOption('order-id', null, Option::VALUE_OPTIONAL, '只同步指定 prescription_order.id', null)
+            ->addOption('limit', 'l', Option::VALUE_OPTIONAL, '本次最多处理多少条订单（跳过已完成/已签收）', 2000)
+            ->addOption('order-id', null, Option::VALUE_OPTIONAL, '只同步指定订单：prescription_order.id 或 PO 业务单号 order_no', null)
             ->addOption('tracking-number', 't', Option::VALUE_REQUIRED, '按快递单号走快递100 查询并落库')
             ->addOption('detail', 'd', Option::VALUE_NONE, '打印每单详细结果');
     }
@@ -48,8 +52,19 @@ class GancaoSyncLogisticsRoute extends Command
     protected function execute(Input $input, Output $output)
     {
         $limit = max(1, (int) $input->getOption('limit'));
-        $onlyOrderId = $input->getOption('order-id');
-        $onlyOrderId = $onlyOrderId !== null ? (int) $onlyOrderId : null;
+        $onlyOrderId = null;
+        $onlyOrderNo = '';
+        $orderIdArg = $input->getOption('order-id');
+        if ($orderIdArg !== null && trim((string) $orderIdArg) !== '') {
+            $resolved = self::resolvePrescriptionOrderId((string) $orderIdArg);
+            if ($resolved === null) {
+                $output->error('未找到订单：' . trim((string) $orderIdArg) . '（--order-id 支持数字 id 或 PO 业务单号）');
+
+                return 1;
+            }
+            $onlyOrderId = $resolved['id'];
+            $onlyOrderNo = $resolved['order_no'];
+        }
         $trackingNumber = trim((string) $input->getOption('tracking-number'));
         $verbose = (bool) $input->getOption('detail');
 
@@ -71,7 +86,11 @@ class GancaoSyncLogisticsRoute extends Command
         if ($trackingNumber !== '') {
             $output->writeln('开始查询...（快递100，tracking_number=' . $trackingNumber . '）');
         } else {
-            $output->writeln('开始同步...（limit=' . $limit . ($onlyOrderId ? ', order_id=' . $onlyOrderId : '') . '）');
+            if ($onlyOrderId !== null) {
+                $output->writeln('开始同步...（指定单 order_id=' . $onlyOrderId . ($onlyOrderNo !== '' ? ', order_no=' . $onlyOrderNo : '') . '）');
+            } else {
+                $output->writeln('开始同步...（limit=' . $limit . '）');
+            }
         }
 
         try {
@@ -82,10 +101,16 @@ class GancaoSyncLogisticsRoute extends Command
                 $stats['reconcile_lines'] = [];
             } else {
                 $stats = GancaoLogisticsRouteService::syncBatch($limit, $onlyOrderId);
-                $recon = ExpressTrackingService::reconcileAssistantReleaseForShippedPrescriptionOrders(2000);
-                $stats['reconcile_cleared'] = (int) ($recon['cleared'] ?? 0);
-                $stats['reconcile_scanned'] = (int) ($recon['scanned'] ?? 0);
-                $stats['reconcile_lines'] = $recon['lines'] ?? [];
+                if ($onlyOrderId !== null) {
+                    $stats['reconcile_cleared'] = 0;
+                    $stats['reconcile_scanned'] = 0;
+                    $stats['reconcile_lines'] = [];
+                } else {
+                    $recon = ExpressTrackingService::reconcileAssistantReleaseForShippedPrescriptionOrders(2000);
+                    $stats['reconcile_cleared'] = (int) ($recon['cleared'] ?? 0);
+                    $stats['reconcile_scanned'] = (int) ($recon['scanned'] ?? 0);
+                    $stats['reconcile_lines'] = $recon['lines'] ?? [];
+                }
             }
         } catch (\Throwable $e) {
             $output->error('同步异常：' . $e->getMessage());
@@ -120,10 +145,13 @@ class GancaoSyncLogisticsRoute extends Command
         $output->writeln('同步完成');
         $output->writeln('========================================');
         $output->writeln('总数：' . $stats['total']);
+        if (isset($stats['skipped'])) {
+            $output->writeln('跳过：' . (int) $stats['skipped'] . '（已完成/已签收）');
+        }
         $output->writeln('成功：' . $stats['success']);
         $output->writeln('失败：' . $stats['failed']);
         $output->writeln('医助已移除（甘草同步+指派日志）：' . (int) ($stats['assistant_cleared'] ?? 0));
-        $output->writeln('医助已移除（履约已发货/签收核对）：' . (int) ($stats['reconcile_cleared'] ?? 0) . '（扫描 ' . (int) ($stats['reconcile_scanned'] ?? 0) . ' 单）');
+        $output->writeln('医助已移除（履约已发货核对）：' . (int) ($stats['reconcile_cleared'] ?? 0) . '（扫描 ' . (int) ($stats['reconcile_scanned'] ?? 0) . ' 单）');
         $lines = array_merge($stats['assistant_lines'] ?? [], $stats['reconcile_lines'] ?? []);
         if ($lines === []) {
             $output->writeln('医助明细：（无）');
@@ -137,4 +165,35 @@ class GancaoSyncLogisticsRoute extends Command
 
         return 0;
     }
+
+    /**
+     * @return array{id:int, order_no:string}|null
+     */
+    private static function resolvePrescriptionOrderId(string $raw): ?array
+    {
+        $raw = trim($raw);
+        if ($raw === '') {
+            return null;
+        }
+
+        $q = PrescriptionOrder::whereNull('delete_time');
+        if (preg_match('/^\d+$/', $raw) === 1) {
+            $id = (int) $raw;
+            if ($id <= 0) {
+                return null;
+            }
+            $row = (clone $q)->where('id', $id)->field('id,order_no')->find();
+        } else {
+            $row = (clone $q)->where('order_no', $raw)->field('id,order_no')->find();
+        }
+
+        if (!$row) {
+            return null;
+        }
+
+        return [
+            'id'       => (int) $row->id,
+            'order_no' => (string) $row->order_no,
+        ];
+    }
 }

server/app/common/service/ExpressTrackService.php

@@ -63,29 +63,95 @@ class ExpressTrackService
 
         $cfg = Config::get('logistics.kuaidi100', []);
         $enable = !empty($cfg['enable']);
+
+        $result = $out;
         if (! $enable) {
-            $out['hint'] = '未配置快递100查询密钥或已关闭（LOGISTICS_KUAIDI100_DISABLE），仅可打开官网查件。请在 .env 中配置 LOGISTICS_KUAIDI100_CUSTOMER、LOGISTICS_KUAIDI100_KEY';
-
-            return $out;
-        }
-
-        // 顺丰（及快递100 要求电话的承运商）无 phone 时不请求接口，避免无效调用
-        if ($phoneForKuaidi === '' && self::kuaidiPhoneRequired($kuaidiCom)) {
-            $out['hint'] = '顺丰查询需在快递100 中同时提交单号与收/寄件人电话（可与面单一致的完整手机号或后四位）。请填写收件电话后点「刷新轨迹」。';
-
-            return $out;
-        }
-
-        $lastFail = null;
-        foreach ($comCandidates as $tryCom) {
-            $tryOut = self::queryKuaidiOnce($cfg, $tryCom, $num, $phoneForKuaidi, $carrier, $label);
-            if (!empty($tryOut['traces']) || ($tryOut['state'] ?? '') !== '') {
-                return $tryOut;
+            $result['hint'] = '未配置快递100查询密钥或已关闭（LOGISTICS_KUAIDI100_DISABLE），仅可打开官网查件。请在 .env 中配置 LOGISTICS_KUAIDI100_CUSTOMER、LOGISTICS_KUAIDI100_KEY';
+        } elseif ($phoneForKuaidi === '' && self::kuaidiPhoneRequired($kuaidiCom)) {
+            // 顺丰（及快递100 要求电话的承运商）无 phone 时不请求接口，避免无效调用
+            $result['hint'] = '顺丰查询需在快递100 中同时提交单号与收/寄件人电话（可与面单一致的完整手机号或后四位）。请填写收件电话后点「刷新轨迹」。';
+        } else {
+            $matched = null;
+            $lastFail = null;
+            foreach ($comCandidates as $tryCom) {
+                $tryOut = self::queryKuaidiOnce($cfg, $tryCom, $num, $phoneForKuaidi, $carrier, $label);
+                if (!empty($tryOut['traces']) || ($tryOut['state'] ?? '') !== '') {
+                    $matched = $tryOut;
+                    break;
+                }
+                $lastFail = $tryOut;
             }
-            $lastFail = $tryOut;
+            $result = $matched ?? $lastFail ?? $out;
         }
 
-        return $lastFail ?? $out;
+        // 京东自营单（JDVE…）兜底：快递100 无轨迹/陈旧时，用京东官方接口（更新或更全才采用）。
+        // 未配置京东官方接口时 isConfigured()=false，本段跳过，行为与原先一致。
+        if ($carrier === 'jd' && JdLogisticsService::isConfigured()) {
+            try {
+                $jdPhone = $overrideDigits !== '' ? $overrideDigits : $recipientDigits;
+                $jd = JdLogisticsService::queryTrace($num, $jdPhone);
+                if ($jd !== null && !empty($jd['traces']) && self::jdResultPreferred($jd, $result)) {
+                    $result['traces'] = $jd['traces'];
+                    $result['state'] = (string) $jd['state'];
+                    $result['state_text'] = (string) $jd['state_text'];
+                    $result['source'] = 'jd_official';
+                    $result['hint'] = '';
+                    // carrier / carrier_label / official_url / kuaidi_com 保留原值
+                }
+            } catch (\Throwable $e) {
+                Log::warning('ExpressTrackService jd official fallback failed', [
+                    'num' => $num,
+                    'error' => $e->getMessage(),
+                ]);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * 京东官方轨迹是否应优先于快递100 结果采用：
+     * 快递100 无轨迹 → 直接用；否则京东更「新」（最新轨迹时间更晚）或同样新但条目更多 → 用。
+     *
+     * @param array{traces?:array,newest_unix?:int} $jd
+     * @param array{traces?:array} $kuaidi
+     */
+    private static function jdResultPreferred(array $jd, array $kuaidi): bool
+    {
+        $kuaidiTraces = is_array($kuaidi['traces'] ?? null) ? $kuaidi['traces'] : [];
+        if ($kuaidiTraces === []) {
+            return true;
+        }
+
+        $jdNewest = (int) ($jd['newest_unix'] ?? 0);
+        $kuaidiNewest = self::newestUnixFromTraces($kuaidiTraces);
+        if ($jdNewest > $kuaidiNewest) {
+            return true;
+        }
+        if ($jdNewest === $kuaidiNewest && $jdNewest > 0) {
+            return count($jd['traces'] ?? []) > count($kuaidiTraces);
+        }
+
+        return false;
+    }
+
+    /**
+     * @param array<int, array{time?:string}> $traces
+     */
+    private static function newestUnixFromTraces(array $traces): int
+    {
+        $best = 0;
+        foreach ($traces as $t) {
+            if (!is_array($t)) {
+                continue;
+            }
+            $p = strtotime((string) ($t['time'] ?? ''));
+            if ($p !== false && (int) $p > $best) {
+                $best = (int) $p;
+            }
+        }
+
+        return $best;
     }
 
     /**

server/app/common/service/ExpressTrackingService.php

@@ -162,6 +162,76 @@ class ExpressTrackingService
         return $stats;
     }
 
+    /**
+     * 甘草路由不可用时的降级：按业务订单运单号走快递100 查询并落库（自发货等场景）
+     *
+     * @return array{
+     *   success: bool,
+     *   message: string,
+     *   traces_count: int,
+     *   state: string,
+     *   source: string,
+     *   assistant_sync?: array|null
+     * }
+     */
+    public static function queryKuaidiForPrescriptionOrder(PrescriptionOrder $order, bool $isAuto = true): array
+    {
+        $fail = static fn (string $msg): array => [
+            'success' => false,
+            'message' => $msg,
+            'traces_count' => 0,
+            'state' => '',
+            'source' => 'kuaidi100_fallback',
+            'assistant_sync' => null,
+        ];
+
+        $tn = trim((string) ($order->tracking_number ?? ''));
+        if ($tn === '') {
+            return $fail('甘草无快递任务且业务单未填写快递单号，无法走快递100');
+        }
+
+        $tracking = self::resolveTrackingByNumber($tn);
+        if (!$tracking) {
+            return $fail('未找到运单对应的物流追踪记录');
+        }
+
+        self::backfillRecipientPhoneFromPrescriptionOrder($tracking);
+        self::syncTrackingExpressCompanyFromNumber($tracking);
+
+        try {
+            $result = self::queryAndUpdate((int) $tracking->id, $isAuto);
+            $ok = self::isKuaidiQuerySuccessful($result);
+            $tracking = ExpressTracking::where('id', (int) $tracking->id)->whereNull('delete_time')->find();
+            $state = $tracking ? (string) ($tracking->current_state ?? '') : '';
+            $hint = trim((string) ($result['hint'] ?? ''));
+            $message = $ok
+                ? 'ok（甘草无快递任务，已降级快递100）'
+                : ($hint !== '' ? $hint : '快递100 查询未返回有效轨迹');
+
+            $assistantSync = null;
+            if (is_array($result) && isset($result['_assistant_sync']) && is_array($result['_assistant_sync'])) {
+                $assistantSync = $result['_assistant_sync'];
+            }
+
+            return [
+                'success' => $ok,
+                'message' => $message,
+                'traces_count' => count($result['traces'] ?? []),
+                'state' => $state,
+                'source' => 'kuaidi100_fallback',
+                'assistant_sync' => $assistantSync,
+            ];
+        } catch (\Throwable $e) {
+            Log::error('queryKuaidiForPrescriptionOrder failed', [
+                'order_id' => (int) $order->id,
+                'tracking_number' => $tn,
+                'error' => $e->getMessage(),
+            ]);
+
+            return $fail('快递100 降级异常：' . $e->getMessage());
+        }
+    }
+
     /**
      * 确保 express_tracking 存在（不发起查询）
      */
@@ -283,6 +353,93 @@ class ExpressTrackingService
 
         $responseTime = (int) ((microtime(true) - $startTime) * 1000);
 
+        return self::persistTrackingResult($tracking, $result, $isAuto, $responseTime);
+    }
+
+    /**
+     * 直接调用京东官方物流接口（绕过快递100），将轨迹落库到 express_tracking / express_trace。
+     * 供后台「京东接口更新」按钮使用；未配置京东官方接口或无轨迹时返回失败。
+     *
+     * @return array{success:bool, message:string, traces_count:int, state:string, source:string}
+     */
+    public static function queryJdOfficialAndUpdate(string $trackingNumber): array
+    {
+        $fail = static fn (string $msg): array => [
+            'success' => false,
+            'message' => $msg,
+            'traces_count' => 0,
+            'state' => '',
+            'source' => 'jd_official',
+        ];
+
+        $tn = trim($trackingNumber);
+        if ($tn === '') {
+            return $fail('快递单号不能为空');
+        }
+        if (!JdLogisticsService::isConfigured()) {
+            return $fail('未配置京东官方物流接口（请在 .env 配置 JD_LOGISTICS_* 后重试）');
+        }
+
+        $tracking = self::resolveTrackingByNumber($tn);
+        if (!$tracking) {
+            return $fail('未找到该快递单号对应的业务订单或物流追踪记录');
+        }
+
+        $startTime = microtime(true);
+        try {
+            $jd = JdLogisticsService::queryTrace($tn, (string) ($tracking->recipient_phone ?? ''));
+        } catch (\Throwable $e) {
+            Log::error('queryJdOfficialAndUpdate failed', [
+                'tracking_number' => $tn,
+                'error' => $e->getMessage(),
+            ]);
+
+            return $fail('京东官方接口请求异常：' . $e->getMessage());
+        }
+        $responseTime = (int) ((microtime(true) - $startTime) * 1000);
+
+        if ($jd === null || empty($jd['traces'])) {
+            self::logQuery($tn, (string) $tracking->express_company, 'manual', [
+                'source' => 'jd_official',
+                'hint' => '京东官方接口未返回有效轨迹',
+                'traces' => [],
+            ], $responseTime);
+
+            return $fail('京东官方接口未返回有效轨迹，请确认运单号或稍后重试');
+        }
+
+        $result = [
+            'carrier' => 'jd',
+            'carrier_label' => '京东快递',
+            'kuaidi_com' => 'jd',
+            'traces' => $jd['traces'],
+            'state' => (string) ($jd['state'] ?? '0'),
+            'state_text' => (string) ($jd['state_text'] ?? ''),
+            'source' => 'jd_official',
+            'hint' => '',
+            'official_url' => '',
+        ];
+
+        self::persistTrackingResult($tracking, $result, false, $responseTime);
+
+        return [
+            'success' => true,
+            'message' => '京东物流轨迹已更新',
+            'traces_count' => count($jd['traces']),
+            'state' => (string) ($jd['state_text'] ?? ''),
+            'source' => 'jd_official',
+        ];
+    }
+
+    /**
+     * 将一次轨迹查询结果（快递100 / 京东官方等）落库并推进订单状态。
+     *
+     * @param array<string, mixed> $result query 返回的轨迹结构
+     * @param bool $isAuto 是否定时任务触发（影响查询日志类型与医助释放）
+     * @return array<string, mixed>|null 查询结果；自动任务时可能含 _assistant_sync
+     */
+    private static function persistTrackingResult(ExpressTracking $tracking, array $result, bool $isAuto, int $responseTime): ?array
+    {
         // 记录查询日志
         self::logQuery(
             $tracking->tracking_number,
@@ -873,7 +1030,7 @@ class ExpressTrackingService
     }
 
     /**
-     * 按处方订单履约核对：已发货(5)/已签收(6) 时符合条件的订单调用 applyAssistantReleaseForShippedPrescriptionOrder。
+     * 按处方订单履约核对：仅已发货(5) 时符合条件的订单调用 applyAssistantReleaseForShippedPrescriptionOrder（已完成/已签收不再扫描）。
      * 与快递 100 / 甘草来自哪个物流渠道无关；是否清空医助以该方法为准（**二中心豁免看业务单创建人**参见 apply；已 shipped 释放且 assistant_id=0 视为已处理）。
      *
      * @return array{scanned: int, cleared: int, lines: list<string>}
@@ -888,7 +1045,7 @@ class ExpressTrackingService
             ->whereNull('po.delete_time')
             ->whereNull('d.delete_time')
             ->whereRaw('(IFNULL(d.shipped_non_er_assistant_cleared_at, 0) = 0 OR d.assistant_id > 0)')
-            ->whereIn('po.fulfillment_status', [5, 6])
+            ->where('po.fulfillment_status', 5)
             ->where('po.diagnosis_id', '>', 0)
             ->where(function ($w) {
                 $w->where('d.assistant_id', '>', 0)
@@ -977,7 +1134,7 @@ class ExpressTrackingService
             ->field('et.*')
             ->limit($limit)
             ->select();
-
+           
         $success = 0;
         $failed = 0;
         $assistantCleared = 0;

server/app/common/service/JdLogisticsService.php

@@ -0,0 +1,461 @@
+<?php
+
+declare(strict_types=1);
+
+namespace app\common\service;
+
+use think\facade\Config;
+use think\facade\Log;
+
+/**
+ * 京东官方物流轨迹查询（京东物流开放平台 LOP，https://api.jdl.com）
+ *
+ * 作用：作为快递100 对「京东自营运单（JDVE…）」轨迹陈旧/缺失时的兜底数据源，
+ * 同时供后台「京东接口更新」按钮直接拉取并落库。
+ * 仅在 config/logistics.php 的 jd.enable=true（填好 app_key/app_secret/access_token）时生效；
+ * 未配置时 isConfigured()=false，ExpressTrackService 完全沿用快递100 逻辑，互不影响。
+ *
+ * 接口：京东物流标准轨迹服务 /jd/tracking/query（2025-04-29 改版，对接方案编码 Tracking_JD）。
+ * 调用走 LOP 统一网关，鉴权/签名规则与官方 SDK(IsvFilter) 完全一致：
+ *   - 公共参数(app_key/access_token/timestamp/v/sign/algorithm/LOP-DN)以 query string 拼到 URL；
+ *   - 业务参数 JSON 字符串作为请求体；待签串固定顺序拼接并首尾包 app_secret。
+ * 加签算法由 .env JD_LOGISTICS_ALGORITHM 控制（默认 md5-salt=md5(content)，另支持 HMacMD5/SHA1/SHA256/SHA512）。
+ * 注意：后台「报文加解密密钥」的 RSA 公私钥仅用于报文加解密，与本网关签名无关。
+ *
+ * 网关/path/对接方案编码/单号类型 走 .env（JD_LOGISTICS_GATEWAY / METHOD / LOP_DN / REFERENCE_TYPE）。
+ * 响应解析采用「递归找轨迹行」的宽松策略，兼容多种返回结构。
+ */
+final class JdLogisticsService
+{
+    /** 轨迹行「时间」候选字段（按优先级） */
+    private const TIME_FIELDS = [
+        'operationTime', 'operatorTime', 'opeTime', 'operateTime', 'msgTime', 'scanTime',
+        'time', 'createTime', 'waybillStateTime', 'orderTime',
+    ];
+
+    /** 轨迹行「描述」候选字段（按优先级） */
+    private const CONTEXT_FIELDS = [
+        'remark', 'operateRemark', 'opeRemark', 'content', 'opeTitle',
+        'operationCodeName', 'operationTypeName', 'scanTypeName', 'waybillStateName', 'message', 'desc', 'msg',
+    ];
+
+    public static function isConfigured(): bool
+    {
+        $cfg = Config::get('logistics.jd', []);
+
+        // LOP 网关签名用 app_secret（md5-salt / HMAC），不需要 RSA 私钥（私钥仅用于报文加解密）
+        return !empty($cfg['enable'])
+            && trim((string) ($cfg['app_key'] ?? '')) !== ''
+            && trim((string) ($cfg['app_secret'] ?? '')) !== ''
+            && trim((string) ($cfg['access_token'] ?? '')) !== '';
+    }
+
+    /**
+     * 查询京东官方轨迹，返回与 ExpressTrackService::query 兼容的结构（失败/未配置返回 null）。
+     *
+     * @return array{
+     *   traces: list<array{time:string,context:string,status:string}>,
+     *   state: string,
+     *   state_text: string,
+     *   source: string,
+     *   hint: string,
+     *   newest_unix: int
+     * }|null
+     */
+    public static function queryTrace(string $waybillCode, string $phoneTail = ''): ?array
+    {
+        $num = trim($waybillCode);
+        if ($num === '' || !self::isConfigured()) {
+            return null;
+        }
+
+        $cfg = Config::get('logistics.jd', []);
+
+        // 京东物流标准轨迹服务 /jd/tracking/query：body 为 JSON 数组 [{referenceNumber, referenceType, phone}]
+        $row = [
+            (string) ($cfg['reference_field'] ?? 'referenceNumber') => $num,
+            'referenceType' => (string) ($cfg['reference_type'] ?? '20000'),
+        ];
+        $tail = substr(preg_replace('/\D/', '', $phoneTail) ?? '', -4);
+        if ($tail !== '') {
+            $row['phone'] = $tail;
+        }
+        $customerCode = trim((string) ($cfg['customer_code'] ?? ''));
+        if ($customerCode !== '') {
+            $row['customerCode'] = $customerCode;
+        }
+        $body = json_encode([$row], JSON_UNESCAPED_UNICODE);
+
+        $raw = self::request($cfg, (string) $body);
+        if ($raw === null) {
+            return null;
+        }
+
+        $json = json_decode($raw, true);
+        if (!is_array($json)) {
+            Log::warning('JdLogisticsService invalid json', ['raw' => mb_substr($raw, 0, 500), 'num' => $num]);
+
+            return null;
+        }
+
+        // LOP 网关/业务错误：code 非 1000（成功）时记录原始报文，便于排查鉴权/单号/权限问题
+        $code = (string) ($json['code'] ?? $json['resultCode'] ?? '');
+        if ($code !== '' && !in_array($code, ['1000', '0000', '0'], true)) {
+            Log::warning('JdLogisticsService lop error', [
+                'num' => $num,
+                'code' => $code,
+                'message' => (string) ($json['msg'] ?? $json['message'] ?? $json['resultMessage'] ?? ''),
+                'raw' => mb_substr($raw, 0, 500),
+            ]);
+
+            return null;
+        }
+        // 兼容 JOS 网关层错误结构
+        if (isset($json['error_response'])) {
+            Log::warning('JdLogisticsService gateway error', [
+                'num' => $num,
+                'error' => $json['error_response'],
+            ]);
+
+            return null;
+        }
+
+        $rows = self::extractTraceRows($json);
+        if ($rows === []) {
+            Log::info('JdLogisticsService no trace rows', ['num' => $num, 'json' => mb_substr($raw, 0, 800)]);
+
+            return null;
+        }
+
+        $traces = self::normalizeRows($rows);
+        if ($traces === []) {
+            return null;
+        }
+
+        // 时间倒序（最新在前），与快递100 输出一致
+        usort($traces, static function (array $a, array $b): int {
+            return ($b['_unix'] ?? 0) <=> ($a['_unix'] ?? 0);
+        });
+
+        $newestUnix = (int) ($traces[0]['_unix'] ?? 0);
+        $signed = false;
+        foreach ($traces as $t) {
+            if (self::looksSigned((string) $t['context'])) {
+                $signed = true;
+                break;
+            }
+        }
+        $state = $signed ? '3' : '0';
+
+        // 去掉内部辅助字段
+        $clean = [];
+        foreach ($traces as $t) {
+            $clean[] = [
+                'time' => (string) $t['time'],
+                'context' => (string) $t['context'],
+                'status' => (string) ($t['status'] ?? ''),
+            ];
+        }
+
+        return [
+            'traces' => $clean,
+            'state' => $state,
+            'state_text' => $signed ? '已签收' : '在途',
+            'source' => 'jd_official',
+            'hint' => '',
+            'newest_unix' => $newestUnix,
+        ];
+    }
+
+    /**
+     * 调用 LOP 网关（统一鉴权/签名，与官方 SDK IsvFilter 一致）。
+     *
+     * 公共参数以 query string 拼到 URL；业务参数(JSON 字符串)作为请求体；
+     * 网关靠 LOP-DN(对接方案编码) 路由到对应服务。
+     *
+     * @param array<string,mixed> $cfg
+     * @param string $body 业务参数 JSON 字符串（param_json）
+     */
+    private static function request(array $cfg, string $body): ?string
+    {
+        $appKey = (string) ($cfg['app_key'] ?? '');
+        $appSecret = (string) ($cfg['app_secret'] ?? '');
+        $accessToken = (string) ($cfg['access_token'] ?? '');
+        $path = (string) ($cfg['method'] ?? '/jd/tracking/query');
+        $version = (string) ($cfg['api_version'] ?? '2.0');
+        $algorithm = trim((string) ($cfg['algorithm'] ?? 'md5-salt')) ?: 'md5-salt';
+        $lopDn = (string) ($cfg['lop_dn'] ?? 'Tracking_JD');
+        // 时间戳与时区必须自洽（否则网关报 471 时间戳已失效）：统一用北京时间 + lop-tz=8
+        $now = new \DateTime('now', new \DateTimeZone('Asia/Shanghai'));
+        $timestamp = $now->format('Y-m-d H:i:s');
+
+        // 待签串：固定顺序拼接，首尾包 appSecret（method=接口path，param_json=业务体）
+        $content = implode('', [
+            $appSecret,
+            'access_token', $accessToken,
+            'app_key', $appKey,
+            'method', $path,
+            'param_json', $body,
+            'timestamp', $timestamp,
+            'v', $version,
+            $appSecret,
+        ]);
+        $sign = self::sign($algorithm, $content, $appSecret);
+        if ($sign === null) {
+            return null;
+        }
+
+        $query = [
+            'LOP-DN' => $lopDn,
+            'app_key' => $appKey,
+            'access_token' => $accessToken,
+            'timestamp' => $timestamp,
+            'v' => $version,
+            'sign' => $sign,
+            'algorithm' => $algorithm,
+        ];
+
+        $base = rtrim((string) ($cfg['gateway'] ?? 'https://api.jdl.com'), '/');
+        $url = $base . $path . '?' . http_build_query($query);
+
+        // lop-tz：与 timestamp 同源（北京时间 = 东八区 = 8）
+        $offsetHours = (int) ($now->getOffset() / 3600);
+
+        return self::httpPostJson($url, $body, [
+            'Content-Type: application/json;charset=utf-8',
+            'User-Agent: lop-http/php',
+            'lop-tz: ' . $offsetHours,
+        ]);
+    }
+
+    /**
+     * LOP 网关签名（与官方 SDK Utils::sign 一致）：
+     *   - md5-salt                                  ：md5(content) 的小写十六进制
+     *   - HMacMD5 / HMacSHA1 / HMacSHA256 / HMacSHA512：base64(hmac(算法, content, appSecret))
+     * 不支持的算法返回 null。
+     */
+    private static function sign(string $algorithm, string $content, string $secret): ?string
+    {
+        switch (trim($algorithm)) {
+            case 'md5-salt':
+                return md5($content);
+            case 'HMacMD5':
+                return base64_encode(hash_hmac('md5', $content, $secret, true));
+            case 'HMacSHA1':
+                return base64_encode(hash_hmac('sha1', $content, $secret, true));
+            case 'HMacSHA256':
+                return base64_encode(hash_hmac('sha256', $content, $secret, true));
+            case 'HMacSHA512':
+                return base64_encode(hash_hmac('sha512', $content, $secret, true));
+            default:
+                Log::warning('JdLogisticsService unsupported algorithm', ['algorithm' => $algorithm]);
+
+                return null;
+        }
+    }
+
+    /**
+     * 递归在响应 JSON 中找出「轨迹行数组」：取出现轨迹行最多的一组。
+     * 兼容字段被序列化成 JSON 字符串（如 querytrace_result 为 string）的情况。
+     *
+     * @param mixed $node
+     * @return list<array<string,mixed>>
+     */
+    private static function extractTraceRows($node): array
+    {
+        $best = [];
+
+        $walk = function ($n) use (&$walk, &$best): void {
+            if (is_string($n)) {
+                $trimmed = trim($n);
+                if ($trimmed !== '' && ($trimmed[0] === '{' || $trimmed[0] === '[')) {
+                    $decoded = json_decode($trimmed, true);
+                    if (is_array($decoded)) {
+                        $walk($decoded);
+                    }
+                }
+
+                return;
+            }
+            if (!is_array($n)) {
+                return;
+            }
+
+            // 是否为「轨迹行的列表」：连续数字键、且元素是带时间/描述字段的关联数组
+            if (self::isList($n)) {
+                $rows = [];
+                foreach ($n as $item) {
+                    if (is_array($item) && self::rowHasTraceFields($item)) {
+                        $rows[] = $item;
+                    }
+                }
+                if (count($rows) > count($best)) {
+                    $best = $rows;
+                }
+            }
+
+            foreach ($n as $v) {
+                $walk($v);
+            }
+        };
+
+        $walk($node);
+
+        return $best;
+    }
+
+    /**
+     * @param array<string,mixed> $row
+     */
+    private static function rowHasTraceFields(array $row): bool
+    {
+        $hasTime = false;
+        foreach (self::TIME_FIELDS as $f) {
+            if (isset($row[$f]) && trim((string) $row[$f]) !== '') {
+                $hasTime = true;
+                break;
+            }
+        }
+        if (!$hasTime) {
+            return false;
+        }
+        foreach (self::CONTEXT_FIELDS as $f) {
+            if (isset($row[$f]) && trim((string) $row[$f]) !== '') {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param array<int, array<string,mixed>> $rows
+     * @return list<array{time:string,context:string,status:string,_unix:int}>
+     */
+    private static function normalizeRows(array $rows): array
+    {
+        $out = [];
+        foreach ($rows as $row) {
+            $time = '';
+            foreach (self::TIME_FIELDS as $f) {
+                if (isset($row[$f]) && trim((string) $row[$f]) !== '') {
+                    $time = trim((string) $row[$f]);
+                    break;
+                }
+            }
+            $context = '';
+            foreach (self::CONTEXT_FIELDS as $f) {
+                if (isset($row[$f]) && trim((string) $row[$f]) !== '') {
+                    $context = trim((string) $row[$f]);
+                    break;
+                }
+            }
+            if ($time === '' && $context === '') {
+                continue;
+            }
+
+            $unix = self::parseTimeToUnix($time);
+            $out[] = [
+                'time' => $time !== '' ? self::formatTime($time, $unix) : '',
+                'context' => $context,
+                'status' => '',
+                '_unix' => $unix,
+            ];
+        }
+
+        return $out;
+    }
+
+    private static function parseTimeToUnix(string $time): int
+    {
+        $t = trim($time);
+        if ($t === '') {
+            return 0;
+        }
+        // 毫秒时间戳
+        if (preg_match('/^\d{13}$/', $t)) {
+            return (int) ((int) $t / 1000);
+        }
+        // 秒时间戳
+        if (preg_match('/^\d{10}$/', $t)) {
+            return (int) $t;
+        }
+        $p = strtotime($t);
+
+        return $p !== false ? (int) $p : 0;
+    }
+
+    private static function formatTime(string $raw, int $unix): string
+    {
+        // 纯时间戳统一格式化成可读时间，便于落库/前端展示
+        if ($unix > 0 && preg_match('/^\d{10,13}$/', trim($raw))) {
+            return date('Y-m-d H:i:s', $unix);
+        }
+
+        return $raw;
+    }
+
+    /**
+     * @param array<mixed> $arr
+     */
+    private static function isList(array $arr): bool
+    {
+        if ($arr === []) {
+            return false;
+        }
+        if (function_exists('array_is_list')) {
+            return array_is_list($arr);
+        }
+
+        return array_keys($arr) === range(0, count($arr) - 1);
+    }
+
+    private static function looksSigned(string $hay): bool
+    {
+        if ($hay === '') {
+            return false;
+        }
+        foreach (['准备签收', '待签收', '等待签收', '预计', '即将送达'] as $neg) {
+            if (mb_stripos($hay, $neg) !== false) {
+                return false;
+            }
+        }
+        foreach (['签收', '妥投', '送达', '已放在'] as $k) {
+            if (mb_stripos($hay, $k) !== false) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param list<string> $headers
+     */
+    private static function httpPostJson(string $url, string $body, array $headers): ?string
+    {
+        if (!function_exists('curl_init')) {
+            return null;
+        }
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_POST, true);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_TIMEOUT, 15);
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+        $resp = curl_exec($ch);
+        $err = curl_error($ch);
+        curl_close($ch);
+
+        if ($resp === false) {
+            Log::warning('JdLogisticsService http error', ['url' => $url, 'error' => $err]);
+
+            return null;
+        }
+
+        return (string) $resp;
+    }
+}

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

@@ -69,7 +69,11 @@ final class GancaoLogisticsRouteService
 
         $resp = self::callRouteApi($appOrderNo);
         if (!$resp['success']) {
-            self::logQuery($order, '', 'auto', false, 0, $resp['message']);
+            self::logQuery($order, '', 'auto', false, (int) ($resp['runtime_ms'] ?? 0), $resp['message']);
+            if (self::shouldFallbackToKuaidi100($resp)) {
+                return self::syncOneViaKuaidi100($order, (string) $resp['message']);
+            }
+
             return ['success' => false, 'message' => $resp['message'], 'traces_count' => 0, 'state' => ''];
         }
 
@@ -87,6 +91,10 @@ final class GancaoLogisticsRouteService
 
         if ($trackingNumber === '') {
             self::logQuery($order, '', 'auto', false, $resp['runtime_ms'], '甘草未返回 sp_order_no（快递单号），可能尚未发货');
+            if (trim((string) ($order->tracking_number ?? '')) !== '') {
+                return self::syncOneViaKuaidi100($order, '甘草未返回快递单号，业务单已填写运单号');
+            }
+
             return ['success' => false, 'message' => '尚未发货（无快递单号）', 'traces_count' => 0, 'state' => ''];
         }
 
@@ -136,11 +144,54 @@ final class GancaoLogisticsRouteService
             'message' => 'ok',
             'traces_count' => $tracesCount,
             'state' => $newState,
+            'source' => 'gancao',
             'raw' => $result,
             'assistant_sync' => $assistantSync,
         ];
     }
 
+    /**
+     * 甘草侧无快递任务 / 路由拉取失败时，按业务单运单号降级快递100（自发货）
+     *
+     * @return array{success:bool, message:string, traces_count:int, state:string, source?:string, assistant_sync?:array|null}
+     */
+    private static function syncOneViaKuaidi100(PrescriptionOrder $order, string $gancaoReason): array
+    {
+        $ret = ExpressTrackingService::queryKuaidiForPrescriptionOrder($order, true);
+        if (!$ret['success']) {
+            $ret['message'] = trim((string) $ret['message']) . '；甘草：' . mb_substr($gancaoReason, 0, 200);
+        }
+
+        return $ret;
+    }
+
+    /**
+     * 是否因甘草「快递任务」类错误降级走快递100
+     *
+     * @param array{success?:bool, message?:string, api_code?:string} $gancaoResp
+     */
+    private static function shouldFallbackToKuaidi100(array $gancaoResp): bool
+    {
+        $code = trim((string) ($gancaoResp['api_code'] ?? ''));
+        if ($code === '10101') {
+            return true;
+        }
+
+        $msg = (string) ($gancaoResp['message'] ?? '');
+        if ($msg === '') {
+            return false;
+        }
+
+        $needles = ['快递任务', '任务id不存在', '任务不存在', '无快递任务', '物流任务'];
+        foreach ($needles as $needle) {
+            if (mb_strpos($msg, $needle) !== false) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * 调用甘草 GET_TASK_ROUTE_LIST 接口
      *
@@ -181,6 +232,7 @@ final class GancaoLogisticsRouteService
             return [
                 'success' => false,
                 'message' => 'API 错误：' . GancaoScmRecipelService::apiStatusMessage($body),
+                'api_code' => (string) ($body['status']['code'] ?? ''),
                 'runtime_ms' => $runtimeMs,
             ];
         }
@@ -435,7 +487,7 @@ final class GancaoLogisticsRouteService
     }
 
     /**
-     * 批量同步：选取候选订单（已上传甘草、且未签收/未取消的）
+     * 批量同步：选取候选订单（已上传甘草、且未完成/未签收/未取消的）
      *
      * @return array{total:int, success:int, failed:int, skipped:int, assistant_cleared:int, assistant_skipped_assign_log:int, assistant_lines:list<string>, details:array<int, array<string,mixed>>}
      */
@@ -464,8 +516,8 @@ final class GancaoLogisticsRouteService
                 $w->whereIn('gancao_order_state', [110, 20, 30, 90])
                   ->whereOr('tracking_number', '<>', '');
             });
-            // 排除已取消(4)、已签收(6)；已完成(3)仍跑一次以补齐路由
-            $q->whereNotIn('fulfillment_status', [4, 6]);
+            // 排除已完成(3)、已取消(4)、已签收(6)
+            $q->whereNotIn('fulfillment_status', [3, 4, 6]);
         }
 
         $orders = $q->order('id', 'desc')->limit($limit)->select();
@@ -481,6 +533,12 @@ final class GancaoLogisticsRouteService
      */
     private static function appendSyncOneResult(array &$stats, PrescriptionOrder $order): void
     {
+        $fs = (int) ($order->fulfillment_status ?? 0);
+        if (in_array($fs, [3, 6], true)) {
+            $stats['skipped']++;
+            return;
+        }
+
         $stats['total']++;
         try {
             $r = self::syncOne($order);
@@ -493,6 +551,7 @@ final class GancaoLogisticsRouteService
                 'message' => $r['message'],
                 'traces' => $r['traces_count'],
                 'state' => $r['state'],
+                'source' => $r['source'] ?? 'gancao',
             ];
             if ($r['success']) {
                 $stats['success']++;
@@ -501,8 +560,10 @@ final class GancaoLogisticsRouteService
                     $act = (string) ($sync['action'] ?? '');
                     if ($act === 'cleared') {
                         $stats['assistant_cleared']++;
+                        $channel = (($r['source'] ?? '') === 'kuaidi100_fallback') ? '快递100降级' : '甘草路由';
                         $stats['assistant_lines'][] = sprintf(
-                            '[移除医助+指派日志][甘草路由] 诊单=%d 业务订单=%d 运单=%s 原医助ID=%s 履约状态=%d',
+                            '[移除医助+指派日志][%s] 诊单=%d 业务订单=%d 运单=%s 原医助ID=%s 履约状态=%d',
+                            $channel,
                             (int) ($sync['diagnosis_id'] ?? 0),
                             (int) ($sync['prescription_order_id'] ?? 0),
                             (string) ($sync['tracking_number'] ?? ''),

server/config/logistics.php

@@ -41,6 +41,34 @@ $forceDisable = filter_var($forceDisableRaw, FILTER_VALIDATE_BOOLEAN);
 // 已填 CUSTOMER+KEY 即启用；需临时关闭时设 LOGISTICS_KUAIDI100_DISABLE=true（LOGISTICS_KUAIDI100_ENABLE 已废弃，可删）
 $kuaidiEnabled = ! $forceDisable && $hasCreds;
 
+// 京东物流开放平台 LOP（https://api.jdl.com）
+// 仅当填好 APP_KEY / APP_SECRET / ACCESS_TOKEN（RSA2 模式还需 RSA_PRIVATE_KEY）时启用；
+// 作为快递100 对京东自营单（JDVE…）轨迹陈旧时的兜底数据源，并供后台「京东接口更新」按钮使用。
+// 未配置时本段 enable=false，ExpressTrackService 完全沿用现有快递100 逻辑，互不影响。
+// 加签方式由 JD_LOGISTICS_ALGORITHM 控制：rsa2（默认，需私钥） / md5（摘要，无需私钥）。
+$envJd = static function (string $suffix, $default = '') use ($stripQuotes) {
+    $top = 'JD_LOGISTICS_' . $suffix;
+    $v = env($top, null);
+    if ($v !== null && $v !== '') {
+        return $stripQuotes((string) $v);
+    }
+    // 兼容误写进 [trtc] 等分区的情况
+    $nested = env('trtc.' . $top, $default);
+
+    return $stripQuotes((string) $nested);
+};
+
+$jdAppKey = $envJd('APP_KEY', '');
+$jdAppSecret = $envJd('APP_SECRET', '');
+$jdAccessToken = $envJd('ACCESS_TOKEN', '');
+$jdHasCreds = $jdAppKey !== '' && $jdAppSecret !== '' && $jdAccessToken !== '';
+$jdDisableRaw = env('JD_LOGISTICS_DISABLE', null);
+if ($jdDisableRaw === null || $jdDisableRaw === '') {
+    $jdDisableRaw = env('trtc.JD_LOGISTICS_DISABLE', false);
+}
+$jdDisabled = filter_var($jdDisableRaw, FILTER_VALIDATE_BOOLEAN);
+$jdEnabled = ! $jdDisabled && $jdHasCreds;
+
 return [
     'kuaidi100' => [
         'enable' => $kuaidiEnabled,
@@ -48,4 +76,23 @@ return [
         'key' => $key,
         'query_url' => $envKuaidi('QUERY_URL', 'https://poll.kuaidi100.com/poll/query.do'),
     ],
+    'jd' => [
+        'enable' => $jdEnabled,
+        'app_key' => $jdAppKey,
+        'app_secret' => $jdAppSecret,
+        'access_token' => $jdAccessToken,
+        // LOP 网关签名算法（与官方 SDK 一致）：md5-salt（默认） / HMacMD5 / HMacSHA1 / HMacSHA256 / HMacSHA512
+        'algorithm' => $envJd('ALGORITHM', 'md5-salt'),
+        // 生产网关基址（不含路径）
+        'gateway' => $envJd('GATEWAY', 'https://api.jdl.com'),
+        // 接口 path（即签名里的 method）；京东物流标准轨迹服务（2025-04-29 改版）
+        'method' => $envJd('METHOD', '/jd/tracking/query'),
+        // LOP-DN：对接方案编码（订阅记录可查），标准轨迹服务为 Tracking_JD
+        'lop_dn' => $envJd('LOP_DN', 'Tracking_JD'),
+        // 业务体字段：单号字段名 / 单号类型（20000=运单号） / 商家编码(可选)
+        'reference_field' => $envJd('REFERENCE_FIELD', 'referenceNumber'),
+        'reference_type' => $envJd('REFERENCE_TYPE', '20000'),
+        'customer_code' => $envJd('CUSTOMER_CODE', ''),
+        'api_version' => $envJd('API_VERSION', '2.0'),
+    ],
 ];

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

@@ -1 +1 @@
-import r from"./error-RqF1tBKh.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-FimllnSe.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-3-P5389h.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-Ds3qCU_G.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-D49jsFPW.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-CYLw0J2V.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-DFXqVJI1.js

@@ -1 +1 @@
-import o from"./error-RqF1tBKh.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-FimllnSe.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-3-P5389h.js";import{f as r,ak as t,I as m,a as p}from"./@vue/runtime-core-C6bnekPw.js";import"./element-plus-Ds3qCU_G.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-D49jsFPW.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-CYLw0J2V.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-CIhrw8f5.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{a3 as P}from"./tcm-Bt45zV2E.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-FimllnSe.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-Ds3qCU_G.js";import{X as E}from"./@element-plus/icons-vue-D49jsFPW.js";import{a5 as P}from"./tcm-BqLeG7XT.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-CYLw0J2V.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};

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

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

server/public/admin/assets/MediaSourceSelect-DctGOVr6.js

@@ -1 +1 @@
-import{_ as o}from"./MediaSourceSelect.vue_vue_type_script_setup_true_lang-BOQUTiLN.js";import"./element-plus-lurTijPg.js";import"./@vue/runtime-dom-DDAG46FW.js";import"./lodash-D3kF6u-c.js";import"./@vue/runtime-core-C6bnekPw.js";import"./@vue/reactivity-DiY1c2vO.js";import"./@vue/shared-mAAVTE9n.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";export{o as default};
+import{_ as o}from"./MediaSourceSelect.vue_vue_type_script_setup_true_lang-DIj1J3Im.js";import"./element-plus-Ds3qCU_G.js";import"./@vue/runtime-dom-DDAG46FW.js";import"./lodash-D3kF6u-c.js";import"./@vue/runtime-core-C6bnekPw.js";import"./@vue/reactivity-DiY1c2vO.js";import"./@vue/shared-mAAVTE9n.js";import"./@element-plus/icons-vue-D49jsFPW.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";export{o as default};

server/public/admin/assets/MediaSourceSelect.vue_vue_type_script_setup_true_lang-DIj1J3Im.js

@@ -1 +1 @@
-import{Q as g,P as V}from"./element-plus-lurTijPg.js";import{f as C,ak as o,G as s,aN as v,I as p,F as h,ap as B,H as k,A as m}from"./@vue/runtime-core-C6bnekPw.js";import{y as c}from"./@vue/reactivity-DiY1c2vO.js";import{p as w,o as S}from"./@vue/shared-mAAVTE9n.js";const N=C({__name:"MediaSourceSelect",props:{modelValue:{default:""},options:{},loading:{type:Boolean,default:!1},placeholder:{default:"请选择自媒体来源"},clearable:{type:Boolean,default:!0},filterable:{type:Boolean,default:!0},allowCreate:{type:Boolean,default:!1},disabled:{type:Boolean,default:!1},selectClass:{},selectStyle:{}},emits:["update:modelValue","change","visible-change"],setup(e,{emit:i}){const u=e,n=i,d=m(()=>(u.options||[]).map(l=>typeof l=="string"?{name:l}:{name:l.name,value:l.value})),f=m(()=>d.value.some(l=>l.name===u.modelValue)),b=l=>{n("visible-change",l)};return(l,t)=>{const r=g,y=V;return o(),s(y,{"model-value":e.modelValue,placeholder:e.placeholder,clearable:e.clearable,filterable:e.filterable,"allow-create":e.allowCreate,"default-first-option":e.allowCreate,disabled:e.disabled,loading:e.loading,class:S(e.selectClass),style:w(e.selectStyle),"onUpdate:modelValue":t[0]||(t[0]=a=>n("update:modelValue",a)),onChange:t[1]||(t[1]=a=>n("change",a)),onVisibleChange:b},{default:v(()=>[(o(!0),p(h,null,B(c(d),a=>(o(),s(r,{key:a.name,label:a.name,value:a.name},null,8,["label","value"]))),128)),e.modelValue&&!c(f)?(o(),s(r,{key:`__legacy_${e.modelValue}`,label:`${e.modelValue}（已停用）`,value:e.modelValue},null,8,["label","value"])):k("",!0)]),_:1},8,["model-value","placeholder","clearable","filterable","allow-create","default-first-option","disabled","loading","class","style"])}}});export{N as _};
+import{Q as g,P as V}from"./element-plus-Ds3qCU_G.js";import{f as C,ak as o,G as s,aN as v,I as p,F as h,ap as B,H as k,A as m}from"./@vue/runtime-core-C6bnekPw.js";import{y as c}from"./@vue/reactivity-DiY1c2vO.js";import{p as w,o as S}from"./@vue/shared-mAAVTE9n.js";const N=C({__name:"MediaSourceSelect",props:{modelValue:{default:""},options:{},loading:{type:Boolean,default:!1},placeholder:{default:"请选择自媒体来源"},clearable:{type:Boolean,default:!0},filterable:{type:Boolean,default:!0},allowCreate:{type:Boolean,default:!1},disabled:{type:Boolean,default:!1},selectClass:{},selectStyle:{}},emits:["update:modelValue","change","visible-change"],setup(e,{emit:i}){const u=e,n=i,d=m(()=>(u.options||[]).map(l=>typeof l=="string"?{name:l}:{name:l.name,value:l.value})),f=m(()=>d.value.some(l=>l.name===u.modelValue)),b=l=>{n("visible-change",l)};return(l,t)=>{const r=g,y=V;return o(),s(y,{"model-value":e.modelValue,placeholder:e.placeholder,clearable:e.clearable,filterable:e.filterable,"allow-create":e.allowCreate,"default-first-option":e.allowCreate,disabled:e.disabled,loading:e.loading,class:S(e.selectClass),style:w(e.selectStyle),"onUpdate:modelValue":t[0]||(t[0]=a=>n("update:modelValue",a)),onChange:t[1]||(t[1]=a=>n("change",a)),onVisibleChange:b},{default:v(()=>[(o(!0),p(h,null,B(c(d),a=>(o(),s(r,{key:a.name,label:a.name,value:a.name},null,8,["label","value"]))),128)),e.modelValue&&!c(f)?(o(),s(r,{key:`__legacy_${e.modelValue}`,label:`${e.modelValue}（已停用）`,value:e.modelValue},null,8,["label","value"])):k("",!0)]),_:1},8,["model-value","placeholder","clearable","filterable","allow-create","default-first-option","disabled","loading","class","style"])}}});export{N as _};

server/public/admin/assets/NoteTimeline-CCWIpEBQ.css

@@ -1 +0,0 @@
-.timeline-actions[data-v-f77bb3f4]{display:flex;flex-direction:column;gap:12px;margin-bottom:12px;padding-bottom:12px;border-bottom:1px dashed #ebeef5}.upload-trigger[data-v-f77bb3f4]{width:90px;height:90px;border:1px dashed #dcdfe6;border-radius:6px;display:flex;flex-direction:column;align-items:center;justify-content:center;gap:4px;cursor:pointer;color:#909399;font-size:12px;transition:border-color .2s}.upload-trigger[data-v-f77bb3f4]:hover{border-color:#409eff;color:#409eff}.note-timeline[data-v-f77bb3f4]{position:relative;padding-left:22px}.note-timeline[data-v-f77bb3f4]:before{content:"";position:absolute;left:6px;top:4px;bottom:4px;width:2px;background:#ebeef5;border-radius:1px}.timeline-node[data-v-f77bb3f4]{position:relative;padding-bottom:16px}.timeline-node[data-v-f77bb3f4]:last-child{padding-bottom:0}.timeline-dot[data-v-f77bb3f4]{position:absolute;left:-19px;top:5px;width:10px;height:10px;border-radius:50%;background:#409eff;border:2px solid #ecf5ff}.timeline-date[data-v-f77bb3f4]{font-size:13px;font-weight:600;color:#303133;margin-bottom:6px;font-family:IBM Plex Mono,Consolas,monospace}.timeline-body[data-v-f77bb3f4]{display:flex;flex-direction:column;gap:6px}.timeline-content[data-v-f77bb3f4]{display:flex;flex-direction:column;gap:2px}.content-line[data-v-f77bb3f4]{font-size:12.5px;color:#606266;line-height:1.6;word-break:break-word}.timeline-images[data-v-f77bb3f4]{display:flex;flex-wrap:wrap;align-items:center;gap:6px}.images-label[data-v-f77bb3f4]{font-size:12px;color:#909399;flex-shrink:0}.thumb-wrap[data-v-f77bb3f4]{position:relative;display:inline-block}.timeline-thumb[data-v-f77bb3f4]{width:64px;height:64px;border-radius:6px;border:1px solid #ebeef5;cursor:pointer;transition:transform .15s ease}.timeline-thumb[data-v-f77bb3f4]:hover{transform:scale(1.05)}.thumb-delete[data-v-f77bb3f4]{position:absolute;top:-6px;right:-6px;font-size:16px;color:#f56c6c;background:#fff;border-radius:50%;cursor:pointer;display:none}.thumb-wrap:hover .thumb-delete[data-v-f77bb3f4]{display:block}.file-wrap[data-v-f77bb3f4]{position:relative;display:inline-flex;align-items:center}.file-link[data-v-f77bb3f4]{display:inline-flex;align-items:center;gap:4px;padding:6px 10px;border:1px solid #ebeef5;border-radius:6px;text-decoration:none;color:#409eff;font-size:12px;max-width:180px;transition:border-color .2s}.file-link[data-v-f77bb3f4]:hover{border-color:#409eff}.file-name[data-v-f77bb3f4]{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:120px}.file-delete[data-v-f77bb3f4]{position:absolute;top:-6px;right:-6px;font-size:16px;color:#f56c6c;background:#fff;border-radius:50%;cursor:pointer;display:none}.file-wrap:hover .file-delete[data-v-f77bb3f4]{display:block}

server/public/admin/assets/NoteTimeline-CLaTWgVZ.js

@@ -0,0 +1,2 @@
+import{i as se,W as ne,C as le,V as ae,v as re,d as me,a as de}from"./element-plus-Ds3qCU_G.js";import{_ as pe}from"./picker-DcVdXs-r.js";import{e as ue,c as ce,i as g,_ as ge}from"./index-CYLw0J2V.js";import{s as U}from"./@vue/runtime-dom-DDAG46FW.js";import{b as z,G as fe}from"./@element-plus/icons-vue-D49jsFPW.js";import{a as P,d as ve}from"./patient-jF4jBNUB.js";import{h as _e}from"./perm-DTInbRd6.js";import{f as ye,w as he,ak as o,I as n,G as k,aN as r,O as M,H as p,a as l,J as m,F as w,ap as E,A as ke}from"./@vue/runtime-core-C6bnekPw.js";import{n as f,y as N}from"./@vue/reactivity-DiY1c2vO.js";import{Q as T}from"./@vue/shared-mAAVTE9n.js";import"./lodash-es-C2A-Pj28.js";import"./@popperjs/core-C5az9QE8.js";import"./dayjs-DG77mNTn.js";import"./lodash-D3kF6u-c.js";import"./@ctrl/tinycolor-BuyEbX8F.js";import"./async-validator-CFA_igpM.js";import"./normalize-wheel-es-BQoi3Ox2.js";import"./index-wRiKfob5.js";import"./index-DQ_c_7GJ.js";import"./index.vue_vue_type_script_setup_true_lang-Ch-2CJwb.js";import"./index-BXes3WfF.js";import"./index-BdBwexoG.js";import"./cos-js-sdk-v5-DSMN0LUT.js";import"./file-C_xnWpAD.js";import"./index.vue_vue_type_script_setup_true_lang-d5pf8jrB.js";import"./@vueuse/core-1S4fJlii.js";import"./@vueuse/shared-Cl3lVqjz.js";import"./usePaging-VsbTxSU0.js";import"./vuedraggable-5bKFmC7X.js";import"./vue-BVs68q8v.js";import"./@vue/compiler-dom-CqayqxS7.js";import"./@vue/compiler-core-CvbQOXIO.js";import"./sortablejs-dsEAUXlE.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"./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 we={class:"note-timeline-wrap"},Ie={key:0,class:"timeline-actions"},Ce={class:"upload-trigger"},xe={class:"upload-trigger"},Ve={key:1,class:"note-timeline"},Ee={class:"timeline-date"},Ne={class:"timeline-body"},be={key:0,class:"timeline-content"},Se={key:1,class:"timeline-images"},Ae={key:2,class:"timeline-images"},De={key:0,class:"thumb-wrap"},Be={key:1,class:"file-wrap"},Ue=["href","title"],ze={class:"file-name"},O=8e3,Pe=ye({__name:"NoteTimeline",props:{notes:{},diagnosisId:{},readonly:{type:Boolean}},emits:["refresh"],setup(d,{emit:j}){const u=d,I=j,X=ke(()=>_e(["doctor.appointment/addDoctorNote"])),v=f(!1),C=f(""),b=f(!1),H=ue(),_=t=>H.getImageUrl(t),S=f([]),A=f([]),y=f(0),h=f(0),J=["jpg","jpeg","png","gif","bmp","webp","svg"],D=t=>{var s;const e=((s=t.split(".").pop())==null?void 0:s.toLowerCase().split("?")[0])||"";return J.includes(e)},$=t=>{var s;const e=t.split("/");return decodeURIComponent(((s=e[e.length-1])==null?void 0:s.split("?")[0])||"文件")},Q=t=>t.filter(D).map(_),Z=(t,e)=>{const s=t.filter(D),x=t[e];return s.indexOf(x)},q=t=>t?t.split(`
+`).filter(Boolean):[],K=t=>{if(!u.diagnosisId)return;const e=Array.isArray(t)?t:[t];if(e.length<=y.value){y.value=e.length;return}const s=e.slice(y.value);y.value=e.length,s.length>0&&P({diagnosis_id:u.diagnosisId,tongue_images:s}).then(()=>{g.msgSuccess("舌苔照片已添加"),I("refresh")})},Y=t=>{if(!u.diagnosisId)return;const e=Array.isArray(t)?t:[t];if(e.length<=h.value){h.value=e.length;return}const s=e.slice(h.value);h.value=e.length,s.length>0&&P({diagnosis_id:u.diagnosisId,report_files:s}).then(()=>{g.msgSuccess("检查报告已添加"),I("refresh")})};he(()=>u.notes,()=>{S.value=[],A.value=[],y.value=0,h.value=0});const ee=async()=>{if(!u.diagnosisId){g.msgWarning("当前无诊单，无法添加备注");return}const t=C.value.trim();if(!t){g.msgWarning("请输入备注内容");return}b.value=!0;try{await P({diagnosis_id:u.diagnosisId,content:t}),g.msgSuccess("备注保存成功"),C.value="",v.value=!1,I("refresh")}catch(e){g.msgError((e==null?void 0:e.message)||"保存失败")}finally{b.value=!1}},B=async(t,e,s)=>{try{await de.confirm("确认删除？","提示",{type:"warning"})}catch{return}await ve({note_id:t,image_type:e,image_path:s}),g.msgSuccess("已删除"),I("refresh")};return(t,e)=>{const s=se,x=ce,F=pe,G=re,V=me,te=ne,ie=le,oe=ae;return o(),n("div",we,[!d.readonly&&d.diagnosisId?(o(),n("div",Ie,[X.value?(o(),k(s,{key:0,type:"primary",plain:"",size:"small",onClick:e[0]||(e[0]=i=>v.value=!0)},{default:r(()=>[...e[6]||(e[6]=[M(" 添加备注 ",-1)])]),_:1})):p("",!0),l(F,{modelValue:S.value,"onUpdate:modelValue":e[1]||(e[1]=i=>S.value=i),limit:99,type:"image","exclude-domain":!0,onChange:K},{upload:r(()=>[m("div",Ce,[l(x,{size:20,name:"el-icon-Plus"}),e[7]||(e[7]=m("span",null,"舌苔照片",-1))])]),_:1},8,["modelValue"]),l(F,{modelValue:A.value,"onUpdate:modelValue":e[2]||(e[2]=i=>A.value=i),limit:99,type:"file","exclude-domain":!0,onChange:Y},{upload:r(()=>[m("div",xe,[l(x,{size:20,name:"el-icon-Plus"}),e[8]||(e[8]=m("span",null,"检查报告",-1))])]),_:1},8,["modelValue"])])):p("",!0),d.notes.length?(o(),n("div",Ve,[(o(!0),n(w,null,E(d.notes,i=>{var L,R;return o(),n("div",{key:i.id,class:"timeline-node"},[e[11]||(e[11]=m("div",{class:"timeline-dot"},null,-1)),m("div",Ee,T(i.note_date),1),m("div",Ne,[i.content?(o(),n("div",be,[(o(!0),n(w,null,E(q(i.content),(a,c)=>(o(),n("div",{key:c,class:"content-line"},T(a),1))),128))])):p("",!0),(L=i.tongue_images)!=null&&L.length?(o(),n("div",Se,[e[9]||(e[9]=m("span",{class:"images-label"},"舌苔照片",-1)),(o(!0),n(w,null,E(i.tongue_images,(a,c)=>(o(),n("div",{key:c,class:"thumb-wrap"},[l(G,{src:_(a),"preview-src-list":i.tongue_images.map(_),"initial-index":c,"z-index":O,fit:"cover",class:"timeline-thumb","preview-teleported":""},null,8,["src","preview-src-list","initial-index"]),d.readonly?p("",!0):(o(),k(V,{key:0,class:"thumb-delete",onClick:U(W=>B(i.id,"tongue_images",a),["stop"])},{default:r(()=>[l(N(z))]),_:1},8,["onClick"]))]))),128))])):p("",!0),(R=i.report_files)!=null&&R.length?(o(),n("div",Ae,[e[10]||(e[10]=m("span",{class:"images-label"},"检查报告",-1)),(o(!0),n(w,null,E(i.report_files,(a,c)=>(o(),n(w,{key:c},[D(a)?(o(),n("div",De,[l(G,{src:_(a),"preview-src-list":Q(i.report_files),"initial-index":Z(i.report_files,c),"z-index":O,fit:"cover",class:"timeline-thumb","preview-teleported":""},null,8,["src","preview-src-list","initial-index"]),d.readonly?p("",!0):(o(),k(V,{key:0,class:"thumb-delete",onClick:U(W=>B(i.id,"report_files",a),["stop"])},{default:r(()=>[l(N(z))]),_:1},8,["onClick"]))])):(o(),n("div",Be,[m("a",{href:_(a),target:"_blank",class:"file-link",title:$(a)},[l(V,{size:20},{default:r(()=>[l(N(fe))]),_:1}),m("span",ze,T($(a)),1)],8,Ue),d.readonly?p("",!0):(o(),k(V,{key:0,class:"file-delete",onClick:U(W=>B(i.id,"report_files",a),["stop"])},{default:r(()=>[l(N(z))]),_:1},8,["onClick"]))]))],64))),128))])):p("",!0)])])}),128))])):p("",!0),!d.notes.length&&d.readonly?(o(),k(te,{key:2,description:"暂无备注","image-size":48})):p("",!0),l(oe,{modelValue:v.value,"onUpdate:modelValue":e[5]||(e[5]=i=>v.value=i),title:"添加备注",width:"480px","append-to-body":""},{footer:r(()=>[l(s,{onClick:e[4]||(e[4]=i=>v.value=!1)},{default:r(()=>[...e[12]||(e[12]=[M("取消",-1)])]),_:1}),l(s,{type:"primary",loading:b.value,onClick:ee},{default:r(()=>[...e[13]||(e[13]=[M("保存",-1)])]),_:1},8,["loading"])]),default:r(()=>[l(ie,{modelValue:C.value,"onUpdate:modelValue":e[3]||(e[3]=i=>C.value=i),type:"textarea",rows:4,placeholder:"输入今日备注...",maxlength:"500","show-word-limit":""},null,8,["modelValue"])]),_:1},8,["modelValue"])])}}}),Mt=ge(Pe,[["__scopeId","data-v-530ad386"]]);export{Mt as default};

server/public/admin/assets/NoteTimeline-I2FSxX4s.css

@@ -0,0 +1 @@
+.timeline-actions[data-v-530ad386]{display:flex;flex-direction:column;align-items:flex-start;gap:12px;margin-bottom:12px;padding-bottom:12px;border-bottom:1px dashed #ebeef5}.upload-trigger[data-v-530ad386]{width:90px;height:90px;border:1px dashed #dcdfe6;border-radius:6px;display:flex;flex-direction:column;align-items:center;justify-content:center;gap:4px;cursor:pointer;color:#909399;font-size:12px;transition:border-color .2s}.upload-trigger[data-v-530ad386]:hover{border-color:#409eff;color:#409eff}.note-timeline[data-v-530ad386]{position:relative;padding-left:22px}.note-timeline[data-v-530ad386]:before{content:"";position:absolute;left:6px;top:4px;bottom:4px;width:2px;background:#ebeef5;border-radius:1px}.timeline-node[data-v-530ad386]{position:relative;padding-bottom:16px}.timeline-node[data-v-530ad386]:last-child{padding-bottom:0}.timeline-dot[data-v-530ad386]{position:absolute;left:-19px;top:5px;width:10px;height:10px;border-radius:50%;background:#409eff;border:2px solid #ecf5ff}.timeline-date[data-v-530ad386]{font-size:13px;font-weight:600;color:#303133;margin-bottom:6px;font-family:IBM Plex Mono,Consolas,monospace}.timeline-body[data-v-530ad386]{display:flex;flex-direction:column;gap:6px}.timeline-content[data-v-530ad386]{display:flex;flex-direction:column;gap:2px}.content-line[data-v-530ad386]{font-size:12.5px;color:#606266;line-height:1.6;word-break:break-word}.timeline-images[data-v-530ad386]{display:flex;flex-wrap:wrap;align-items:center;gap:6px}.images-label[data-v-530ad386]{font-size:12px;color:#909399;flex-shrink:0}.thumb-wrap[data-v-530ad386]{position:relative;display:inline-block}.timeline-thumb[data-v-530ad386]{width:64px;height:64px;border-radius:6px;border:1px solid #ebeef5;cursor:pointer;transition:transform .15s ease}.timeline-thumb[data-v-530ad386]:hover{transform:scale(1.05)}.thumb-delete[data-v-530ad386]{position:absolute;top:-6px;right:-6px;font-size:16px;color:#f56c6c;background:#fff;border-radius:50%;cursor:pointer;display:none}.thumb-wrap:hover .thumb-delete[data-v-530ad386]{display:block}.file-wrap[data-v-530ad386]{position:relative;display:inline-flex;align-items:center}.file-link[data-v-530ad386]{display:inline-flex;align-items:center;gap:4px;padding:6px 10px;border:1px solid #ebeef5;border-radius:6px;text-decoration:none;color:#409eff;font-size:12px;max-width:180px;transition:border-color .2s}.file-link[data-v-530ad386]:hover{border-color:#409eff}.file-name[data-v-530ad386]{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:120px}.file-delete[data-v-530ad386]{position:absolute;top:-6px;right:-6px;font-size:16px;color:#f56c6c;background:#fff;border-radius:50%;cursor:pointer;display:none}.file-wrap:hover .file-delete[data-v-530ad386]{display:block}

server/public/admin/assets/NoteTimeline-VfiQpcyr.js

@@ -1,2 +0,0 @@
-import{W as Q,v as Z,d as q,a as K}from"./element-plus-lurTijPg.js";import{_ as Y}from"./picker-cRsNDKaC.js";import{e as ee,c as te,i as S,_ as ie}from"./index-FimllnSe.js";import{s as A}from"./@vue/runtime-dom-DDAG46FW.js";import{b as B,G as se}from"./@element-plus/icons-vue-HOEUG8sr.js";import{d as oe,a as T}from"./patient-DTMlM6EZ.js";import{f as ne,w as re,ak as i,I as n,a as l,aN as c,J as a,H as d,F as v,ap as k,G as I}from"./@vue/runtime-core-C6bnekPw.js";import{n as w,y as C}from"./@vue/reactivity-DiY1c2vO.js";import{Q as z}from"./@vue/shared-mAAVTE9n.js";import"./lodash-es-C2A-Pj28.js";import"./@popperjs/core-C5az9QE8.js";import"./dayjs-DG77mNTn.js";import"./lodash-D3kF6u-c.js";import"./@ctrl/tinycolor-BuyEbX8F.js";import"./async-validator-CFA_igpM.js";import"./normalize-wheel-es-BQoi3Ox2.js";import"./index-DPukmZrj.js";import"./index-C4BsY_iD.js";import"./index.vue_vue_type_script_setup_true_lang-CB1JgtXC.js";import"./index-BFPN4E1c.js";import"./index-DWt-lpdR.js";import"./cos-js-sdk-v5-DSMN0LUT.js";import"./file-C3a0qLlq.js";import"./index.vue_vue_type_script_setup_true_lang-SfFZFG0h.js";import"./@vueuse/core-1S4fJlii.js";import"./@vueuse/shared-Cl3lVqjz.js";import"./usePaging-VsbTxSU0.js";import"./vuedraggable-5bKFmC7X.js";import"./vue-BVs68q8v.js";import"./@vue/compiler-dom-CqayqxS7.js";import"./@vue/compiler-core-CvbQOXIO.js";import"./sortablejs-dsEAUXlE.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"./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 le={class:"note-timeline-wrap"},ae={key:0,class:"timeline-actions"},me={class:"upload-trigger"},de={class:"upload-trigger"},pe={key:1,class:"note-timeline"},ce={class:"timeline-date"},ue={class:"timeline-body"},ge={key:0,class:"timeline-content"},_e={key:1,class:"timeline-images"},fe={key:2,class:"timeline-images"},ve={key:0,class:"thumb-wrap"},he={key:1,class:"file-wrap"},ye=["href","title"],ke={class:"file-name"},G=8e3,Ie=ne({__name:"NoteTimeline",props:{notes:{},diagnosisId:{},readonly:{type:Boolean}},emits:["refresh"],setup(m,{emit:L}){const u=m,b=L,R=ee(),g=t=>R.getImageUrl(t),x=w([]),E=w([]),_=w(0),f=w(0),$=["jpg","jpeg","png","gif","bmp","webp","svg"],N=t=>{var s;const e=((s=t.split(".").pop())==null?void 0:s.toLowerCase().split("?")[0])||"";return $.includes(e)},M=t=>{var s;const e=t.split("/");return decodeURIComponent(((s=e[e.length-1])==null?void 0:s.split("?")[0])||"文件")},j=t=>t.filter(N).map(g),O=(t,e)=>{const s=t.filter(N),h=t[e];return s.indexOf(h)},W=t=>t?t.split(`
-`).filter(Boolean):[],X=t=>{if(!u.diagnosisId)return;const e=Array.isArray(t)?t:[t];if(e.length<=_.value){_.value=e.length;return}const s=e.slice(_.value);_.value=e.length,s.length>0&&T({diagnosis_id:u.diagnosisId,tongue_images:s}).then(()=>{S.msgSuccess("舌苔照片已添加"),b("refresh")})},H=t=>{if(!u.diagnosisId)return;const e=Array.isArray(t)?t:[t];if(e.length<=f.value){f.value=e.length;return}const s=e.slice(f.value);f.value=e.length,s.length>0&&T({diagnosis_id:u.diagnosisId,report_files:s}).then(()=>{S.msgSuccess("检查报告已添加"),b("refresh")})};re(()=>u.notes,()=>{x.value=[],E.value=[],_.value=0,f.value=0});const V=async(t,e,s)=>{try{await K.confirm("确认删除？","提示",{type:"warning"})}catch{return}await oe({note_id:t,image_type:e,image_path:s}),S.msgSuccess("已删除"),b("refresh")};return(t,e)=>{const s=te,h=Y,U=Z,y=q,J=Q;return i(),n("div",le,[!m.readonly&&m.diagnosisId?(i(),n("div",ae,[l(h,{modelValue:x.value,"onUpdate:modelValue":e[0]||(e[0]=o=>x.value=o),limit:99,type:"image","exclude-domain":!0,onChange:X},{upload:c(()=>[a("div",me,[l(s,{size:20,name:"el-icon-Plus"}),e[2]||(e[2]=a("span",null,"舌苔照片",-1))])]),_:1},8,["modelValue"]),l(h,{modelValue:E.value,"onUpdate:modelValue":e[1]||(e[1]=o=>E.value=o),limit:99,type:"file","exclude-domain":!0,onChange:H},{upload:c(()=>[a("div",de,[l(s,{size:20,name:"el-icon-Plus"}),e[3]||(e[3]=a("span",null,"检查报告",-1))])]),_:1},8,["modelValue"])])):d("",!0),m.notes.length?(i(),n("div",pe,[(i(!0),n(v,null,k(m.notes,o=>{var D,F;return i(),n("div",{key:o.id,class:"timeline-node"},[e[6]||(e[6]=a("div",{class:"timeline-dot"},null,-1)),a("div",ce,z(o.note_date),1),a("div",ue,[o.content?(i(),n("div",ge,[(i(!0),n(v,null,k(W(o.content),(r,p)=>(i(),n("div",{key:p,class:"content-line"},z(r),1))),128))])):d("",!0),(D=o.tongue_images)!=null&&D.length?(i(),n("div",_e,[e[4]||(e[4]=a("span",{class:"images-label"},"舌苔照片",-1)),(i(!0),n(v,null,k(o.tongue_images,(r,p)=>(i(),n("div",{key:p,class:"thumb-wrap"},[l(U,{src:g(r),"preview-src-list":o.tongue_images.map(g),"initial-index":p,"z-index":G,fit:"cover",class:"timeline-thumb","preview-teleported":""},null,8,["src","preview-src-list","initial-index"]),m.readonly?d("",!0):(i(),I(y,{key:0,class:"thumb-delete",onClick:A(P=>V(o.id,"tongue_images",r),["stop"])},{default:c(()=>[l(C(B))]),_:1},8,["onClick"]))]))),128))])):d("",!0),(F=o.report_files)!=null&&F.length?(i(),n("div",fe,[e[5]||(e[5]=a("span",{class:"images-label"},"检查报告",-1)),(i(!0),n(v,null,k(o.report_files,(r,p)=>(i(),n(v,{key:p},[N(r)?(i(),n("div",ve,[l(U,{src:g(r),"preview-src-list":j(o.report_files),"initial-index":O(o.report_files,p),"z-index":G,fit:"cover",class:"timeline-thumb","preview-teleported":""},null,8,["src","preview-src-list","initial-index"]),m.readonly?d("",!0):(i(),I(y,{key:0,class:"thumb-delete",onClick:A(P=>V(o.id,"report_files",r),["stop"])},{default:c(()=>[l(C(B))]),_:1},8,["onClick"]))])):(i(),n("div",he,[a("a",{href:g(r),target:"_blank",class:"file-link",title:M(r)},[l(y,{size:20},{default:c(()=>[l(C(se))]),_:1}),a("span",ke,z(M(r)),1)],8,ye),m.readonly?d("",!0):(i(),I(y,{key:0,class:"file-delete",onClick:A(P=>V(o.id,"report_files",r),["stop"])},{default:c(()=>[l(C(B))]),_:1},8,["onClick"]))]))],64))),128))])):d("",!0)])])}),128))])):d("",!0),!m.notes.length&&m.readonly?(i(),I(J,{key:2,description:"暂无备注","image-size":48})):d("",!0)])}}}),It=ie(Ie,[["__scopeId","data-v-f77bb3f4"]]);export{It as default};

server/public/admin/assets/PatientCaseCard-C3Mob6yG.css

@@ -0,0 +1 @@
+.card[data-v-7b1b11be]{background:var(--rx-surface);border:1px solid var(--rx-line);border-radius:14px;padding:18px;display:flex;flex-direction:column;gap:14px;box-shadow:var(--rx-shadow-sm);transition:box-shadow .2s ease}.card[data-v-7b1b11be]:hover{box-shadow:var(--rx-shadow)}.card-title[data-v-7b1b11be]{font-size:15px;font-weight:700;color:var(--rx-ink);display:flex;align-items:center;gap:10px;padding-left:10px;position:relative}.card-title[data-v-7b1b11be]:before{content:"";position:absolute;left:0;top:50%;transform:translateY(-50%);width:3px;height:16px;border-radius:2px;background:linear-gradient(180deg,#4f8cff,#2563eb)}.case-sub[data-v-7b1b11be]{font-size:12px;font-weight:400;color:var(--rx-soft);font-family:var(--rx-font-data)}.grid-block[data-v-7b1b11be]{display:flex;flex-direction:column;gap:10px;padding-top:12px;border-top:1px dashed var(--rx-line)}.grid-block[data-v-7b1b11be]:first-of-type{border-top:none;padding-top:0}.grid-title[data-v-7b1b11be]{font-size:13px;font-weight:600;color:var(--rx-accent-strong);letter-spacing:.02em;display:flex;align-items:center;gap:6px}.grid-title[data-v-7b1b11be]:before{content:"";width:4px;height:4px;border-radius:50%;background:var(--rx-accent)}.kv-grid[data-v-7b1b11be]{display:grid;gap:8px 16px}.kv-grid.one[data-v-7b1b11be]{grid-template-columns:1fr}.kv-grid.two[data-v-7b1b11be]{grid-template-columns:repeat(2,1fr)}.kv-grid.three[data-v-7b1b11be]{grid-template-columns:repeat(3,1fr)}.kv-grid.four[data-v-7b1b11be]{grid-template-columns:repeat(4,1fr)}[data-v-7b1b11be] .kv-item{display:flex;gap:6px;font-size:12.5px;line-height:1.55;min-width:0}[data-v-7b1b11be] .kv-item.multiline{flex-direction:column;gap:2px}[data-v-7b1b11be] .kv-item .kv-label{color:var(--rx-soft);flex-shrink:0;min-width:58px}[data-v-7b1b11be] .kv-item .kv-value{color:var(--rx-ink);word-break:break-word;flex:1;font-weight:500}[data-v-7b1b11be] .kv-item.empty .kv-value{color:#c0c4cc;font-weight:400}[data-v-7b1b11be] .kv-item.multiline .kv-value{white-space:pre-wrap;font-weight:400}[data-v-7b1b11be] .metric-kv-item .metric-kv-value{display:inline-flex;align-items:center;gap:4px}[data-v-7b1b11be] .metric-kv-item .metric-kv-value.high{color:#dc2626;font-weight:700}[data-v-7b1b11be] .metric-up{font-size:14px;line-height:1;color:#dc2626}.rx-note[data-v-7b1b11be]{font-size:13px;color:var(--rx-muted);line-height:1.6;padding:12px 14px;background:linear-gradient(135deg,#fafbfd,#f5f7fb);border-radius:8px;border-left:3px solid var(--rx-accent)}

server/public/admin/assets/PatientCaseCard-De53cbHo.css

@@ -1 +0,0 @@
-.card[data-v-5de08f8e]{background:var(--rx-surface);border:1px solid var(--rx-line);border-radius:14px;padding:18px;display:flex;flex-direction:column;gap:14px;box-shadow:var(--rx-shadow-sm);transition:box-shadow .2s ease}.card[data-v-5de08f8e]:hover{box-shadow:var(--rx-shadow)}.card-title[data-v-5de08f8e]{font-size:15px;font-weight:700;color:var(--rx-ink);display:flex;align-items:center;gap:10px;padding-left:10px;position:relative}.card-title[data-v-5de08f8e]:before{content:"";position:absolute;left:0;top:50%;transform:translateY(-50%);width:3px;height:16px;border-radius:2px;background:linear-gradient(180deg,#4f8cff,#2563eb)}.case-sub[data-v-5de08f8e]{font-size:12px;font-weight:400;color:var(--rx-soft);font-family:var(--rx-font-data)}.grid-block[data-v-5de08f8e]{display:flex;flex-direction:column;gap:10px;padding-top:12px;border-top:1px dashed var(--rx-line)}.grid-block[data-v-5de08f8e]:first-of-type{border-top:none;padding-top:0}.grid-title[data-v-5de08f8e]{font-size:13px;font-weight:600;color:var(--rx-accent-strong);letter-spacing:.02em;display:flex;align-items:center;gap:6px}.grid-title[data-v-5de08f8e]:before{content:"";width:4px;height:4px;border-radius:50%;background:var(--rx-accent)}.kv-grid[data-v-5de08f8e]{display:grid;gap:8px 16px}.kv-grid.one[data-v-5de08f8e]{grid-template-columns:1fr}.kv-grid.two[data-v-5de08f8e]{grid-template-columns:repeat(2,1fr)}.kv-grid.three[data-v-5de08f8e]{grid-template-columns:repeat(3,1fr)}.kv-grid.four[data-v-5de08f8e]{grid-template-columns:repeat(4,1fr)}[data-v-5de08f8e] .kv-item{display:flex;gap:6px;font-size:12.5px;line-height:1.55;min-width:0}[data-v-5de08f8e] .kv-item.multiline{flex-direction:column;gap:2px}[data-v-5de08f8e] .kv-item .kv-label{color:var(--rx-soft);flex-shrink:0;min-width:58px}[data-v-5de08f8e] .kv-item .kv-value{color:var(--rx-ink);word-break:break-word;flex:1;font-weight:500}[data-v-5de08f8e] .kv-item.empty .kv-value{color:#c0c4cc;font-weight:400}[data-v-5de08f8e] .kv-item.multiline .kv-value{white-space:pre-wrap;font-weight:400}[data-v-5de08f8e] .metric-kv-item .metric-kv-value{display:inline-flex;align-items:center;gap:4px}[data-v-5de08f8e] .metric-kv-item .metric-kv-value.high{color:#dc2626;font-weight:700}[data-v-5de08f8e] .metric-up{font-size:14px;line-height:1;color:#dc2626}.rx-note[data-v-5de08f8e]{font-size:13px;color:var(--rx-muted);line-height:1.6;padding:12px 14px;background:linear-gradient(135deg,#fafbfd,#f5f7fb);border-radius:8px;border-left:3px solid var(--rx-accent)}

server/public/admin/assets/PatientInfoCard-CgTUi7Co.js

@@ -1 +1 @@
-import{m as x,f as y,a as B}from"./diag-display-DCz_VAqj.js";import{f as w,ak as I,I as P,J as a,H as N}from"./@vue/runtime-core-C6bnekPw.js";import{Q as i}from"./@vue/shared-mAAVTE9n.js";import{y as e}from"./@vue/reactivity-DiY1c2vO.js";import{_ as V}from"./index-FimllnSe.js";import"./lodash-D3kF6u-c.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"./element-plus-lurTijPg.js";import"./@vue/runtime-dom-DDAG46FW.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"./@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 D={class:"card patient-card"},E={class:"patient-hero"},G={class:"patient-name"},H={class:"patient-meta"},J={key:0},Q=w({__name:"PatientInfoCard",props:{apt:{default:()=>({})},diag:{default:()=>({})}},setup(t){return(S,o)=>{var m,r,n,d,p,s,c,l,g,f,u,h,v,k,C;return I(),P("div",D,[o[0]||(o[0]=a("div",{class:"card-title"},"患者信息",-1)),a("div",E,[a("div",G,i(((m=t.apt)==null?void 0:m.patient_name)||"—"),1),a("div",H,[a("div",null,i(e(x)((r=t.apt)==null?void 0:r.patient_phone))+" · "+i(e(y)((n=t.diag)==null?void 0:n.gender))+" · "+i(((d=t.diag)==null?void 0:d.age)!=null?t.diag.age+"岁":"—"),1),a("div",null,i((p=t.diag)!=null&&p.height?t.diag.height+"cm":"—")+" / "+i((s=t.diag)!=null&&s.weight?t.diag.weight+"kg":"—")+" · "+i(((c=t.diag)==null?void 0:c.region)||"—"),1),a("div",null," 预约："+i((l=t.apt)==null?void 0:l.appointment_date)+" "+i((g=t.apt)==null?void 0:g.appointment_time)+" · "+i(e(B)((f=t.apt)==null?void 0:f.period)),1),a("div",null,"医生："+i(((u=t.apt)==null?void 0:u.doctor_name)||"—")+"　医助："+i(((h=t.apt)==null?void 0:h.assistant_name)||"—"),1),a("div",null," 状态："+i(((v=t.apt)==null?void 0:v.status_desc)||"—")+" · "+i((k=t.apt)!=null&&k.has_prescription?"已开方":"未开方"),1),(C=t.apt)!=null&&C.remark?(I(),P("div",J,"备注："+i(t.apt.remark),1)):N("",!0)])])])}}}),Ct=V(Q,[["__scopeId","data-v-e3476da5"]]);export{Ct as default};
+import{m as x,f as y,a as B}from"./diag-display-DCz_VAqj.js";import{f as w,ak as I,I as P,J as a,H as N}from"./@vue/runtime-core-C6bnekPw.js";import{Q as i}from"./@vue/shared-mAAVTE9n.js";import{y as e}from"./@vue/reactivity-DiY1c2vO.js";import{_ as V}from"./index-CYLw0J2V.js";import"./lodash-D3kF6u-c.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"./element-plus-Ds3qCU_G.js";import"./@vue/runtime-dom-DDAG46FW.js";import"./@element-plus/icons-vue-D49jsFPW.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"./@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 b={class:"card patient-card"},D={class:"patient-hero"},E={class:"patient-name"},G={class:"patient-meta"},H={key:0},J=w({__name:"PatientInfoCard",props:{apt:{default:()=>({})},diag:{default:()=>({})}},setup(t){return(Q,o)=>{var m,r,n,d,p,s,c,l,g,f,u,h,v,k,C;return I(),P("div",b,[o[0]||(o[0]=a("div",{class:"card-title"},"患者信息",-1)),a("div",D,[a("div",E,i(((m=t.apt)==null?void 0:m.patient_name)||"—"),1),a("div",G,[a("div",null,i(e(x)((r=t.apt)==null?void 0:r.patient_phone))+" · "+i(e(y)((n=t.diag)==null?void 0:n.gender))+" · "+i(((d=t.diag)==null?void 0:d.age)!=null?t.diag.age+"岁":"—"),1),a("div",null,i((p=t.diag)!=null&&p.height?t.diag.height+"cm":"—")+" / "+i((s=t.diag)!=null&&s.weight?t.diag.weight+"kg":"—")+" · "+i(((c=t.diag)==null?void 0:c.region)||"—"),1),a("div",null," 预约："+i((l=t.apt)==null?void 0:l.appointment_date)+" "+i((g=t.apt)==null?void 0:g.appointment_time)+" · "+i(e(B)((f=t.apt)==null?void 0:f.period)),1),a("div",null,"医生："+i(((u=t.apt)==null?void 0:u.doctor_name)||"—")+"　客服："+i(((h=t.apt)==null?void 0:h.assistant_name)||"—"),1),a("div",null," 状态："+i(((v=t.apt)==null?void 0:v.status_desc)||"—")+" · "+i((k=t.apt)!=null&&k.has_prescription?"已开方":"未开方"),1),(C=t.apt)!=null&&C.remark?(I(),P("div",H,"备注："+i(t.apt.remark),1)):N("",!0)])])])}}}),Ct=V(J,[["__scopeId","data-v-1b0de09c"]]);export{Ct as default};

server/public/admin/assets/PatientInfoCard-n6_UPo9e.css

@@ -1 +1 @@
-.card[data-v-e3476da5]{background:var(--rx-surface);border:1px solid var(--rx-line);border-radius:14px;padding:18px;display:flex;flex-direction:column;gap:14px;box-shadow:var(--rx-shadow-sm);transition:box-shadow .2s ease}.card[data-v-e3476da5]:hover{box-shadow:var(--rx-shadow)}.card-title[data-v-e3476da5]{font-size:15px;font-weight:700;color:var(--rx-ink);display:flex;align-items:center;gap:10px;padding-left:10px;position:relative}.card-title[data-v-e3476da5]:before{content:"";position:absolute;left:0;top:50%;transform:translateY(-50%);width:3px;height:16px;border-radius:2px;background:linear-gradient(180deg,#4f8cff,#2563eb)}.patient-hero[data-v-e3476da5]{background:linear-gradient(135deg,#f5f8ff,#eef3ff);border:1px solid #dde7ff;border-radius:12px;padding:16px 18px;display:flex;flex-direction:column;gap:6px;position:relative;overflow:hidden}.patient-hero[data-v-e3476da5]:after{content:"";position:absolute;right:-20px;top:-20px;width:100px;height:100px;border-radius:50%;background:radial-gradient(circle,rgba(79,140,255,.08) 0%,transparent 70%)}.patient-name[data-v-e3476da5]{font-size:22px;font-weight:700;color:var(--rx-ink);letter-spacing:-.01em}.patient-meta[data-v-e3476da5]{color:var(--rx-muted);font-size:13px;line-height:1.7;display:flex;flex-direction:column;gap:2px;position:relative;z-index:1}
+.card[data-v-1b0de09c]{background:var(--rx-surface);border:1px solid var(--rx-line);border-radius:14px;padding:18px;display:flex;flex-direction:column;gap:14px;box-shadow:var(--rx-shadow-sm);transition:box-shadow .2s ease}.card[data-v-1b0de09c]:hover{box-shadow:var(--rx-shadow)}.card-title[data-v-1b0de09c]{font-size:15px;font-weight:700;color:var(--rx-ink);display:flex;align-items:center;gap:10px;padding-left:10px;position:relative}.card-title[data-v-1b0de09c]:before{content:"";position:absolute;left:0;top:50%;transform:translateY(-50%);width:3px;height:16px;border-radius:2px;background:linear-gradient(180deg,#4f8cff,#2563eb)}.patient-hero[data-v-1b0de09c]{background:linear-gradient(135deg,#f5f8ff,#eef3ff);border:1px solid #dde7ff;border-radius:12px;padding:16px 18px;display:flex;flex-direction:column;gap:6px;position:relative;overflow:hidden}.patient-hero[data-v-1b0de09c]:after{content:"";position:absolute;right:-20px;top:-20px;width:100px;height:100px;border-radius:50%;background:radial-gradient(circle,rgba(79,140,255,.08) 0%,transparent 70%)}.patient-name[data-v-1b0de09c]{font-size:22px;font-weight:700;color:var(--rx-ink);letter-spacing:-.01em}.patient-meta[data-v-1b0de09c]{color:var(--rx-muted);font-size:13px;line-height:1.7;display:flex;flex-direction:column;gap:2px;position:relative;z-index:1}

server/public/admin/assets/RecordingPlaybackBlock-C1sSjc-x.js

@@ -1 +1 @@
-import{S as L}from"./element-plus-lurTijPg.js";import B from"./RecordingVideoPlayer-BPVkKT7p.js";import{e as H,_ as I}from"./index-FimllnSe.js";import{f as w,ak as n,I as m,J as p,F as v,G as u,aN as _,O as k,H as y,ap as R,A as d}from"./@vue/runtime-core-C6bnekPw.js";import{Q as q}from"./@vue/shared-mAAVTE9n.js";import"./@vue/runtime-dom-DDAG46FW.js";import"./lodash-D3kF6u-c.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"./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 C={key:0,class:"recording-list"},N={class:"recording-item"},P={key:1,class:"recording-alternates"},V={class:"recording-alternates__links"},A={key:1,class:"text-gray-400"},E=w({__name:"RecordingPlaybackBlock",props:{recordId:{},urls:{}},setup(c){const $=c,h=H(),l=d(()=>{const e=$.urls||[],t=new Set,r=[];for(const s of e){const o=String(s??"").trim();!o||t.has(o)||(t.add(o),r.push(o))}return r}),a=d(()=>{const e=l.value;if(!e.length)return null;const t=e.find(i=>/\.mp4(\?|#|$)/i.test(i));if(t)return t;const r=e.find(i=>/\.m3u8(\?|#|$)/i.test(i)&&/vod-qcloud\.com/i.test(i));if(r)return r;const s=e.find(i=>/\.m3u8(\?|#|$)/i.test(i)&&/\.cos\.[^/]+\.myqcloud\.com/i.test(i));if(s)return s;const o=e.find(i=>/\.m3u8(\?|#|$)/i.test(i));return o||e[0]}),f=d(()=>{const e=l.value,t=a.value;return t?e.filter(r=>r!==t):e.slice(1)});function S(e){if(!e||typeof e!="string")return!1;const t=e.trim();return/^https?:\/\//i.test(t)?/\.(mp4|webm|ogg|mov|mkv|m4v|m3u8)(\?|#|$)/i.test(t):/\.(mp4|webm|ogg|mov|mkv|m4v|m3u8)(\?|#|$)/i.test(t)||t.startsWith("/uploads/")}function g(e){return h.getImageUrl(String(e||"").trim())}function b(e,t){const r=e.trim();return/\.mp4(\?|#|$)/i.test(r)?`MP4 ${t+1}`:/vod-qcloud\.com/i.test(r)&&/\.m3u8/i.test(r)?`点播 ${t+1}`:/\.cos\.[^/]+\.myqcloud\.com/i.test(r)&&/\.m3u8/i.test(r)?`COS HLS ${t+1}`:/\.m3u8/i.test(r)?`HLS ${t+1}`:`链接 ${t+1}`}return(e,t)=>{const r=L;return l.value.length?(n(),m("div",C,[p("div",N,[a.value?(n(),m(v,{key:0},[S(a.value)?(n(),u(B,{key:`${c.recordId}-${a.value}`,src:a.value},null,8,["src"])):(n(),u(r,{key:1,href:g(a.value),target:"_blank",type:"primary"},{default:_(()=>[...t[0]||(t[0]=[k(" 打开回放 ",-1)])]),_:1},8,["href"]))],64)):y("",!0),f.value.length?(n(),m("div",P,[t[1]||(t[1]=p("span",{class:"recording-alternates__label"},"备用地址",-1)),p("div",V,[(n(!0),m(v,null,R(f.value,(s,o)=>(n(),u(r,{key:`${c.recordId}-alt-${o}-${s.slice(-32)}`,href:g(s),target:"_blank",type:"primary",class:"recording-alternates__link"},{default:_(()=>[k(q(b(s,o)),1)]),_:2},1032,["href"]))),128))])])):y("",!0)])])):(n(),m("span",A,"暂无"))}}}),ht=I(E,[["__scopeId","data-v-d67b2e91"]]);export{ht as default};
+import{S as L}from"./element-plus-Ds3qCU_G.js";import B from"./RecordingVideoPlayer-CqR6OAdN.js";import{e as H,_ as I}from"./index-CYLw0J2V.js";import{f as w,ak as n,I as m,J as p,F as v,G as u,aN as _,O as k,H as y,ap as R,A as d}from"./@vue/runtime-core-C6bnekPw.js";import{Q as q}from"./@vue/shared-mAAVTE9n.js";import"./@vue/runtime-dom-DDAG46FW.js";import"./lodash-D3kF6u-c.js";import"./@vue/reactivity-DiY1c2vO.js";import"./@element-plus/icons-vue-D49jsFPW.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 C={key:0,class:"recording-list"},N={class:"recording-item"},P={key:1,class:"recording-alternates"},V={class:"recording-alternates__links"},A={key:1,class:"text-gray-400"},E=w({__name:"RecordingPlaybackBlock",props:{recordId:{},urls:{}},setup(c){const $=c,h=H(),l=d(()=>{const e=$.urls||[],t=new Set,r=[];for(const s of e){const o=String(s??"").trim();!o||t.has(o)||(t.add(o),r.push(o))}return r}),a=d(()=>{const e=l.value;if(!e.length)return null;const t=e.find(i=>/\.mp4(\?|#|$)/i.test(i));if(t)return t;const r=e.find(i=>/\.m3u8(\?|#|$)/i.test(i)&&/vod-qcloud\.com/i.test(i));if(r)return r;const s=e.find(i=>/\.m3u8(\?|#|$)/i.test(i)&&/\.cos\.[^/]+\.myqcloud\.com/i.test(i));if(s)return s;const o=e.find(i=>/\.m3u8(\?|#|$)/i.test(i));return o||e[0]}),f=d(()=>{const e=l.value,t=a.value;return t?e.filter(r=>r!==t):e.slice(1)});function S(e){if(!e||typeof e!="string")return!1;const t=e.trim();return/^https?:\/\//i.test(t)?/\.(mp4|webm|ogg|mov|mkv|m4v|m3u8)(\?|#|$)/i.test(t):/\.(mp4|webm|ogg|mov|mkv|m4v|m3u8)(\?|#|$)/i.test(t)||t.startsWith("/uploads/")}function g(e){return h.getImageUrl(String(e||"").trim())}function b(e,t){const r=e.trim();return/\.mp4(\?|#|$)/i.test(r)?`MP4 ${t+1}`:/vod-qcloud\.com/i.test(r)&&/\.m3u8/i.test(r)?`点播 ${t+1}`:/\.cos\.[^/]+\.myqcloud\.com/i.test(r)&&/\.m3u8/i.test(r)?`COS HLS ${t+1}`:/\.m3u8/i.test(r)?`HLS ${t+1}`:`链接 ${t+1}`}return(e,t)=>{const r=L;return l.value.length?(n(),m("div",C,[p("div",N,[a.value?(n(),m(v,{key:0},[S(a.value)?(n(),u(B,{key:`${c.recordId}-${a.value}`,src:a.value},null,8,["src"])):(n(),u(r,{key:1,href:g(a.value),target:"_blank",type:"primary"},{default:_(()=>[...t[0]||(t[0]=[k(" 打开回放 ",-1)])]),_:1},8,["href"]))],64)):y("",!0),f.value.length?(n(),m("div",P,[t[1]||(t[1]=p("span",{class:"recording-alternates__label"},"备用地址",-1)),p("div",V,[(n(!0),m(v,null,R(f.value,(s,o)=>(n(),u(r,{key:`${c.recordId}-alt-${o}-${s.slice(-32)}`,href:g(s),target:"_blank",type:"primary",class:"recording-alternates__link"},{default:_(()=>[k(q(b(s,o)),1)]),_:2},1032,["href"]))),128))])])):y("",!0)])])):(n(),m("span",A,"暂无"))}}}),ht=I(E,[["__scopeId","data-v-d67b2e91"]]);export{ht as default};