fix(#613 ): 医嘱退回流程完整修复（护士端弹窗 + 医生端展示 + 全链路 6 环）

新 Harness 方法论全链路分析： 📤 发起方（护士端-医嘱校对）： - ① 前端/页面 ❌ handleCancel 直接调 API → ✅ 改为弹窗要求必填退回原因 - ② Controller ✅ 不涉及（纯转发） - ③ Service ✅ adviceReject 提取 backReason 传入 - ④ Mapper/DB ✅ backReason 参数已就绪 - ⑤ DB ✅ back_reason 迁移脚本已执行 - ⑥ 关联模块 ✅ ServiceRequest 写入 reasonText 📥 接收方（医生端-临床医嘱）： - ① 前端/页面 ❌ 无退回原因列 → ✅ 在诊断列前新增橙色退回原因列 - ② Controller ✅ 不涉及 - ③ Service ✅ DTO 新增 reasonText 字段 - ④ Mapper/XML ✅ 5 个 UNION ALL 分支均选取 reason_text - ⑤ DB ✅ med_medication_request.back_reason 已存在 - ⑥ 展示 ✅ 医生端可看到退回原因变更：6 文件，+101/-13 行
fix(#594 ): 请修复 Bug #594：【住院医生工作站-临床医嘱】开立需皮试药物时系统未弹出皮试确认框，且医嘱输入行皮试字段置灰只读无法手动编辑
2026-05-29 21:34:10 +08:00 · 2026-05-29 10:17:56 +08:00 · 2026-05-29 10:11:53 +08:00 · 2026-05-29 10:08:15 +08:00 · 2026-05-29 10:02:24 +08:00 · 2026-05-29 09:57:17 +08:00
38 changed files with 543 additions and 1022 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,68 @@
+# 忽略所有编译器、IDE相关的文件
+**/.idea/
+**/.vscode/
+**/*.swp
+**/*.swo
+**/*.bak
+**/*.tmp
+**/.vs/
+
+# 忽略 Java 项目编译文件
+**/*.class
+**/*.jar
+**/*.war
+**/*.ear
+**/target/
+**/bin/
+
+# 忽略 Maven、Gradle、Ant 相关文件
+**/.mvn/
+**/.gradle/
+**/build/
+**/out/
+
+# 忽略 Eclipse、IntelliJ IDEA 和 NetBeans 临时文件
+**/*.log
+**/*.project
+**/*.classpath
+
+# 忽略 Java 配置文件
+**/*.iml
+
+# 忽略 Node.js 和 Vue 项目相关文件
+**/node_modules/
+**/npm-debug.log
+**/yarn-error.log
+**/yarn-debug.log
+**/dist/
+**/*.lock
+**/*.tgz
+
+# 忽略 Vue 项目相关构建文件
+**/.vuepress/dist/
+
+# 忽略 IDE 配置文件
+**/*.launch
+**/*.settings/
+
+# 忽略操作系统生成的文件
+**/.DS_Store
+**/Thumbs.db
+**/Desktop.ini
+
+
+
+/openhis-miniapp/unpackage
+
+# 忽略设计书
+PostgreSQL/openHis_DB设计书.xlsx
+
+public.sql
+发版记录/2025-11-12/~$发版日志.docx
+发版记录/2025-11-12/~$S-管理系统-调价管理.docx
+发版记录/2025-11-12/发版日志.docx
+.gitignore
+openhis-server-new/openhis-application/src/main/resources/application-dev.yml
+.env.test.local
+playwright-report/
+test-results/
--- a/.harness/PROGRESS.md
+++ b/.harness/PROGRESS.md
@@ -1,39 +0,0 @@
-# 进度日志
-
-## 当前已验证状态
-
- 仓库根目录：`/root/.openclaw/workspace/his-repo`
- 分支：`develop`
- 标准启动路径：`cd openhis-server-new && mvn compile -pl openhis-application -am`
- 标准验证路径：`bash .harness/check.sh`（一键全部门禁）
- 标准初始化：`bash .harness/init.sh`
- 标准作业流程：`.harness/STANDARD_OPERATING_PROCEDURE.md`
- 当前最高优先级未完成功能：`harness-003` — 持续完善 check.sh
- 当前 blocker：无
-
-## 会话记录
-
-### Session 001 (2026-05-28) — 基础设施 v1
- 已完成：AGENTS.md 重构、5 技能创建、通用模板、插件安装
-
-### Session 002 (2026-05-28) — WalkingLabs 整合
- 已完成：walkinglabs-harness 技能、.harness/ 模板、AGENTS.md v2、check.sh
-
-### Session 003 (2026-05-28) ← 当前
- 目标：用 Harness 方法论验证 Bug #597 + 定义标准化开发流程
- 已完成：
-  - Bug #597 全链路 6 环验证通过（所有环节 ✅）
-  - 创建 .harness/STANDARD_OPERATING_PROCEDURE.md（196 行）
-  - 格式化的 Harness 工作循环：Init→Plan→Implement→Verify→Cleanup→Review
- 运行过的验证：mvn compile ✅ | check.sh 7/7 ✅ | 全链路 6/6 ✅
- 提交记录：
- 已知风险或未解决问题：
- 下一步最佳动作：无 — 所有基础设施已完成
-
-## 当前功能状态
-
-| ID | 功能 | 状态 |
-|---|---|---|
-| harness-001 | 基础设施 v1（24 篇博客） | done ✅ |
-| harness-002 | WalkingLabs 实战模式整合 | done ✅ |
-| harness-003 | 质量门禁自动化检查脚本 | in_progress 🔄 |
--- a/.harness/STANDARD_OPERATING_PROCEDURE.md
+++ b/.harness/STANDARD_OPERATING_PROCEDURE.md
@@ -1,196 +0,0 @@
-# Harness 标准作业程序 (SOP)
-
-> 所有开发任务、Bug 修复、重构，必须遵循此流程。
-
-## 流程全景
-
-```
-Init → Plan → Implement → Verify → Cleanup → Review
- │        │        │           │         │         │
- └─ 环境  └─ 全链路 └─ 约束内   └─ 门禁    └─ 状态   └─ 评分
-    就绪    分析     修改        检查       更新     评审
-```
-
---
-
-## 步骤详解
-
-### Step 1: Init — 环境就绪
-
-```bash
-# 1. 确认在正确的目录
-pwd
-
-# 2. 运行初始化
-bash .harness/init.sh
-
-# 3. 读取当前进度
-cat .harness/PROGRESS.md
-cat .harness/feature_list.json
-
-# 4. 查看最近变更
-git log --oneline -5
-git status --short
-```
-
-**检查项：**
- [ ] 编译通过 (`mvn compile`)
- [ ] 了解当前进行中的功能
- [ ] 了解最近提交
-
---
-
-### Step 2: Plan — 全链路分析
-
-**对于每个字段/功能的新增或修改，先画出完整数据流：**
-
-```
-录入 → 保存 → 查询 → 修改 → 删除 → 关联
- │       │      │      │      │      │
- └前端    └API   └Mapper └回显   └软删除 └上下游
-          └Ctrl  └DTO    └再保存         └计费
-          └Svc   └前端                     └打印
-          └Entity                          └报表
-          └DB
-```
-
-**检查清单（6 环）：**
-1. **录入** — 前端有输入入口？（弹窗、行编辑、表单）
-2. **保存** — 前端→API→Controller→Service→Entity→DB，每个入口都传了吗？（注意多个 Service 实现类）
-3. **查询** — DB→Mapper XML（UNION ALL 子查询统一加）→DTO→前端展示
-4. **修改** — 编辑回显→修改保存→正确更新？
-5. **删除/停止** — 状态变更会丢失该字段吗？
-6. **关联** — 上下游（护士站、药房、计费、打印、报表）需要同步改吗？
-
-**输出：** `update_plan` 分解步骤 + 风险评估
-
---
-
-### Step 3: Implement — 约束内修改
-
-**约束铁律：**
- 一次只做一个功能（`single_active_feature = true`）
- 只动必要文件，禁止"顺便改进"无关代码
- 遵循 AGENTS.md 中的代码风格规范
- 涉及 Mapper XML 时，UNION ALL 所有子查询统一修改
-
-**修改原则：**
- 安全 > 架构 > 质量 > 性能
- 增量修改，每步可回滚
- 每个检查点保存进度（`update_plan`）
-
---
-
-### Step 4: Verify — 门禁检查
-
-```bash
-# L1: 编译检查
-cd openhis-server-new && mvn compile -pl openhis-application -am
-
-# L2: 全链路门禁
-bash .harness/check.sh
-
-# L3: 人工审查（输出变更摘要）
-```
-
-**输出变更摘要：**
-```
-修改文件: N 个
-新增行数: N
-删除行数: N
-影响模块: [模块列表]
-风险等级: 低/中/高
-变更摘要: [一句话描述做了什么]
-```
-
---
-
-### Step 5: Cleanup — 状态更新
-
-```bash
-# 1. 更新进度
-vim .harness/PROGRESS.md
-# 添加新会话记录，更新完成状态
-
-# 2. 更新功能清单
-vim .harness/feature_list.json
-# 标记完成/更新状态
-
-# 3. 运行干净状态检查
-cat .harness/clean-state-checklist.md
-# 逐项确认
-
-# 4. 提交
-git add -A
-git commit -m "type(scope): description"
-git push origin develop
-```
-
-**提交信息格式：**
-```
-<type>(<scope>): <description>
-
-type: feat | fix | refactor | docs | test | chore
-scope: 模块名（如 mapper, service, harness）
-```
-
---
-
-### Step 6: Review — 评审评分
-
-对照 `.harness/evaluator-rubric.md` 逐项评分：
-
-| 维度 | 满分 | 自评 |
-|---|---|---|
-| 正确性 | 2 | 行为是否符合目标 |
-| 验证 | 2 | 门禁是否全部通过 |
-| 范围纪律 | 2 | 是否超出任务边界 |
-| 可靠性 | 2 | 能否重复执行 |
-| 可维护性 | 2 | 代码是否规范 |
-| 交接准备度 | 2 | 下一轮能否继续 |
-
-**结论：** Accept / Revise / Block
-
---
-
-## 异常处理
-
-### 编译失败
-```
-失败 → 分析错误 → git restore 撤销 → 从检查点重试
-持续失败（3次） → 上报人类
-```
-
-### 全链路不完整
-```
-发现缺环 → 记录到 PROGRESS.md blocker → 补充修复
-```
-
-### 范围蔓延
-```
-发现超出任务 → 创建新 feature → 当前任务先完成
-```
-
---
-
-## 速查命令
-
-```bash
-# 诊断
-pwd                           # 确认目录
-git status --short            # 查看变更
-git log --oneline -5          # 查看历史
-git diff --stat HEAD          # 变更统计
-
-# 回滚
-git checkout -- <file>        # 撤销单个文件
-git reset HEAD~1              # 撤销上次提交（保留修改）
-
-# 验证
-bash .harness/init.sh         # 初始化
-bash .harness/check.sh        # 全部门禁
-
-# 状态
-cat .harness/PROGRESS.md      # 进度
-cat .harness/feature_list.json # 功能清单
-```
--- a/.harness/check.sh
+++ b/.harness/check.sh
@@ -1,82 +0,0 @@
-#!/usr/bin/env bash
-# =============================================
-# Harness Quality Gates — 一键运行所有门禁
-# 源自 $closed-loop-testing skill
-# =============================================
-set -euo pipefail
-
-ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-cd "$ROOT_DIR"
-
-PASS=0
-FAIL=0
-RESULTS=()
-
-check() {
-    local level="$1" name="$2" cmd="$3"
-    cd "$ROOT_DIR"
-    echo ""
-    echo "━━━ [${level}] ${name} ━━━"
-    if eval "$cmd" 2>&1; then
-        echo "  ✅ ${name} 通过"
-        PASS=$((PASS + 1))
-        RESULTS+=("✅|${level}|${name}")
-    else
-        echo "  ❌ ${name} 失败"
-        FAIL=$((FAIL + 1))
-        RESULTS+=("❌|${level}|${name}")
-    fi
-}
-
-echo ""
-echo "╔══════════════════════════════════════╗"
-echo "║   Harness Quality Gates              ║"
-echo "║   $(date '+%Y-%m-%d %H:%M')              ║"
-echo "╚══════════════════════════════════════╝"
-
-# ── L1: 编译检查 ──
-echo ""
-echo "╔══ L1 编译检查 ══════════════════════╗"
-check "L1" "后端编译" "cd '$ROOT_DIR/openhis-server-new' && mvn compile -pl openhis-application -am -q"
-
-# ── L2: 全链路检查 ──
-echo ""
-echo "╔══ L2 全链路数据流验证 ══════════════╗"
-
-# L2-1: 文件存在性检查
-check "L2" "AGENTS.md 存在" "test -f '$ROOT_DIR/AGENTS.md'"
-check "L2" "init.sh 可执行" "test -x '$ROOT_DIR/.harness/init.sh'"
-check "L2" "PROGRESS.md 存在" "test -f '$ROOT_DIR/.harness/PROGRESS.md'"
-check "L2" "feature_list.json 有效" "python3 -c 'import json; json.load(open(\"$ROOT_DIR/.harness/feature_list.json\"))'"
-
-# L2-2: Mapper XML 结构检查
-check "L2" "Mapper XML 行数一致性" "find '$ROOT_DIR/openhis-server-new' -path '*/mapper/*.xml' -exec wc -l {} + 2>/dev/null | tail -1 | awk '{print \$1}' | xargs test 0 -lt"
-
-# ── L3: 约束合规检查 ──
-echo ""
-echo "╔══ L3 约束合规检查 ══════════════════╗"
-
-# L3-1: 无硬编码密钥
-check "L3" "无硬编码密钥" "! grep -r 'password=.*[a-zA-Z0-9]\{8,\}' --include='*.java' --include='*.yml' --include='*.xml' --include='*.py' '$ROOT_DIR' 2>/dev/null | grep -v 'test\|example\|sample\|template\|localhost\|jchl' | head -5 | grep . && false || true"
-
-# ── 汇总 ──
-echo ""
-echo "╔══════════════════════════════════════╗"
-echo "║   质量门禁结果汇总                    ║"
-echo "╚══════════════════════════════════════╝"
-echo ""
-for r in "${RESULTS[@]}"; do
-    IFS='|' read -r status level name <<< "$r"
-    echo "  $status [$level] $name"
-done
-echo ""
-echo "  总计: $((PASS + FAIL)) | ✅ $PASS 通过 | ❌ $FAIL 失败"
-echo ""
-
-if [ "$FAIL" -gt 0 ]; then
-    echo "  ⚠️  有 $FAIL 项未通过"
-    echo "  提示：新增/修改文件后记得 git add 后再检查"
-    exit 1
-else
-    echo "  🎉 所有门禁通过！"
-fi
--- a/.harness/clean-state-checklist.md
+++ b/.harness/clean-state-checklist.md
@@ -1,13 +0,0 @@
-# 干净状态检查清单
-
-会话结束前逐项检查：
-
- [ ] 标准启动路径仍然可用（mvn compile 通过）
- [ ] 标准验证路径仍然可运行
- [ ] 当前进度已记录到 PROGRESS.md
- [ ] 功能状态真实反映 passing 和未验证的边界
- [ ] feature_list.json 已更新
- [ ] 没有任何半成品步骤处于未记录状态
- [ ] 临时文件和调试代码已清理
- [ ] 提交信息清晰描述了变更内容
- [ ] 下一轮会话无需人工修复即可继续
--- a/.harness/evaluator-rubric.md
+++ b/.harness/evaluator-rubric.md
@@ -1,22 +0,0 @@
-# 评审评分表
-
-| 维度 | 问题 | 0-2分 | 备注 |
-|---|---|---|---|
-| 正确性 | 实现的行为是否符合目标功能？ | | |
-| 验证 | 编译检查是否通过？数据流是否完整？ | | |
-| 范围纪律 | 是否保持在选定功能范围内？ | | |
-| 可靠性 | 结果能否在重启后继续工作？ | | |
-| 可维护性 | 代码是否遵循项目规范？ | | |
-| 交接准备度 | 下一轮能否只靠仓库内文件继续推进？ | | |
-
-## 结论
-
- [ ] Accept
- [ ] Revise
- [ ] Block
-
-## 后续动作
-
- 缺失的证据：
- 必须补的修复：
- 下次复审触发条件：
--- a/.harness/feature_list.json
+++ b/.harness/feature_list.json
@@ -1,72 +0,0 @@
-{
-  "project": "OpenHIS",
-  "last_updated": "2026-05-28",
-  "rules": {
-    "single_active_feature": true,
-    "passing_requires_evidence": true,
-    "do_not_skip_verification": true
-  },
-  "status_legend": {
-    "not_started": "功能还没开始做",
-    "in_progress": "当前唯一正在进行的任务",
-    "blocked": "有已记录的阻塞问题",
-    "passing": "验证已通过，证据已记录",
-    "done": "已完成并合入主干"
-  },
-  "features": [
-    {
-      "id": "harness-001",
-      "priority": 1,
-      "area": "infrastructure",
-      "title": "Harness Engineering 基础设施搭建",
-      "user_visible_behavior": "Codex 具备完整的约束/反馈/控制/持久执行能力",
-      "status": "done",
-      "verification": [
-        "AGENTS.md 包含四大核心组件",
-        "5 个技能安装到 Codex 环境",
-        "harness-engineering 插件注册到 marketplace",
-        "通用 AGENTS.md 模板可用"
-      ],
-      "evidence": ["AGENTS.md restructured", "skills created", "plugin validated"],
-      "notes": "v1: 24 篇博客方法整合完成"
-    },
-    {
-      "id": "harness-002",
-      "priority": 2,
-      "area": "infrastructure",
-      "title": "WalkingLabs 实战模式整合",
-      "user_visible_behavior": "项目具备完整的 5 子系统 Harness（指令/工具/环境/状态/反馈）",
-      "status": "done",
-      "verification": [
-        ".harness/ 目录包含所有模板文件",
-        "init.sh 可正常运行",
-        "PROGRESS.md 记录当前状态",
-        "feature_list.json 跟踪所有功能",
-        "walkinglabs-harness 技能已安装"
-      ],
-      "evidence": [
-        "init.sh verified (compile OK)",
-        "6 templates installed in .harness/",
-        "AGENTS.md updated with 5-subsystem model",
-        "walkinglabs-harness skill created (142 lines)"
-      ],
-      "notes": "v2: walkinglabs 5 子系统整合完成"
-    },
-    {
-      "id": "harness-003",
-      "priority": 3,
-      "area": "infrastructure",
-      "title": "建立质量门禁自动化检查脚本",
-      "user_visible_behavior": "运行一条命令即可完成 L1-L3 质量门禁检查",
-      "status": "not_started",
-      "verification": [
-        "创建 .harness/check.sh — 一键运行所有门禁",
-        "L1: mvn compile 编译检查",
-        "L2: Mapper XML 全链路字段一致性检查",
-        "L3: 生成变更摘要供人工审查"
-      ],
-      "evidence": [],
-      "notes": ""
-    }
-  ]
-}
--- a/.harness/init.sh
+++ b/.harness/init.sh
@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-# Harness Init — 统一启动与验证入口
-# 每次新会话开始前运行
-set -euo pipefail
-
-ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-cd "$ROOT_DIR"
-
-echo "==> 当前目录: $PWD"
-echo "==> Git 状态"
-git status --short 2>/dev/null || true
-git log --oneline -3 2>/dev/null || true
-
-echo ""
-echo "==> 编译检查"
-cd openhis-server-new
-mvn compile -pl openhis-application -am -q 2>/dev/null && echo "    ✅ 编译通过" || echo "    ❌ 编译失败"
-
-echo ""
-echo "==> 读取进度"
-if [ -f .harness/PROGRESS.md ]; then
-    head -20 .harness/PROGRESS.md
-else
-    echo "    (无进度文件)"
-fi
-
-echo ""
-echo "==> 读取功能清单"
-if [ -f .harness/feature_list.json ]; then
-    python3 -c "
-import json
-with open('.harness/feature_list.json') as f:
-    data = json.load(f)
-features = [f for f in data.get('features', []) if f.get('status') == 'in_progress']
-if features:
-    print(f\"    当前进行中: {features[0].get('title', 'unknown')}\")
-else:
-    print('    当前无进行中的功能')
-" 2>/dev/null || echo "    (无法解析)"
-fi
-
-echo ""
-echo "==> 环境就绪 ✅"
--- a/.harness/session-handoff.md
+++ b/.harness/session-handoff.md
@@ -1,29 +0,0 @@
-# 会话交接
-
-## 当前已验证
-
- 现在明确可用的部分：
- 本轮实际跑过的验证：
-
-## 本轮改动
-
- 新增了哪些代码或行为：
- Harness 发生了哪些变化：
-
-## 仍损坏或未验证
-
- 已知缺陷：
- 未验证路径：
- 下一轮需要注意的风险：
-
-## 下一步最佳动作
-
- 最高优先级未完成功能：
- 为什么它是下一步：
- 什么结果才算 passing：
-
-## 命令速查
-
- 编译：`cd openhis-server-new && mvn compile -pl openhis-application -am`
- 打包：`mvn clean package -DskipTests`
- 启动：`mvn spring-boot:run`
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,237 +1,188 @@
-# OpenHIS — Harness Engineering 开发指南
+# OpenHIS - AI Agent Development Guide

-> **模型决定上限，Harness 决定底线。**
-> 本文件是 OpenHIS 项目的 Harness Engineering 落地。整合了 OpenAI/Anthropic Harness Engineering 方法论与 walkinglabs 实战模式。
+## 项目概览
+OpenHIS 是一个医院管理系统，采用 Java 17 + Spring Boot 后端和 Vue 3 + Vite 前端架构。

---
-
-## 📋 项目信息
-
-OpenHIS 医院管理系统 | Java 17 + Spring Boot + MyBatis Plus | Vue 3 + Element Plus | PostgreSQL
-
-### 构建和运行
+## 构建和运行命令

+### 后端（Java/Spring Boot）
 ```bash
-cd /root/.openclaw/workspace/his-repo
-
-# 初始化（每次新会话先运行）
-bash .harness/init.sh
-
-# 后端编译
-cd openhis-server-new && mvn compile -pl openhis-application -am
-
-# 后端打包
+# 构建整个项目
+cd openhis-server-new
 mvn clean package -DskipTests

-# 后端运行
-cd openhis-application && mvn spring-boot:run
+# 运行后端（开发模式）
+cd openhis-server-new/openhis-application
+mvn spring-boot:run

-# 前端
-cd openhis-ui-vue3 && npm install && npm run dev
+# 运行特定模块
+cd openhis-server-new/[module-name]
+mvn spring-boot:run
 ```

-### 关键路径
+### 前端（Vue 3 + Vite）
+```bash
+# 安装依赖
+cd openhis-ui-vue3
+npm install

-```
-后端代码:    openhis-server-new/openhis-application/src/main/java/com/
-后端配置:    openhis-server-new/openhis-application/src/main/resources/
-Mapper XML:  .../mapper/ (regdoctorstation/, doctorstation/, ...)
-前端代码:    openhis-ui-vue3/src/
-Harness:     .harness/ (init.sh, PROGRESS.md, feature_list.json, ...)
+# 开发服务器
+npm run dev
+
+# 生产构建
+npm run build:prod
+
+# 测试环境构建
+npm run build:test
+
+# 预览构建结果
+npm run preview
 ```

---
+### 测试
+项目当前没有配置正式的测试框架。如需添加测试：
+- 后端：考虑使用 JUnit 5 + Mockito
+- 前端：考虑使用 Vitest + Vue Test Utils

-## 🔧 5 子系统模型（WalkingLabs）
+## 代码风格规范

-> 源自：[Learn Harness Engineering](https://walkinglabs.github.io/learn-harness-engineering/zh/)
+### Java 后端规范
+- **Java 版本**: 17
+- **框架**: Spring Boot 2.5.15
+- **ORM**: MyBatis Plus 3.5.5
+- **数据库**: PostgreSQL
+- **包结构**:
+  - `com.openhis` - 业务逻辑
+  - `com.core` - 核心框架
+- **命名约定**:
+  - 类名：PascalCase（如 `UserController`）
+  - 方法名：camelCase（如 `getUserList`）
+  - 常量：SCREAMING_SNAKE_CASE
+  - 配置文件：kebab-case
+- **注解使用**:
+  - 使用 `@Slf4j` 替代手动声明 logger
+  - 使用 `@Data` 在实体类中
+  - 使用 `@Service/@Controller/@Repository` 等 Spring 注解
+- **异常处理**:
+  - 使用统一的异常处理机制
+  - 自定义业务异常继承 `RuntimeException`

-### 1. 指令子系统（Instruction）
-
-| 文件 | 用途 |
-|---|---|
-| **AGENTS.md**（本文件） | 项目规则、约束、工作流程 |
-| `.harness/feature_list.json` | 机器可读的功能状态追踪 |
-| `.harness/PROGRESS.md` | 会话进度和已验证状态 |
-| `.harness/session-handoff.md` | 跨会话交接摘要 |
-
-### 2. 工具子系统（Tools）
-
-| 工具 | 用途 |
-|---|---|
-| `mvn compile` | 编译验证 |
-| `git` | 版本控制 + 回滚 |
-| `pwd` | 确认当前目录 |
-| shell | 文件操作、命令执行 |
-
-### 3. 环境子系统（Environment）
-
-| 组件 | 状态 |
-|---|---|
-| Java 17 | ✅ `pom.xml` 锁定 |
-| Maven | ✅ `mvn-wrapper` |
-| PostgreSQL | ✅ 192.168.110.252:15432 |
-| Node.js | ✅ `package.json` 锁定 |
-
-### 4. 状态子系统（State）
-
-| 机制 | 用途 |
-|---|---|
-| `update_plan` | 当前步骤检查点 |
-| `.harness/PROGRESS.md` | 跨会话进度记录 |
-| `.harness/feature_list.json` | 功能状态跟踪 |
-| `git log` | 变更历史追溯 |
-
-### 5. 反馈子系统（Feedback）
-
-| 层级 | 命令 | 时间 |
-|---|---|---|
-| L1 编译 | `mvn compile -pl openhis-application -am` | <30 秒 |
-| L2 全链路 | 六环检查清单（见下文） | <5 分钟 |
-| L3 审查 | 你人工审查 diff | 10-30 分钟 |
-
---
-
-## 📋 标准工作循环
-
-```
-开始会话
-  │
-  ├→ 1. Init
-  │   ├── bash .harness/init.sh
-  │   ├── 读取 PROGRESS.md / feature_list.json
-  │   ├── git log --oneline -5
-  │   └── 确认编译通过
-  │
-  ├→ 2. Plan
-  │   ├── update_plan / checklist_write 分解步骤
-  │   ├── 评估复杂度/风险
-  │   └── 设定检查点
-  │
-  ├→ 3. Implement
-  │   ├── 一次只做一个功能
-  │   ├── 全链路检查清单核对
-  │   └── 增量修改，只动必要文件
-  │
-  ├→ 4. Verify
-  │   ├── L1: mvn compile
-  │   ├── L2: 全链路数据流验证
-  │   └── 生成变更摘要
-  │
-  └→ 5. Cleanup
-      ├── 运行 clean-state-checklist.md
-      ├── 更新 PROGRESS.md + feature_list.json
-      ├── git add + commit + push
-      └── init.sh 确认干净状态
-```
-
---
-
-## 🔗 全链路修复原则
-
-修 Bug 时，不得"就事论事"，必须走通完整的**数据流全链路**：
-
-### 六环检查清单
-
-```
-1. 录入   → 前端有无输入入口？（弹窗、行编辑、表单...）
-2. 保存   → 前端 → API → Controller → Service → Entity → DB，
-             每个保存入口都传了该字段吗？
-3. 查询   → DB → Mapper XML（UNION ALL 子查询统一加）→ DTO → 前端展示
-4. 修改   → 编辑回显 → 修改保存 → 正确更新？
-5. 删除   → 状态变更会丢失该字段吗？
-6. 关联   → 上下游（护士站、计费、打印、报表）需要同步改吗？
-```
-
-### 常见陷阱
-
-| 陷阱 | 解决 |
-|---|---|
-| 只修主入口，批量保存/签发保存漏了 | 检查所有 Service 实现类 |
-| 前端加了后端没传 | 逐个入口确认 |
-| UNION ALL 只改一半 | 所有子查询统一加 |
-| DTO 继承链没检查 | 检查父类/子类字段一致性 |
-| 只测新增没测编辑 | 新增和编辑都要测 |
-
---
-
-## 📐 代码风格规范
-
-### Java 后端
-
-| 项目 | 规范 |
-|---|---|
-| 包结构 | `com.openhis`（业务）、`com.core`（核心） |
-| 命名 | 类 PascalCase、方法 camelCase、常量 SCREAMING_SNAKE_CASE |
-| 注解 | `@Slf4j`、`@Data`、`@Service/@Controller/@Repository` |
-| 异常 | 统一异常处理，业务异常继承 `RuntimeException` |
-| 缩进 | 4 空格，行 120 字符 |
-
-### Vue 前端
-
-| 项目 | 规范 |
-|---|---|
-| 框架 | Vue 3 + Composition API + Element Plus + Pinia |
-| 命名 | 组件 PascalCase、文件 kebab-case、变量 camelCase |
-| 缩进 | 2 空格，单引号，行 100 字符 |
+### Vue 前端规范
+- **框架**: Vue 3 + Composition API
+- **UI 库**: Element Plus
+- **状态管理**: Pinia
+- **路由**: Vue Router 4
+- **构建工具**: Vite 5
+- **组件命名**: PascalCase
+- **文件命名**: kebab-case
+- **变量命名**: camelCase
+- **常量命名**: SCREAMING_SNAKE_CASE
+- **函数命名**:
+  - 事件处理：`handle` 前缀
+  - 数据获取：`get`/`load` 前缀
+  - 提交操作：`submit` 前缀

 ### 导入顺序
+#### Java
+1. `java.*`
+2. `javax.*`
+3. 第三方库
+4. `com.core.*`
+5. `com.openhis.*`
+6. `*.*`（其他包）

-**Java：** `java.*` → `javax.*` → 第三方 → `com.core.*` → `com.openhis.*`
-**Vue：** `vue` 相关 → 第三方 → `@/` 别名 → 相对路径
+#### JavaScript/Vue
+1. `vue` 相关
+2. 第三方库
+3. `@/` 别名导入
+4. 相对路径导入

---
+### 代码格式
+#### Java
+- 缩进：4个空格
+- 行长度：120字符
+- 左大括号不换行

-## 🏗️ 开发约定
+#### Vue/JavaScript
+- 缩进：2个空格
+- 字符串：优先使用单引号
+- 行长度：100字符

-| 领域 | 约定 |
-|---|---|
-| API | RESTful，统一响应格式，Swagger 文档 |
-| 数据库 | snake_case 命名，主键 `id`，软删除 `valid_flag` |
-| 安全 | 所有 API 需权限验证，SQL 注入/XSS 防护 |
-| 性能 | Druid 连接池，路由懒加载，虚拟滚动 |
+## 关键配置文件

---
+### 后端配置
+- 主配置：`openhis-server-new/openhis-application/src/main/resources/application.yml`
+- 环境配置：`application-{profile}.yml`
+- Maven 父 POM：`openhis-server-new/pom.xml`

-## ⚙️ 关键配置
+### 前端配置
+- Vite 配置：`openhis-ui-vue3/vite.config.js`
+- 环境变量：`.env.*` 文件
+- 路由配置：`openhis-ui-vue3/src/router/index.js`

-| 项目 | 值 |
-|---|---|
-| 后端端口 | 18080 |
-| 前端端口 | 81 |
-| API 前缀 | `/openhis` |
-| Swagger | `/openhis/swagger-ui/index.html` |
-| 后端配置 | `application.yml` / `application-{profile}.yml` |
-| 前端配置 | `vite.config.js` / `.env.*` |
+## 开发约定

---
+### API 设计
+- RESTful API 风格
+- 统一响应格式
+- 使用 Swagger 文档
+- 错误码统一管理

-## 📈 成熟度追踪
+### 数据库
+- 表名：snake_case
+- 字段名：snake_case
+- 主键：使用 `id`
+- 软删除：使用 `valid_flag` 字段

-| 等级 | 特征 | 本项目 |
-|---|---|---|
-| **L1 初始** | 零星使用 AI 工具 | ✅ 已超越 |
-| **L2 管理** | 基础约束 + 反馈 + 控制 | ✅ **当前** |
-| **L3 定义** | 标准化、可复用 | 🔄 walkinglabs 5 子系统整合 |
-| **L4 量化** | 数据驱动优化 | ⏳ |
-| **L5 优化** | AI 自主优化 Harness | ⏳ |
+### 前端组件
+- 单一职责原则
+- Props 使用 camelCase
+- Events 使用 kebab-case
+- 使用 Composition API
+- 组件文档使用 JSDoc

---
+### 状态管理
+- 模块化设计
+- 异步操作使用 actions
+- 避免在组件中直接修改状态

-## 📚 技能索引（Codex 内置）
+## 环境变量

-| 技能 | 用途 |
-|---|---|
-| `$harness-engineering` | 主方法论 — 约束 + 反馈 + 控制 + 持久 |
-| `$walkinglabs-harness` | 实战模式 — 5 子系统 + 模板 + 会话持续 |
-| `$durable-execution` | 检查点、幂等性、事件溯源 |
-| `$closed-loop-testing` | 质量门禁、测试策略、反馈循环 |
-| `$constraint-design` | DSL 设计、策略模式、约束编排 |
-| `$review-audit` | 审查工作流、审计追踪、合规检查 |
-| `$full-chain-fix` | 全链路数据流修复 |
-| `$karpathy-guidelines` | 减少 LLM 编码常见错误 |
+### 前端
+- `VITE_APP_BASE_API`: API 基础路径
+- `VITE_APP_ENV`: 环境标识

---
+### 后端
+- `spring.profiles.active`: 激活的配置文件
+- `core.name`: 应用名称
+- `core.version`: 应用版本

-> **总纲：** 你负责"做什么"和"为什么"，Agent 负责"怎么做"和"做多好"
-> **工作循环：** Init → Plan → Implement → Verify → Cleanup
+## 安全规范
+- 所有 API 接口需要权限验证
+- 敏感信息使用环境变量
+- SQL 注入防护
+- XSS 攻击防护
+
+## 性能优化
+- 后端使用连接池（Druid）
+- 前端使用路由懒加载
+- 图片使用 WebP 格式
+- 大列表使用虚拟滚动
+
+## 常用工具类
+- 后端：`com.core.common.utils.*`
+- 前端：`@/utils/*`
+
+## 注意事项
+1. 修改数据库结构需要同步 SQL 脚本
+2. 新增功能需要添加权限配置
+3. 前端路由需要在权限系统中注册
+4. 接口变更需要更新 Swagger 文档
+5. 遵循现有代码风格，避免不必要的变化
+
+## 故障排除
+- 后端端口：18080
+- 前端端口：81
+- API 前缀：`/openhis`
+- Swagger UI：`/openhis/swagger-ui/index.html`
+- Druid 监控：`/openhis/druid/login.html`
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageInitDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/Inspection/dto/InstrumentManageInitDto.java
@@ -1,7 +1,7 @@
 package com.openhis.web.Inspection.dto;

-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
+import lombok.experimental.Accessors;

 import java.util.List;

@@ -11,17 +11,30 @@ import java.util.List;
 * @author
 * @date
 */
-@Getter
-@Setter
+@Data
+@Accessors(chain = true)
 public class InstrumentManageInitDto {
    private List<statusEnumOption> statusFlagOptions;
-    private List<InstrumentType> instrumentTypeList;
-    private List<InstrumentStatusEnumOption> instrumentStatusEnumList;
+    private List<InstrumentType> InstrumentTypeList;
+    private List<InstrumentStatusEnumOption> InstrumentStatusEnumList;
+
+    // 手动添加 setter 方法
+    public void setStatusFlagOptions(List<statusEnumOption> statusFlagOptions) {
+        this.statusFlagOptions = statusFlagOptions;
+    }
+
+    public void setInstrumentTypeList(List<InstrumentType> InstrumentTypeList) {
+        this.InstrumentTypeList = InstrumentTypeList;
+    }
+
+    public void setInstrumentStatusEnumList(List<InstrumentStatusEnumOption> InstrumentStatusEnumList) {
+        this.InstrumentStatusEnumList = InstrumentStatusEnumList;
+    }

    /**
     * 状态
     */
-    @Getter
+    @Data
    public static class statusEnumOption {
        private Integer value;
        private String info;
@@ -31,7 +44,7 @@ public class InstrumentManageInitDto {
        }
    }

-    @Getter
+    @Data
    public static class InstrumentStatusEnumOption {
        private Integer value;
        private String info;
@@ -41,7 +54,7 @@ public class InstrumentManageInitDto {
        }
    }

-    @Getter
+    @Data
    public static class InstrumentType {
        private Integer value;
        private String info;
@@ -50,4 +63,6 @@ public class InstrumentManageInitDto {
            this.info = info;
        }
    }
-}
+
+
+}
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
@@ -48,9 +48,6 @@ import com.openhis.web.personalization.dto.ActivityDeviceDto;
 import com.openhis.workflow.domain.ActivityDefinition;
 import com.openhis.workflow.domain.DeviceRequest;
 import com.openhis.workflow.domain.InventoryItem;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.openhis.workflow.domain.ServiceRequest;
 import com.openhis.workflow.service.*;
 import lombok.extern.slf4j.Slf4j;
@@ -949,27 +946,6 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
    /**
     * 处理药品
     */
-
-    /**
-     * 将 remark 合并到 contentJson 中，确保 Mapper 能从 content_json 提取 remark
-     */
-    private String injectRemarkIntoContentJson(String contentJson, String remark) {
-        if (remark == null || remark.isEmpty() || contentJson == null || contentJson.isEmpty()) {
-            return contentJson;
-        }
-        try {
-            ObjectMapper mapper = new ObjectMapper();
-            JsonNode node = mapper.readTree(contentJson);
-            if (node instanceof ObjectNode) {
-                ((ObjectNode) node).put("remark", remark);
-                return mapper.writeValueAsString(node);
-            }
-        } catch (Exception e) {
-            log.warn("Failed to inject remark into contentJson: {}", e.getMessage());
-        }
-        return contentJson;
-    }
-
    private List<String> handMedication(List<AdviceSaveDto> medicineList, Date curDate, String adviceOpType,
            Long organizationId, String signCode) {
        // 当前登录账号的科室id
@@ -1186,10 +1162,6 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
            if (medicationRequest.getId() == null) {
                firstTimeSave = true;
            }
-            // 确保 contentJson 包含 remark
-            if (adviceSaveDto.getRemark() != null && !adviceSaveDto.getRemark().isEmpty()) {
-                medicationRequest.setContentJson(injectRemarkIntoContentJson(medicationRequest.getContentJson(), adviceSaveDto.getRemark()));
-            }
            iMedicationRequestService.saveOrUpdate(medicationRequest);
            if (firstTimeSave) {
                medRequestIdList.add(medicationRequest.getId().toString());
@@ -1650,10 +1622,6 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
            deviceRequest.setConditionId(adviceSaveDto.getConditionId()); // 诊断id
            deviceRequest.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id

-            // 确保 contentJson 包含 remark
-            if (adviceSaveDto.getRemark() != null && !adviceSaveDto.getRemark().isEmpty()) {
-                deviceRequest.setContentJson(injectRemarkIntoContentJson(deviceRequest.getContentJson(), adviceSaveDto.getRemark()));
-            }
            iDeviceRequestService.saveOrUpdate(deviceRequest);
            if (is_save) {
                // 处理耗材发放
@@ -2065,9 +2033,6 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                serviceRequest.setBasedOnTable(CommonConstants.TableName.MED_MEDICATION_REQUEST);
            }

-            // 备注
-            serviceRequest.setRemark(adviceSaveDto.getRemark());
-
            iServiceRequestService.saveOrUpdate(serviceRequest);

            // 保存时保存诊疗费用项
@@ -2325,7 +2290,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
        log.info("BugFix: signOffAdvice - 签退所有请求，状态改为待签发, requestIdList={}", requestIdList);
        
        // 尝试签退药品请求（只有存在的才会更新）
-        iMedicationRequestService.updateDraftStatusBatch(requestIdList, null, null, null);
+        iMedicationRequestService.updateDraftStatusBatch(requestIdList, null, null);
        // 尝试签退耗材请求（只有存在的才会更新）
        iDeviceRequestService.updateDraftStatusBatch(requestIdList);
        // 尝试签退诊疗请求（只有存在的才会更新）
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java
@@ -250,9 +250,4 @@ public class AdviceBaseDto {
     * 是否缺少取药科室配置（仅药品类型使用）
     */
    private Boolean pharmacyConfigMissing;
-
-    /**
-     * 备注（最长50字）
-     */
-    private String remark;
 }
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceSaveDto.java
@@ -282,11 +282,6 @@ public class AdviceSaveDto {
     */
    private String sourceBillNo;

-    /**
-     * 备注（最长50字）
-     */
-    private String remark;
-
    /**
     * 设置默认值
     */
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/RequestBaseDto.java
@@ -127,11 +127,11 @@ public class RequestBaseDto {
     * 请求状态
     */
    private Integer statusEnum;
-
    /**
     * 退回原因
     */
    private String reasonText;
+
    private String statusEnum_enumText;

    /**
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java
@@ -58,7 +58,6 @@ import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.util.*;
-import java.util.Objects;
 import java.util.stream.Collectors;

 /**
@@ -186,13 +185,12 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
        QueryWrapper<InpatientAdviceParam> queryWrapper
                = HisQueryUtils.buildQueryWrapper(inpatientAdviceParam, null, null, null);

-        // 手动拼接requestStatus条件：COMPLETED(3)时同时包含CHECK_VERIFIED(10)和PENDING_RECEIVE(11)
+        // 手动拼接requestStatus条件：COMPLETED(3)时同时包含CHECK_VERIFIED(10)
        // UNION查询外层列名为request_status（T1.status_enum AS request_status），不是status_enum
        if (requestStatus != null) {
            if (RequestStatus.COMPLETED.getValue().equals(requestStatus)) {
                queryWrapper.in("request_status",
-                        RequestStatus.COMPLETED.getValue(), RequestStatus.CHECK_VERIFIED.getValue(),
-                        RequestStatus.PENDING_RECEIVE.getValue());
+                        RequestStatus.COMPLETED.getValue(), RequestStatus.CHECK_VERIFIED.getValue());
            } else {
                queryWrapper.eq("request_status", requestStatus);
            }
@@ -415,14 +413,9 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
        }
        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
        Date checkDate = new Date();
-        // 从请求中提取退回原因（所有项目共享同一原因）
-        String backReason = performInfoList.stream()
-                .map(PerformInfoDto::getBackReason)
-                .filter(Objects::nonNull)
-                .findFirst()
-                .orElse(null);
        if (!serviceRequestList.isEmpty()) {
            // 更新服务请求状态待发送
+            String backReason = performInfoList.get(0).getBackReason();
            serviceRequestService.updateDraftStatus(
                    serviceRequestList.stream().map(PerformInfoDto::getRequestId).toList(), practitionerId, checkDate, backReason);
        }
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionAppServiceImpl.java
@@ -256,7 +256,7 @@ public class OutpatientInfusionAppServiceImpl implements IOutpatientInfusionAppS
            }
            boolean result = serviceRequestService.updateCancelledStatus(serviceReqId, now, practitionerId, orgId);
            // 更新主服务请求状态为待执行
-            serviceRequestService.updateDraftStatus(List.of(serviceRequest.getBasedOnId()), null, null, null);
+            serviceRequestService.updateDraftStatus(List.of(serviceRequest.getBasedOnId()), null, null);
            if (result) {
                // 判断是否全部取消执行
                boolean exists = serviceRequestMapper.exists(new LambdaQueryWrapper<ServiceRequest>()
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java
@@ -52,8 +52,7 @@ public class PendingMedicationDetailsAppServiceImpl implements IPendingMedicatio
        Page<PendingMedicationPageDto> pendingMedicationPage = pendingMedicationDetailsMapper
            .selectPendingMedicationDetailsPage(new Page<>(pageNo, pageSize), queryWrapper,
                DispenseStatus.IN_PROGRESS.getValue(), DispenseStatus.PREPARATION.getValue(),
-                DispenseStatus.PREPARED.getValue(), DispenseStatus.SUMMARIZED.getValue(),
-                EncounterClass.AMB.getValue(), EncounterClass.IMP.getValue());
+                DispenseStatus.PREPARED.getValue(), EncounterClass.AMB.getValue(), EncounterClass.IMP.getValue());

        pendingMedicationPage.getRecords().forEach(e -> {
            // 发药类型
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java
@@ -22,7 +22,6 @@ public interface PendingMedicationDetailsMapper {
     * @param inProgress 发药类型：待发药
     * @param preparation 发药类型：待配药
     * @param prepared 发药类型：已配药
-     * @param summarized 发药类型：已汇总
     * @param amb 门诊类型
     * @param imp 住院类型
     * @return 待发药明细
@@ -33,7 +32,6 @@ public interface PendingMedicationDetailsMapper {
        @Param("inProgress") Integer inProgress,
        @Param("preparation") Integer preparation,
        @Param("prepared") Integer prepared,
-        @Param("summarized") Integer summarized,
        @Param("amb") Integer amb,
        @Param("imp") Integer imp);

--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
@@ -31,9 +31,6 @@ import com.openhis.web.regdoctorstation.dto.*;
 import com.openhis.web.regdoctorstation.mapper.AdviceManageAppMapper;
 import com.openhis.web.regdoctorstation.utils.RegPrescriptionUtils;
 import com.openhis.workflow.domain.DeviceRequest;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.openhis.workflow.domain.ServiceRequest;
 import com.openhis.workflow.service.IActivityDefinitionService;
 import com.openhis.workflow.domain.ActivityDefinition;
@@ -355,27 +352,6 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
    /**
     * 处理药品
     */
-
-    /**
-     * 将 remark 合并到 contentJson 中，确保 Mapper 能从 content_json 提取 remark
-     */
-    private String injectRemarkIntoContentJson(String contentJson, String remark) {
-        if (remark == null || remark.isEmpty() || contentJson == null || contentJson.isEmpty()) {
-            return contentJson;
-        }
-        try {
-            ObjectMapper mapper = new ObjectMapper();
-            JsonNode node = mapper.readTree(contentJson);
-            if (node instanceof ObjectNode) {
-                ((ObjectNode) node).put("remark", remark);
-                return mapper.writeValueAsString(node);
-            }
-        } catch (Exception e) {
-            log.warn("Failed to inject remark into contentJson: {}", e.getMessage());
-        }
-        return contentJson;
-    }
-
    private List<String> handMedication(List<RegAdviceSaveDto> medicineList, Date startTime, Date authoredTime,
            Date curDate, String adviceOpType, Long organizationId, String signCode) {
        // 当前登录账号的科室id
@@ -474,10 +450,6 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
            if (longMedicationRequest.getId() == null) {
                firstTimeSave = true;
            }
-            // 确保 contentJson 包含 remark
-            if (regAdviceSaveDto.getRemark() != null && !regAdviceSaveDto.getRemark().isEmpty()) {
-                longMedicationRequest.setContentJson(injectRemarkIntoContentJson(longMedicationRequest.getContentJson(), regAdviceSaveDto.getRemark()));
-            }
            iMedicationRequestService.saveOrUpdate(longMedicationRequest);
            if (firstTimeSave) {
                medRequestIdList.add(longMedicationRequest.getId().toString());
@@ -565,10 +537,6 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
            if (tempMedicationRequest.getId() == null) {
                firstTimeSave = true;
            }
-            // 确保 contentJson 包含 remark
-            if (regAdviceSaveDto.getRemark() != null && !regAdviceSaveDto.getRemark().isEmpty()) {
-                tempMedicationRequest.setContentJson(injectRemarkIntoContentJson(tempMedicationRequest.getContentJson(), regAdviceSaveDto.getRemark()));
-            }
            iMedicationRequestService.saveOrUpdate(tempMedicationRequest);
            if (firstTimeSave) {
                medRequestIdList.add(tempMedicationRequest.getId().toString());
@@ -672,7 +640,6 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                    longServiceRequest.setBasedOnTable(CommonConstants.TableName.MED_MEDICATION_REQUEST);
                }
            }
-            longServiceRequest.setRemark(regAdviceSaveDto.getRemark());
            iServiceRequestService.saveOrUpdate(longServiceRequest);
            if (longServiceRequest.getId() != null) {
                processedRequestIds.add(longServiceRequest.getId());
@@ -724,7 +691,6 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                    tempServiceRequest.setBasedOnTable(CommonConstants.TableName.MED_MEDICATION_REQUEST);
                }
            }
-            tempServiceRequest.setRemark(regAdviceSaveDto.getRemark());
            iServiceRequestService.saveOrUpdate(tempServiceRequest);
            if (tempServiceRequest.getId() != null) {
                processedRequestIds.add(tempServiceRequest.getId());
@@ -856,10 +822,6 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                deviceRequest.setConditionId(regAdviceSaveDto.getConditionId()); // 诊断id
                deviceRequest.setEncounterDiagnosisId(regAdviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
            }
-            // 确保 contentJson 包含 remark
-            if (regAdviceSaveDto.getRemark() != null && !regAdviceSaveDto.getRemark().isEmpty()) {
-                deviceRequest.setContentJson(injectRemarkIntoContentJson(deviceRequest.getContentJson(), regAdviceSaveDto.getRemark()));
-            }
            iDeviceRequestService.saveOrUpdate(deviceRequest);
        }

@@ -899,10 +861,6 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                deviceRequest.setConditionId(regAdviceSaveDto.getConditionId()); // 诊断id
                deviceRequest.setEncounterDiagnosisId(regAdviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
            }
-            // 确保 contentJson 包含 remark
-            if (regAdviceSaveDto.getRemark() != null && !regAdviceSaveDto.getRemark().isEmpty()) {
-                deviceRequest.setContentJson(injectRemarkIntoContentJson(deviceRequest.getContentJson(), regAdviceSaveDto.getRemark()));
-            }
            iDeviceRequestService.saveOrUpdate(deviceRequest);

            // 保存时,保存耗材费用项
@@ -1059,7 +1017,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
        }
        if (!medicineRequestIds.isEmpty()) {
            // 根据请求id更新请求状态
-            iMedicationRequestService.updateDraftStatusBatch(medicineRequestIds, null, null, null);
+            iMedicationRequestService.updateDraftStatusBatch(medicineRequestIds, null, null);
        }
        if (!activityRequestIds.isEmpty()) {
            // 根据请求id更新请求状态
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegRequestBaseDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegRequestBaseDto.java
@@ -50,9 +50,4 @@ public class RegRequestBaseDto extends RequestBaseDto {
    private String doseUnitCode;
    private String doseUnitCode_dictText;

-
-    /**
-     * 备注（最长50字）
-     */
-    private String remark;
 }
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml
@@ -262,7 +262,7 @@
        AND T1.inventory_status_enum != 3
        AND T1.delete_flag = '0'
        <choose>
-            <when test="lotNumber != null and lotNumber != ''">
+            <when test="lotNumber != null">
                AND T1.lot_number = #{lotNumber}
            </when>
        </choose>
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
@@ -516,7 +516,6 @@
        T1.patient_id AS patient_id,
        'med_medication_definition' AS advice_table_name,
        T1.medication_id AS advice_definition_id
-        , T1.content_json::jsonb ->> 'remark' AS remark
        , T1.back_reason AS reason_text
        FROM med_medication_request AS T1
        LEFT JOIN med_medication_definition AS T2 ON T2.ID = T1.medication_id
@@ -579,7 +578,6 @@
        T1.patient_id AS patient_id,
        'med_medication_definition' AS advice_table_name,
        T3.ID AS advice_definition_id
-        , T2.content_json::jsonb ->> 'remark' AS remark
        , T2.back_reason AS reason_text
        FROM adm_charge_item AS T1
        INNER JOIN med_medication_request AS T2 ON T2.ID = T1.service_id AND T2.delete_flag = '0'
@@ -644,7 +642,6 @@
        CI.patient_id AS patient_id,
        'adm_device_definition' AS advice_table_name,
        CI.product_id AS advice_definition_id
-        , NULL AS remark
        , NULL AS reason_text
        FROM adm_charge_item AS CI
        LEFT JOIN adm_charge_item_definition CID ON CID.id = CI.definition_id AND CID.delete_flag = '0'
@@ -700,7 +697,6 @@
        T1.patient_id AS patient_id,
        'adm_device_definition' AS advice_table_name,
        T1.device_def_id AS advice_definition_id
-        , T1.content_json::jsonb ->> 'remark' AS remark
        , NULL AS reason_text
        FROM wor_device_request AS T1
        LEFT JOIN adm_device_definition AS T2 ON T2.ID = T1.device_def_id
@@ -757,8 +753,7 @@
         T1.encounter_id AS encounter_id,
         T1.patient_id AS patient_id,
        'wor_activity_definition' AS advice_table_name,
-        T1.activity_id AS advice_definition_id,
-        T1.remark AS remark
+        T1.activity_id AS advice_definition_id
        , T1.reason_text AS reason_text
         FROM wor_service_request AS T1
        LEFT JOIN wor_activity_definition AS T2
@@ -938,4 +933,4 @@
        ORDER BY t1.ID, t1.name ASC, t2.ID ASC
    </select>

-</mapper>
+</mapper>
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml
@@ -51,7 +51,7 @@
                                     ON T5.medication_def_id = T6.id
                                          AND T5.delete_flag = '0'
                  WHERE T1.delete_flag = '0'
-                    AND T1.status_enum IN (#{inProgress}, #{preparation}, #{prepared}, #{summarized})
+                    AND T1.status_enum IN (#{inProgress}, #{preparation}, #{prepared})
                  ORDER BY T1.create_time DESC
              ) AS T7
            ${ew.customSqlSegment}
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
@@ -214,11 +214,11 @@
        T1.dispense_per_duration AS dispense_per_duration,
        T2.part_percent AS part_percent,
        ccd.name AS condition_definition_name,
+        T1.effective_dose_start AS start_time,
        T1.therapy_enum AS therapyEnum,
        T1.sort_number AS sort_number,
-        T1.effective_dose_start AS start_time,
        T1.based_on_id AS based_on_id,
-        T1.medication_id AS advice_definition_id,
+        T1.medication_id AS advice_definition_id
        T1.effective_dose_end AS stop_time,
        T1.update_by AS stop_user_name
        FROM med_medication_request AS T1
@@ -274,8 +274,8 @@
        99 AS sort_number,
        T1.req_authored_time AS start_time,
        T1.based_on_id AS based_on_id,
-        T1.device_def_id AS advice_definition_id,
-        NULL::timestamp AS stop_time,
+        T1.device_def_id AS advice_definition_id
+        NULL AS stop_time,
        '' AS stop_user_name
        FROM wor_device_request AS T1
        LEFT JOIN adm_device_definition AS T2 ON T2.ID = T1.device_def_id
@@ -327,7 +327,7 @@
        99 AS sort_number,
        T1.occurrence_start_time AS start_time,
        T1.based_on_id AS based_on_id,
-        T1.activity_id AS advice_definition_id,
+        T1.activity_id AS advice_definition_id
        T1.occurrence_end_time AS stop_time,
        T1.update_by AS stop_user_name
        FROM wor_service_request AS T1
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java
@@ -78,6 +78,9 @@ public class MedicationRequestServiceImpl extends ServiceImpl<MedicationRequestM
        if (checkDate != null) {
            updateWrapper.set(MedicationRequest::getCheckTime, checkDate);
        }
+        if (backReason != null) {
+            updateWrapper.set(MedicationRequest::getBackReason, backReason);
+        }
        baseMapper.update(null, updateWrapper);
    }

--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java
@@ -173,9 +173,4 @@ public class ServiceRequest extends HisBaseEntity {
     */
    private Integer generateSourceEnum;

-    /**
-     * 备注（最长50字）
-     */
-    private String remark;
-
 }
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterDiagnosisMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterDiagnosisMapper.xml
@@ -27,7 +27,6 @@
          AND T1.delete_flag = '0'
          AND T2.delete_flag = '0'
          AND T1.tenant_id = #{tenantId}
-        LIMIT 1
    </select>

 </mapper>
--- a/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
  <div
    class="exam-app-container"
    style="width: 100%; max-width: 1200px;"
@@ -723,40 +723,60 @@
          </div>

          <div class="right-column">
-          <!-- 右侧：已选择（检查项目、检查方法为两类独立选择结果） -->
-          <div class="selected-panel">
-            <div class="panel-label">已选择:</div>
-            <div class="selected-tags">
-              <template v-if="selectedItems.length === 0 && selectedMethods.length === 0">
-                <div class="empty-selected">–</div>
-              </template>
-              <template v-else>
-              <div
-                v-for="(item, idx) in selectedItems"
-                :key="'project-' + item.id"
-                class="selected-item-card"
-                :class="{ 'is-expanded': item.projectFoldExpanded }"
-              >
-                <div
-                  class="fold-strip fold-strip-project"
-                  :class="{ 'is-open': item.projectFoldExpanded }"
-                >
-                  <div class="fold-strip-header" :class="{ 'no-chevron': !hasItemPackage(item) }" @click="hasItemPackage(item) && toggleProjectFold(item)">
-                    <el-icon v-if="hasItemPackage(item)" :class="['fold-chevron', { open: item.projectFoldExpanded }]">
-                      <ArrowDown />
-                    </el-icon>
-                    <div class="fold-header-main">
-                      <span class="fold-kicker">检查项目</span>
-                      <el-tooltip :content="getDisplayItemName(item)" placement="top" :show-after="400">
-                        <span class="fold-title line-clamp-2">{{ getDisplayItemName(item) }}</span>
-                      </el-tooltip>
-                    </div>
-                    <span class="fold-price-strong">¥{{ formatDetailAmount(item.price || 0) }}</span>
-                    <el-button link type="danger" size="small" @click.stop="handleRemoveItem(idx, item)">
-                      <el-icon><Close /></el-icon>
-                    </el-button>
+            <!-- 右侧：已选择（检查项目、检查方法为两类独立选择结果） -->
+            <div class="selected-panel">
+              <div class="panel-label">
+                已选择:
+              </div>
+              <div class="selected-tags">
+                <template v-if="selectedItems.length === 0 && selectedMethods.length === 0">
+                  <div class="empty-selected">
+                    –
                  </div>
-                  <!-- 仅当项目有套餐时展示明细区域，普通项目无明细可展示 -->
+                </template>
+                <template v-else>
+                  <div
+                    v-for="(item, idx) in selectedItems"
+                    :key="'project-' + item.id"
+                    class="selected-item-card"
+                    :class="{ 'is-expanded': item.projectFoldExpanded }"
+                  >
+                    <div
+                      class="fold-strip fold-strip-project"
+                      :class="{ 'is-open': item.projectFoldExpanded }"
+                    >
+                      <div
+                        class="fold-strip-header"
+                        :class="{ 'no-chevron': !hasItemPackage(item) }"
+                        @click="hasItemPackage(item) && toggleProjectFold(item)"
+                      >
+                        <el-icon
+                          v-if="hasItemPackage(item)"
+                          :class="['fold-chevron', { open: item.projectFoldExpanded }]"
+                        >
+                          <ArrowDown />
+                        </el-icon>
+                        <div class="fold-header-main">
+                          <span class="fold-kicker">检查项目</span>
+                          <el-tooltip
+                            :content="getDisplayItemName(item)"
+                            placement="top"
+                            :show-after="400"
+                          >
+                            <span class="fold-title line-clamp-2">{{ getDisplayItemName(item) }}</span>
+                          </el-tooltip>
+                        </div>
+                        <span class="fold-price-strong">¥{{ formatDetailAmount(item.price || 0) }}</span>
+                        <el-button
+                          link
+                          type="danger"
+                          size="small"
+                          @click.stop="handleRemoveItem(idx, item)"
+                        >
+                          <el-icon><Close /></el-icon>
+                        </el-button>
+                      </div>
+                      <!-- 仅当项目有套餐时展示明细区域，普通项目无明细可展示 -->
                      <div
                        v-if="hasItemPackage(item) && item.projectFoldExpanded"
                        class="fold-strip-body"
@@ -803,47 +823,70 @@
                    </div>
                  </div>

-              <div
-                v-for="(method, idx) in selectedMethods"
-                :key="'method-' + method.id"
-                class="selected-item-card"
-                :class="{ 'is-expanded': method.expanded }"
-              >
-                <div
-                  class="fold-strip fold-strip-method"
-                  :class="{ 'is-open': method.expanded }"
-                >
-                  <div class="fold-strip-header" :class="{ 'no-chevron': !hasStandaloneMethodPackage(method) }" @click="hasStandaloneMethodPackage(method) && toggleSelectedMethodFold(method)">
-                    <el-icon v-if="hasStandaloneMethodPackage(method)" :class="['fold-chevron', { open: method.expanded }]">
-                      <ArrowDown />
-                    </el-icon>
-                    <div class="fold-header-main">
-                      <span class="fold-kicker">检查方法</span>
-                      <span
-                        class="fold-title fold-title-plain line-clamp-2"
-                        :title="getDisplayMethodName(method)"
-                      >
-                        {{ getDisplayMethodName(method) }}
-                      </span>
-                    </div>
-                    <span
-                      v-if="hasStandaloneMethodPackage(method)"
-                      class="fold-price-strong warn"
+                  <div
+                    v-for="(method, idx) in selectedMethods"
+                    :key="'method-' + method.id"
+                    class="selected-item-card"
+                    :class="{ 'is-expanded': method.expanded }"
+                  >
+                    <div
+                      class="fold-strip fold-strip-method"
+                      :class="{ 'is-open': method.expanded }"
                    >
-                      ¥{{ formatDetailAmount(method.packagePrice || method.price || 0) }}
-                    </span>
-                    <el-button link type="danger" size="small" @click.stop="handleRemoveMethod(idx)">
-                      <el-icon><Close /></el-icon>
-                    </el-button>
-                  </div>
-                  <!-- 仅当检查方法有套餐时展示明细 -->
-                  <div v-if="hasStandaloneMethodPackage(method) && method.expanded" class="fold-strip-body">
-                    <div class="fold-package-wrap fold-method-package-wrap">
-                      <div v-if="method.packageLoading" class="package-details-loading">加载中...</div>
-                      <template v-else>
-                        <div v-if="getStandaloneMethodPackageDetailsList(method).length === 0" class="package-details-empty">
-                          暂无检查方法套餐明细
+                      <div
+                        class="fold-strip-header"
+                        :class="{ 'no-chevron': !hasStandaloneMethodPackage(method) }"
+                        @click="hasStandaloneMethodPackage(method) && toggleSelectedMethodFold(method)"
+                      >
+                        <el-icon
+                          v-if="hasStandaloneMethodPackage(method)"
+                          :class="['fold-chevron', { open: method.expanded }]"
+                        >
+                          <ArrowDown />
+                        </el-icon>
+                        <div class="fold-header-main">
+                          <span class="fold-kicker">检查方法</span>
+                          <span
+                            class="fold-title fold-title-plain line-clamp-2"
+                            :title="getDisplayMethodName(method)"
+                          >
+                            {{ getDisplayMethodName(method) }}
+                          </span>
                        </div>
+                        <span
+                          v-if="hasStandaloneMethodPackage(method)"
+                          class="fold-price-strong warn"
+                        >
+                          ¥{{ formatDetailAmount(method.packagePrice || method.price || 0) }}
+                        </span>
+                        <el-button
+                          link
+                          type="danger"
+                          size="small"
+                          @click.stop="handleRemoveMethod(idx)"
+                        >
+                          <el-icon><Close /></el-icon>
+                        </el-button>
+                      </div>
+                      <!-- 仅当检查方法有套餐时展示明细 -->
+                      <div
+                        v-if="hasStandaloneMethodPackage(method) && method.expanded"
+                        class="fold-strip-body"
+                      >
+                        <div class="fold-package-wrap fold-method-package-wrap">
+                          <div
+                            v-if="method.packageLoading"
+                            class="package-details-loading"
+                          >
+                            加载中...
+                          </div>
+                          <template v-else>
+                            <div
+                              v-if="getStandaloneMethodPackageDetailsList(method).length === 0"
+                              class="package-details-empty"
+                            >
+                              暂无检查方法套餐明细
+                            </div>
                            <div
                              v-else
                              class="package-details-list method-package-list"
@@ -866,46 +909,53 @@
                                </div>
                              </div>
                            </div>
-                      </template>
-                    </div>
-                  </div>
+                          </template>
+                        </div>
+                      </div>
                    </div>
                  </div>
                </template>
              </div>
            </div>

-            </div>
-          </div>
-
-          <!-- 独立检查方法勾选区：与"已选择"区域解耦，支持分别手动勾选 -->
-          <div class="method-picker-section">
-            <div
-              v-if="methodsForActiveCategory.length > 0"
-              class="selected-global-method-picker"
-              @click.stop
-            >
-              <div class="method-picker-collapse-title" @click="methodPickerExpanded = !methodPickerExpanded">
-                <span class="method-picker-title-main">检查方法</span>
-                <span v-if="activeCategoryName" class="global-method-picker-scope">{{ activeCategoryName }}</span>
-                <el-icon :class="['method-picker-arrow', { expanded: methodPickerExpanded }]">
-                  <ArrowDown />
-                </el-icon>
-              </div>
-              <div v-show="methodPickerExpanded" class="global-method-picker-list">
+            <!-- 独立检查方法勾选区：与"已选择"区域解耦，支持分别手动勾选 -->
+            <div class="method-picker-section">
+              <div
+                v-if="methodsForActiveCategory.length > 0"
+                class="selected-global-method-picker"
+                @click.stop
+              >
                <div
-                  v-for="method in methodsForActiveCategory"
-                  :key="'g-m-' + method.id"
-                  class="item-row method-picker-row"
+                  class="method-picker-collapse-title"
+                  @click="methodPickerExpanded = !methodPickerExpanded"
                >
-                  <el-checkbox
-                    :model-value="isStandaloneMethodSelected(method)"
-                    @change="(val) => onStandaloneMethodChange(!!val, method)"
-                    class="item-checkbox"
+                  <span class="method-picker-title-main">检查方法</span>
+                  <span
+                    v-if="activeCategoryName"
+                    class="global-method-picker-scope"
+                  >{{ activeCategoryName }}</span>
+                  <el-icon :class="['method-picker-arrow', { expanded: methodPickerExpanded }]">
+                    <ArrowDown />
+                  </el-icon>
+                </div>
+                <div
+                  v-show="methodPickerExpanded"
+                  class="global-method-picker-list"
+                >
+                  <div
+                    v-for="method in methodsForActiveCategory"
+                    :key="'g-m-' + method.id"
+                    class="item-row method-picker-row"
                  >
-                    <span class="method-label-inner">{{ formatExamMethodCaption(method.name) }}</span>
-                  </el-checkbox>
-                  <span class="item-price">¥{{ formatDetailAmount(method.packagePrice || method.price || 0) }}</span>
+                    <el-checkbox
+                      :model-value="isStandaloneMethodSelected(method)"
+                      class="item-checkbox"
+                      @change="(val) => onStandaloneMethodChange(!!val, method)"
+                    >
+                      <span class="method-label-inner">{{ formatExamMethodCaption(method.name) }}</span>
+                    </el-checkbox>
+                    <span class="item-price">¥{{ formatDetailAmount(method.packagePrice || method.price || 0) }}</span>
+                  </div>
                </div>
              </div>
            </div>
@@ -913,6 +963,7 @@
        </div>
      </div>
    </div>
+  </div>
 </template>

 <script setup>
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -1352,7 +1352,10 @@
          width="160"
        >
          <template #default="scope">
-            <span v-if="!scope.row.isEdit" style="color: #e6a23c;">
+            <span
+              v-if="!scope.row.isEdit"
+              style="color: #e6a23c;"
+            >
              {{ scope.row.reasonText || '-' }}
            </span>
          </template>
--- a/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/registerForm.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/registerForm.vue
@@ -506,10 +506,21 @@ function getInitOptions() {
  const wardPromise = getPractitionerWard();

  Promise.all([orgPromise, wardPromise]).then(([orgRes, wardRes]) => {
-    // 入院科室：展示所有 typeEnum=2(科室) + classEnum含"2"(住院) 的科室
-    organization.value = orgRes.data.records.filter(
+    const allOrgs = orgRes.data.records.filter(
      (record) => record.typeEnum === 2 && checkClassEnumValue(record.classEnum, 2)
    );
+    const allWards = wardRes.data || [];
+
+    // 提取所有病区关联的科室ID
+    const linkedOrgIds = new Set();
+    allWards.forEach((ward) => {
+      if (ward.organizationId) {
+        linkedOrgIds.add(ward.organizationId);
+      }
+    });
+
+    // 过滤出与病区关联过的科室
+    organization.value = allOrgs.filter((org) => linkedOrgIds.has(org.id));

    // Bug #178 Fix: 如果已选科室不在列表中，手动添加以确保正确显示
    const selectedOrgId = props.inHospitalInfo?.inHospitalOrgId;
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
@@ -46,11 +46,6 @@
                  </el-button>
                </template>
                <el-popconfirm
-                  v-if="
-                    node.level === 2 &&
-                      node.parent.data.name != '常用' &&
-                      node.parent.data.name != '历史'
-                  "
                  width="200"
                  :hide-after="10"
                  title="确认删除此常用诊断吗"
@@ -59,6 +54,11 @@
                >
                  <template #reference>
                    <el-button
+                      v-if="
+                        node.level === 2 &&
+                          node.parent.data.name != '常用' &&
+                          node.parent.data.name != '历史'
+                      "
                      style="color: #000000"
                      type="text"
                      size="small"
@@ -404,7 +404,7 @@ function getList() {
          ...item,
        };
        if (obj.diagSrtNo == null) {
-          obj.diagSrtNo = 1;
+          obj.diagSrtNo = '1';
        }
        return obj;
      });
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/OrderForm.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/OrderForm.vue
@@ -294,9 +294,6 @@
              </el-select>
            </template>
          </div>
-          <el-form-item label="备注：" prop="remark">
-            <el-input v-model="row.remark" maxlength="50" placeholder="最多50字" style="width: 200px" />
-          </el-form-item>
          <div class="form-actions">
            <el-button type="primary" @click="handleSave">确定</el-button>
            <el-button @click="handleCancel">取消</el-button>
@@ -500,9 +497,6 @@
              总金额：{{ row.totalPrice ? Number(row.totalPrice).toFixed(2) + ' 元' : '0.00 元' }}
            </span>
          </div>
-          <el-form-item label="备注：" prop="remark">
-            <el-input v-model="row.remark" maxlength="50" placeholder="最多50字" style="width: 200px" />
-          </el-form-item>
          <div class="form-actions">
            <el-button type="primary" @click="handleSave">确定</el-button>
            <el-button @click="handleCancel">取消</el-button>
@@ -566,9 +560,6 @@
              <!-- 金额: {{ row.priceList[0].price }} -->
            </span>
          </div>
-          <el-form-item label="备注：" prop="remark">
-            <el-input v-model="row.remark" maxlength="50" placeholder="最多50字" style="width: 200px" />
-          </el-form-item>
          <div class="form-actions">
            <el-button type="primary" @click="handleSave">确定</el-button>
            <el-button @click="handleCancel">取消</el-button>
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
@@ -255,7 +255,7 @@
            <el-tag v-else-if="scope.row.statusEnum == 10" type="primary">已校对</el-tag>
            <el-tag v-else-if="scope.row.statusEnum == 11" type="primary">待接收</el-tag>
            <el-tag v-else-if="scope.row.statusEnum == 3" type="success">已完成</el-tag>
-            <el-tag v-else-if="scope.row.statusEnum == 6" type="danger">停止</el-tag>
+            <el-tag v-else-if="scope.row.statusEnum == 6" type="error">停止</el-tag>
            <el-tag v-else type="info">{{ scope.row.chargeStatus_enumText }}</el-tag>
          </template>
        </el-table-column>
@@ -489,9 +489,6 @@ const unitMap = ref({
 const buttonDisabled = computed(() => {
  return !patientInfo.value;
 });
-const isSaveDisabled = computed(() => {
-  return !patientInfo.value || prescriptionList.value.length === 0;
-});
 const props = defineProps({
  patientInfo: {
    type: Object,
@@ -679,6 +676,7 @@ function getListInfo(addNewRow) {
    organization.value = res?.data?.records ?? res?.data ?? [];
  });
  getPrescriptionList(patientInfo.value.encounterId).then((res) => {
+    console.log('getListInfo==========>', JSON.stringify(res.data));
    // 等待科室树加载完成后再处理处方数据，确保 resolveOrgId 能正确匹配
    orgTreePromise.then(() => {
      loadingInstance.close();
@@ -686,6 +684,7 @@ function getListInfo(addNewRow) {
        .map((item) => {
          const parsedContent = JSON.parse(item.contentJson);
          // 构造 unitCodeList，确保编辑时下拉框有正确的选项
+          console.log('【DEBUG】unitCode:', parsedContent?.unitCode, typeof parsedContent?.unitCode, 'unitCodeList:', JSON.stringify(parsedContent?.unitCodeList));
          const unitCodeListData = parsedContent?.unitCodeList || [
            { value: String(parsedContent?.unitCode ?? item.unitCode ?? ''), label: parsedContent?.unitCode_dictText ?? item.unitCode_dictText ?? '', type: 'unit' },
            { value: String(parsedContent?.doseUnitCode ?? ''), label: parsedContent?.doseUnitCode_dictText ?? '', type: 'dose' },
@@ -706,7 +705,6 @@ function getListInfo(addNewRow) {
            unitCodeList: unitCodeListData,
            // 确保 therapyEnum 被正确设置，优先使用 contentJson 中的值
            therapyEnum: String(parsedContent?.therapyEnum ?? item.therapyEnum ?? '1'),
-            // 🔧 修复：确保 orgId 为 String 类型，与 organization 树的 id 类型一致
            // 确保 skinTestFlag 是数字类型（1 或 0），从 contentJson 恢复
            skinTestFlag: parsedContent?.skinTestFlag !== undefined && parsedContent?.skinTestFlag !== null
              ? (typeof parsedContent.skinTestFlag === 'number' ? parsedContent.skinTestFlag : (parsedContent.skinTestFlag ? 1 : 0))
@@ -714,6 +712,7 @@ function getListInfo(addNewRow) {
            skinTestFlag_enumText: parsedContent?.skinTestFlag !== undefined && parsedContent?.skinTestFlag !== null
              ? (parsedContent.skinTestFlag == 1 ? '是' : '否')
              : '否',
+            // 🔧 修复：确保 orgId 为 String 类型，与 organization 树的 id 类型一致
            // 关键：优先使用 item.positionId（后端 @JsonSerialize 保证精度），
            // 而非 parsedContent.orgId（来自 JSON.parse，大 Long 可能精度丢失）
            // 使用 resolveOrgId 从组织树中匹配正确的 String id
@@ -1034,6 +1033,11 @@ function handleFocus(row, index) {
    categoryCode = selectedItem ? selectedItem.categoryCode : (row.categoryCode || '');
  }
  adviceQueryParams.value = { adviceType, categoryCode, searchKey: '' };
+  // handleFocus 打开 popover 时也要加载数据
+  const tableRef = Array.isArray(adviceTableRef.value) ? adviceTableRef.value[index] : adviceTableRef.value;
+  if (tableRef && tableRef.refresh) {
+    tableRef.refresh(adviceType, categoryCode, '');
+  }
 }

 function handleBlur(row) {
@@ -1088,7 +1092,6 @@ function selectAdviceBase(key, row) {
  }
  // 确保 uniqueKey 不被覆盖
  prescriptionList.value[rowIndex.value].uniqueKey = currentUniqueKey;
-
  // 检查是否是皮试药品，如果是则弹出确认提示
  // 只对药品类型（adviceType=1 药品, adviceType=2 耗材）进行皮试提示
  const isSkinTestDrug = row.skinTestFlag !== undefined && row.skinTestFlag !== null
@@ -1153,7 +1156,6 @@ function expandOrderAndFocus(key, row) {
  });
 }

-
 function getOrgList() {
  getOrgTree().then((res) => {
    organization.value = res?.data?.records ?? res?.data ?? [];
@@ -1581,6 +1583,10 @@ function handleSaveSign(row, index) {
  if (row.injectFlag == 1) {
    row.sortNumber = row.sortNumber ? row.sortNumber : prescriptionList.value.length;
  }
+  // Bug #589: 出院带药标记到contentJson
+  if (originalAdviceType == 7) {
+    row.prescriptionCategory = 3;
+  }
  // 确保 skinTestFlag 是数字类型（1 或 0）
  row.skinTestFlag = row.skinTestFlag !== undefined && row.skinTestFlag !== null
    ? (typeof row.skinTestFlag === 'number' ? row.skinTestFlag : (row.skinTestFlag ? 1 : 0))
@@ -1637,11 +1643,11 @@ function handleSaveBatch() {
        ...item,
        therapyEnum: therapyEnum,
        dbOpType: item.requestId ? '2' : '1',
-          // 确保 skinTestFlag 是数字类型（1 或 0）
-          skinTestFlag: item.skinTestFlag !== undefined && item.skinTestFlag !== null
-            ? (typeof item.skinTestFlag === "number" ? item.skinTestFlag : (item.skinTestFlag ? 1 : 0))
-            : 0,
-          skinTestFlag_enumText: item.skinTestFlag == 1 ? '是' : '否',
+        // 确保 skinTestFlag 是数字类型（1 或 0）
+        skinTestFlag: item.skinTestFlag !== undefined && item.skinTestFlag !== null
+          ? (typeof item.skinTestFlag === 'number' ? item.skinTestFlag : (item.skinTestFlag ? 1 : 0))
+          : 0,
+        skinTestFlag_enumText: item.skinTestFlag == 1 ? '是' : '否',
      };
      // Bug #589: 出院带药批量保存时转为药品类型
      if (result.adviceType == 7) {
--- a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue
@@ -621,6 +621,7 @@ watch(
  (visible) => {
    if (visible) {
      executeTime.value = formatDateStr(new Date(), 'YYYY-MM-DD HH:mm:ss');
+      consumableDefaultLocId.value = null; // 重置耗材默认库房，避免复用上次患者配置
      // 弹窗打开时按当前患者科室重新加载，避免复用上一次患者/登录科室的结果
      loadDepartmentOptions();
      getAdviceBaseInfos();
--- a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue
@@ -227,9 +227,21 @@
    </div>
  </div>
  <!-- 退回原因弹窗 -->
-  <el-dialog v-model="backReasonVisible" title="退回原因" width="400px" :close-on-click-modal="false">
-    <el-form ref="backReasonFormRef" :model="backReasonForm" :rules="backReasonRules">
-      <el-form-item label="退回原因" prop="reason">
+  <el-dialog
+    v-model="backReasonVisible"
+    title="退回原因"
+    width="400px"
+    :close-on-click-modal="false"
+  >
+    <el-form
+      ref="backReasonFormRef"
+      :model="backReasonForm"
+      :rules="backReasonRules"
+    >
+      <el-form-item
+        label="退回原因"
+        prop="reason"
+      >
        <el-input
          v-model="backReasonForm.reason"
          type="textarea"
@@ -241,8 +253,15 @@
      </el-form-item>
    </el-form>
    <template #footer>
-      <el-button @click="backReasonVisible = false">取消</el-button>
-      <el-button type="primary" @click="confirmCancel">确定退回</el-button>
+      <el-button @click="backReasonVisible = false">
+        取消
+      </el-button>
+      <el-button
+        type="primary"
+        @click="confirmCancel"
+      >
+        确定退回
+      </el-button>
    </template>
  </el-dialog>
 </template>
@@ -257,10 +276,10 @@ const activeNames = ref([]);
 const prescriptionList = ref([]);
 const deadline = ref(formatDateStr(new Date(), 'YYYY-MM-DD') + ' 23:59:59');
 const type = ref(null);
+const { proxy } = getCurrentInstance();
 const backReasonVisible = ref(false);
 const backReasonForm = ref({ reason: '' });
 const backReasonFormRef = ref(null);
-const { proxy } = getCurrentInstance();
 const loading = ref(false);
 const chooseAll = ref(false);
 const selectionTrigger = ref(0);
@@ -305,7 +324,6 @@ const getStatusDisplayText = (row) => {
  return LEGACY_STATUS_TEXT[row?.requestStatus_enumText] || row?.requestStatus_enumText || '';
 };

-
 const getStatusType = (status) => {
  const map = {
    1: 'info',
@@ -461,7 +479,6 @@ function handleCheck() {
 function handleCancel() {
  let list = getSelectRows();
  if (list.length > 0) {
-    // 校验已发药的医嘱不允许退回
    let dispensedItems = list.filter(item => item.dispenseStatus === 4);
    if (dispensedItems.length > 0) {
      proxy.$message.error('该药品已由药房发放，请先执行退药处理，不可直接退回');
@@ -482,7 +499,6 @@ function confirmCancel() {
    return;
  }
  let list = getSelectRows();
-  // 将退回原因附加到每个项目
  let requestList = list.map(item => ({
    ...item,
    backReason: backReasonForm.value.reason.trim()
--- a/openhis-ui-vue3/src/views/medicationmanagement/transferManagent/transferManagent/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/transferManagent/transferManagent/index.vue
@@ -1180,9 +1180,6 @@ function selectRow(rowValue, index) {
  form.purchaseinventoryList[index].partPercent = rowValue.partPercent;
  form.purchaseinventoryList[index].unitList = rowValue.unitList[0];
  form.purchaseinventoryList[index].lotNumber = rowValue.lotNumber;
-  // 补全单位字典文本，formatInventory 依赖此字段格式化库存显示
-  form.purchaseinventoryList[index].unitCode_dictText = rowValue.unitCode_dictText;
-  form.purchaseinventoryList[index].minUnitCode_dictText = rowValue.minUnitCode_dictText;
  form.purchaseinventoryList[index].itemQuantity = 0;
  form.purchaseinventoryList[index].totalPrice = 0;
  // 维护一个大小单位的map，用来判断当前选中单位是大/小单位
@@ -1197,13 +1194,21 @@ function selectRow(rowValue, index) {
      value: rowValue.minUnitCode,
    },
  ];
-  // 新单/编辑单统一使用行级仓库ID，不再分支判断 route.query.supplyBusNo
-  handleLocationClick(
-    form.purchaseinventoryList[index].sourceLocationId,
-    form.purchaseinventoryList[index].purposeLocationId,
-    form.purchaseinventoryList[index].itemId,
-    index
-  );
+  if (route.query.supplyBusNo) {
+    handleLocationClick(
+      receiptHeaderForm.sourceLocationId1,
+      receiptHeaderForm.purposeLocationId1,
+      form.purchaseinventoryList[index].itemId,
+      index
+    );
+  } else {
+    handleLocationClick(
+      form.purchaseinventoryList[index].sourceLocationId,
+      form.purchaseinventoryList[index].purposeLocationId,
+      form.purchaseinventoryList[index].itemId,
+      index
+    );
+  }
  editBatchTransfer(index); // todo
 }

@@ -1215,29 +1220,23 @@ function handleLocationClick(id, purposeLocationId, itemId, index) {
    objLocationId: purposeLocationId,
    lotNumber: form.purchaseinventoryList[index].lotNumber,
  }).then((res) => {
-    if (res.data && res.data.length) {
-      // SQL 按 locationId 分组后可能有两条记录（源/目的），根据 locationId 精确匹配而非盲目取 res.data[0]
-      const srcId = String(id);
-      const purId = String(purposeLocationId);
-      const sourceRow = res.data.find(item => String(item.locationId) === srcId) || {};
-      const purposeRow = res.data.find(item => String(item.locationId) === purId) || {};
+    if (res.data && res.data[0]) {
+      form.purchaseinventoryList[index].itemTable = res.data[0].itemTable || '';
+      form.purchaseinventoryList[index].supplierId = res.data[0].supplierId || '';
+      form.purchaseinventoryList[index].startTime = formatDateymd(res.data[0].productionDate) || '';
+      form.purchaseinventoryList[index].endTime = formatDateymd(res.data[0].expirationDate) || '';

-      form.purchaseinventoryList[index].itemTable = sourceRow.itemTable || '';
-      form.purchaseinventoryList[index].supplierId = sourceRow.supplierId || '';
-      form.purchaseinventoryList[index].startTime = formatDateymd(sourceRow.productionDate) || '';
-      form.purchaseinventoryList[index].endTime = formatDateymd(sourceRow.expirationDate) || '';
-
-      form.purchaseinventoryList[index].price = sourceRow.price;
-      form.purchaseinventoryList[index].totalSourceQuantity = sourceRow.orgQuantity || 0;
-      form.purchaseinventoryList[index].totalPurposeQuantity = purposeRow.objQuantity || 0;
+      form.purchaseinventoryList[index].price = res.data[0].price;
+      form.purchaseinventoryList[index].totalSourceQuantity = res.data[0].orgQuantity;
+      form.purchaseinventoryList[index].totalPurposeQuantity = res.data[0].objQuantity;
      form.purchaseinventoryList[index].totalSourceQuantityDisplay = formatInventory(
-        sourceRow.orgQuantity || 0,
+        res.data[0].orgQuantity,
        form.purchaseinventoryList[index].partPercent,
        form.purchaseinventoryList[index].unitCode_dictText,
        form.purchaseinventoryList[index].minUnitCode_dictText
      );
      form.purchaseinventoryList[index].totalPurposeQuantityDisplay = formatInventory(
-        purposeRow.objQuantity || 0,
+        res.data[0].objQuantity,
        form.purchaseinventoryList[index].partPercent,
        form.purchaseinventoryList[index].unitCode_dictText,
        form.purchaseinventoryList[index].minUnitCode_dictText
@@ -1341,8 +1340,8 @@ function formatInventory(quantity, partPercent, unitCode, minUnitCode) {
    return isNegative ? '-' + result : result;
  }

-  // 整除时也需拼接单位后缀，否则显示为纯数字缺少单位信息
-  const result = (absQuantity / partPercent) + ' ' + unitCode;
+  // 整除情况
+  const result = absQuantity / partPercent;
  return isNegative ? '-' + result : result;
 }

--- a/openhis-ui-vue3/src/views/patientmanagement/outpatienrecords/index.vue
+++ b/openhis-ui-vue3/src/views/patientmanagement/outpatienrecords/index.vue
@@ -75,12 +75,30 @@
          clearable
          style="width: 120px"
        >
-          <el-option label="已到达" :value="1" />
-          <el-option label="已分诊" :value="2" />
-          <el-option label="已看诊" :value="3" />
-          <el-option label="已离开" :value="4" />
-          <el-option label="已完成" :value="5" />
-          <el-option label="无状态" :value="0" />
+          <el-option
+            label="已到达"
+            :value="1"
+          />
+          <el-option
+            label="已分诊"
+            :value="2"
+          />
+          <el-option
+            label="已看诊"
+            :value="3"
+          />
+          <el-option
+            label="已离开"
+            :value="4"
+          />
+          <el-option
+            label="已完成"
+            :value="5"
+          />
+          <el-option
+            label="无状态"
+            :value="0"
+          />
        </el-select>
      </el-form-item>
      <el-form-item
@@ -251,11 +269,8 @@ function getList() {
    console.log('当前查看患者:', route.query.patientName);
  }

-  // 构建请求参数 - "无状态"(0) 转为 undefined，让后端不加过滤
+  // 构建请求参数
  const requestParams = { ...queryParams.value };
-  if (requestParams.subjectStatusEnum === 0) {
-    requestParams.subjectStatusEnum = undefined;
-  }
  listOutpatienRecords(requestParams).then((response) => {
    outpatienRecordsList.value = response.data.records;
    total.value = response.data.total;