diff --git a/healthlink-his-server/AGENTS.md b/healthlink-his-server/AGENTS.md
index 4a13dc4ae..d320b4a8a 100644
--- a/healthlink-his-server/AGENTS.md
+++ b/healthlink-his-server/AGENTS.md
@@ -1,29 +1,438 @@
-# HealthLink-HIS 后端开发规范
+# HealthLink-HIS — AI 开发规范
 
-> 🤖 本文件供 AI 工具自动读取。完整规范见 **[../../RULES.md](../../RULES.md)**
+> 🤖 本文件供所有 AI 编码工具自动读取。进入本项目后必须遵守以下规范。
+> 
+> **模型决定上限，Harness 决定底线。**
 
-## 铁律速查
+---
 
-1. **修改完必须测试** — `mvn clean compile -DskipTests`
-2. **Flyway 迁移** — 新建表/字段必须走 Flyway
-3. **测试通过才提交** — 编译+测试全通过才能 commit
-4. **API路径对齐** — `/healthlink-his/api/v1/`
-5. **先分解再行动** — 非平凡任务先出计划
-6. **文档在 MD 目录** — 大写下划线命名
-7. **铁律18: 禁止破坏原有功能** — 完善功能时不能破坏已有功能
+## 一、项目概览
 
-## 快速命令
+| 属性 | 值 |
+|------|------|
+| 项目名 | HealthLink-HIS（医院信息系统） |
+| 后端路径 | `healthlink-his-server/` |
+| 前端路径 | `healthlink-his-ui/` |
+| 文档路径 | `MD/` |
+| JDK | 25 (OpenJDK) |
+| Spring Boot | 4.0.6 |
+| MyBatis-Plus | 3.5.16 |
+| Vue | 3.x + Vite + Element Plus |
+| 数据库 | PostgreSQL 15+ |
+| 包名 | `com.healthlink.his` |
+| 后端端口 | 18082 |
+| 前端端口 | 81 |
+
+---
+
+## 二、铁律（必须遵守，违反即失败）
+
+### 🔴 P0 铁律 — 不可违反
+
+**铁律1: 修改完必须测试**
+```
+后端: mvn clean compile -DskipTests → mvn install -DskipTests → mvn test
+前端: npm run build:dev → npm run lint
+```
+- 白盒：编译通过，无 ERROR
+- 黑盒：关键接口返回 `{code:200, data:...}`，验证业务逻辑
+- 冒烟：应用正常启动，核心流程通畅
+
+**铁律2: Flyway 数据库迁移**
+- 凡是新建表、新增字段，必须创建 Flyway 迁移脚本
+- 路径：`healthlink-his-domain/src/main/resources/db/migration/`
+- 命名：`V{版本号}__{描述}.sql`（双下划线）
+
+**铁律3: 测试通过后才提交**
+- 编译 + 测试全部通过后才能 git commit
+- 不提交未完成的功能、调试代码、临时文件
+
+**铁律4: 前后端API路径对齐**
+- 后端前缀：`/healthlink-his/api/v1/`
+- 前端 `request.js` 的 baseURL 必须与后端匹配
+
+**铁律5: 状态值一致性（Bug #574 教训）**
+- 修改任何状态值前，必须先列出完整的状态流转链路
+- 检查项：枚举定义 → Service 设置 → 查询映射 → 前端 STATUS_CLASS_MAP → 前端 v-if → 统计SQL
+- 禁止：只改一端不检查其他端
+
+**铁律6: 禁止删除源文件（Bug #574 教训）**
+- 绝对禁止删除项目中已有的 Java/Vue/SQL 源文件
+- 编译错误 → 修复错误；重复文件 → 重构合并
+- AI 幻觉文件 → 检查 `git ls-tree baseline -- <file>` 确认后再删除
+- 唯一例外：明确由人类确认删除的文件
+
+**铁律7: 禁止修改已有公开方法签名**
+- 不能删除/重命名已有的 public 方法，不能修改参数列表
+- 需要新功能 → 添加重载方法；需要改行为 → 修改内部实现
+
+**铁律8: 验证后才宣称完成（Verification Before Completion）**
+- **没有跑过验证命令，就不能说"完成了""通过了""没问题"**
+- 禁止使用"应该可以""大概没问题""看起来正确"
+- 必须：运行命令 → 读取输出 → 确认结果 → 才能宣称
+- 这是诚实原则，不是效率问题
+
+**铁律9: 开发前必须审核原有代码（P0 — 铁律）**
+- **任何新功能开发前，必须先搜索项目中是否已有相关代码**
+- 搜索路径：Controller / AppService / Service / Mapper / Entity / 前端页面 / API接口
+- 如果已有部分功能 → 在原有代码基础上**升级优化完善**，禁止另起炉灶
+- 如果已有接口但前端缺失 → 只补前端，不重复建后端
+- 如果已有前端但后端缺失 → 只补后端，不重写前端
+- 搜索命令：`rg -l "关键词" healthlink-his-server/ healthlink-his-ui/src/`
+- 禁止：不看代码就新建模块、重复实现已有功能、废弃原有代码另写一套
+
+**铁律10: 状态变更影响面分析（Bug #574→575 教训）**
+- 改任何状态枚举值前，**必须**执行影响面分析
+- `rg "原状态枚举名" --type java` 列出所有引用文件
+- 逐个检查：设置值？查询过滤？显示映射？统计聚合？
+- 检查逆向流程：退号、取消、停诊是否兼容新状态
+- 检查 XML mapper 中所有查询过滤条件
+- 检查前端所有 v-if/v-for/disabled 条件
+- **禁止**：只改正向流程不验逆向流程
+
+**铁律11: 逆向流程验证（Bug #575 教训）**
+- 涉及状态流转的 Bug，验证时**必须**覆盖：
+  - 正向：预约→签到→就诊→完成
+  - 逆向：退号、取消预约、停诊、退费
+  - 边界：并发操作、重复操作、异常中断
+- **禁止**：只测正向流程就标记"修复完成"
+
+**铁律12: 全链路 6 环分析**
+- 涉及数据库字段的 Bug/需求 必须走完整链路
+```
+前端/页面 → Controller → Service → Mapper → DB/SQL → 关联模块
+ ①录入      ②验证      ③业务     ④持久化    ⑤存储     ⑥联动
+```
+- ①录入：前端有无输入入口（弹窗、表格行编辑、表单）
+- ②验证：Controller 参数校验、@Valid、权限控制
+- ③业务：Service 业务逻辑、事务边界、多个 Service 实现类入口
+- ④持久化：Mapper XML、DTO 字段映射、类型转换
+- ⑤存储：数据库表结构、索引、NOT NULL 约束
+- ⑥联动：上游（医嘱→护士站）、下游（打印、计费、报表）是否同步
+
+**铁律13: 全链路验证（状态流转 Bug 必做）**
+- 修复后按以下顺序验证，**编译通过不等于修复完成**
+```
+① 数据库：SELECT status FROM table WHERE id = ?  → 确认写入正确
+② 后端接口：检查所有 if/switch 分支  → 确认映射正确
+③ 前端显示：检查 STATUS_CLASS_MAP  → 确认文本正确
+④ 前端交互：检查 v-if/v-for/disabled  → 确认按钮状态正确
+⑤ 统计数据：检查聚合 SQL  → 确认统计包含新状态
+```
+
+**铁律14: 池/统计表同步（Bug #574 教训）**
+- **任何状态变更必须同步更新关联统计表**
+- 检查清单：
+  1. 状态变更后，哪些统计字段需要更新？
+  2. 是原子递增/递减，还是全量重算？
+  3. 并发安全：用 `SET field = field + 1` 还是先查后改？
+  4. 逆向操作（退号/取消）是否正确回滚统计？
+- **禁止**：只改状态不改统计，或只改统计不改状态
+
+**铁律15: 统计变更必须验证实际值（Bug #575 教训）**
+- 修改统计逻辑后，**必须查数据库验证实际值**
+- 对比操作前后的值，确认统计正确
+- **禁止**：改了统计逻辑不查数据库验证
+
+**铁律16: 搜索所有相关代码路径**
+- 修复前必须用 `rg` 搜索所有引用
+```
+rg "状态枚举名|相关方法名|相关字段名" --type java --type vue
+```
+- 确保不遗漏任何引用路径
+
+**铁律17: 数据库铁律**
+- **修前必须查询真实数据库** — 确认表结构、字段约束、索引
+- **禁止凭猜测写 SQL** — 先查看表结构
+- **修改 SQL 后必须验证** — `EXPLAIN` 或实际查询验证语法
+- **NOT NULL 约束必须检查** — INSERT/UPDATE 前先查 `is_nullable`
+- **关联表必须查完整** — 涉及 JOIN 查所有关联表结构和外键
+
+**铁律18: 禁止破坏原有功能（P0绝对铁律）**
+- **完善增加功能和流程时，绝对不能破坏或者让原有功能不能用**
+- 修改已有实体前必须对比原始文件（`git show HEAD~N:./file.java`），保留所有原有字段和方法
+- 新增字段只能追加，不能删除或重命名已有字段
+- SQL迁移只允许 `ALTER TABLE ADD COLUMN`，不允许 `DROP COLUMN` 或 `RENAME COLUMN`
+- Controller新端点不能修改已有端点的路径或参数
+- 前端新页面不能修改已有页面的组件结构
+- 每次修改后必须 `mvn clean compile -DskipTests` 验证
+
+**铁律19: 编译错误不区分来源（Bug #698 教训）**
+- `mvn compile`、`vite build`、`vue-tsc` 等构建命令报错 = 不过关，**不管是自己引入的还是历史遗留的**
+- 禁止说"这是预存问题""不是我改的""原有bug"——构建通不过就不能宣称完成
+- 正确做法：定位错误 → 修复 → 重新构建确认通过 → 然后才能继续
+
+**铁律20: 数据来源必须验证（Bug #698 教训）**
+- 涉及数据查询/提取时，必须先确认数据实际存储位置，不能假设
+- 修复前必须：打印/检查原始数据结构 → 确认字段存在 → 再写提取逻辑
+- 禁止：凭代码推断数据位置、假设"应该在这里"
+
+**铁律21: 外部配置值必须实测验证（Bug #698 教训）**
+- 使用外部服务（API、模型、数据库）的配置值，必须实际调用验证
+- 配置变更后必须：发起一次真实请求 → 确认返回 200 → 再宣称配置正确
+- 禁止：改完配置不测试、假设"应该能用"
+
+**铁律22: 端到端验证必须有实际输出证据（Bug #698 教训）**
+- 声称功能生效前，必须有实际的端到端输出证据
+- 验证方式：运行命令 → 检查输出中包含预期关键词
+- 禁止：只检查代码路径可达就算"验证通过"
+
+**铁律23: 文件读写强制 UTF-8 编码（必遵守）**
+- **禁止**使用 PowerShell Get-Content -Raw（不带 -Encoding UTF8）读取源文件
+- **禁止**使用 Out-File -Encoding utf8（会写 BOM）
+- **正确写法**：
+  - 读取：`[System.IO.File]::ReadAllText($path, [System.Text.Encoding]::UTF8)`
+  - 写入：`[System.IO.File]::WriteAllText($path, $content, [System.Text.UTF8Encoding]::new(False))`
+- **原因**：Windows PowerShell 5.1 默认用系统 locale（GBK/CP936）读写，会把 UTF-8 中文变成乱码
+
+**铁律24: 禁止硬编码业务默认值（Bug #617 教训）**
+- **禁止**在提交参数中硬编码业务默认值（如 `contractNo: '0000'`）
+- 必须使用用户在表单中选择的值，硬编码值仅作为 fallback
+- 检查清单：
+  1. 表单字段是否有 `v-model` 绑定？
+  2. 构建提交参数时是否使用了绑定值？
+  3. 提交后是否覆盖了用户选择？
+
+---
+
+### 🟡 P1 铁律 — 强烈建议
+
+**铁律25: 先分解再行动**
+- 修改超过3个文件、涉及多模块、数据库变更，必须先制定计划
+
+**铁律26: 验证后信**
+- 每次修改后必须验证编译通过，不信记忆
+
+**铁律27: 文档统一管理**
+- 所有文档存储在 `MD/` 目录
+- 文件名：大写英文+下划线（如 `BACKEND_CHECKLIST.md`）
+- 文档头部必须包含元数据块（文档类型、版本、日期）
+
+**铁律28: 设计文档必须包含UI设计和调用流程**
+- 所有新模块/页面的设计文档必须包含：UI布局描述、交互效果清单、前后端调用流程
+- 没有明确UI设计的模块，禁止直接编码
+- 设计文档必须写清楚：系统调用关系、方法函数调用关系、完整业务流程
+- 设计文档中每个用户操作必须对应：前端事件 → API调用 → 后端处理链路 → 返回数据 → UI渲染
+
+**铁律29: 设计文档确认后自主开发（铁律）**
+- 设计文档一旦确认，后续开发**必须按文档自主执行**
+- **禁止反复询问"是否继续""下一步做什么""是否开始"**——直接按计划推进
+- 每完成一个 Sprint，自动提交推送，然后立即开始下一个 Sprint
+- 只在遇到**无法解决的阻塞**时才暂停询问
+
+**铁律30: 前端验证铁律**
+- **提交前必须编译前端** — `npm run build:dev` 或 `npx vite build` 通过才算完成
+- **禁止只改 .vue 文件不验证编译** — 改完必须跑一次编译确认无报错
+- **SCSS 括号闭合必须检查** — `<style lang="scss" scoped>` 内的所有 `{}` 必须成对闭合
+- **编译报错必须当场修复** — 看到 error 立即修，不要留到下一步
+
+**铁律31: 提交前验证铁律**
+- **后端**: `mvn compile` 通过 + 无新增 warning
+- **前端**: `npm run build:dev` 通过 + 无 SCSS 错误
+- **禁止跳过编译直接提交** — 编译失败的代码不允许进仓库
+- **提交信息格式**: `type(scope): description`（如 `fix(registration): 修复退号金额计算`）
+
+**铁律32: 修复流程**
+- **一次只修一个 Bug**，不扩大范围
+- **修前必须完整获取 Bug 全部信息** — 描述、复现步骤、所有截图/附件、所有备注历史。禁止只看标题就写代码
+- **修复前必须读 AGENTS.md**
+- **修复后必须验证编译** — `mvn compile` / `vue-tsc --noEmit` 0 error
+- **commit 前必须验证** — 编译通过 + 无新增 lint 警告
+
+**铁律33: Bug 状态管理**
+- **已关闭/已解决的 Bug 禁止处理** — 处理前检查状态，resolved/closed 直接跳过
+- **人类提的 Bug 只加备注不改状态** — 不改 status、不改 assignedTo
+- **智能体提的 Bug 可改分配和加备注** — 状态变更等测试通过后由华佗确认
+- **每个修复必须有 git commit** — 格式: `fix(#bug_id): 简要描述`
+
+**铁律34: 质量门禁**
+- L1: 编译通过
+- L2: 测试通过
+- L3: DB审查通过
+- L4: 验收通过
+- L5: 归档完成
+
+---
+
+## 三、Karpathy 编码准则
+
+> 减少 LLM 常见编码错误。偏向谨慎而非速度。
+
+### 3.1 先想再写
+- 明确陈述假设，不确定就问
+- 多种解读时都列出来，不要默默选一种
+- 有更简单的方案就说出来，该推回就推回
+- 不清楚的地方停下来，说清楚哪里不清楚
+
+### 3.2 简洁优先
+- 不做没要求的功能，不做一次性代码的抽象
+- 不加没要求的"灵活性"和"可配置性"
+- 200 行能 50 行搞定就重写
+- 自问："高级工程师会不会觉得这过度设计？"
+
+### 3.3 精准修改
+- 只改必须改的，不"顺手改进"相邻代码
+- 匹配现有代码风格，即使你有不同的偏好
+- 每行改动都能追溯到用户的请求
+- 只清理你自己改动产生的无用代码
+
+### 3.4 目标驱动
+- 把任务转化为可验证目标
+- 多步任务声明计划：`[步骤] → 验证: [检查]`
+- 强验收标准让 Agent 能独立循环，弱标准需要持续澄清
+
+---
+
+## 四、系统化调试（Systematic Debugging）
+
+> **铁律：没有根因调查，不能提出修复方案。**
+
+### 四阶段流程
+
+**阶段1：根因调查**（修复前必须完成）
+1. 仔细阅读错误信息（堆栈、行号、错误码）
+2. 稳定复现（能否可靠触发？步骤？每次？）
+3. 检查最近变更（git diff、新依赖、配置变更）
+4. 多组件系统：在每个组件边界加诊断日志，定位哪一层断裂
+5. 追踪数据流：坏值从哪里来？谁调用的？一直追溯到源头
+
+**阶段2：模式分析**
+- 找到同代码库中类似的正常工作代码
+- 逐项对比差异
+- 理解依赖关系
+
+**阶段3：假设与测试**
+- 形成单一假设："我认为X是根因，因为Y"
+- 做最小改动测试
+- 有效 → 阶段4；无效 → 新假设
+
+**阶段4：实施**
+- 创建失败测试用例
+- 修复根因（不是症状）
+- 验证修复
+
+---
+
+## 五、后端开发规范
+
+### 分层架构
+```
+Controller → AppService → Service → Mapper → Entity
+```
+
+### 命名规范
+| 类型 | 规则 | 示例 |
+|------|------|------|
+| Controller | `XxxController` | `RegistrationController` |
+| AppService | `IXxxAppService` / `XxxAppServiceImpl` | `IRegistrationAppService` |
+| Service | `IXxxService` / `XxxServiceImpl` | `IRegistrationService` |
+| Mapper | `XxxMapper` | `RegistrationMapper` |
+| Entity | `Xxx` | `Registration` |
+| DTO | `XxxDto` / `XxxQueryDto` | `RegistrationDto` |
+
+### 包结构
+```
+com.healthlink.his.web.{module}.controller
+com.healthlink.his.web.{module}.appservice
+com.healthlink.his.web.{module}.service
+com.healthlink.his.web.{module}.mapper
+com.healthlink.his.web.{module}.dto
+com.healthlink.his.domain.{module}
+com.healthlink.his.common.enums
+```
+
+### 关键约束
+- 所有查询使用 `LambdaQueryWrapper`，禁止字符串拼接 SQL
+- `@Transactional(rollbackFor = Exception.class)` 管理事务
+- 所有接口标注 `@PreAuthorize` 权限控制
+- 患者敏感信息在日志中脱敏
+- **扩展功能不修改原有函数签名**
+- **DTO 字段类型防御**：前端传入的 Boolean 字段 → 改用 String + 业务层转换（Jackson 对 Boolean 严格校验）；所有接受前端输入的 DTO 加 `@JsonIgnoreProperties(ignoreUnknown = true)`
+
+---
+
+## 六、前端开发规范
+
+### 技术栈
+- Vue 3 + Vite + Element Plus + Pinia + Axios（基于 RuoYi-Vue3）
+
+### 目录结构
+```
+src/api/{module}/        # API接口
+src/views/{module}/      # 页面组件
+src/store/modules/       # Pinia状态管理
+src/components/          # 公共组件
+```
+
+### 关键约束
+- API前缀：`/healthlink-his/api/v1/`
+- 路由懒加载：`() => import('@/views/xxx/index.vue')`
+- 页面使用 `<script setup>` 语法
+- 按钮权限使用 `v-hasPermi` 指令
+- `onMounted` 中注册的事件在 `onUnmounted` 中移除
+
+---
+
+## 七、Agent 体系
+
+### 角色与路由
+
+| 代号 | 名称 | 角色 | 路由关键词 |
+|------|------|------|-----------|
+| liubei | 刘备 | 项目经理 | 协调、分派、异常升级 |
+| zhugeliang | 诸葛亮 | 架构师 | 分析、路由、设计 |
+| guanyu | 关羽 | 后端开发 | java, api, spring, service, controller |
+| zhaoyun | 赵云 | 前端开发 | vue, 界面, 显示, 弹窗, 按钮 |
+| xunyu | 荀彧 | DBA | 数据库, sql, 迁移, mapper xml |
+| zhangfei | 张飞 | 测试 | 测试, QA, 回归 |
+| huatuo | 华佗 | 验收 | 需求验收、质量确认 |
+| chenlin | 陈琳 | 文档 | 文档、归档、Git提交 |
+
+### 协作流水线
+
+```
+刘备(协调) → 诸葛亮(分析路由) → {关羽|赵云}(修复) → 荀彧(DB审查) → 张飞(测试) → 华佗(验收) → 陈琳(归档)
+```
+
+---
+
+## 八、快速参考命令
 
 ```bash
+# === 后端 ===
 export JAVA_HOME=/opt/jdk-25
 mvn clean compile -DskipTests          # 编译
 mvn install -DskipTests                # 构建
 mvn test -pl healthlink-his-application -Dtest="XxxTest" -Dsurefire.failIfNoSpecifiedTests=false
+
+# === 前端 ===
+cd healthlink-his-ui
+npm run dev && npm run build:dev && npm run lint && npm run test:run
+
+# === Git ===
+git status && git add -A && git commit -m "feat(module): desc" && git push origin develop
 ```
 
-## 详细规范
+---
 
-→ 完整铁律: `MD/specs/IRON_RULES.md`
-→ 后端规范: `MD/specs/BACKEND_DEVELOPMENT_STANDARD.md`
-→ 后端清单: `MD/specs/BACKEND_CHECKLIST.md`
-→ 根目录完整规范: `RULES.md`
+## 九、过往教训
+
+| Bug | 教训 | 根因 |
+|---|---|---|
+| #574 | 状态值 BOOKED(1)→应为 CHECKED_IN(3)，前端映射缺失 | 没走完整状态链路 |
+| #574 | AI 看到编译错误直接删文件 | 没检查 git baseline |
+| #574 | 多次 fallback 修错文件 | 没用 rg 搜索所有引用 |
+| #574 | 签到后 booked_num 未累加 | 只改状态没改统计 |
+| #575 | 改了签到状态没检查退号流程 | 只验正向不验逆向 |
+| #575 | booked_num 应在预约时累加而非签到时 | 统计变更未验证实际值 |
+| #617 | 费用性质硬编码为 '0000'（自费），用户选医保无效 | 构建参数时写死默认值 |
+| #632 | Boolean DTO 接收字符串 "肝功能12项" 导致反序列化失败 | DTO 字段类型未做防御 |
+| #698 | 模型名拼写错误 mino→mimo 导致 400 | 外部配置值未实测验证 |
+| — | 修复完成未提交到 develop | 框架未强制验证提交 |
+| — | 退号流程只检查 BOOKED(1) 不兼容 CHECKED_IN(3) | 状态变更影响面分析缺失 |
+
+---
+
+> ⚠️ 本文件是 AI 开发规范的唯一信源。
+> 
+> 📅 最后更新: 2026-06-10 | 来源: AgentForge Harness Iron Laws (39条)
\ No newline at end of file
diff --git a/healthlink-his-server/core-admin/src/main/java/com/core/web/util/TenantOptionUtil.java b/healthlink-his-server/core-admin/src/main/java/com/core/web/util/TenantOptionUtil.java
index e0c152210..1957bc5bd 100755
--- a/healthlink-his-server/core-admin/src/main/java/com/core/web/util/TenantOptionUtil.java
+++ b/healthlink-his-server/core-admin/src/main/java/com/core/web/util/TenantOptionUtil.java
@@ -35,7 +35,7 @@ public class TenantOptionUtil {
 
         // TODO:2025/10/17 李永兴提出的sys_option切换TenantOption临时防止报错方案，最晚2025年11月底删除
         String newValue = loginUser.getOptionMap().get(optionDict.getCode());
-        String oldValue = loginUser.getOptionJson().path(optionDict.getCode()).asText();
+        String oldValue = loginUser.getOptionJsonValue(optionDict.getCode());
         return StringUtils.isEmpty(newValue) ? oldValue : newValue;
     }
 
diff --git a/healthlink-his-server/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java b/healthlink-his-server/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java
index de920ee9b..f80cf6c35 100755
--- a/healthlink-his-server/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java
+++ b/healthlink-his-server/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java
@@ -1,7 +1,5 @@
 package com.core.common.core.domain.model;
 
-
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.core.common.core.domain.entity.SysRole;
 import com.core.common.core.domain.entity.SysUser;
 import lombok.Data;
@@ -14,7 +12,7 @@ import java.util.Map;
 import java.util.Set;
 
 /**
- * 登录用户身份权限
+ * 登录用户身份权限
  * 
  * @author system
  */
@@ -23,77 +21,77 @@ public class LoginUser implements UserDetails {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 用户ID
+     * 用户ID
      */
     private Long userId;
 
     /**
-     * 部门ID
+     * 部门ID
      */
     private Long deptId;
 
     /**
-     * 用户唯一标识
+     * 用户唯一标识
      */
     private String token;
 
     /**
-     * 登录时间
+     * 登录时间
      */
     private Long loginTime;
 
     /**
-     * 过期时间
+     * 过期时间
      */
     private Long expireTime;
 
     /**
-     * 登录IP地址
+     * 登录IP地址
      */
     private String ipaddr;
 
     /**
-     * 登录地点
+     * 登录地点
      */
     private String loginLocation;
 
     /**
-     * 浏览器类型
+     * 浏览器类型
      */
     private String browser;
 
     /**
-     * 操作系统
+     * 操作系统
      */
     private String os;
 
     /**
-     * 权限列表
+     * 权限列表
      */
     private Set<String> permissions;
 
-    /** 租户ID */
+    /** 租户ID */
     private Integer tenantId;
 
     /**
-     * 机构/科室id
+     * 机构/科室id
      */
     private Long orgId;
 
     /**
-     * 所属医院id
+     * 所属医院id
      */
     private Long hospitalId;
 
     /**
-     * 参与者id
+     * 参与者id
      */
     private Long practitionerId;
 
     /**
-     * option JSON串
+     * option JSON串
      */
-    private tools.jackson.databind.node.ObjectNode optionJson;
+    private Object optionJson;
 
     /**
      * option Map
@@ -101,12 +99,12 @@ public class LoginUser implements UserDetails {
     private Map<String, String> optionMap;
 
     /**
-     * 当前登录账号角色集合
+     * 当前登录账号角色集合
      */
     private List<SysRole> roleList;
 
     /**
-     * 用户信息
+     * 用户信息
      */
     private SysUser user;
 
@@ -146,10 +144,7 @@ public class LoginUser implements UserDetails {
 
     public void setToken(String token) {
         this.token = token;
-    }
-
-    @JsonProperty(access = com.fasterxml.jackson.annotation.JsonProperty.Access.WRITE_ONLY)
-    @Override
+    }    @Override
     public String getPassword() {
         return user.getPassword();
     }
@@ -160,43 +155,35 @@ public class LoginUser implements UserDetails {
     }
 
     /**
-     * 账户是否未过期,过期无法验证
-     */
-    @JsonProperty(access = com.fasterxml.jackson.annotation.JsonProperty.Access.WRITE_ONLY)
-    @Override
+     * 账户是否未过期,过期无法验证
+     */    @Override
     public boolean isAccountNonExpired() {
         return true;
     }
 
     /**
-     * 指定用户是否解锁,锁定的用户无法进行身份验证
+     * 指定用户是否解锁,锁定的用户无法进行身份验证
      * 
      * @return
-     */
-    @JsonProperty(access = com.fasterxml.jackson.annotation.JsonProperty.Access.WRITE_ONLY)
-    @Override
+     */    @Override
     public boolean isAccountNonLocked() {
         return true;
     }
 
     /**
-     * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证
+     * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证
      * 
      * @return
-     */
-    @JsonProperty(access = com.fasterxml.jackson.annotation.JsonProperty.Access.WRITE_ONLY)
-    @Override
+     */    @Override
     public boolean isCredentialsNonExpired() {
         return true;
     }
 
     /**
-     * 是否可用 ,禁用的用户不能身份验证
+     * 是否可用 ,禁用的用户不能身份验证
      * 
      * @return
-     */
-    @JsonProperty(access = com.fasterxml.jackson.annotation.JsonProperty.Access.WRITE_ONLY)
-    @Override
+     */    @Override
     public boolean isEnabled() {
         return true;
     }
@@ -265,6 +252,15 @@ public class LoginUser implements UserDetails {
         this.user = user;
     }
 
+    /** Safe accessor for option values from optionJson (Map) */
+    @SuppressWarnings("unchecked")
+    public String getOptionJsonValue(String key) {
+        if (optionJson instanceof Map<?, ?> map) {
+            Object val = map.get(key);
+            return val != null ? val.toString() : "";
+        }
+        return "";
+    }
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
         return java.util.Collections.emptyList();
diff --git a/healthlink-his-server/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java b/healthlink-his-server/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java
index 1ebafbda3..1e09b9baa 100755
--- a/healthlink-his-server/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java
+++ b/healthlink-his-server/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java
@@ -1,7 +1,5 @@
 package com.core.framework.web.service;
 
-import tools.jackson.databind.node.ObjectNode;
-import tools.jackson.databind.json.JsonMapper;
 
 import com.core.common.constant.CacheConstants;
 import com.core.common.constant.Constants;
@@ -41,7 +39,7 @@ import java.util.Map;
 import java.util.Optional;
 
 /**
- * 登录校验方法
+ * 登录校验方法
  * 
  * @author system
  */
@@ -69,33 +67,33 @@ public class SysLoginService {
     private ISysTenantOptionService sysTenantOptionService;
 
     /**
-     * 登录验证
+     * 登录验证
      * 
-     * @param username 用户名
-     * @param password 密码
-     * @param code 验证码
-     * @param uuid 唯一标识
-     * @param tenantId 租户ID
-     * @return 结果
+     * @param username 用户名
+     * @param password 密码
+     * @param code 验证码
+     * @param uuid 唯一标识
+     * @param tenantId 租户ID
+     * @return 结果
      */
     public String login(String username, String password, String code, String uuid, Integer tenantId) {
-        // 验证码校验
+        // 验证码校验
         // validateCaptcha(username, code, uuid);
 
-        // 租户校验
+        // 租户校验
         validateTenant(username, tenantId);
-        // 保存本次勾选租户
+        // 保存本次勾选租户
         redisCache.setCacheObject(CacheConstants.LOGIN_SELECTED_TENANT + username, tenantId);
 
-        // 登录前置校验
+        // 登录前置校验
         loginPreCheck(username, password);
-        // 用户验证
+        // 用户验证
         Authentication authentication = null;
         try {
             UsernamePasswordAuthenticationToken authenticationToken =
                 new UsernamePasswordAuthenticationToken(username, password);
             AuthenticationContextHolder.setContext(authenticationToken);
-            // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername
+            // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername
             authentication = authenticationManager.authenticate(authenticationToken);
         } catch (Exception e) {
             if (e instanceof BadCredentialsException ex) {
@@ -113,80 +111,80 @@ public class SysLoginService {
         AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS,
             MessageUtils.message("user.login.success")));
         LoginUser loginUser = (LoginUser)authentication.getPrincipal();
-        // 设置登录用户信息
+        // 设置登录用户信息
         this.setLoginUserInfo(loginUser, tenantId);
-        // 生成token
+        // 生成token
         return tokenService.createToken(loginUser);
     }
 
     /**
-     * 设置登录用户信息
+     * 设置登录用户信息
      * 
-     * @param loginUser 登录用户
-     * @param tenantId 租户ID
+     * @param loginUser 登录用户
+     * @param tenantId 租户ID
      */
     public void setLoginUserInfo(LoginUser loginUser, Integer tenantId) {
-        // // 登录时set租户id
+        // // 登录时set租户id
         // Integer tenantId = 0;
         // ServletRequestAttributes attributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
         // if (attributes != null) {
         // HttpServletRequest request = attributes.getRequest();
-        // // 从请求头获取租户ID，假设header名称为"X-Tenant-ID" ; 登录接口前端把租户id放到请求头里
+        // // 从请求头获取租户ID，假设header名称为"X-Tenant-ID" ; 登录接口前端把租户id放到请求头里
         // String tenantIdHeader = request.getHeader("X-Tenant-ID");
         // if (tenantIdHeader != null && !tenantIdHeader.isEmpty()) {
         // tenantId = Integer.parseInt(tenantIdHeader);
         // }
         // }
-        // // 设置租户id
+        // // 设置租户id
         // loginUser.setTenantId(tenantId);
-        // 记录登录信息
+        // 记录登录信息
         recordLoginInfo(loginUser.getUserId());
-        // 设置登录用户的信息
+        // 设置登录用户的信息
         LoginUserExtend loginUserExtend = userService.getLoginUserExtend(loginUser.getUserId());
         if (loginUserExtend != null) {
-            loginUser.setOrgId(loginUserExtend.getOrgId()); // 科室id
-            loginUser.setPractitionerId(loginUserExtend.getPractitionerId()); // 参与者id
-            loginUser.setHospitalId(userService.getHospitalIdByOrgId(loginUserExtend.getOrgId())); // 所属医院id
+            loginUser.setOrgId(loginUserExtend.getOrgId()); // 科室id
+            loginUser.setPractitionerId(loginUserExtend.getPractitionerId()); // 参与者id
+            loginUser.setHospitalId(userService.getHospitalIdByOrgId(loginUserExtend.getOrgId())); // 所属医院id
             // user
-            loginUser.getUser().setOrgId(loginUserExtend.getOrgId()); // 科室id
-            loginUser.getUser().setOrgName(loginUserExtend.getOrgName()); // 科室名称
+            loginUser.getUser().setOrgId(loginUserExtend.getOrgId()); // 科室id
+            loginUser.getUser().setOrgName(loginUserExtend.getOrgName()); // 科室名称
         }
         List<SysRole> roleList = userService.getRoleList(loginUser.getUserId());
         if (!roleList.isEmpty()) {
             loginUser.setRoleList(roleList);
         }
 
-        // 设置租户ID
+        // 设置租户ID
         loginUser.getUser().setTenantId(tenantId);
         loginUser.setTenantId(tenantId);
 
-        // option集合
+        // option集合
         List<Map<String, String>> optionList = userService.getOptionList(tenantId);
         if (optionList.isEmpty()) {
-            throw new IllegalArgumentException("未匹配到option信息");
+            throw new IllegalArgumentException("未匹配到option信息");
         }
-        ObjectNode optionJson = JsonMapper.builder().build().createObjectNode();
+        Map<String, String> optionJsonMap = new java.util.HashMap<>();
         for (Map<String, String> map : optionList) {
             String key = map.get("optionkey");
             String value = map.get("optionvalue");
-            optionJson.put(key, value);
+            optionJsonMap.put(key, value);
         }
-        loginUser.setOptionJson(optionJson);
+        loginUser.setOptionJson(optionJsonMap);
 
-        // TODO:下面的配置项启用后，上面option集合处理注释掉
+        // TODO:下面的配置项启用后，上面option集合处理注释掉
 
-        // 全部租户配置项
+        // 全部租户配置项
         Map<String, String> optionMap = sysTenantOptionService.getAllTenantOption(tenantId);
         loginUser.setOptionMap(optionMap);
     }
 
     /**
-     * 校验验证码
+     * 校验验证码
      * 
-     * @param username 用户名
-     * @param code 验证码
-     * @param uuid 唯一标识
-     * @return 结果
+     * @param username 用户名
+     * @param code 验证码
+     * @param uuid 唯一标识
+     * @return 结果
      */
     public void validateCaptcha(String username, String code, String uuid) {
         boolean captchaEnabled = configService.selectCaptchaEnabled();
@@ -208,33 +206,33 @@ public class SysLoginService {
     }
 
     /**
-     * 登录前置校验
+     * 登录前置校验
      * 
-     * @param username 用户名
-     * @param password 用户密码
+     * @param username 用户名
+     * @param password 用户密码
      */
     public void loginPreCheck(String username, String password) {
-        // 用户名或密码为空 错误
+        // 用户名或密码为空 错误
         if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) {
             AsyncManager.me().execute(
                 AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("not.null")));
             throw new UserNotExistsException();
         }
-        // 密码如果不在指定范围内 错误
+        // 密码如果不在指定范围内 错误
         if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
             || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
             AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL,
                 MessageUtils.message("user.password.not.match")));
             throw new UserPasswordNotMatchException();
         }
-        // 用户名不在指定范围内 错误
+        // 用户名不在指定范围内 错误
         if (username.length() < UserConstants.USERNAME_MIN_LENGTH
             || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
             AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL,
                 MessageUtils.message("user.password.not.match")));
             throw new UserPasswordNotMatchException();
         }
-        // IP黑名单校验
+        // IP黑名单校验
         String blackStr = configService.selectConfigByKey("sys.login.blackIPList");
         if (IpUtils.isMatchedIp(blackStr, IpUtils.getIpAddr())) {
             AsyncManager.me().execute(
@@ -244,9 +242,9 @@ public class SysLoginService {
     }
 
     /**
-     * 记录登录信息
+     * 记录登录信息
      *
-     * @param userId 用户ID
+     * @param userId 用户ID
      */
     public void recordLoginInfo(Long userId) {
         SysUser sysUser = new SysUser();
@@ -257,32 +255,32 @@ public class SysLoginService {
     }
 
     /**
-     * 校验租户
+     * 校验租户
      *
-     * @param username 用户名
-     * @param tenantId 租户ID
+     * @param username 用户名
+     * @param tenantId 租户ID
      */
     private void validateTenant(String username, Integer tenantId) {
-        // 租户非空校验
+        // 租户非空校验
         if (tenantId == null) {
-            throw new ServiceException("请指定所属医院");
+            throw new ServiceException("请指定所属医院");
         }
-        // 查询用户绑定的租户列表
+        // 查询用户绑定的租户列表
         R<List<SysTenant>> bindTenantList = sysTenantService.getUserBindTenantList(username);
-        // 租户合法性校验
+        // 租户合法性校验
         Optional<SysTenant> currentTenantOptional =
             bindTenantList.getData().stream().filter(e -> tenantId.equals(e.getId())).findFirst();
         if (currentTenantOptional.isEmpty()) {
-            throw new ServiceException("所属医院无权限");
+            throw new ServiceException("所属医院无权限");
         }
-        // 租户状态校验
+        // 租户状态校验
         SysTenant currentTenant = currentTenantOptional.get();
         if (TenantStatus.DISABLE.getCode().equals(currentTenant.getStatus())) {
-            throw new ServiceException("所属医院停用");
+            throw new ServiceException("所属医院停用");
         }
-        // 租户删除状态校验
+        // 租户删除状态校验
         if (DelFlag.YES.getCode().equals(currentTenant.getDeleteFlag())) {
-            throw new ServiceException("所属医院不存在");
+            throw new ServiceException("所属医院不存在");
         }
 
     }
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/controller/HealthcareServiceController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/controller/HealthcareServiceController.java
index 14377098f..21b52995b 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/controller/HealthcareServiceController.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/basicservice/controller/HealthcareServiceController.java
@@ -101,7 +101,7 @@ public class HealthcareServiceController {
         boolean res = iChargeItemDefinitionService.addChargeItemDefinitionByHealthcareService(healthcareServiceAfterAdd,
             chargeItemDefinition);
         // 调用医保目录对照接口
-        String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+        String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
         // 医保开关打开并且,页面传了医保编码
         String ybNo = healthcareServiceFormData.getYbNo();
         if (Whether.YES.getCode().equals(ybSwitch) && StringUtils.isNotEmpty(ybNo)) {
@@ -186,7 +186,7 @@ public class HealthcareServiceController {
         HealthcareService healthcareService = new HealthcareService();
         BeanUtils.copyProperties(healthcareServiceFormData, healthcareService);
         // 调用医保目录对照接口
-        String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+        String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
         // 医保开关打开并且,页面传了医保编码
         String ybNo = healthcareServiceFormData.getYbNo();
         if (Whether.YES.getCode().equals(ybSwitch) && StringUtils.isNotEmpty(ybNo)) {
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java
index 1550c093d..722512d5f 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/impl/OutpatientRefundAppServiceImpl.java
@@ -581,7 +581,7 @@ public class OutpatientRefundAppServiceImpl implements IOutpatientRefundAppServi
             }
         }
         String fixmedinsCode =
-            SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.FIXMEDINS_CODE).asText();
+            SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.FIXMEDINS_CODE);
         if (!HospitalCodeEnum.CCU.getCode().equals(fixmedinsCode)) {
             if (!devReqIdList.isEmpty()) {
                 List<DeviceRequest> deviceRequestList = deviceRequestService
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java
index 3b859ff39..4e514c699 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java
@@ -317,9 +317,9 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
         CancelPaymentDto cancelPaymentDto = new CancelPaymentDto();
         BeanUtils.copyProperties(cancelRegPaymentDto, cancelPaymentDto);
         //LoginUser loginUser = SecurityUtils.getLoginUser();
-        //String string1 = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText();
+        //String string1 = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH);
         // 开通医保的处理
-        if ("1".equals(SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText())
+        if ("1".equals(SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH))
             && account != null && !CommonConstants.BusinessName.DEFAULT_CONTRACT_NO.equals(account.getContractNo())) {
             CancelRegPaymentModel model = new CancelRegPaymentModel();
             BeanUtils.copyProperties(cancelRegPaymentDto, model);
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java
index 27997b0a6..3b7ba339b 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/DeviceManageAppServiceImpl.java
@@ -211,7 +211,7 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
         if (deviceDefinitionService.updateById(deviceDefinition)) {
 
             // 调用医保目录对照接口
-            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch) && StringUtils.isNotEmpty(deviceDefinition.getYbNo())) {
                 R<?> r
                         = ybService.directoryCheck(CommonConstants.TableName.ADM_DEVICE_DEFINITION, deviceDefinition.getId());
@@ -336,7 +336,7 @@ public class DeviceManageAppServiceImpl implements IDeviceManageAppService {
         deviceDefinition.setStatusEnum(PublicationStatus.ACTIVE.getValue());
         if (deviceDefinitionService.addDevice(deviceDefinition)) {
             // 调用医保目录对照接口
-            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch) && StringUtils.isNotEmpty(deviceDefinition.getYbNo())) {
                 R<?> r
                         = ybService.directoryCheck(CommonConstants.TableName.ADM_DEVICE_DEFINITION, deviceDefinition.getId());
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java
index 31a989440..08b63c525 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java
@@ -378,7 +378,7 @@ public class DiagTreatMAppServiceImpl implements IDiagTreatMAppService {
         // 更新诊疗信息
         if (activityDefinitionService.updateById(activityDefinition)) {
             // 调用医保目录对照接口
-            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch) && StringUtils.isNotEmpty(activityDefinition.getYbNo())) {
                 R<?> r = ybService.directoryCheck(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION,
                         activityDefinition.getId());
@@ -547,7 +547,7 @@ public class DiagTreatMAppServiceImpl implements IDiagTreatMAppService {
         
         if (activityDefinitionService.addDiagnosisTreatment(activityDefinition)) {
             // 调用医保目录对照接口
-            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch) && StringUtils.isNotEmpty(activityDefinition.getYbNo())) {
                 R<?> r = ybService.directoryCheck(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION,
                         activityDefinition.getId());
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java
index 710e54eec..34b44d26e 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/datadictionary/appservice/impl/MedicationManageAppServiceImpl.java
@@ -278,7 +278,7 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
             if (updateMedicationDefinition) {
                 // 调用医保目录对照接口
                 String ybSwitch
-                        = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+                        = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
                 if (Whether.YES.getCode().equals(ybSwitch) && StringUtils.isNotEmpty(medicationDefinition.getYbNo())) {
                     R<?> r = ybService.directoryCheck(CommonConstants.TableName.MED_MEDICATION_DEFINITION,
                             medicationDefinition.getId());
@@ -410,7 +410,7 @@ public class MedicationManageAppServiceImpl implements IMedicationManageAppServi
         // 新增主表外来药品目录
         if (medicationDefinitionService.addMedication(medicationDetail)) {
             // 调用医保目录对照接口
-            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch) && StringUtils.isNotEmpty(medicationDetail.getYbNo())) {
                 R<?> r = ybService.directoryCheck(CommonConstants.TableName.MED_MEDICATION_DEFINITION,
                         medicationDetail.getId());
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentReceiptApprovalServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentReceiptApprovalServiceImpl.java
index 7e55a1afa..1321073ca 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentReceiptApprovalServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/departmentmanage/appservice/impl/DepartmentReceiptApprovalServiceImpl.java
@@ -187,7 +187,7 @@ public class DepartmentReceiptApprovalServiceImpl implements IDepartmentReceiptA
                 SupplyType.PURCHASE_STOCKIN.getValue());
 
             // 调用医保商品采购接口 todo 科室材料相关医保接口未对应
-            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch)) {
                 List<String> uploadFailedNoList =
                     this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.PURCHASE_IN, false, true, false, now);
@@ -274,7 +274,7 @@ public class DepartmentReceiptApprovalServiceImpl implements IDepartmentReceiptA
                 SupplyType.PURCHASE_RETURN.getValue());
 
             // 调用医保采购退货接口
-            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch)) {
                 List<String> uploadFailedNoList =
                     this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.RETURN_OUT, false, false, true, now);
@@ -425,7 +425,7 @@ public class DepartmentReceiptApprovalServiceImpl implements IDepartmentReceiptA
             }
 
             // 调用医保库存变更接口
-            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch)) {
                 List<String> uploadFailedNoList = this.ybInventoryIntegrated(supplyItemDetailList,
                     YbInvChgType.DESTRUCTION, false, false, false, now);
@@ -522,7 +522,7 @@ public class DepartmentReceiptApprovalServiceImpl implements IDepartmentReceiptA
                 }
 
                 String ybSwitch =
-                    SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+                    SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
                 if (Whether.YES.getCode().equals(ybSwitch)) {
                     // 如果首次盘点信息不为空
                     if (!firstSupplyItemDetailList.isEmpty()) {
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java
index c8a6a4739..bad9211e6 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inventorymanage/appservice/impl/ReceiptApprovalAppServiceImpl.java
@@ -366,7 +366,7 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
             }
 
             // 调用医保商品采购接口
-            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch)) {
                 List<String> uploadFailedNoList
                         = this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.PURCHASE_IN, now, false);
@@ -454,7 +454,7 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
             // 处理盘点追溯码
             traceNoAppService.updateTraceNoList(supplyItemDetailList, SupplyType.PRODUCT_STOCKTAKING.getValue());
             // 医保开关
-            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText();
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH);
             if (Whether.YES.getCode().equals(ybSwitch)) {
                 List<String> uploadFailedGainList = null;
                 List<String> uploadFailedLossList = null;
@@ -677,7 +677,7 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
             traceNoAppService.addTraceNoManage(supplyItemDetailList, TraceNoStatus.OUT.getValue(),
                     SupplyType.PRODUCT_RETURN.getValue());
             // 调用医保采购退货接口
-            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch)) {
                 List<String> uploadFailedNoList
                         = this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.RETURN_OUT, now, false);
@@ -769,7 +769,7 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
                     SupplyType.LOSS_REPORT_FORM.getValue());
 
             // 调用医保库存变更接口
-            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch)) {
                 List<String> uploadFailedNoList
                         = this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.DESTRUCTION, now, false);
@@ -866,7 +866,7 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
         // 返回信息
         String returnMsg = null;
         // 调用医保库存变更接口
-        String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+        String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
         if (Whether.YES.getCode().equals(ybSwitch)) {
             List<String> uploadFailedNoList
                     = this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.OTHER_OUT, now, false);
@@ -962,7 +962,7 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
             // 返回信息
             String returnMsg = null;
             // 调用医保库存变更接口
-            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch)) {
                 List<String> uploadFailedNoList
                         = this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.OTHER_IN, now, false);
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialReceiptApprovalServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialReceiptApprovalServiceImpl.java
index dfeb3b238..8f37e8d73 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialReceiptApprovalServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/materialmanage/appservice/impl/MaterialReceiptApprovalServiceImpl.java
@@ -201,7 +201,7 @@ public class MaterialReceiptApprovalServiceImpl implements IMaterialReceiptAppro
                 SupplyType.MATERIAL_STOCKIN.getValue());
 
             // 调用医保商品采购接口 todo 相关医保接口未对应
-            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch)) {
                 List<String> uploadFailedNoList =
                     this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.PURCHASE_IN, false, true, false, now);
@@ -304,7 +304,7 @@ public class MaterialReceiptApprovalServiceImpl implements IMaterialReceiptAppro
                 SupplyType.MATERIAL_RETURN.getValue());
 
             // 调用医保采购退货接口
-            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch)) {
                 List<String> uploadFailedNoList =
                     this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.RETURN_OUT, false, false, true, now);
@@ -532,7 +532,7 @@ public class MaterialReceiptApprovalServiceImpl implements IMaterialReceiptAppro
             }
 
             // 调用医保库存变更接口
-            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch)) {
                 List<String> uploadFailedNoList = this.ybInventoryIntegrated(supplyItemDetailList,
                     YbInvChgType.DESTRUCTION, false, false, false, now);
@@ -627,7 +627,7 @@ public class MaterialReceiptApprovalServiceImpl implements IMaterialReceiptAppro
                 }
 
                 String ybSwitch =
-                    SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+                    SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
                 if (Whether.YES.getCode().equals(ybSwitch)) {
                     // 如果首次盘点信息不为空
                     if (!firstSupplyItemDetailList.isEmpty()) {
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java
index 5e7c2c713..61c200e7e 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java
@@ -142,8 +142,8 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
         message.put("createTime", "20251101143028");
         message.put("billQRCode", "QR_DATA_SCARLET");
 
-        var optionJson = SecurityUtils.getLoginUser().getOptionJson();
-        String baseUrl = optionJson.path(CommonConstants.Option.URL).asText();
+        var loginUser = SecurityUtils.getLoginUser();
+        String baseUrl = loginUser.getOptionJsonValue(CommonConstants.Option.URL);
         message.put("pictureUrl", baseUrl + "/invoice/view?busNo=scarlet");
         message.put("pictureNetUrl", baseUrl + "/invoice/view?busNo=scarlet");
 
@@ -155,8 +155,8 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
 
     private JsonNode createInternalSuccessResponse(JsonNode bill, String prefix) {
         String busNo = bill.path("busNo").asText();
-        var optionJson = SecurityUtils.getLoginUser().getOptionJson();
-        String baseUrl = optionJson.path(CommonConstants.Option.URL).asText();
+        var loginUser = SecurityUtils.getLoginUser();
+        String baseUrl = loginUser.getOptionJsonValue(CommonConstants.Option.URL);
 
         ObjectNode message = new com.fasterxml.jackson.databind.ObjectMapper().createObjectNode();
         message.put("billBatchCode", prefix + "BC" + System.currentTimeMillis());
@@ -495,7 +495,7 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
             logger.info("挂号请求参数：" + JsonUtils.toJson(bill));
             logger.info("———————————————————————————————————————————————————————————————————————————————————————");
             JsonNode resobj;
-            if ("0".equals(SecurityUtils.getLoginUser().getOptionJson().path("forwardSwitch").asText())) {
+            if ("0".equals(SecurityUtils.getLoginUser().getOptionJsonValue("forwardSwitch"))) {
                 resobj = PreInvoicePostForward(bill, "api/medical/invEBillRegistration");
             } else {
                 resobj = PreInvoicePost(bill, "api/medical/invEBillRegistration");
@@ -805,7 +805,7 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
             logger.info("************************************** 分 割 线 ***************************************");
             logger.info("门诊信息入参：" + JsonUtils.toJson(bill));
             logger.info("———————————————————————————————————————————————————————————————————————————————————————");
-            if ("0".equals(SecurityUtils.getLoginUser().getOptionJson().path("forwardSwitch").asText())) {
+            if ("0".equals(SecurityUtils.getLoginUser().getOptionJsonValue("forwardSwitch"))) {
                 resobj = PreInvoicePostForward(bill, "api/medical/invoiceEBillOutpatient");
             } else {
                 resobj = PreInvoicePost(bill, "api/medical/invoiceEBillOutpatient");
@@ -1118,7 +1118,7 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
             logger.info("************************************** 分 割 线 ***************************************");
             logger.info("住院信息入参：" + JsonUtils.toJson(bill));
             logger.info("———————————————————————————————————————————————————————————————————————————————————————");
-            if ("0".equals(SecurityUtils.getLoginUser().getOptionJson().path("forwardSwitch").asText())) {
+            if ("0".equals(SecurityUtils.getLoginUser().getOptionJsonValue("forwardSwitch"))) {
                 resobj = PreInvoicePostForward(bill, "api/medical/invEBillHospitalized");
             } else {
                 resobj = PreInvoicePost(bill, "api/medical/invEBillHospitalized");
@@ -1205,7 +1205,7 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         Practitioner user = practitionerService.getPractitionerByUserId(loginUser.getUserId());
 
-        var optionJson = SecurityUtils.getLoginUser().getOptionJson();
+
 
         ObjectNode bill = new com.fasterxml.jackson.databind.ObjectMapper().createObjectNode();
 
@@ -1248,7 +1248,7 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
         // ------就诊信息------
         // medicalInstitution 医疗机构类型 String 30 是 按照《医疗机构管理条例实施细则》和《卫生部关于修订<医疗机构管理条例实施细则>第三条有关内容的通知》确定的医疗卫生机构类别
         String medicalInstitution;
-        switch (optionJson.path("hospital_lv").asText()) {
+        switch (loginUser.getOptionJsonValue("hospital_lv")) {
             case "01":
                 medicalInstitution = "三级特等";
                 break;
@@ -1285,7 +1285,7 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
         }
         bill.put("medicalInstitution", medicalInstitution);
         // medCareInstitution 医保机构编码 String 60 否 医保机构的唯一编码
-        bill.put("medCareInstitution", optionJson.path(CommonConstants.Option.HOSPITAL_CODE).asText());
+        bill.put("medCareInstitution", loginUser.getOptionJsonValue(CommonConstants.Option.HOSPITAL_CODE));
 
         // 410 长期照护保险 //310 职工基本医疗保险
         // 320 公务员医疗补助 //330 大额医疗费用补助
@@ -1572,7 +1572,7 @@ public class EleInvoiceServiceImpl implements IEleInvoiceService {
             logger.info("************************************** 分 割 线 ***************************************");
             logger.info("冲红信息入参：" + JsonUtils.toJson(bill));
             logger.info("———————————————————————————————————————————————————————————————————————————————————————");
-            if ("0".equals(SecurityUtils.getLoginUser().getOptionJson().path("forwardSwitch").asText())) {
+            if ("0".equals(SecurityUtils.getLoginUser().getOptionJsonValue("forwardSwitch"))) {
                 resobj = PreInvoicePostForward(bill, "api/medical/writeOffEBill");
             } else {
                 resobj = PreInvoicePost(bill, "api/medical/writeOffEBill");
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java
index 8b433dc5f..49610c8ae 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java
@@ -449,10 +449,10 @@ public class IChargeBillServiceImpl implements IChargeBillService {
         map.put("REGISTRATION_FEE", sum13);// 挂号费
         map.put("OTHER_FEE", sum14);// 其他费用
 
-        // String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText();
-        var optionJson = SecurityUtils.getLoginUser().getOptionJson();
-        String fixmedinsName = optionJson.path(CommonConstants.Option.FIXMEDINS_NAME).asText();
-        String fixmedinsCode = optionJson.path(CommonConstants.Option.FIXMEDINS_CODE).asText();
+        // String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH);
+        var loginUser = SecurityUtils.getLoginUser();
+        String fixmedinsName = loginUser.getOptionJsonValue(CommonConstants.Option.FIXMEDINS_NAME);
+        String fixmedinsCode = loginUser.getOptionJsonValue(CommonConstants.Option.FIXMEDINS_CODE);
 
         map.put("fixmedinsName", fixmedinsName);// 医院名称
         map.put("fixmedinsCode", fixmedinsCode);// 医院编号
@@ -819,10 +819,10 @@ public class IChargeBillServiceImpl implements IChargeBillService {
                 .add(sum11).add(sum12).add(sum13).add(sum14);
         map.put("SUM", sum15);// 合计费用
 
-        // String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText();
-        var optionJson = SecurityUtils.getLoginUser().getOptionJson();
-        String fixmedinsName = optionJson.path(CommonConstants.Option.FIXMEDINS_NAME).asText();
-        String fixmedinsCode = optionJson.path(CommonConstants.Option.FIXMEDINS_CODE).asText();
+        // String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH);
+        var loginUser = SecurityUtils.getLoginUser();
+        String fixmedinsName = loginUser.getOptionJsonValue(CommonConstants.Option.FIXMEDINS_NAME);
+        String fixmedinsCode = loginUser.getOptionJsonValue(CommonConstants.Option.FIXMEDINS_CODE);
 
         map.put("fixmedinsName", fixmedinsName);
         map.put("fixmedinsCode", fixmedinsCode);
@@ -1383,10 +1383,10 @@ public class IChargeBillServiceImpl implements IChargeBillService {
                 .add(sum11).add(sum12).add(sum13).add(sum14);
         map.put("SUM", sum15);// 合计费用
 
-        // String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText();
-        var optionJson = SecurityUtils.getLoginUser().getOptionJson();
-        String fixmedinsName = optionJson.path(CommonConstants.Option.FIXMEDINS_NAME).asText();
-        String fixmedinsCode = optionJson.path(CommonConstants.Option.FIXMEDINS_CODE).asText();
+        // String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH);
+        var loginUser = SecurityUtils.getLoginUser();
+        String fixmedinsName = loginUser.getOptionJsonValue(CommonConstants.Option.FIXMEDINS_NAME);
+        String fixmedinsCode = loginUser.getOptionJsonValue(CommonConstants.Option.FIXMEDINS_CODE);
 
         map.put("fixmedinsName", fixmedinsName);
         map.put("fixmedinsCode", fixmedinsCode);
@@ -2183,9 +2183,9 @@ public class IChargeBillServiceImpl implements IChargeBillService {
 
     private Map getMap(Map<String, Object> map) {
 
-        var optionJson = SecurityUtils.getLoginUser().getOptionJson();
-        String fixmedinsName = optionJson.path(CommonConstants.Option.FIXMEDINS_NAME).asText();
-        String fixmedinsCode = optionJson.path(CommonConstants.Option.FIXMEDINS_CODE).asText();
+        var loginUser = SecurityUtils.getLoginUser();
+        String fixmedinsName = loginUser.getOptionJsonValue(CommonConstants.Option.FIXMEDINS_NAME);
+        String fixmedinsCode = loginUser.getOptionJsonValue(CommonConstants.Option.FIXMEDINS_CODE);
 
         map.put("fixmedinsName", fixmedinsName);
         map.put("fixmedinsCode", fixmedinsCode);
@@ -2484,9 +2484,9 @@ public class IChargeBillServiceImpl implements IChargeBillService {
             }
         }
 
-        var optionJson = SecurityUtils.getLoginUser().getOptionJson();
-        String fixmedinsName = optionJson.path(CommonConstants.Option.FIXMEDINS_NAME).asText();
-        String fixmedinsCode = optionJson.path(CommonConstants.Option.FIXMEDINS_CODE).asText();
+        var loginUser = SecurityUtils.getLoginUser();
+        String fixmedinsName = loginUser.getOptionJsonValue(CommonConstants.Option.FIXMEDINS_NAME);
+        String fixmedinsCode = loginUser.getOptionJsonValue(CommonConstants.Option.FIXMEDINS_CODE);
 
         map.put("fixmedinsName", fixmedinsName);// 医院名称
         map.put("fixmedinsCode", fixmedinsCode);// 医院编号
@@ -2710,7 +2710,7 @@ public class IChargeBillServiceImpl implements IChargeBillService {
             Catalogue1312QueryParam catalogue1312QueryParam = new Catalogue1312QueryParam();
             catalogue1312QueryParam.setHilistCode(activityDefinition.getYbNo());
             catalogue1312QueryParam.setInsuplcAdmdvs(
-                    SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.INSUPLC_ADMDVS).asText());
+                    SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.INSUPLC_ADMDVS));
             // 直接解析（默认 ISO 格式）
             LocalDate localDate = LocalDate.parse("2025-01-01");
             // 转换为 Date
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java
index 84ccc7f88..fd240316b 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java
@@ -357,7 +357,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
                     if (StringUtils.isEmpty(chargeItem.getChildrenJson())
                             || CommonConstants.BusinessName.DEFAULT_CONTRACT_NO.equals(account.getContractNo())
                             || "0".equals(
-                                    SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText())) {
+                                    SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH))) {
                         PaymentedItemModel piModel = ConverterToPaymenItemModel(diagList, chargeItem);
                         prePaymentedItems.add(piModel);
                     } else {
@@ -1863,8 +1863,8 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
         }
 
         Clinic2206OrderOutput clinic2206OrderResult;
-        String string = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText();
-        if ("1".equals(SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText())
+        String string = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH);
+        if ("1".equals(SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH))
                 && !(CommonConstants.BusinessName.DEFAULT_CONTRACT_NO
                         .equals(outpatientRegistrationAddParam.getAccountFormData().getContractNo())
                 || CommonConstants.BusinessName.DEFAULT_STUDENT_CONTRACT_NO
@@ -1959,7 +1959,7 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
             throw new ServiceException("请选择合适的费用性质");
         }
         com.healthlink.his.financial.model.PaymentResult paymentResult;
-        if ("1".equals(SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText())
+        if ("1".equals(SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH))
                 && !CommonConstants.BusinessName.DEFAULT_CONTRACT_NO
                         .equals(outpatientRegistrationAddParam.getAccountFormData().getContractNo())
                 && contract.getYbFlag() == 1) {
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReceiptApprovalServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReceiptApprovalServiceImpl.java
index b3ab4812c..b8d388a74 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReceiptApprovalServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyDispensarymanage/appservice/impl/PharmacyDispensaryReceiptApprovalServiceImpl.java
@@ -189,7 +189,7 @@ public class PharmacyDispensaryReceiptApprovalServiceImpl implements IPharmacyDi
                 SupplyType.PURCHASE_STOCKIN.getValue());
 
             // 调用医保商品采购接口 todo 药房相关医保接口未对应
-            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch)) {
                 List<String> uploadFailedNoList =
                     this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.PURCHASE_IN, false, true, false, now);
@@ -276,7 +276,7 @@ public class PharmacyDispensaryReceiptApprovalServiceImpl implements IPharmacyDi
                 SupplyType.PURCHASE_RETURN.getValue());
 
             // 调用医保采购退货接口
-            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch)) {
                 List<String> uploadFailedNoList =
                     this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.RETURN_OUT, false, false, true, now);
@@ -427,7 +427,7 @@ public class PharmacyDispensaryReceiptApprovalServiceImpl implements IPharmacyDi
             }
 
             // 调用医保库存变更接口
-            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch)) {
                 List<String> uploadFailedNoList = this.ybInventoryIntegrated(supplyItemDetailList,
                     YbInvChgType.DESTRUCTION, false, false, false, now);
@@ -524,7 +524,7 @@ public class PharmacyDispensaryReceiptApprovalServiceImpl implements IPharmacyDi
                 }
 
                 String ybSwitch =
-                    SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+                    SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
                 if (Whether.YES.getCode().equals(ybSwitch)) {
                     // 如果首次盘点信息不为空
                     if (!firstSupplyItemDetailList.isEmpty()) {
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReceiptApprovalServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReceiptApprovalServiceImpl.java
index b61eb9fee..5f0bf8622 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReceiptApprovalServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseReceiptApprovalServiceImpl.java
@@ -213,7 +213,7 @@ public class PharmacyWarehouseReceiptApprovalServiceImpl implements IPharmacyWar
                 SupplyType.CABINET_STOCKIN.getValue());
 
             // 调用医保商品采购接口 todo 药库相关医保接口未对应
-            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch)) {
                 List<String> uploadFailedNoList =
                     this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.PURCHASE_IN, false, true, false, now);
@@ -316,7 +316,7 @@ public class PharmacyWarehouseReceiptApprovalServiceImpl implements IPharmacyWar
                 SupplyType.CABINET_RETURN.getValue());
 
             // 调用医保采购退货接口
-            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch)) {
                 List<String> uploadFailedNoList =
                     this.ybInventoryIntegrated(supplyItemDetailList, YbInvChgType.RETURN_OUT, false, false, true, now);
@@ -545,7 +545,7 @@ public class PharmacyWarehouseReceiptApprovalServiceImpl implements IPharmacyWar
             }
 
             // 调用医保库存变更接口
-            String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+            String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
             if (Whether.YES.getCode().equals(ybSwitch)) {
                 List<String> uploadFailedNoList = this.ybInventoryIntegrated(supplyItemDetailList,
                     YbInvChgType.DESTRUCTION, false, false, false, now);
@@ -640,7 +640,7 @@ public class PharmacyWarehouseReceiptApprovalServiceImpl implements IPharmacyWar
                 }
 
                 String ybSwitch =
-                    SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+                    SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
                 if (Whether.YES.getCode().equals(ybSwitch)) {
                     // 如果首次盘点信息不为空
                     if (!firstSupplyItemDetailList.isEmpty()) {
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/InHospitalReturnMedicineAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/InHospitalReturnMedicineAppServiceImpl.java
index 60d770b56..3e2f8bc4f 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/InHospitalReturnMedicineAppServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/InHospitalReturnMedicineAppServiceImpl.java
@@ -450,7 +450,7 @@ public class InHospitalReturnMedicineAppServiceImpl implements IInHospitalReturn
         String returnMsg = null;
         List<String> uploadFailedNoList;
         // 调用医保商品销售退货接口
-        String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+        String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
         if (Whether.YES.getCode().equals(ybSwitch)) {
             List<DeviceDefinition> deviceDefinitions = new ArrayList<>();
             List<MedicationDefinition> medicationDefinitions = new ArrayList<>();
@@ -647,7 +647,7 @@ public class InHospitalReturnMedicineAppServiceImpl implements IInHospitalReturn
             .setDrugtracinfo(medicalTraceNo).setCertno(dispenseInventoryDto.getIdCard());
         // 查看所属医院
         String fixmedinsCode =
-            SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.FIXMEDINS_CODE).asText();
+            SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.FIXMEDINS_CODE);
         if (dispenseInventoryDto.getPreparerName() == null && HospitalCodeEnum.CCU.getCode().equals(fixmedinsCode)) {
             medical3506Param.setSelRetnOpterName(CommonConstants.CCU.DisDeviceDoctorName);
         } else {
@@ -677,7 +677,7 @@ public class InHospitalReturnMedicineAppServiceImpl implements IInHospitalReturn
         MedicalInventory3511Param medicalInventory3511Param = new MedicalInventory3511Param();
 
         String fixmedinsCode =
-            SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.FIXMEDINS_CODE).asText();
+            SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.FIXMEDINS_CODE);
         // TODO
         medicalInventory3511Param.setFixmedinsCode(fixmedinsCode).setMedinsListCodg(dispenseInventoryDto.getYbNo())
             .setFixmedinsBchno(dispenseInventoryDto.getLotNumber()).setBegndate(dispenseInventoryDto.getDispenseTime())
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/MedicalDeviceDispenseAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/MedicalDeviceDispenseAppServiceImpl.java
index f6c330e88..ab63163e9 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/MedicalDeviceDispenseAppServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/MedicalDeviceDispenseAppServiceImpl.java
@@ -347,7 +347,7 @@ public class MedicalDeviceDispenseAppServiceImpl implements IMedicalDeviceDispen
         // String returnMsg = null;
         // List<String> uploadFailedNoList;
         // // 调用医保商品销售接口
-        // String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText();
+        // String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH);
         // // 医保开关
         // if (Whether.YES.getCode().equals(ybSwitch)) {
         // // 设置进销存参数
@@ -388,7 +388,7 @@ public class MedicalDeviceDispenseAppServiceImpl implements IMedicalDeviceDispen
     public R<?> dispenseMedicalConsumables(List<Long> chargeItemIds) {
         // 查看所属医院
         String fixmedinsCode
-                = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.FIXMEDINS_CODE).asText();
+                = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.FIXMEDINS_CODE);
         if (!HospitalCodeEnum.CCU.getCode().equals(fixmedinsCode)) {
             return R.ok();
         }
@@ -498,7 +498,7 @@ public class MedicalDeviceDispenseAppServiceImpl implements IMedicalDeviceDispen
         // // 返回信息
         // String returnMsg = null;
         // // 调用医保商品销售接口
-        // String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText();
+        // String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH);
         // List<String> uploadFailedNoList = new ArrayList<>();
         // // 医保开关
         // if (Whether.YES.getCode().equals(ybSwitch)) {
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java
index 82c79afad..3cbf83e1a 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/ReturnMedicineAppServiceImpl.java
@@ -443,7 +443,7 @@ public class ReturnMedicineAppServiceImpl implements IReturnMedicineAppService {
         String returnMsg = null;
         List<String> uploadFailedNoList;
         // 调用医保商品销售退货接口
-        String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+        String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
         if (Whether.YES.getCode().equals(ybSwitch)) {
             List<DeviceDefinition> deviceDefinitions = new ArrayList<>();
             List<MedicationDefinition> medicationDefinitions = new ArrayList<>();
@@ -641,7 +641,7 @@ public class ReturnMedicineAppServiceImpl implements IReturnMedicineAppService {
                 .setDrugtracinfo(medicalTraceNo).setCertno(dispenseInventoryDto.getIdCard());
         // 查看所属医院
         String fixmedinsCode
-                = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.FIXMEDINS_CODE).asText();
+                = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.FIXMEDINS_CODE);
         if (dispenseInventoryDto.getPreparerName() == null && HospitalCodeEnum.CCU.getCode().equals(fixmedinsCode)) {
             medical3506Param.setSelRetnOpterName(CommonConstants.CCU.DisDeviceDoctorName);
         } else {
@@ -671,7 +671,7 @@ public class ReturnMedicineAppServiceImpl implements IReturnMedicineAppService {
         MedicalInventory3511Param medicalInventory3511Param = new MedicalInventory3511Param();
 
         String fixmedinsCode
-                = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.FIXMEDINS_CODE).asText();
+                = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.FIXMEDINS_CODE);
         // TODO
         medicalInventory3511Param.setFixmedinsCode(fixmedinsCode).setMedinsListCodg(dispenseInventoryDto.getYbNo())
                 .setFixmedinsBchno(dispenseInventoryDto.getLotNumber()).setBegndate(dispenseInventoryDto.getDispenseTime())
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java
index 0f5d19778..97e671b50 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java
@@ -269,7 +269,7 @@ public class SummaryDispenseMedicineAppServiceImpl implements ISummaryDispenseMe
         String returnMsg = null;
         List<String> uploadFailedNoList;
         // 调用医保商品销售接口
-        String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText();
+        String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH);
         // 医保开关
         if (Whether.YES.getCode().equals(ybSwitch)) {
             // 设置进销存参数
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java
index 8e167b942..bbad3414f 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/pharmacymanage/appservice/impl/WesternMedicineDispenseAppServiceImpl.java
@@ -495,7 +495,7 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi
         String returnMsg = null;
         List<String> uploadFailedNoList;
         // 调用医保商品销售接口
-        String ybSwitch = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText(); // 医保开关
+        String ybSwitch = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH); // 医保开关
         if (Whether.YES.getCode().equals(ybSwitch)) {
             // 设置进销存参数
             List<MedicationDefinition> medicationDefinitions = medicationDefinitionService.listByIds(
@@ -707,7 +707,7 @@ public class WesternMedicineDispenseAppServiceImpl implements IWesternMedicineDi
         }
         // 查看所属医院
         String fixmedinsCode
-                = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.FIXMEDINS_CODE).asText();
+                = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.FIXMEDINS_CODE);
         if (dispenseInventoryDto.getPreparerName() == null && HospitalCodeEnum.CCU.getCode().equals(fixmedinsCode)) {
             medical3505Param.setSelRetnOpterName(CommonConstants.CCU.DisDeviceDoctorName);
         } else {
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/InpatientMedicalRecordHomePageCollectionAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/InpatientMedicalRecordHomePageCollectionAppServiceImpl.java
index dc3d4b83f..cf86b11ca 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/InpatientMedicalRecordHomePageCollectionAppServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/InpatientMedicalRecordHomePageCollectionAppServiceImpl.java
@@ -8,6 +8,7 @@ import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.core.common.core.domain.R;
+import com.core.common.core.domain.model.LoginUser;
 import com.core.common.utils.AgeCalculatorUtil;
 import com.core.common.utils.SecurityUtils;
 import com.healthlink.his.administration.service.IEncounterService;
@@ -82,11 +83,11 @@ public class InpatientMedicalRecordHomePageCollectionAppServiceImpl implements I
         df10_2.setMaximumFractionDigits(2);
 
         // // 获取当前登陆用户信息
-        // LoginUser loginUser = SecurityUtils.getLoginUser();
+        LoginUser loginUser = SecurityUtils.getLoginUser();
         // Practitioner user = practitionerService.getPractitionerByUserId(loginUser.getUserId());
 
         // 获取系统信息
-        var optionJson = SecurityUtils.getLoginUser().getOptionJson();
+
 
         // 住院病案csv参数
         InpatientMedicalRecordHomePageCollectionDto medicalRecordHomePage =
@@ -98,9 +99,9 @@ public class InpatientMedicalRecordHomePageCollectionAppServiceImpl implements I
 
         for (InpatientMedicalRecordHomePageMakeDto item : medicalRecordHomePageMakeList) {
             // 组织机构代码 字符 30 必填
-            medicalRecordHomePage.setA01(optionJson.path(CommonConstants.Option.FIXMEDINS_CODE).asText());
+            medicalRecordHomePage.setA01(loginUser.getOptionJsonValue(CommonConstants.Option.FIXMEDINS_CODE));
             // 医疗机构名称 A02 字符 80 必填
-            medicalRecordHomePage.setA02(optionJson.path(CommonConstants.Option.FIXMEDINS_NAME).asText());
+            medicalRecordHomePage.setA02(loginUser.getOptionJsonValue(CommonConstants.Option.FIXMEDINS_NAME));
             // 病案号 A48 字符 50 必填
             medicalRecordHomePage.setA48(item.getA48());
             // 住院次数 A49 数字 4 必填
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/ReportAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/ReportAppServiceImpl.java
index f2d07e16f..c6609acf9 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/ReportAppServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/reportmanage/appservice/impl/ReportAppServiceImpl.java
@@ -192,11 +192,11 @@ public class ReportAppServiceImpl implements IReportAppService {
      */
     private String[] getOrgInfo() {
         // 获取系统信息
-        var optionJson = SecurityUtils.getLoginUser().getOptionJson();
+        var loginUser = SecurityUtils.getLoginUser();
         // 医疗机构代码
-        String fixmedinsCode = optionJson.path(CommonConstants.Option.FIXMEDINS_CODE).asText();
+        String fixmedinsCode = loginUser.getOptionJsonValue(CommonConstants.Option.FIXMEDINS_CODE);
         // 组织机构名称
-        String fixmedinsName = optionJson.path(CommonConstants.Option.FIXMEDINS_NAME).asText();
+        String fixmedinsName = loginUser.getOptionJsonValue(CommonConstants.Option.FIXMEDINS_NAME);
         return new String[]{fixmedinsCode, fixmedinsName};
     }
 
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/controller/YbController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/controller/YbController.java
index d943424d0..d6fc3a1b2 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/controller/YbController.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/controller/YbController.java
@@ -293,7 +293,7 @@ public class YbController {
                 .setFundPaySumamt(financialHand3203WebParam.getFundAppySum().doubleValue())
                 .setAcctPay(financialHand3203WebParam.getAcctPay().doubleValue())
                 .setFixmedinsSetlCnt(Integer.parseInt(financialHand3203WebParam.getSetlCnt()))
-                .setInsuplcAdmdvs(SecurityUtils.getLoginUser().getOptionJson().path("admvs").asText());
+                .setInsuplcAdmdvs(SecurityUtils.getLoginUser().getOptionJsonValue("admvs"));
 
         Result result = ybHttpUtils.reconcileGeneralLedger(financial3201Param);
         if (result.getCode().equals(CommonConstant.SC_OK_200)) {
@@ -336,7 +336,7 @@ public class YbController {
             HttpServletResponse response) throws IOException {
         List<Financial3202FileParam> financial3202FileParams
                 = ybDao.paymentCompareYbSettle(financial3202WebParam.getSettlementIdList());
-        // String filePath = SecurityUtils.getLoginUser().getOptionJson().path("filePath").asText()+new
+        // String filePath = SecurityUtils.getLoginUser().getOptionJsonValue("filePath")+new
         // Date().getTime()+".txt";
         // String filePath = "C:\\Users\\bjbUser\\Desktop\\"+new Date().getTime()+".txt";
         // try (BufferedWriter writer = new BufferedWriter(new FileWriter(filePath))) {
@@ -407,7 +407,7 @@ public class YbController {
     public R<?> reconcileGeneral(List<String> settlementIdList, String filePath, String fileQuryNo, String setlOptins,
             String clrType) {
         // todo:这里需要考虑3302接口的参数是后台合计还是由前台传入，因为这个参数还要和txt文件对应（既需要txt中的数据还需要db表中的一些数据），
-        // String filePath = SecurityUtils.getLoginUser().getOptionJson().path("filePath").asText()+new
+        // String filePath = SecurityUtils.getLoginUser().getOptionJsonValue("filePath")+new
         // Date().getTime()+".txt";
         List<Financial3202FileParam> financial3202FileParamList = new ArrayList<>();
         Resource resource = resourceLoader.getResource(filePath); // 或使用 "file:" 读取绝对路径
@@ -783,7 +783,7 @@ public class YbController {
         Catalogue1312QueryParam catalogue1312QueryParam = new Catalogue1312QueryParam();
         catalogue1312QueryParam.setHilistCode(hilistCode);
         catalogue1312QueryParam.setInsuplcAdmdvs(
-                SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.INSUPLC_ADMDVS).asText());
+                SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.INSUPLC_ADMDVS));
         // 直接解析（默认 ISO 格式）
         LocalDate localDate = LocalDate.parse(dateStr);
         // 转换为 Date
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbEleHttpServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbEleHttpServiceImpl.java
index a8a292f89..c5fab0e6b 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbEleHttpServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/service/impl/YbEleHttpServiceImpl.java
@@ -54,7 +54,7 @@ public class YbEleHttpServiceImpl implements IYbEleHttpService {
         ElepVeriPrescriptionOutput pcpResult = new ElepVeriPrescriptionOutput();
         BaseInfo baseInfo = ybParamBuilderUtil.getBaseInfo(medType, dutyDoctorName);
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("eleUrl").asText() + "/preCheckPrescription",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("eleUrl") + "/preCheckPrescription",
             pcp, baseInfo);
         // 参数处理
         ObjectMapper mapper = new ObjectMapper();
@@ -83,7 +83,7 @@ public class YbEleHttpServiceImpl implements IYbEleHttpService {
 
         ElepSignatureOutput esResult = new ElepSignatureOutput();
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("eleUrl").asText() + "/signature", eleSign,
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("eleUrl") + "/signature", eleSign,
             ybParamBuilderUtil.getBaseInfo("", ""));
         // 参数处理
         ObjectMapper mapper = new ObjectMapper();
@@ -112,7 +112,7 @@ public class YbEleHttpServiceImpl implements IYbEleHttpService {
 
         ElepUploadOutput euResult = new ElepUploadOutput();
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("eleUrl").asText() + "/upload",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("eleUrl") + "/upload",
             eleUploadInput, ybParamBuilderUtil.getBaseInfo("", ""));
         // 参数处理
         ObjectMapper mapper = new ObjectMapper();
@@ -141,7 +141,7 @@ public class YbEleHttpServiceImpl implements IYbEleHttpService {
 
         ElepRevokeOutput ereResult = new ElepRevokeOutput();
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("eleUrl").asText() + "/revoke",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("eleUrl") + "/revoke",
             eleRevokeInput, ybParamBuilderUtil.getBaseInfo("", ""));
         // 参数处理
         ObjectMapper mapper = new ObjectMapper();
@@ -173,7 +173,7 @@ public class YbEleHttpServiceImpl implements IYbEleHttpService {
         // baseParam.setBaseInfo(ybParamBuilderUtil.getBaseInfo()).setData(o);
         QueryPrescription emrResult = new QueryPrescription();
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("eleUrl").asText() + "/querPrescription",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("eleUrl") + "/querPrescription",
             eleQueryPreInput, ybParamBuilderUtil.getBaseInfo("", ""));
         // 参数处理
         ObjectMapper mapper = new ObjectMapper();
@@ -201,7 +201,7 @@ public class YbEleHttpServiceImpl implements IYbEleHttpService {
 
         MedicationResultInquiry medResult = new MedicationResultInquiry();
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("eleUrl").asText() + "/medresult",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("eleUrl") + "/medresult",
             eleMedInput, ybParamBuilderUtil.getBaseInfo("", ""));
         // 参数处理
         ObjectMapper mapper = new ObjectMapper();
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/util/YbEleParamBuilderUtil.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/util/YbEleParamBuilderUtil.java
index 0c35c7c7b..42878da8f 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/util/YbEleParamBuilderUtil.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/ybmanage/util/YbEleParamBuilderUtil.java
@@ -331,9 +331,9 @@ public class YbEleParamBuilderUtil {
         }
 
         String fixmedinsCode =
-            SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.FIXMEDINS_CODE).asText();
+            SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.FIXMEDINS_CODE);
         String fixmedinsName =
-            SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.FIXMEDINS_NAME).asText();
+            SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.FIXMEDINS_NAME);
 
         // 1-输入-就诊信息
         ElepVeriVisitInfo eleInfo = new ElepVeriVisitInfo();
@@ -424,10 +424,10 @@ public class YbEleParamBuilderUtil {
         SimpleDateFormat targetFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String targetDateStr = targetFormat.format(checkDate);
 
-        var optionJson = SecurityUtils.getLoginUser().getOptionJson();
-        String outputPath = optionJson.path(CommonConstants.Option.OUTPUT_PATH).asText();
-        String fixmedinsCode = optionJson.path(CommonConstants.Option.FIXMEDINS_CODE).asText();
-        String fixmedinsName = optionJson.path(CommonConstants.Option.FIXMEDINS_NAME).asText();
+        var loginUser = SecurityUtils.getLoginUser();
+        String outputPath = loginUser.getOptionJsonValue(CommonConstants.Option.OUTPUT_PATH);
+        String fixmedinsCode = loginUser.getOptionJsonValue(CommonConstants.Option.FIXMEDINS_CODE);
+        String fixmedinsName = loginUser.getOptionJsonValue(CommonConstants.Option.FIXMEDINS_NAME);
 
         // 审方药师信息
         Practitioner practitioner = practitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/PaymentReconciliationServiceImpl.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/PaymentReconciliationServiceImpl.java
index cb7c273cf..d298adb44 100755
--- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/PaymentReconciliationServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/financial/service/impl/PaymentReconciliationServiceImpl.java
@@ -153,7 +153,7 @@ public class PaymentReconciliationServiceImpl extends ServiceImpl<PaymentReconci
             List<PaymentedItemModel> paymentedItemList) {
 
         PrePaymentResult prePaymentResult = null;
-        String ybSwitchFlag = SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText();
+        String ybSwitchFlag = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH);
         if (ybSwitchFlag.equals("0")) {
             contractBusNo = CommonConstants.BusinessName.DEFAULT_CONTRACT_NO;
         }
@@ -186,7 +186,7 @@ public class PaymentReconciliationServiceImpl extends ServiceImpl<PaymentReconci
                     Clinic2206OrderOutput clinic2206OrderOutput = null;
                     ClinicReg2201Output reg2201Output = null;
                     if (!medTypeKV.getKey().equals(YbMedType.GENERAL_OUTPATIENT.getValue()) && "1".equals(
-                            SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText())) {
+                            SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH))) {
                         // 不是普通门诊就诊类型，补充挂号信息
                         reg2201Output = ybManager.createRegWithMedType(contract, ybMdtrtCertType, busiCardInfo,
                                 medTypeKV.getValue().get(0).getEncounterId(),
@@ -605,7 +605,7 @@ public class PaymentReconciliationServiceImpl extends ServiceImpl<PaymentReconci
             Clinic2206OrderOutput clinic2206OrderOutput = null;
             ClinicReg2201Output reg2201Output = null;
             if (!medTypeKV.getKey().equals(YbMedType.GENERAL_OUTPATIENT.getValue()) && "1"
-                    .equals(SecurityUtils.getLoginUser().getOptionJson().path(CommonConstants.Option.YB_SWITCH).asText())) {
+                    .equals(SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.YB_SWITCH))) {
                 // 不是普通门诊就诊类型，补充挂号信息
                 reg2201Output = ybManager.createRegWithMedType(contract, ybMdtrtCertType, busiCardInfo,
                         medTypeKV.getValue().get(0).getEncounterId(),
diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/YbHttpUtils.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/YbHttpUtils.java
index d384d1730..05716df1d 100755
--- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/YbHttpUtils.java
+++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/service/YbHttpUtils.java
@@ -77,7 +77,7 @@ public class YbHttpUtils {
         Info1101Output perinfo = null;
         // 发送请求
         String resultString
-                = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/getPatinfo", readcard, null);
+                = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/getPatinfo", readcard, null);
         if (StringUtils.isEmpty(resultString)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -108,7 +108,7 @@ public class YbHttpUtils {
         Result result = null;
         ClinicReg2201Output clinicReg2201Output = new ClinicReg2201Output();
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/reg", reg, contract);
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/reg", reg, contract);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -138,7 +138,7 @@ public class YbHttpUtils {
         ClinicReg2201Output clinicReg2201Output = new ClinicReg2201Output();
         // 发送请求
         String s
-                = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/cancelReg", reg, contract);
+                = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/cancelReg", reg, contract);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -167,7 +167,7 @@ public class YbHttpUtils {
         // 声名参数
         Result result = null;
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/upload2204-record",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/upload2204-record",
                 clinic2204OrderParam, contract);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -201,7 +201,7 @@ public class YbHttpUtils {
         // 声名参数
         Result result = null;
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/preSetl",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/preSetl",
                 clinic2206OrderParam, contract);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -234,7 +234,7 @@ public class YbHttpUtils {
         // 声名参数
         Result result = null;
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/setl", clinicOrder2207,
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/setl", clinicOrder2207,
                 contract);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -264,7 +264,7 @@ public class YbHttpUtils {
     public Sign9001Result sign(Sign signParam, Contract contract) {
         Sign9001Result sign = null;
         String resultString
-                = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/signIn", signParam, contract);
+                = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/signIn", signParam, contract);
         if (StringUtils.isEmpty(resultString)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -296,7 +296,7 @@ public class YbHttpUtils {
         // 声名参数
         Result result = null;
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/unPreSettle",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/unPreSettle",
                 clinic2205OrderParam, contract);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -326,7 +326,7 @@ public class YbHttpUtils {
         // 声名参数
         Result result = null;
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/cancelSetl",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/cancelSetl",
                 clinicOrder2208, contract);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -357,7 +357,7 @@ public class YbHttpUtils {
 
         Clinic2208UnSetlInfoResult clinicOrder2206Result = new Clinic2208UnSetlInfoResult();
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/directoryCheck",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/directoryCheck",
                 medicalDirectory3301ListParam, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -377,7 +377,7 @@ public class YbHttpUtils {
 
     public Result directoryUnCheck(MedicalDirectory3302Param medicalDirectory3302Param) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/directoryUnCheck",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/directoryUnCheck",
                 medicalDirectory3302Param, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -403,7 +403,7 @@ public class YbHttpUtils {
             throw new ServiceException("未查询到合同信息");
         }
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/reconcile",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/reconcile",
                 financial3201Param, contract);
 
         // 赋值（上述回填的两个参数医保不要，为了避免麻烦，在发送http后进行回填）
@@ -429,7 +429,7 @@ public class YbHttpUtils {
 
     public FinancialSettlement3202Result reconcileGeneralLedgerDetail(FinancialSettlement3202Param financial3202Param) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/reconcile-detail",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/reconcile-detail",
                 financial3202Param, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -450,7 +450,7 @@ public class YbHttpUtils {
     public List<FinancialSettlement3209AResult>
             threePartSearch(FinancialSettlement3209AParam financialSettlement3209AParam) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/three-part-search-err",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/three-part-search-err",
                 financialSettlement3209AParam, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -470,7 +470,7 @@ public class YbHttpUtils {
 
     public String applyFinancialClearing(Financial3203AParam financial3203AParam) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/apply-clearing",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/apply-clearing",
                 financial3203AParam, iContractService.getContract(financial3203AParam.getClrOptins()));
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -481,7 +481,7 @@ public class YbHttpUtils {
     public Result cancelFinancialClearing(Financial3204Param financial3204Param) {
 
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/cancel-clearing",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/cancel-clearing",
                 financial3204Param, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -499,7 +499,7 @@ public class YbHttpUtils {
 
     public Clearing3205AResult getFinancialClearingStatus(Clearing3205AParma clearing3205AParma) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/get-clearing-status",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/get-clearing-status",
                 clearing3205AParma, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -517,7 +517,7 @@ public class YbHttpUtils {
 
     public Result uploadInventoryCount(MedicalInventory3501Param medicalInventory3501Param) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/upload-inventory-count",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/upload-inventory-count",
                 medicalInventory3501Param, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -535,7 +535,7 @@ public class YbHttpUtils {
 
     public Result updateInventoryCount(MedicalInventory3502Param medicalInventory3502Param) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/update-inventory",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/update-inventory",
                 medicalInventory3502Param, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -553,7 +553,7 @@ public class YbHttpUtils {
 
     public Result procurement(Medical3503Param medical3503Param) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/procurement",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/procurement",
                 medical3503Param, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -571,7 +571,7 @@ public class YbHttpUtils {
 
     public Result cancelProcurement(MedicalPurchase3504Param medicalPurchase3504Param) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/procurement-cancel",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/procurement-cancel",
                 medicalPurchase3504Param, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -589,7 +589,7 @@ public class YbHttpUtils {
 
     public Result merchandise(Medical3505Param medical3505Param, Contract contract) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/merchandise",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/merchandise",
                 medical3505Param, contract);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -607,7 +607,7 @@ public class YbHttpUtils {
 
     public Result cancelMerchandise(Medical3506Param medical3506Param, Contract contract) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/cancel-merchandise",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/cancel-merchandise",
                 medical3506Param, contract);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -625,7 +625,7 @@ public class YbHttpUtils {
 
     public Result deleteGoodsInfo(Medical3507Param medical3507Param) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/del-goods",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/del-goods",
                 medical3507Param, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -643,7 +643,7 @@ public class YbHttpUtils {
 
     public MedicalInventory3511Output querySalesInfo(MedicalInventory3511Param medicalInventory3511Param) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/query-3511-info",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/query-3511-info",
                 medicalInventory3511Param, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -672,7 +672,7 @@ public class YbHttpUtils {
 
     public Result getClrOptins(Clearing3206AParam clearing3206AParam) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/getclroptins",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/getclroptins",
                 clearing3206AParam, null);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -690,7 +690,7 @@ public class YbHttpUtils {
 
     public Result upload2203Record(Clinic2203MedicalParam medical2203Param, Contract contract) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/upload2203-record",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/upload2203-record",
                 medical2203Param, contract);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -708,7 +708,7 @@ public class YbHttpUtils {
 
     public Result query3512(MedicalInventory3512Param inventory3512Param, Contract contract) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/query-3512-info",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/query-3512-info",
                 inventory3512Param, contract);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -726,7 +726,7 @@ public class YbHttpUtils {
 
     public Result query3513(MedicalInventory3513Param inventory3513Param, Contract contract) {
         // 发送请求
-        String s = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/query-3513-info",
+        String s = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/query-3513-info",
                 inventory3513Param, contract);
         if (StringUtils.isEmpty(s)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -791,7 +791,7 @@ public class YbHttpUtils {
         try {
 
             String resultString
-                    = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/queryYbCatalogue",
+                    = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/queryYbCatalogue",
                             catalogue1312QueryParam, null);
             // logger.info("--------1312resultString-------------" + resultString);
             // 1. 解析外层 JSON
@@ -843,7 +843,7 @@ public class YbHttpUtils {
             // 3. 转发并删除临时文件
             RestTemplate restTemplate = new RestTemplate();
             response = restTemplate.postForEntity(
-                    SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/file-up2",
+                    SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/file-up2",
                     new HttpEntity<>(body, headers), String.class);
             logger.info(JsonUtils.toJson(response));
             // 清理临时文件
@@ -871,11 +871,11 @@ public class YbHttpUtils {
         // RestTemplate restTemplate = new RestTemplate();
         // HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(body, headers);
         // ResponseEntity<String> response =
-        // restTemplate.postForEntity(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/file-up2",
+        // restTemplate.postForEntity(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/file-up2",
         // requestEntity, String.class);
 
         // try {
-        // String resultString = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/file-up2",
+        // String resultString = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/file-up2",
         // file9101Param,null);
         // // logger.info("--------1312resultString-------------" + resultString);
         // // 1. 解析外层 JSON
@@ -911,7 +911,7 @@ public class YbHttpUtils {
      */
     public Yb3101OutputResult yb3101PreMidAnalysis(Yb3101InputData data) {
         String resultString
-                = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/pre-mid-analysis", data, null);
+                = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/pre-mid-analysis", data, null);
         if (StringUtils.isEmpty(resultString)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -941,7 +941,7 @@ public class YbHttpUtils {
      */
     public void yb3103PreMidFeedback(Yb3103InputData data) {
         String resultString
-                = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/pre-mid-feedback", data, null);
+                = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/pre-mid-feedback", data, null);
         if (StringUtils.isEmpty(resultString)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -965,7 +965,7 @@ public class YbHttpUtils {
 
     public List<Yb2301OutputResult> upload2301FeeDetail(Yb2301InputFeeDetailModel yb2301InputFeeDetailModel) {
         String resultString
-                = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/upload-2301-fee-detail",
+                = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/upload-2301-fee-detail",
                         yb2301InputFeeDetailModel, null);
         if (StringUtils.isEmpty(resultString)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -997,7 +997,7 @@ public class YbHttpUtils {
 
     public Yb2303OutputSetInfo inpatientPreSettle(Yb2303InputInpatient yb2303InputInpatient) {
         String resultString
-                = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/inpa-pre-setl",
+                = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/inpa-pre-setl",
                         yb2303InputInpatient, null);
         if (StringUtils.isEmpty(resultString)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -1022,7 +1022,7 @@ public class YbHttpUtils {
     }
 
     public Yb2304OutputSetlInfo inpatientSettle(Contract contract, Yb2304InputInpatient yb2304InpatientParam) {
-        String resultString = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/inpa-setl",
+        String resultString = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/inpa-setl",
                 yb2304InpatientParam, contract);
         if (StringUtils.isEmpty(resultString)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -1055,7 +1055,7 @@ public class YbHttpUtils {
      */
     public Yb2305OutputSetlInfo inpatientUnSettle(Contract contract, Yb2305InputInpatient yb2305InpatientParam) {
         String resultString
-                = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/inpa-un-setl",
+                = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/inpa-un-setl",
                         yb2305InpatientParam, contract);
         if (StringUtils.isEmpty(resultString)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -1088,7 +1088,7 @@ public class YbHttpUtils {
     public List<Yb5205OutputSpecialDisease>
             yb5205SpecialDiseaseDrugRecordSearch(Yb5205InputSpecialDisease yb5205InputSpecialDisease) {
         String resultString
-                = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/spe-disease-record-search",
+                = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/spe-disease-record-search",
                         yb5205InputSpecialDisease, null);
         if (StringUtils.isEmpty(resultString)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -1121,7 +1121,7 @@ public class YbHttpUtils {
      */
     public FileResult queryCatalog(CatalogFileInput catalogFileInput) {
         String resultString = httpPost(
-                SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/query-catalog", catalogFileInput, null);
+                SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/query-catalog", catalogFileInput, null);
         if (StringUtils.isEmpty(resultString)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -1153,7 +1153,7 @@ public class YbHttpUtils {
      */
     public String downLoadFile(FileResult fileResult) {
         String resultString
-                = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/download", fileResult, null);
+                = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/download", fileResult, null);
         if (StringUtils.isEmpty(resultString)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -1185,7 +1185,7 @@ public class YbHttpUtils {
      */
     public InpatientReg inpatientReg(JsonNode jsonObject, String contractNo) {
         String resultString
-                = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/inpatient-reg", jsonObject,
+                = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/inpatient-reg", jsonObject,
                         contractServiceImpl.getContract(contractNo));
         if (StringUtils.isEmpty(resultString)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -1218,7 +1218,7 @@ public class YbHttpUtils {
      */
     public void cancelInpatientReg(Yb2404InputInpatient yb2404InputInpatient, String contractNo) {
         String resultString
-                = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/cancel-inpatient-reg",
+                = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/cancel-inpatient-reg",
                         yb2404InputInpatient, contractServiceImpl.getContract(contractNo));
         if (StringUtils.isEmpty(resultString)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -1251,7 +1251,7 @@ public class YbHttpUtils {
      */
     public Yb2402InputParam inpatientCheckOut(Yb2402InputParam yb2402InputInpatientDscgInfo, String contractNo) {
         String resultString
-                = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/discharge-patient",
+                = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/discharge-patient",
                         yb2402InputInpatientDscgInfo, iContractService.getContract(contractNo));
         if (StringUtils.isEmpty(resultString)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -1284,7 +1284,7 @@ public class YbHttpUtils {
      */
     public void cancelInpatientCheckOut(Yb2405InputInpatient yb2405InputInpatient, String contractNo) {
         String resultString
-                = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/cancel-discharge-patient",
+                = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/cancel-discharge-patient",
                         yb2405InputInpatient, contractServiceImpl.getContract(contractNo));
         if (StringUtils.isEmpty(resultString)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -1316,7 +1316,7 @@ public class YbHttpUtils {
      */
     public void updateInpatientInfo(Yb2403InputParam yb2403InputInpatient, String contractNo) {
         String resultString
-                = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/change-inpatient-info",
+                = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/change-inpatient-info",
                         yb2403InputInpatient, iContractService.getContract(contractNo));
         if (StringUtils.isEmpty(resultString)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -1343,7 +1343,7 @@ public class YbHttpUtils {
 
     public void emrUp(Yb4401InputDto yb4401InputDto) {
         String resultString
-                = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/emr-up", yb4401InputDto, null);
+                = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/emr-up", yb4401InputDto, null);
         if (StringUtils.isEmpty(resultString)) {
             throw new ServiceException("未接收到医保返回参数");
         }
@@ -1374,7 +1374,7 @@ public class YbHttpUtils {
      * @param contract 省市医保
      */
     public void ybToReverse(Yb2601InputParam toReverse, Contract contract) {
-        String resultString = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/to-reverse",
+        String resultString = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/to-reverse",
                 toReverse, contract);
         if (StringUtils.isEmpty(resultString)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -1401,7 +1401,7 @@ public class YbHttpUtils {
 
     public void yb4101Up(Yb4101AInputData yb4101AInputData, Contract contract) {
 
-        String resultString = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/setl-up",
+        String resultString = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/setl-up",
                 yb4101AInputData, contract);
         if (StringUtils.isEmpty(resultString)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -1428,7 +1428,7 @@ public class YbHttpUtils {
 
     public void yb4102Up(Yb4102InputStastInfo yb4102InputStastInfo) {
         String resultString
-                = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/setl-status-up",
+                = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/setl-status-up",
                         yb4102InputStastInfo, null);
         if (StringUtils.isEmpty(resultString)) {
             throw new ServiceException("未接收到医保返回参数");
@@ -1456,7 +1456,7 @@ public class YbHttpUtils {
 
     public void cancel2302FeeDetailUp(Yb2302InpatientParam yb2302InpatientParam, Contract contract) {
         String resultString
-                = httpPost(SecurityUtils.getLoginUser().getOptionJson().path("ybUrl").asText() + "/cancel-2302-fee-detail",
+                = httpPost(SecurityUtils.getLoginUser().getOptionJsonValue("ybUrl") + "/cancel-2302-fee-detail",
                         yb2302InpatientParam, contract);
         if (StringUtils.isEmpty(resultString)) {
             throw new ServiceException("未接收到医保返回参数");
diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/util/YbParamBuilderUtil.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/util/YbParamBuilderUtil.java
index 307ab2ae6..ab9447da7 100755
--- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/util/YbParamBuilderUtil.java
+++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/yb/util/YbParamBuilderUtil.java
@@ -1,9 +1,8 @@
 /*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
  */
 package com.healthlink.his.yb.util;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.enums.TenantOptionDict;
@@ -19,9 +18,10 @@ import com.healthlink.his.administration.service.*;
 import com.healthlink.his.clinical.domain.Condition;
 import com.healthlink.his.clinical.domain.ConditionDefinition;
 import com.healthlink.his.clinical.service.IConditionDefinitionService;
-import com.core.common.utils.JsonUtils;
 import com.healthlink.his.clinical.service.IConditionService;
 import com.healthlink.his.common.constant.CommonConstants;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.core.common.utils.JsonUtils;
 import com.healthlink.his.common.constant.YbCommonConstants;
 import com.healthlink.his.common.enums.*;
 import com.healthlink.his.common.enums.ybenums.*;
@@ -65,7 +65,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * 医保接口调用工具 todo:sjq 若部署云服务，该工具类内所有的查询原则上增加租户的查询条件
+ * 医保接口调用工具 todo:sjq 若部署云服务，该工具类内所有的查询原则上增加租户的查询条件
  *
  * @author SunJQ
  * @date 2025-04-03
@@ -73,10 +73,10 @@ import java.util.stream.Collectors;
 @Component
 public class YbParamBuilderUtil {
 
-    /********************* Mapper服务 *******************/
+    /********************* Mapper服务 *******************/
     @Autowired
     private MedicalInsuranceMapper medicalInsuranceMapper;
-    /********************* 业务实体服务 *******************/
+    /********************* 业务实体服务 *******************/
     @Autowired
     private IEncounterService iEncounterService;
     @Autowired
@@ -143,7 +143,7 @@ public class YbParamBuilderUtil {
     private IHealthcareServiceService iHealthcareServiceService;
     @Autowired
     private AssignSeqUtil assignSeqUtil;
-    /********************* 医保实体服务 *******************/
+    /********************* 医保实体服务 *******************/
     // @Autowired
     // private IReadcardService iReadcardService;
     @Autowired
@@ -162,17 +162,17 @@ public class YbParamBuilderUtil {
     private IClinicUnSettleService iClinicUnSettleService;
 
     /**
-     * 获取基础读卡实体
+     * 获取基础读卡实体
      *
-     * @param certType 就诊凭证
-     * @param certNo 凭证编号
-     * @return 读卡基础实体
+     * @param certType 就诊凭证
+     * @param certNo 凭证编号
+     * @return 读卡基础实体
      */
     public Info1101ReadcardParam getReadCard(String certType, String certNo) {
         YbMdtrtCertType ybCertType = YbMdtrtCertType.getByValue(certType);
         // YbPsnCertType ybPsnCertType = YbPsnCertType.getByValue(psnCertType);
         if (ybCertType == null) {
-            throw new ServiceException("未选择就诊凭证类型");
+            throw new ServiceException("未选择就诊凭证类型");
         }
         Info1101ReadcardParam readcard = new Info1101ReadcardParam();
         readcard.setMdtrtCertNo(certNo).setMdtrtCertType(ybCertType.getValue());
@@ -185,44 +185,44 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * 【2201】组装医保挂号参数
+     * 【2201】组装医保挂号参数
      *
      * @return
      */
     public ClinicReg getReg(YbMdtrtCertType ybMdtrtCertType, String busiCardInfo, Long encounterId, YbMedType medType,
         Integer tenantId) {
-        // 查询此次就诊信息(此处需要业务上保证下述两个实体一对一关系)
+        // 查询此次就诊信息(此处需要业务上保证下述两个实体一对一关系)
         Encounter encounter = iEncounterService.getById(encounterId);
         Account account =
             accountService.getOne(new LambdaQueryWrapper<Account>().eq(Account::getEncounterId, encounterId)
                 .eq(Account::getTenantId, tenantId).ne(Account::getTypeCode, AccountType.PERSONAL_CASH_ACCOUNT)
                 .eq(Account::getEncounterFlag, Whether.YES.getValue()));
         if (account == null || encounter == null) {
-            throw new ServiceException("未查询到就诊信息");
+            throw new ServiceException("未查询到就诊信息");
         }
         Patient patient = iPatientService.getById(encounter.getPatientId());
         if (patient == null) {
-            throw new ServiceException("未查询到患者信息");
+            throw new ServiceException("未查询到患者信息");
         }
-        YbMdtrtCertType certType = YbMdtrtCertType.getByValue(account.getTypeCode());// 2025/05/28 该值存01/02/03
+        YbMdtrtCertType certType = YbMdtrtCertType.getByValue(account.getTypeCode());// 2025/05/28 该值存01/02/03
         if (certType == null) {
-            throw new ServiceException("未查询到就诊凭证信息");
+            throw new ServiceException("未查询到就诊凭证信息");
         }
         InfoPerson perinfo = iPerinfoService.getOne(new LambdaQueryWrapper<InfoPerson>()
             .eq(InfoPerson::getCertno, patient.getIdCard()).eq(InfoPerson::getTenantId, tenantId)
             .orderByDesc(InfoPerson::getCreateTime).last(YbCommonConstants.sqlConst.LIMIT1));
         if (perinfo == null) {
-            throw new ServiceException("未查询到就诊凭证信息");
+            throw new ServiceException("未查询到就诊凭证信息");
         }
         // InfoReadcard1101Param readcard = iReadcardService.getOne(new LambdaQueryWrapper<InfoReadcard1101Param>()
         // .eq(InfoReadcard1101Param::getPsnCertType, certType.getValue())
         // .eq(InfoReadcard1101Param::getCertno, account.getNo()).eq(InfoReadcard1101Param::getTenantId, tenantId));
-        // Info1101ReadcardParam readcard = JsonUtils.parse(perinfo.getResult1101(),
+        // Info1101ReadcardParam readcard = JsonUtils.parseObject(perinfo.getResult1101(),
         // Info1101ReadcardParam.class);
         // if (readcard == null) {
-        // throw new ServiceException("未查询到就诊凭证信息");
+        // throw new ServiceException("未查询到就诊凭证信息");
         // }
-        // 主治医生查询
+        // 主治医生查询
         EncounterParticipant participant = null;
         Practitioner doctor = null;
         List<EncounterParticipant> list =
@@ -234,17 +234,17 @@ public class YbParamBuilderUtil {
             }
         }
         if (participant == null) {
-            throw new ServiceException("未查询到就诊医生信息");
+            throw new ServiceException("未查询到就诊医生信息");
         }
         doctor = iPractitionerService.getById(participant.getPractitionerId());
         if (doctor == null) {
-            throw new ServiceException("未查询到就诊医生信息");
+            throw new ServiceException("未查询到就诊医生信息");
         }
 
-        // 查询科室信息
+        // 查询科室信息
         Organization organization = iOrganizationService.getById(doctor.getOrgId());
         if (organization == null) {
-            throw new ServiceException("未查询到就诊科室信息");
+            throw new ServiceException("未查询到就诊科室信息");
         }
 
         ClinicReg reg = new ClinicReg();
@@ -259,21 +259,21 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * 【2203】组装就诊信息参数
+     * 【2203】组装就诊信息参数
      *
      * @return
      */
     public Clinic2203MedicalParam getClinicMedical2203Param(Long encounterId, Integer tenantId,
         ClinicReg2201Output reg2201Output, YbMedType ybMedType) {
 
-        // 查询诊断信息
+        // 查询诊断信息
         EncounterDiagnosis mainEncounterDiagnosis = null;
         List<EncounterDiagnosis> encounterDiagnosis =
             iEncounterDiagnosisService.list(new LambdaQueryWrapper<EncounterDiagnosis>()
                 .eq(EncounterDiagnosis::getEncounterId, encounterId).eq(EncounterDiagnosis::getTenantId, tenantId)
                 .eq(EncounterDiagnosis::getMedTypeCode, ybMedType.getValue()));
         // 2025/08/05
-        // 农大患者结算慢病时会上传普通门诊的疾病，医保回复该参保人未做该病种的门慢门特备案，故此修正根据门诊类型去上传
+        // 农大患者结算慢病时会上传普通门诊的疾病，医保回复该参保人未做该病种的门慢门特备案，故此修正根据门诊类型去上传
         for (EncounterDiagnosis diagnosis : encounterDiagnosis) {
             if (Objects.equals(Whether.YES.getValue(), diagnosis.getMaindiseFlag())) {
                 mainEncounterDiagnosis = diagnosis;
@@ -285,23 +285,23 @@ public class YbParamBuilderUtil {
             mainEncounterDiagnosis = encounterDiagnosis.get(0);
         }
         if (encounterDiagnosis.isEmpty()) {
-            throw new ServiceException("未查询到诊断信息");
+            throw new ServiceException("未查询到诊断信息");
         }
         if (mainEncounterDiagnosis == null) {
-            throw new ServiceException("未查询到主诊断信息");
+            throw new ServiceException("未查询到主诊断信息");
         }
-        // 查询主诊断
+        // 查询主诊断
         Condition mainCondition = iConditionService.getById(mainEncounterDiagnosis.getConditionId());
         if (mainCondition == null) {
-            throw new ServiceException("未查询到主诊断信息");
+            throw new ServiceException("未查询到主诊断信息");
         }
-        // 查询诊断定义信息
+        // 查询诊断定义信息
         ConditionDefinition conditionDefinition = iConditionDefinitionService.getById(mainCondition.getDefinitionId());
         if (conditionDefinition == null) {
-            throw new ServiceException("未查询到诊断定义信息");
+            throw new ServiceException("未查询到诊断定义信息");
         }
 
-        // 组装诊断信息参数
+        // 组装诊断信息参数
         List<Clinic2203DiseInfoParam> diseinfo = getDiseinfo(encounterDiagnosis);
 
         Clinic2203MedicalParam medical2203Param = new Clinic2203MedicalParam();
@@ -315,7 +315,7 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * 【2203】组装诊断信息参数
+     * 【2203】组装诊断信息参数
      *
      * @return
      */
@@ -331,10 +331,10 @@ public class YbParamBuilderUtil {
             if (doctor == null) {
                 continue;
             }
-            // 查询科室信息
+            // 查询科室信息
             Organization organization = iOrganizationService.getById(doctor.getOrgId());
             if (organization == null) {
-                throw new ServiceException("未查询到科室信息");
+                throw new ServiceException("未查询到科室信息");
             }
 
             Clinic2203DiseInfoParam diseinfo = new Clinic2203DiseInfoParam();
@@ -351,7 +351,7 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * 【2204】组装费用明细参数
+     * 【2204】组装费用明细参数
      *
      * @return
      */
@@ -359,49 +359,49 @@ public class YbParamBuilderUtil {
         String chrgBchno, List<PaymentedItemModel> paymentedItemList) {
 
         List<Clinic2204FeeDetailParam> clincFeedetailList = new ArrayList<Clinic2204FeeDetailParam>();
-        // 查询收费项
+        // 查询收费项
         // List<ChargeItem> ChargeItemList = iChargeItemService.list(new LambdaQueryWrapper<ChargeItem>()
         // .in(ChargeItem::getId, chargeItemIds).eq(ChargeItem::getTenantId, tenantId));
 
-        // 是否是电子处方
+        // 是否是电子处方
         Whether eFlag = Whether.getByValue(0);
 
         for (PaymentedItemModel chargeItem : paymentedItemList) {
             Clinic2204FeeDetailParam clinicFeedetail = new Clinic2204FeeDetailParam();
-            // 查询项目信息
+            // 查询项目信息
             String productTable = chargeItem.getProductTable();
             if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(productTable)) {
                 MedicationDefinition medication = iMedicationDefinitionService.getById(chargeItem.getProductId());
                 if (medication == null) {
-                    throw new ServiceException("未查询到药品信息");
+                    throw new ServiceException("未查询到药品信息");
                 }
                 clinicFeedetail.setMedListCodg(medication.getYbNo()).setMedinsListCodg(medication.getBusNo());
             } else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(productTable)) {
                 DeviceDefinition device = iDeviceDefinitionService.getById(chargeItem.getProductId());
                 if (device == null) {
-                    throw new ServiceException("未查询到药品信息");
+                    throw new ServiceException("未查询到药品信息");
                 }
                 clinicFeedetail.setMedListCodg(device.getYbNo()).setMedinsListCodg(device.getYbOrgNo());
             } else {
                 ActivityDefinition activity = iActivityDefinitionService.getById(chargeItem.getProductId());
                 if (activity == null) {
-                    throw new ServiceException("未查询到药品信息");
+                    throw new ServiceException("未查询到药品信息");
                 }
                 clinicFeedetail.setMedListCodg(activity.getYbNo()).setMedinsListCodg(activity.getBusNo());
             }
 
-            // 开单科室查询
+            // 开单科室查询
             Organization org = iOrganizationService.getById(chargeItem.getRequestingOrgId());
             if (org == null) {
-                throw new ServiceException("未查询到开单科室信息");
+                throw new ServiceException("未查询到开单科室信息");
             }
-            // 开立医生查询
+            // 开立医生查询
             Practitioner doctor = iPractitionerService.getById(chargeItem.getEntererId());
             if (doctor == null) {
-                throw new ServiceException("未查询到开立医生信息");
+                throw new ServiceException("未查询到开立医生信息");
             }
 
-            // 外购处方标志（文档上没有详细介绍） 2025/04/14经确认，暂定非处方流转传0，处方流转传1
+            // 外购处方标志（文档上没有详细介绍） 2025/04/14经确认，暂定非处方流转传0，处方流转传1
             clinicFeedetail
                 .setFeedetlSn(
                     chargeItem.getBusNo() + assignSeqUtil.getSeqByDay(AssignSeqEnum.YB_CLINIC_FEE.getPrefix(), 5))
@@ -410,7 +410,7 @@ public class YbParamBuilderUtil {
                 .setDetItemFeeSumamt(chargeItem.getTotalPrice().doubleValue())
                 .setCnt(chargeItem.getQuantityValue().doubleValue()).setPric(chargeItem.getUnitPrice().doubleValue())
                 .setBilgDeptCodg(org.getYbNo()).setBilgDeptName(org.getName()).setBilgDrCodg(doctor.getYbNo())
-                // 默认无需审批
+                // 默认无需审批
                 .setBilgDrName(doctor.getName()).setHospApprFlag(YbHospApprFlag.NO_APPROVAL_REQUIRED.getValue())
                 .setRxCircFlag(eFlag.getValue().toString());
 
@@ -420,9 +420,9 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * 【2204】门诊费用明细信息
+     * 【2204】门诊费用明细信息
      *
-     * @param tenantId 租户id
+     * @param tenantId 租户id
      * @return
      */
     public Clinic2204OrderParam getClinicOrder2204Param(Integer tenantId, List<PaymentedItemModel> paymentedItemList,
@@ -430,7 +430,7 @@ public class YbParamBuilderUtil {
 
         Clinic2204OrderParam clinicOrderPage = new Clinic2204OrderParam();
 
-        // 排番
+        // 排番
         clinicOrderPage.setChrgBchno(assignSeqUtil.getSeqByDay(AssignSeqEnum.YB_CLINIC_ORDER.getPrefix(), 12));
         clinicOrderPage.setChrgBchno(clinicOrderPage.getChrgBchno());
 
@@ -442,7 +442,7 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * 【2205】费用明细撤销
+     * 【2205】费用明细撤销
      * 
      * @return
      */
@@ -456,21 +456,21 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * 【2206】门诊预结算参数
+     * 【2206】门诊预结算参数
      *
      * @return
      */
     /**
-     * 【2206】门诊预结算参数
+     * 【2206】门诊预结算参数
      *
-     * @param payFee 2204返回的费用总额
-     * @param chrgBchno 收费批次号
+     * @param payFee 2204返回的费用总额
+     * @param chrgBchno 收费批次号
      * @return
      */
     public Clinic2206OrderParam getClinicOrder2206Param(BigDecimal payFee, ClinicReg2201Output reg, String chrgBchno,
         String busiCardInfo) {
 
-        // 个人结算方式
+        // 个人结算方式
         YbPsnSetlWay setlWay = YbPsnSetlWay.getByValue("01");
 
         Clinic2206OrderParam clinicOrder = new Clinic2206OrderParam();
@@ -483,13 +483,13 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * 【2207】门诊结算参数
+     * 【2207】门诊结算参数
      *
      * @return
      */
     public Clinic2207OrderParam getClinicOrder2207(Long encounterId, Integer tenantId, String psnSetlWay,
         String chrgBchno, String medType) {
-        // 查询此次就诊信息(此处需要业务上保证下述两个实体一对一关系)
+        // 查询此次就诊信息(此处需要业务上保证下述两个实体一对一关系)
         Encounter encounter = iEncounterService.getById(encounterId);
 
         YbMedType ybMedType = YbMedType.getByValue(medType);
@@ -497,12 +497,12 @@ public class YbParamBuilderUtil {
             ybMedType = YbMedType.GENERAL_OUTPATIENT;
         }
 
-        // 院内唯一流水号查询挂号信息
+        // 院内唯一流水号查询挂号信息
         String busNo = encounter.getBusNo();
         ClinicReg reg = iRegService.getOne(new LambdaQueryWrapper<ClinicReg>().eq(ClinicReg::getIptOtpNo, busNo)
             .eq(ClinicReg::getTenantId, tenantId).eq(ClinicReg::getMedType, ybMedType.getValue()));
 
-        // 个人结算方式
+        // 个人结算方式
         YbPsnSetlWay setlWay = YbPsnSetlWay.getByValue(psnSetlWay);
         if (setlWay == null) {
             setlWay = YbPsnSetlWay.PSN_SETLWAY01;
@@ -520,7 +520,7 @@ public class YbParamBuilderUtil {
 
         Clinic2207OrderParam clinicOrder = new Clinic2207OrderParam();
         clinicOrder.setPsnNo(reg.getPsnNo()).setMdtrtCertType(reg.getMdtrtCertType())
-            // todo：sjq 医疗费用总额需要用ChargeItem的和
+            // todo：sjq 医疗费用总额需要用ChargeItem的和
             .setMdtrtCertNo(reg.getMdtrtCertNo()).setMedType(reg.getMedType())
             .setMedfeeSumamt(clinic2206OrderResult.getMedfeeSumamt().doubleValue()).setPsnSetlway(setlWay.getValue())
             .setMdtrtId(reg.getMdtrtId()).setChrgBchno(chrgBchno).setAcctUsedFlag(Whether.YES.getCode())
@@ -533,26 +533,26 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * 【2208】门诊结算撤销参数
+     * 【2208】门诊结算撤销参数
      *
      * @return
      */
     public Clinic2208UnSetlInfoParam getClinicOrder2208(Integer tenantId, String settleId) {
-        // 查询此次就诊信息(此处需要业务上保证下述两个实体一对一关系)
+        // 查询此次就诊信息(此处需要业务上保证下述两个实体一对一关系)
         // Encounter encounter = iEncounterService.getById(encounterId);
 
         ClinicSettle clinicSettle = iClinicSettleService.getBySettleId(settleId);
         if (clinicSettle == null) {
-            throw new ServiceException("未查询到医保结算信息");
+            throw new ServiceException("未查询到医保结算信息");
         }
 
-        // 院内唯一流水号查询挂号信息
+        // 院内唯一流水号查询挂号信息
         // String busNo = encounter.getBusNo();
         ClinicReg reg =
             iRegService.getOne(new LambdaQueryWrapper<ClinicReg>().eq(ClinicReg::getMdtrtId, clinicSettle.getMdtrtId())
                 .eq(ClinicReg::getTenantId, tenantId).eq(ClinicReg::getMdtrtId, clinicSettle.getMdtrtId()));
         if (reg == null) {
-            throw new ServiceException("未查询到医保结算信息");
+            throw new ServiceException("未查询到医保结算信息");
         }
         Clinic2208UnSetlInfoParam clinicSetl = new Clinic2208UnSetlInfoParam();
         clinicSetl.setPsnNo(reg.getPsnNo()).setMdtrtId(clinicSettle.getMdtrtId()).setSetlId(settleId)
@@ -562,17 +562,17 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * 【3201】结算对总账
+     * 【3201】结算对总账
      *
      * @return
      */
     public Financial3201Param getFinancial3201Param(Settlement3201WebParam settlement3201WebParam,
         Settlement3201DetailDto reconciliation) {
 
-        // 查询合同信息
+        // 查询合同信息
         Contract contract = iContractService.getByContractNo(settlement3201WebParam.getContractNo());
         if (contract == null) {
-            throw new ServiceException("未查询到合同信息");
+            throw new ServiceException("未查询到合同信息");
         }
         YbClrType clrType = YbClrType.getByValue(settlement3201WebParam.getClrType());
         YbInsuType insuType = YbInsuType.getByValue(settlement3201WebParam.getInsuType().toString());
@@ -591,16 +591,16 @@ public class YbParamBuilderUtil {
             .setFundPaySumamt(reconciliation.getFundPaySumAmt().doubleValue())
             .setAcctPay(reconciliation.getAcctPay().add(reconciliation.getAcctGjPay()).doubleValue())
             .setFixmedinsSetlCnt(reconciliation.getFixMedInsSetlCnt())
-            .setInsuplcAdmdvs(SecurityUtils.getLoginUser().getOptionJson().path("admvs").asText());
+            .setInsuplcAdmdvs(SecurityUtils.getLoginUser().getOptionJsonValue("admvs"));
 
         return financial3201Param;
     }
 
     /**
-     * 【3203】清算申请
+     * 【3203】清算申请
      *
-     * @param financial3203WebParam 前台参数
-     * @return 3203参数
+     * @param financial3203WebParam 前台参数
+     * @return 3203参数
      */
     public Financial3203Param getFinancial3203Param(Financial3203WebParam financial3203WebParam) {
         Long orgId = SecurityUtils.getLoginUser().getHospitalId();
@@ -618,7 +618,7 @@ public class YbParamBuilderUtil {
             YbPayment.SELF_CASH_VX_VALUE.getValue(), YbPayment.SELF_CASH_ALI_VALUE.getValue(),
             YbPayment.SELF_CASH_UNION_VALUE.getValue(), YbPayment.YB_FUND_PAY.getValue());
 
-        // 数据处理
+        // 数据处理
         financial3203VO
             .setAcctGjPay(financial3203VO.getAcctGjPay() == null ? BigDecimal.ZERO : financial3203VO.getAcctGjPay());
         financial3203VO
@@ -652,7 +652,7 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * 【3203A】清算申请【吉林省】
+     * 【3203A】清算申请【吉林省】
      * 
      * @param financial3203AWebParam
      * @return
@@ -673,7 +673,7 @@ public class YbParamBuilderUtil {
     // // YbPayment.YB_FUND_PAY.getValue());
     //
     //
-    // // 数据处理
+    // // 数据处理
     // financial3203VO
     // .setAcctGjPay(financial3203VO.getAcctGjPay() == null ? BigDecimal.ZERO : financial3203VO.getAcctGjPay());
     // financial3203VO
@@ -706,7 +706,7 @@ public class YbParamBuilderUtil {
     // }
 
     /**
-     * 【3101】明细审核事前分析服务参数
+     * 【3101】明细审核事前分析服务参数
      *
      * @return
      */
@@ -714,26 +714,26 @@ public class YbParamBuilderUtil {
         YbPayLoc payLoc, Whether inOutDiagType) {
 
         Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
-        // 查询就诊记录
+        // 查询就诊记录
         List<Encounter> encounters = iEncounterService.list(
             new LambdaQueryWrapper<Encounter>().in(Encounter::getId, encounterId).eq(Encounter::getTenantId, tenantId));
 
         List<FsiPatient3101Param> patients = new ArrayList<>();
         for (Encounter encounter : encounters) {
-            // 查询账户信息
+            // 查询账户信息
             Account account = accountService.getOne(new LambdaQueryWrapper<Account>()
                 .eq(Account::getEncounterId, encounter.getId()).eq(Account::getEncounterFlag, Whether.YES.getValue())
                 .orderByDesc(Account::getId).last(YbCommonConstants.sqlConst.LIMIT1));
-            // 查询患者信息
+            // 查询患者信息
             Patient patient = iPatientService.getOne(new LambdaQueryWrapper<Patient>()
                 .in(Patient::getId, encounter.getPatientId()).eq(Patient::getTenantId, tenantId)
                 .orderByDesc(Patient::getId).last(YbCommonConstants.sqlConst.LIMIT1));
 
-            // 查询就诊信息集合
+            // 查询就诊信息集合
             List<FsiEncounter3101Param> list = getFsiEncounterList(encounter, patient, tenantId, payLoc, inOutDiagType);
 
             FsiPatient3101Param patientYb = new FsiPatient3101Param();
-            // 患者唯一标识暂定使用id
+            // 患者唯一标识暂定使用id
             patientYb.setPatnId(patient.getId().toString()).setPatnName(patient.getName())
                 .setGend(patient.getGenderEnum().toString()).setBrdy(patient.getBirthDate())
                 .setPoolarea(account.getYbAreaNo()).setCurrMdtrtId(encounter.getBusNo()).setFsiEncounterDtos(list);
@@ -741,7 +741,7 @@ public class YbParamBuilderUtil {
             patients.add(patientYb);
         }
 
-        // 创建实体
+        // 创建实体
         FsiConsultation3101Param healthcareConsultationDetail = new FsiConsultation3101Param();
         healthcareConsultationDetail.setSyscode(syscode).setPatientDtos(patients);
 
@@ -749,24 +749,24 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * [3101]明细审核事前分析服务参数-就诊信息集合
+     * [3101]明细审核事前分析服务参数-就诊信息集合
      * 
      * @return
      */
     private List<FsiEncounter3101Param> getFsiEncounterList(Encounter encounter, Patient patient, Integer tenantId,
         YbPayLoc payLoc, Whether outSetlFlag) {
-        // 查询就诊记录
+        // 查询就诊记录
         List<Encounter> encounters = iEncounterService.list(new LambdaQueryWrapper<Encounter>()
             .eq(Encounter::getPatientId, patient.getId()).eq(Encounter::getTenantId, tenantId));
 
         List<FsiEncounter3101Param> list = new ArrayList<FsiEncounter3101Param>();
         for (Encounter enc : encounters) {
-            // 查询机构信息
+            // 查询机构信息
             Long hospitalIdByOrgId = userService.getHospitalIdByOrgId(enc.getOrganizationId());
             Organization organization = iOrganizationService.getById(hospitalIdByOrgId);
-            // 查询医嘱信息
+            // 查询医嘱信息
             List<FsiOrder3101Param> fsiOrders = getFsiOrderList(enc, patient, tenantId);
-            // 查询手术信息
+            // 查询手术信息
             List<FsiOperation3101Param> fsiOperations = getFsiOperationList(enc, patient, tenantId);
 
             YbMedinsType medinsType = YbMedinsType.getByValue(organization.getMedinsType());
@@ -774,7 +774,7 @@ public class YbParamBuilderUtil {
                 medinsType = YbMedinsType.FIXMEDINS_TYPE1;
             }
 
-            // 查询诊断信息
+            // 查询诊断信息
             List<EncounterDiagnosis> encounterDiagnosisList = iEncounterDiagnosisService
                 .list(new LambdaQueryWrapper<EncounterDiagnosis>().eq(EncounterDiagnosis::getEncounterId, enc.getId())
                     .eq(EncounterDiagnosis::getTenantId, enc.getTenantId()));
@@ -788,17 +788,17 @@ public class YbParamBuilderUtil {
 
             Condition condition = iConditionService.getById(mainEncounterDiagnosis.getConditionId());
             ConditionDefinition conditionDefinition = iConditionDefinitionService.getById(condition.getDefinitionId());
-            // 查询诊断信息集合
+            // 查询诊断信息集合
             List<FsiDiagnose3101Param> fsiDiagnoses = getFsiDiagnoseList(encounterDiagnosisList, tenantId);
-            // 查询主治医生
+            // 查询主治医生
             EncounterParticipant encounterParticipant = iEncounterParticipantService.getOne(
                 new LambdaQueryWrapper<EncounterParticipant>().eq(EncounterParticipant::getEncounterId, enc.getId())
                     .eq(EncounterParticipant::getTypeCode, ParticipantType.ATTENDING_DOCTOR.getCode()));
             Practitioner doctor = iPractitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
                 .eq(Practitioner::getUserId, encounterParticipant.getPractitionerId()));
-            // 查询科室
+            // 查询科室
             Organization org = iOrganizationService.getById(doctor.getOrgId());
-            // 查询医疗类别
+            // 查询医疗类别
             YbClrType clrType = YbClrType.getByValue(enc.getYbClassEnum().toString());
             YbMedMdtrtType ybMedMdtrtType = null;
             switch (clrType) {
@@ -812,20 +812,20 @@ public class YbParamBuilderUtil {
                     ybMedMdtrtType = YbMedMdtrtType.OTHER;
                     break;
             }
-            // 院内唯一流水号查询挂号信息
+            // 院内唯一流水号查询挂号信息
             String busNo = encounter.getBusNo();
             ClinicReg reg = iRegService.getOne(new LambdaQueryWrapper<ClinicReg>().eq(ClinicReg::getIptOtpNo, busNo)
                 .eq(ClinicReg::getTenantId, tenantId));
-            // 查询付款实体
+            // 查询付款实体
             List<PaymentReconciliation> payList = iPaymentReconciliationService.list(
                 new LambdaQueryWrapper<PaymentReconciliation>().eq(PaymentReconciliation::getEncounterId, enc.getId())
                     .eq(PaymentReconciliation::getTenantId, tenantId));
-            // 自费金额
+            // 自费金额
             BigDecimal ownPay = BigDecimal.ZERO;
-            // 自付金额
+            // 自付金额
             BigDecimal selfPay = BigDecimal.ZERO;
             for (PaymentReconciliation paymentReconciliation : payList) {
-                // 查询付款详情
+                // 查询付款详情
                 List<PaymentRecDetail> details =
                     iPaymentRecDetailService.list(new LambdaQueryWrapper<PaymentRecDetail>()
                         .eq(PaymentRecDetail::getReconciliationId, paymentReconciliation.getId())
@@ -850,10 +850,10 @@ public class YbParamBuilderUtil {
                 .setAdmDate(enc.getStartTime()).setDscgDate(enc.getEndTime()).setDscgMainDiseCodg(condition.getYbNo())
                 .setDscgMainDiseName(conditionDefinition.getName()).setDrCodg(doctor.getYbNo())
                 .setAdmDeptCodg(org.getYbNo()).setAdmDeptName(org.getName())
-                // 门诊的入院出院暂定相同，住院的情况应分出一个if
+                // 门诊的入院出院暂定相同，住院的情况应分出一个if
                 .setDscgDeptCodg(org.getYbNo()).setDscgDeptName(org.getName())
                 .setMedMdtrtType(ybMedMdtrtType.getValue())
-                // 生育状态默认未知
+                // 生育状态默认未知
                 .setMedType(reg.getMedType()).setMedType(YbMatnStas.UNKNOWN.getValue()).setOwnpayAmt(ownPay)
                 .setSelfpayAmt(selfPay).setSetlTotlnum(payList.size()).setInsutype(reg.getInsutype())
                 .setReimFlag(payLoc.getValue()).setOutSetlFlag(outSetlFlag.getValue().toString());
@@ -865,7 +865,7 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * [3101]明细审核事前分析服务参数-手术集合
+     * [3101]明细审核事前分析服务参数-手术集合
      * 
      * @return
      */
@@ -874,7 +874,7 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * [3101]明细审核事前分析服务参数-诊断集合
+     * [3101]明细审核事前分析服务参数-诊断集合
      * 
      * @return
      */
@@ -902,7 +902,7 @@ public class YbParamBuilderUtil {
         int sort = 1;
         for (EncounterDiagnosis encounterDiagnosis : encounterDiagnosisList) {
             FsiDiagnose3101Param fsiDiagnose = new FsiDiagnose3101Param();
-            // 出入院诊断及门诊诊断
+            // 出入院诊断及门诊诊断
             if (YbIptDiseTypeCode.DISCHARGE_DIAGNOSIS.getValue()
                 .equals(encounterDiagnosis.getIptDiseTypeCode().toString())) {
                 fsiDiagnose.setInoutDiseType(YbInOutDiagType.YB_OUT_DIAG_TYPE.getValue());
@@ -911,7 +911,7 @@ public class YbParamBuilderUtil {
                 fsiDiagnose.setInoutDiseType(YbInOutDiagType.YB_IN_DIAG_TYPE.getValue());
             } else if (YbIptDiseTypeCode.OUTPATIENT_DIAGNOSIS.getValue()
                 .equals(encounterDiagnosis.getIptDiseTypeCode().toString())) {
-                //// TODO: sjq 门诊诊断怎么存？
+                //// TODO: sjq 门诊诊断怎么存？
             } else {
                 continue;
             }
@@ -927,7 +927,7 @@ public class YbParamBuilderUtil {
                     continue;
                 }
             }
-            // 主诊断判断
+            // 主诊断判断
             if (Whether.YES.getValue().equals(encounterDiagnosis.getMaindiseFlag())) {
                 fsiDiagnose.setMaindiseFlag(Whether.YES.getValue().toString());
             }
@@ -945,12 +945,12 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * [3101]明细审核事前分析服务参数-处方（医嘱）集合
+     * [3101]明细审核事前分析服务参数-处方（医嘱）集合
      * 
      * @return
      */
     private List<FsiOrder3101Param> getFsiOrderList(Encounter enc, Patient patient, Integer tenantId) {
-        // 查询医嘱信息
+        // 查询医嘱信息
         List<MedicationRequest> medicationRequests =
             iMedicationRequestService.list(new LambdaQueryWrapper<MedicationRequest>()
                 .eq(MedicationRequest::getEncounterId, enc.getId()).eq(MedicationRequest::getTenantId, tenantId));
@@ -962,7 +962,7 @@ public class YbParamBuilderUtil {
             .eq(ServiceRequest::getEncounterId, enc.getId()).eq(ServiceRequest::getTenantId, tenantId));
 
         for (MedicationRequest medicationRequest : medicationRequests) {
-            // 查询药品定义
+            // 查询药品定义
             Medication medication = iMedicationService.getById(medicationRequest.getDeviceDefId());
             if (medication == null) {
                 continue;
@@ -972,12 +972,12 @@ public class YbParamBuilderUtil {
             if (medicationDefinition == null) {
                 continue;
             }
-            // 是否是长期医嘱
+            // 是否是长期医嘱
             Whether whether = Whether.NO;
             if (TherapyTimeType.LONG_TERM.getValue().equals(medicationRequest.getTherapyEnum())) {
                 whether = Whether.YES;
             }
-            // 查询收费项
+            // 查询收费项
             ChargeItem chargeItem = iChargeItemService
                 .getOne(new LambdaQueryWrapper<ChargeItem>().eq(ChargeItem::getEncounterId, enc.getId())
                     .eq(ChargeItem::getServiceTable, CommonConstants.TableName.MED_MEDICATION_REQUEST)
@@ -989,12 +989,12 @@ public class YbParamBuilderUtil {
             if (medChrgItmType == null) {
                 continue;
             }
-            // 查询医保等级
+            // 查询医保等级
             YbChrgitmLv chrgitmLv = YbChrgitmLv.getByValue(medicationDefinition.getChrgitmLv());
             if (chrgitmLv == null) {
                 chrgitmLv = YbChrgitmLv.SELF_PAY;
             }
-            // 查询医保目录价格
+            // 查询医保目录价格
             Double price;
             String ybNo = medicationDefinition.getYbNo();
             CatalogDrugInfo drugInfo = iCatalogDrugInfoService.getOne(new LambdaQueryWrapper<CatalogDrugInfo>()
@@ -1007,22 +1007,22 @@ public class YbParamBuilderUtil {
             } else {
 
             }
-            // 查询医院信息
+            // 查询医院信息
             Long hospitalId = userService.getHospitalIdByOrgId(enc.getOrganizationId());
             Organization org = iOrganizationService.getById(hospitalId);
 
             FsiOrder3101Param fsiOrder = new FsiOrder3101Param();
             fsiOrder.setRxId(medicationRequest.getBusNo()).setRxno(medicationRequest.getPrescriptionNo())
                 .setLongDrordFlag(whether.getCode()).setHilistCode(medicationDefinition.getCategoryCode())
-                // 医嘱类别暂定全部使用其他
+                // 医嘱类别暂定全部使用其他
                 .setChrgType(medChrgItmType.getValue()).setDrordBhvr(YbDrordBhvr.OTHER.getValue())
                 .setHilistCode(medicationDefinition.getYbNo())
-                // 医保目录价格未定义
+                // 医保目录价格未定义
                 .setHilistName(medicationDefinition.getName()).setHilistLv(chrgitmLv.getValue().toString())
                 .setHosplistCode(org.getYbNo()).setHosplistName(org.getName())
                 .setCnt(new BigDecimal(chargeItem.getQuantityValue().toString())).setPric(chargeItem.getUnitPrice())
                 .setSumamt(chargeItem.getTotalPrice());
-            // todo：sjq 从第23项后面的值越来越离谱，暂定先停止3101和3103的开发
+            // todo：sjq 从第23项后面的值越来越离谱，暂定先停止3101和3103的开发
 
         }
 
@@ -1030,13 +1030,13 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * 【3202】医药机构费用结算对明细账
+     * 【3202】医药机构费用结算对明细账
      * 
-     * @param settlement3202WebParam 费用结算对明细账前端入参
-     * @return 医保参数
+     * @param settlement3202WebParam 费用结算对明细账前端入参
+     * @return 医保参数
      */
     public FinancialSettlement3202Param getFinancialSettlement3202Param(Settlement3202WebParam settlement3202WebParam) {
-        // 数据库查询
+        // 数据库查询
         Settlement3202Dto reconciliation =
             medicalInsuranceMapper.get3202Param(settlement3202WebParam.getStmtBegnDate().toString(),
                 settlement3202WebParam.getStmtEndDate().toString(), SecurityUtils.getLoginUser().getTenantId(),
@@ -1045,7 +1045,7 @@ public class YbParamBuilderUtil {
                 YbPayment.SELF_YB_ZH_GJ_VALUE.getValue(), YbPayment.SELF_CASH_VALUE.getValue(),
                 YbPayment.SELF_CASH_VX_VALUE.getValue(), YbPayment.SELF_CASH_ALI_VALUE.getValue(),
                 YbPayment.SELF_CASH_UNION_VALUE.getValue(), YbPayment.YB_FUND_PAY.getValue());
-        // 数据处理
+        // 数据处理
         reconciliation
             .setAcctGjPay(reconciliation.getAcctGjPay() == null ? BigDecimal.ZERO : reconciliation.getAcctGjPay());
         reconciliation.setAcctPay(reconciliation.getAcctPay() == null ? BigDecimal.ZERO : reconciliation.getAcctPay());
@@ -1065,7 +1065,7 @@ public class YbParamBuilderUtil {
         BigDecimal cashSum = reconciliation.getSelfPayCash().add(reconciliation.getSelfPayVX())
             .add(reconciliation.getSelfPayUNION()).add(reconciliation.getSelfPayALI());
         // BigDecimal zhSum = reconciliation.getAcctGjPay().add(reconciliation.getAcctPay());
-        // 组装参数
+        // 组装参数
         FinancialSettlement3202Param financialSettlement3202Param = new FinancialSettlement3202Param();
         financialSettlement3202Param.setClrType(settlement3202WebParam.getClrType()).setCashPayamt(cashSum)
             .setFileQuryNo(settlement3202WebParam.getFileQuryNo())
@@ -1074,26 +1074,26 @@ public class YbParamBuilderUtil {
             .setStmtBegndate(DateUtils.parseDate(settlement3202WebParam.getStmtBegnDate()))
             .setStmtEnddate(DateUtils.parseDate(settlement3202WebParam.getStmtEndDate()))
             .setFundPaySumamt(reconciliation.getFundPaySumAmt());
-        // 返回结果
+        // 返回结果
         return financialSettlement3202Param;
     }
 
     /**
-     * 【3202】对账明细的文件数据
+     * 【3202】对账明细的文件数据
      * 
-     * @param paymentIds 付款实体ids
-     * @return 查询结果
+     * @param paymentIds 付款实体ids
+     * @return 查询结果
      */
     public List<Financial3202FileParam> getFinancial3202FileParam(List<Long> paymentIds) {
         List<Financial3202FileParam> list = new ArrayList<>();
         for (Long paymentId : paymentIds) {
 
-            // 查询基础信息
+            // 查询基础信息
             List<PaymentRecDetail> paymentRecDetails = iPaymentRecDetailService
                 .list(new LambdaQueryWrapper<PaymentRecDetail>().eq(PaymentRecDetail::getReconciliationId, paymentId));
             PaymentReconciliation paymentReconciliation = iPaymentReconciliationService.getById(paymentId);
             if (paymentReconciliation == null) {
-                throw new ServiceException("未查询到付款信息");
+                throw new ServiceException("未查询到付款信息");
             }
             String ybSettleIds = paymentReconciliation.getYbSettleIds();
             if (StringUtils.isEmpty(ybSettleIds)) {
@@ -1116,7 +1116,7 @@ public class YbParamBuilderUtil {
                 ClinicReg clinicReg = iRegService
                     .getOne(new LambdaQueryWrapper<ClinicReg>().eq(ClinicReg::getMdtrtId, clinicSettle.getMdtrtId()));
 
-                // 计算金额
+                // 计算金额
                 BigDecimal fundPay = BigDecimal.ZERO;
                 BigDecimal accountPay = BigDecimal.ZERO;
                 for (PaymentRecDetail paymentRecDetail : paymentRecDetails) {
@@ -1128,16 +1128,16 @@ public class YbParamBuilderUtil {
                     }
                 }
 
-                // 反结标志
+                // 反结标志
                 String refdSetlFlag = Whether.NO.getValue().toString();
                 if (paymentReconciliation.getPaymentEnum().equals(PaymentType.UN_PAY.getValue())) {
-                    refdSetlFlag = Whether.YES.getValue().toString();// 1 是退费 2 否退费
+                    refdSetlFlag = Whether.YES.getValue().toString();// 1 是退费 2 否退费
                 }
                 Financial3202FileParam financial3202FileParam = new Financial3202FileParam();
                 financial3202FileParam.setSetlId(clinicSettle.getSetlId()).setMdtrtId(clinicSettle.getMdtrtId())
                     .setPsnNo(clinicReg.getPsnNo()).setMedfeeSumamt(paymentReconciliation.getTenderedAmount())
                     .setFundPaySumamt(fundPay).setAcctPay(accountPay).setRefdSetlFlag(refdSetlFlag);
-                // 添加集合
+                // 添加集合
                 list.add(financial3202FileParam);
             }
         }
@@ -1145,19 +1145,19 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * 【3301】获取医保目录对照入参
+     * 【3301】获取医保目录对照入参
      * 
-     * @param tableName 对应定义表
-     * @param id 主键
-     * @return 医保参数
+     * @param tableName 对应定义表
+     * @param id 主键
+     * @return 医保参数
      */
     public MedicalDirectory3301Param getMedicalDirectory3301Param(String tableName, Long id) {
         MedicalDirectory3301Param medicalDirectory3301Param = new MedicalDirectory3301Param();
         if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(tableName)) {
-            // 耗材
+            // 耗材
             DeviceDefinition deviceDefinition = iDeviceDefinitionService.getById(id);
             if (deviceDefinition == null) {
-                throw new ServiceException("未查询到药品信息");
+                throw new ServiceException("未查询到药品信息");
             }
             YbListType listType = YbListType.getByValue(deviceDefinition.getCategoryCode());
             if (listType == null) {
@@ -1169,18 +1169,18 @@ public class YbParamBuilderUtil {
                 .setBegndate(DateUtils.dateTimeNow(YbCommonConstants.constants.YYYY_MM_DD))
                 .setEnddate(YbCommonConstants.constants.END_TIME);
         } else if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(tableName)) {
-            // 药品
+            // 药品
             MedicationDefinition medicationDefinition = iMedicationDefinitionService.getById(id);
             if (medicationDefinition == null) {
-                throw new ServiceException("未查询到药品信息");
+                throw new ServiceException("未查询到药品信息");
             }
-            // 项目类型为中成药（1）、西药（2）、外购药品（3）、中草药（4）时查药品表；为耗材（9）时查器材表
+            // 项目类型为中成药（1）、西药（2）、外购药品（3）、中草药（4）时查药品表；为耗材（9）时查器材表
             YbListType listType = YbListType.getByValue(medicationDefinition.getCategoryCode());
             if (listType == null) {
                 listType = switch (medicationDefinition.getCategoryCode()) {
                     case "1", "2" -> YbListType.WESTERN_AND_CHINESE_PATENT_MEDICINE;
                     case "4" -> YbListType.IMPORTANT_HERBAL_SLICES;
-                    default -> throw new ServiceException("未查询到目录类别");
+                    default -> throw new ServiceException("未查询到目录类别");
                 };
             }
             medicalDirectory3301Param.setFixmedinsHilistId(medicationDefinition.getBusNo())
@@ -1189,10 +1189,10 @@ public class YbParamBuilderUtil {
                 .setBegndate(DateUtils.dateTimeNow(YbCommonConstants.constants.YYYY_MM_DD))
                 .setEnddate(YbCommonConstants.constants.END_TIME);
         } else if (CommonConstants.TableName.WOR_ACTIVITY_DEFINITION.equals(tableName)) {
-            // 医疗项目
+            // 医疗项目
             ActivityDefinition activityDefinition = iActivityDefinitionService.getById(id);
             if (activityDefinition == null) {
-                throw new ServiceException("未查询到药品信息");
+                throw new ServiceException("未查询到药品信息");
             }
             YbListType listType = YbListType.getByValue(activityDefinition.getCategoryCode());
             if (listType == null) {
@@ -1204,10 +1204,10 @@ public class YbParamBuilderUtil {
                 .setBegndate(DateUtils.dateTimeNow(YbCommonConstants.constants.YYYY_MM_DD))
                 .setEnddate(YbCommonConstants.constants.END_TIME);
         } else if (CommonConstants.TableName.ADM_HEALTHCARE_SERVICE.equals(tableName)) {
-            // 医疗服务
+            // 医疗服务
             HealthcareService healthcareServiceService = iHealthcareServiceService.getById(id);
             if (healthcareServiceService == null) {
-                throw new ServiceException("未查询到药品信息");
+                throw new ServiceException("未查询到药品信息");
             }
             YbListType listType = YbListType.getByValue(healthcareServiceService.getCategoryCode());
             if (listType == null) {
@@ -1219,19 +1219,19 @@ public class YbParamBuilderUtil {
                 .setBegndate(DateUtils.dateTimeNow(YbCommonConstants.constants.YYYY_MM_DD))
                 .setEnddate(YbCommonConstants.constants.END_TIME);
         } else {
-            throw new ServiceException("未查询到医疗项目");
+            throw new ServiceException("未查询到医疗项目");
         }
         return medicalDirectory3301Param;
     }
 
     /**
-     * 【3301】医保目录对照参数作成（药品）
+     * 【3301】医保目录对照参数作成（药品）
      * 
-     * @param categoryCode 药品分类
-     * @param busNo 药品编号
-     * @param name 药品编号
-     * @param ybNo 医保编码
-     * @return 医保目录对照参数
+     * @param categoryCode 药品分类
+     * @param busNo 药品编号
+     * @param name 药品编号
+     * @param ybNo 医保编码
+     * @return 医保目录对照参数
      */
     public MedicalDirectory3301Param getMedicalDirectory3301ParamMedication(String categoryCode, String busNo,
         String name, String ybNo) {
@@ -1242,7 +1242,7 @@ public class YbParamBuilderUtil {
         } else if (MedCategoryCode.CHINESE_HERBAL_MEDICINE.getValue().equals(categoryCode)) {
             listType = YbListType.IMPORTANT_HERBAL_SLICES.getValue();
         } else {
-            throw new ServiceException("无效的目录类别");
+            throw new ServiceException("无效的目录类别");
         }
         return new MedicalDirectory3301Param().setFixmedinsHilistId(busNo).setFixmedinsHilistName(name)
             .setListType(listType).setMedListCodg(ybNo)
@@ -1251,82 +1251,82 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * 【3302】医保目录对照撤销
+     * 【3302】医保目录对照撤销
      *
-     * @param tableName 对应定义表
-     * @param id 主键
+     * @param tableName 对应定义表
+     * @param id 主键
      * @return
      */
     public MedicalDirectory3302Param getMedicalDirectory3302Param(String tableName, Long id) {
         MedicalDirectory3302Param medicalDirectory3302Param = new MedicalDirectory3302Param();
         if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(tableName)) {
-            // 耗材
+            // 耗材
             DeviceDefinition deviceDefinition = iDeviceDefinitionService.getById(id);
             if (deviceDefinition == null) {
-                throw new ServiceException("未查询到药品信息");
+                throw new ServiceException("未查询到药品信息");
             }
             YbListType listType = YbListType.getByValue(deviceDefinition.getCategoryCode());
             if (listType == null) {
                 listType = YbListType.MEDICAL_CONSUMABLES;
             }
             medicalDirectory3302Param.setFixmedinsHilistId(deviceDefinition.getBusNo())
-                .setFixmedinsCode(SecurityUtils.getLoginUser().getOptionJson().path("fixmedinsCode").asText())
+                .setFixmedinsCode(SecurityUtils.getLoginUser().getOptionJsonValue("fixmedinsCode"))
                 .setListType(listType.getValue()).setMedListCodg(deviceDefinition.getYbNo());
         } else if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(tableName)) {
-            // 药品
+            // 药品
             MedicationDefinition medicationDefinition = iMedicationDefinitionService.getById(id);
             if (medicationDefinition == null) {
-                throw new ServiceException("未查询到药品信息");
+                throw new ServiceException("未查询到药品信息");
             }
-            // 项目类型为中成药（1）、西药（2）、外购药品（3）、中草药（4）时查药品表；为耗材（9）时查器材表
+            // 项目类型为中成药（1）、西药（2）、外购药品（3）、中草药（4）时查药品表；为耗材（9）时查器材表
             YbListType listType = YbListType.getByValue(medicationDefinition.getCategoryCode());
             if (listType == null) {
                 listType = switch (medicationDefinition.getCategoryCode()) {
                     case "1", "2" -> YbListType.WESTERN_AND_CHINESE_PATENT_MEDICINE;
                     case "4" -> YbListType.IMPORTANT_HERBAL_SLICES;
-                    default -> throw new ServiceException("未查询到目录类别");
+                    default -> throw new ServiceException("未查询到目录类别");
                 };
             }
             medicalDirectory3302Param.setFixmedinsHilistId(medicationDefinition.getBusNo())
-                .setFixmedinsCode(SecurityUtils.getLoginUser().getOptionJson().path("fixmedinsCode").asText())
+                .setFixmedinsCode(SecurityUtils.getLoginUser().getOptionJsonValue("fixmedinsCode"))
                 .setListType(listType.getValue()).setMedListCodg(medicationDefinition.getYbNo());
         } else if (CommonConstants.TableName.WOR_ACTIVITY_DEFINITION.equals(tableName)) {
-            // 医疗项目
+            // 医疗项目
             ActivityDefinition activityDefinition = iActivityDefinitionService.getById(id);
             if (activityDefinition == null) {
-                throw new ServiceException("未查询到药品信息");
+                throw new ServiceException("未查询到药品信息");
             }
             YbListType listType = YbListType.getByValue(activityDefinition.getCategoryCode());
             if (listType == null) {
                 listType = YbListType.MEDICAL_SERVICE_ITEM;
             }
             medicalDirectory3302Param.setFixmedinsHilistId(activityDefinition.getBusNo())
-                .setFixmedinsCode(SecurityUtils.getLoginUser().getOptionJson().path("fixmedinsCode").asText())
+                .setFixmedinsCode(SecurityUtils.getLoginUser().getOptionJsonValue("fixmedinsCode"))
                 .setListType(listType.getValue()).setMedListCodg(activityDefinition.getYbNo());
         } else {
-            // 医疗项目
+            // 医疗项目
             HealthcareService healthcareService = iHealthcareServiceService.getById(id);
             if (healthcareService == null) {
-                throw new ServiceException("未查询到药品信息");
+                throw new ServiceException("未查询到药品信息");
             }
             YbListType listType = YbListType.getByValue(healthcareService.getCategoryCode());
             if (listType == null) {
                 listType = YbListType.MEDICAL_SERVICE_ITEM;
             }
             medicalDirectory3302Param.setFixmedinsHilistId(healthcareService.getId().toString())
-                .setFixmedinsCode(SecurityUtils.getLoginUser().getOptionJson().path("fixmedinsCode").asText())
+                .setFixmedinsCode(SecurityUtils.getLoginUser().getOptionJsonValue("fixmedinsCode"))
                 .setListType(listType.getValue()).setMedListCodg(healthcareService.getYbNo());
         }
         return medicalDirectory3302Param;
     }
 
     /**
-     * 【3302】医保目录对照撤销参数作成（药品）
+     * 【3302】医保目录对照撤销参数作成（药品）
      * 
-     * @param categoryCode 药品分类
-     * @param busNo 药品编号
-     * @param ybNo 医保编码
-     * @return 医保目录对照撤销参数
+     * @param categoryCode 药品分类
+     * @param busNo 药品编号
+     * @param ybNo 医保编码
+     * @return 医保目录对照撤销参数
      */
     public MedicalDirectory3302Param getMedicalDirectory3302ParamMedication(String categoryCode, String busNo,
         String ybNo) {
@@ -1337,7 +1337,7 @@ public class YbParamBuilderUtil {
         } else if (MedCategoryCode.CHINESE_HERBAL_MEDICINE.getValue().equals(categoryCode)) {
             listType = YbListType.IMPORTANT_HERBAL_SLICES.getValue();
         } else {
-            throw new ServiceException("无效的目录类别");
+            throw new ServiceException("无效的目录类别");
         }
         return new MedicalDirectory3302Param().setFixmedinsHilistId(busNo)
             .setFixmedinsCode(TenantOptionUtil.getOptionContent(TenantOptionDict.YB_FIXMEDINS_CODE))
@@ -1346,20 +1346,20 @@ public class YbParamBuilderUtil {
 
     /**
      *
-     * @param clearing3205AWebParma [3205]前台传参
-     * @return 医保入参
+     * @param clearing3205AWebParma [3205]前台传参
+     * @return 医保入参
      */
     public Clearing3205AParma getClearing3205AParma(Clearing3205AWebParma clearing3205AWebParma) {
         String clrStas = clearing3205AWebParma.getClrStas();
-        // 10 已申请20 已受理50 已清算如不填写，默认为10
+        // 10 已申请20 已受理50 已清算如不填写，默认为10
         if (StringUtils.isEmpty(clrStas)) {
             clrStas = YbClrStas.CLR_STAS10.getValue();
         }
         YbClrStas ybClrStas = YbClrStas.getByValue(clrStas);
-        // 年月格式，例如：202310
-        // 查询clr_sta为20、50的时候，该值必填
+        // 年月格式，例如：202310
+        // 查询clr_sta为20、50的时候，该值必填
         if (ybClrStas != YbClrStas.CLR_STAS10 && StringUtils.isEmpty(clearing3205AWebParma.getClrYm())) {
-            throw new ServiceException("请填写清算状态");
+            throw new ServiceException("请填写清算状态");
         }
         Clearing3205AParma clearing3205AParma = new Clearing3205AParma();
         clearing3205AParma.setClrOptins(clearing3205AWebParma.getClrOptins())
@@ -1368,25 +1368,25 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * 【3501】库存明细上传
+     * 【3501】库存明细上传
      * 
-     * @param id 供应申请id
-     * @return 3501医保参数
+     * @param id 供应申请id
+     * @return 3501医保参数
      */
     public MedicalInventory3501Param getMedicalInventory3501Param(Long id, Integer talentId) {
         MedicalInventory3501Param medicalInventory3501Param = new MedicalInventory3501Param();
-        // 查库存
+        // 查库存
         InventoryItem inventoryItem = inventoryItemService.getById(id);
         if (inventoryItem == null) {
-            throw new ServiceException("未查询到库存信息");
+            throw new ServiceException("未查询到库存信息");
         }
         if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(inventoryItem.getItemTable())) {
-            // 查询药品
+            // 查询药品
             MedicationDefinition medicationDefinition = iMedicationDefinitionService.getById(inventoryItem.getItemId());
             if (medicationDefinition == null) {
-                throw new ServiceException("未查询到药品信息");
+                throw new ServiceException("未查询到药品信息");
             }
-            // 查询盘存数据
+            // 查询盘存数据
             SupplyDelivery one = iSupplyDeliveryService.getOne(new LambdaQueryWrapper<SupplyDelivery>()
                 .eq(SupplyDelivery::getItemTable, CommonConstants.TableName.MED_MEDICATION_DEFINITION)
                 .eq(SupplyDelivery::getItemId, medicationDefinition.getId()).eq(SupplyDelivery::getTenantId, talentId));
@@ -1397,12 +1397,12 @@ public class YbParamBuilderUtil {
                 .setInvCnt(inventoryItem.getQuantity()).setFixmedinsBchno(inventoryItem.getLotNumber())
                 .setManuDate(inventoryItem.getProductionDate()).setExpyEnd(inventoryItem.getExpirationDate());
         } else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(inventoryItem.getItemTable())) {
-            // 查询器材
+            // 查询器材
             DeviceDefinition deviceDefinition = iDeviceDefinitionService.getById(inventoryItem.getItemId());
             if (deviceDefinition == null) {
-                throw new ServiceException("未查询到药品信息");
+                throw new ServiceException("未查询到药品信息");
             }
-            // 查询盘存数据
+            // 查询盘存数据
             SupplyDelivery one = iSupplyDeliveryService.getOne(new LambdaQueryWrapper<SupplyDelivery>()
                 .eq(SupplyDelivery::getItemTable, CommonConstants.TableName.ADM_DEVICE_DEFINITION)
                 .eq(SupplyDelivery::getItemId, deviceDefinition.getId()).eq(SupplyDelivery::getTenantId, talentId));
@@ -1413,51 +1413,51 @@ public class YbParamBuilderUtil {
                 .setInvCnt(inventoryItem.getQuantity()).setFixmedinsBchno(inventoryItem.getLotNumber())
                 .setManuDate(inventoryItem.getProductionDate()).setExpyEnd(inventoryItem.getExpirationDate());
         } else {
-            throw new ServiceException("未查询到信息");
+            throw new ServiceException("未查询到信息");
         }
         return medicalInventory3501Param;
     }
 
     /**
-     * 【3502】库存信息变更
+     * 【3502】库存信息变更
      * 
-     * @param id 供应发放id
-     * @param invChgType 变更类型 参考枚举
-     * @param talentId 租户id
+     * @param id 供应发放id
+     * @param invChgType 变更类型 参考枚举
+     * @param talentId 租户id
      * @return
      */
     public MedicalInventory3502Param getMedicalInventory3502Param(Long id, String invChgType, Integer talentId) {
         MedicalInventory3502Param medicalInventory3502Param = new MedicalInventory3502Param();
 
-        // 查供应发放实体
+        // 查供应发放实体
         SupplyDelivery supplyDelivery = iSupplyDeliveryService.getById(id);
         if (supplyDelivery == null) {
-            throw new ServiceException("未查询到供应信息");
+            throw new ServiceException("未查询到供应信息");
         }
 
-        // 库存变更类型
+        // 库存变更类型
         YbInvChgType chgType = YbInvChgType.getByValue(invChgType);
         if (chgType == null) {
-            throw new ServiceException("未查询到付款信息");
+            throw new ServiceException("未查询到付款信息");
         }
 
         if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(supplyDelivery.getItemTable())) {
-            // 查询药品信息
+            // 查询药品信息
             MedicationDefinition medicationDefinition =
                 iMedicationDefinitionService.getById(supplyDelivery.getItemId());
             if (medicationDefinition == null) {
-                throw new ServiceException("未查询到药品信息");
+                throw new ServiceException("未查询到药品信息");
             }
-            // 查询定价信息
+            // 查询定价信息
             ChargeItemDefinition chargeItemDefinition =
                 iChargeItemDefinitionService.getOne(new LambdaQueryWrapper<ChargeItemDefinition>()
                     .eq(ChargeItemDefinition::getInstanceTable, CommonConstants.TableName.MED_MEDICATION_DEFINITION)
                     .eq(ChargeItemDefinition::getInstanceId, medicationDefinition.getId())
                     .eq(ChargeItemDefinition::getTenantId, talentId));
             if (chargeItemDefinition == null) {
-                throw new ServiceException("未查询到定价信息");
+                throw new ServiceException("未查询到定价信息");
             }
-            // 查查询定价子表
+            // 查查询定价子表
             ChargeItemDefDetail chargeItemDefDetail =
                 iChargeItemDefDetailService.getOne(new LambdaQueryWrapper<ChargeItemDefDetail>()
                     .eq(ChargeItemDefDetail::getDefinitionId, chargeItemDefinition.getId())
@@ -1465,9 +1465,9 @@ public class YbParamBuilderUtil {
                     .eq(ChargeItemDefDetail::getTenantId, talentId).orderByDesc(ChargeItemDefDetail::getConditionValue)
                     .last(YbCommonConstants.sqlConst.LIMIT1));
             if (chargeItemDefDetail == null) {
-                throw new ServiceException("未查询到定价信息");
+                throw new ServiceException("未查询到定价信息");
             }
-            // 最小单位售卖价格
+            // 最小单位售卖价格
             BigDecimal price;
             if (medicationDefinition.getPartPercent().compareTo(BigDecimal.ZERO) > 0) {
                 price =
@@ -1482,21 +1482,21 @@ public class YbParamBuilderUtil {
                 .setRxFlag(medicationDefinition.getRxFlag().toString()).setPric(price)
                 .setCnt(supplyDelivery.getQuantity()).setInvChgTime(supplyDelivery.getUpdateTime());
         } else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(supplyDelivery.getItemTable())) {
-            // 查询耗材信息
+            // 查询耗材信息
             DeviceDefinition deviceDefinition = iDeviceDefinitionService.getById(supplyDelivery.getItemId());
             if (deviceDefinition == null) {
-                throw new ServiceException("未查询到药品信息");
+                throw new ServiceException("未查询到药品信息");
             }
-            // 查询定价信息
+            // 查询定价信息
             ChargeItemDefinition chargeItemDefinition =
                 iChargeItemDefinitionService.getOne(new LambdaQueryWrapper<ChargeItemDefinition>()
                     .eq(ChargeItemDefinition::getInstanceTable, CommonConstants.TableName.ADM_DEVICE_DEFINITION)
                     .eq(ChargeItemDefinition::getInstanceId, deviceDefinition.getId())
                     .eq(ChargeItemDefinition::getTenantId, talentId));
             if (chargeItemDefinition == null) {
-                throw new ServiceException("未查询到定价信息");
+                throw new ServiceException("未查询到定价信息");
             }
-            // 查查询定价子表
+            // 查查询定价子表
             ChargeItemDefDetail chargeItemDefDetail =
                 iChargeItemDefDetailService.getOne(new LambdaQueryWrapper<ChargeItemDefDetail>()
                     .eq(ChargeItemDefDetail::getDefinitionId, chargeItemDefinition.getId())
@@ -1504,9 +1504,9 @@ public class YbParamBuilderUtil {
                     .eq(ChargeItemDefDetail::getTenantId, talentId).orderByDesc(ChargeItemDefDetail::getConditionValue)
                     .last(YbCommonConstants.sqlConst.LIMIT1));
             if (chargeItemDefDetail == null) {
-                throw new ServiceException("未查询到定价信息");
+                throw new ServiceException("未查询到定价信息");
             }
-            // 最小单位售卖价格
+            // 最小单位售卖价格
             BigDecimal price;
             if (deviceDefinition.getPartPercent().compareTo(BigDecimal.ZERO) > 0) {
                 price = chargeItemDefDetail.getAmount().divide(deviceDefinition.getPartPercent(), RoundingMode.HALF_UP);
@@ -1520,59 +1520,59 @@ public class YbParamBuilderUtil {
                 .setRxFlag(deviceDefinition.getRxFlag().toString()).setPric(price).setCnt(supplyDelivery.getQuantity())
                 .setInvChgTime(supplyDelivery.getUpdateTime());
         } else {
-            throw new ServiceException("未查询到信息");
+            throw new ServiceException("未查询到信息");
         }
         return medicalInventory3502Param;
     }
 
     /**
-     * 【3503】商品采购
+     * 【3503】商品采购
      *
-     * @param id 供应发放id
-     * @param talentId 租户id
+     * @param id 供应发放id
+     * @param talentId 租户id
      * @return
      */
     public Medical3503Param getMedical3503Param(Long id, Integer talentId) {
         Medical3503Param medical3503Param = new Medical3503Param();
-        // 查供应发放实体
+        // 查供应发放实体
         SupplyDelivery supplyDelivery = iSupplyDeliveryService.getById(id);
         if (supplyDelivery == null) {
-            throw new ServiceException("未查询到供应发放信息");
+            throw new ServiceException("未查询到供应发放信息");
         }
-        // 查询发放请求实体
+        // 查询发放请求实体
         SupplyRequest supplyRequest = iSupplyRequestService.getOne(new LambdaQueryWrapper<SupplyRequest>()
             .eq(SupplyRequest::getId, supplyDelivery.getRequestId()).eq(SupplyRequest::getTenantId, talentId)
             .eq(SupplyRequest::getTypeEnum, SupplyType.PURCHASE_INVENTORY.getValue()));
         if (supplyRequest == null) {
-            throw new ServiceException("未查询到供应信息");
+            throw new ServiceException("未查询到供应信息");
         }
-        // 查库存信息
+        // 查库存信息
         InventoryItem inventoryItem = inventoryItemService.getOne(new LambdaQueryWrapper<InventoryItem>()
             .eq(InventoryItem::getLocationStoreId, supplyRequest.getSourceLocationStoreId())
             .eq(InventoryItem::getLocationId, supplyRequest.getPurposeLocationId())
             .eq(InventoryItem::getTenantId, talentId));
 
-        // 查询经办人
+        // 查询经办人
         Practitioner practitioner = iPractitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
             .eq(Practitioner::getUserId, supplyDelivery.getReceiverId()).eq(Practitioner::getTenantId, talentId));
 
         if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(supplyDelivery.getItemTable())) {
-            // 查询药品信息
+            // 查询药品信息
             MedicationDefinition medicationDefinition =
                 iMedicationDefinitionService.getById(supplyDelivery.getItemId());
             if (medicationDefinition == null) {
-                throw new ServiceException("未查询到药品信息");
+                throw new ServiceException("未查询到药品信息");
             }
-            // 查询定价信息
+            // 查询定价信息
             ChargeItemDefinition chargeItemDefinition =
                 iChargeItemDefinitionService.getOne(new LambdaQueryWrapper<ChargeItemDefinition>()
                     .eq(ChargeItemDefinition::getInstanceTable, CommonConstants.TableName.MED_MEDICATION_DEFINITION)
                     .eq(ChargeItemDefinition::getInstanceId, medicationDefinition.getId())
                     .eq(ChargeItemDefinition::getTenantId, talentId));
             if (chargeItemDefinition == null) {
-                throw new ServiceException("未查询到定价信息");
+                throw new ServiceException("未查询到定价信息");
             }
-            // 查查询定价子表
+            // 查查询定价子表
             ChargeItemDefDetail chargeItemDefDetail =
                 iChargeItemDefDetailService.getOne(new LambdaQueryWrapper<ChargeItemDefDetail>()
                     .eq(ChargeItemDefDetail::getDefinitionId, chargeItemDefinition.getId())
@@ -1580,9 +1580,9 @@ public class YbParamBuilderUtil {
                     .eq(ChargeItemDefDetail::getTenantId, talentId).orderByDesc(ChargeItemDefDetail::getConditionValue)
                     .last(YbCommonConstants.sqlConst.LIMIT1));
             if (chargeItemDefDetail == null) {
-                throw new ServiceException("未查询到定价信息");
+                throw new ServiceException("未查询到定价信息");
             }
-            // 查询供应商
+            // 查询供应商
             Supplier supplier = iSupplierService.getById(medicationDefinition.getSupplyId());
 
             medical3503Param.setMedListCodg(medicationDefinition.getYbNo())
@@ -1595,21 +1595,21 @@ public class YbParamBuilderUtil {
                 .setExpyEnd(inventoryItem.getExpirationDate()).setPurcRetnCnt(supplyDelivery.getQuantity())
                 .setPurcRetnStoinTime(supplyDelivery.getOccurrenceTime()).setPurcRetnOpterName(practitioner.getName());
         } else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(supplyDelivery.getItemTable())) {
-            // 查询耗材信息
+            // 查询耗材信息
             DeviceDefinition deviceDefinition = iDeviceDefinitionService.getById(supplyDelivery.getItemId());
             if (deviceDefinition == null) {
-                throw new ServiceException("未查询到耗材信息");
+                throw new ServiceException("未查询到耗材信息");
             }
-            // 查询定价信息
+            // 查询定价信息
             ChargeItemDefinition chargeItemDefinition =
                 iChargeItemDefinitionService.getOne(new LambdaQueryWrapper<ChargeItemDefinition>()
                     .eq(ChargeItemDefinition::getInstanceTable, CommonConstants.TableName.ADM_DEVICE_DEFINITION)
                     .eq(ChargeItemDefinition::getInstanceId, deviceDefinition.getId())
                     .eq(ChargeItemDefinition::getTenantId, talentId));
             if (chargeItemDefinition == null) {
-                throw new ServiceException("未查询到定价信息");
+                throw new ServiceException("未查询到定价信息");
             }
-            // 查查询定价子表
+            // 查查询定价子表
             ChargeItemDefDetail chargeItemDefDetail =
                 iChargeItemDefDetailService.getOne(new LambdaQueryWrapper<ChargeItemDefDetail>()
                     .eq(ChargeItemDefDetail::getDefinitionId, chargeItemDefinition.getId())
@@ -1617,9 +1617,9 @@ public class YbParamBuilderUtil {
                     .eq(ChargeItemDefDetail::getTenantId, talentId).orderByDesc(ChargeItemDefDetail::getConditionValue)
                     .last(YbCommonConstants.sqlConst.LIMIT1));
             if (chargeItemDefDetail == null) {
-                throw new ServiceException("未查询到定价信息");
+                throw new ServiceException("未查询到定价信息");
             }
-            // 查询供应商
+            // 查询供应商
             Supplier supplier = iSupplierService.getById(deviceDefinition.getSupplyId());
 
             medical3503Param.setMedListCodg(deviceDefinition.getYbNo()).setFixmedinsBchno(inventoryItem.getLotNumber())
@@ -1631,60 +1631,60 @@ public class YbParamBuilderUtil {
                 .setExpyEnd(inventoryItem.getExpirationDate()).setPurcRetnCnt(supplyDelivery.getQuantity())
                 .setPurcRetnStoinTime(supplyDelivery.getOccurrenceTime()).setPurcRetnOpterName(practitioner.getName());
         } else {
-            throw new ServiceException("未查询到信息");
+            throw new ServiceException("未查询到信息");
         }
         return medical3503Param;
     }
 
     /**
-     * 【3504】商品采购退货
+     * 【3504】商品采购退货
      *
-     * @param id 供应发放id
-     * @param talentId 租户id
+     * @param id 供应发放id
+     * @param talentId 租户id
      * @return
      */
     public MedicalPurchase3504Param getMedicalPurchase3504Param(Long id, Integer talentId) {
 
         MedicalPurchase3504Param medicalPurchase3504Param = new MedicalPurchase3504Param();
-        // 查供应发放实体
+        // 查供应发放实体
         SupplyDelivery supplyDelivery = iSupplyDeliveryService.getById(id);
         if (supplyDelivery == null) {
-            throw new ServiceException("未查询到供应信息");
+            throw new ServiceException("未查询到供应信息");
         }
-        // 查询发放请求实体
+        // 查询发放请求实体
         SupplyRequest supplyRequest = iSupplyRequestService.getOne(new LambdaQueryWrapper<SupplyRequest>()
             .eq(SupplyRequest::getId, supplyDelivery.getRequestId()).eq(SupplyRequest::getTenantId, talentId)
             .eq(SupplyRequest::getTypeEnum, SupplyType.PRODUCT_RETURN.getValue()));
         if (supplyRequest == null) {
-            throw new ServiceException("未查询到供应信息");
+            throw new ServiceException("未查询到供应信息");
         }
-        // 查库存信息
+        // 查库存信息
         InventoryItem inventoryItem = inventoryItemService.getOne(new LambdaQueryWrapper<InventoryItem>()
             .eq(InventoryItem::getLocationStoreId, supplyRequest.getSourceLocationStoreId())
             .eq(InventoryItem::getLocationId, supplyRequest.getPurposeLocationId())
             .eq(InventoryItem::getTenantId, talentId));
 
-        // 查询经办人
+        // 查询经办人
         Practitioner practitioner = iPractitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
             .eq(Practitioner::getUserId, supplyDelivery.getReceiverId()).eq(Practitioner::getTenantId, talentId));
 
         if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(supplyDelivery.getItemTable())) {
-            // 查询药品信息
+            // 查询药品信息
             MedicationDefinition medicationDefinition =
                 iMedicationDefinitionService.getById(supplyDelivery.getItemId());
             if (medicationDefinition == null) {
-                throw new ServiceException("未查询到药品信息");
+                throw new ServiceException("未查询到药品信息");
             }
-            // 查询定价信息
+            // 查询定价信息
             ChargeItemDefinition chargeItemDefinition =
                 iChargeItemDefinitionService.getOne(new LambdaQueryWrapper<ChargeItemDefinition>()
                     .eq(ChargeItemDefinition::getInstanceTable, CommonConstants.TableName.MED_MEDICATION_DEFINITION)
                     .eq(ChargeItemDefinition::getInstanceId, medicationDefinition.getId())
                     .eq(ChargeItemDefinition::getTenantId, talentId));
             if (chargeItemDefinition == null) {
-                throw new ServiceException("未查询到定价信息");
+                throw new ServiceException("未查询到定价信息");
             }
-            // 查查询定价子表
+            // 查查询定价子表
             ChargeItemDefDetail chargeItemDefDetail =
                 iChargeItemDefDetailService.getOne(new LambdaQueryWrapper<ChargeItemDefDetail>()
                     .eq(ChargeItemDefDetail::getDefinitionId, chargeItemDefinition.getId())
@@ -1692,12 +1692,12 @@ public class YbParamBuilderUtil {
                     .eq(ChargeItemDefDetail::getTenantId, talentId).orderByDesc(ChargeItemDefDetail::getConditionValue)
                     .last(YbCommonConstants.sqlConst.LIMIT1));
             if (chargeItemDefDetail == null) {
-                throw new ServiceException("未查询到定价信息");
+                throw new ServiceException("未查询到定价信息");
             }
-            // 查询供应商
+            // 查询供应商
             Supplier supplier = iSupplierService.getById(medicationDefinition.getSupplyId());
             if (supplier == null) {
-                throw new ServiceException("未查询到供应商信息");
+                throw new ServiceException("未查询到供应商信息");
             }
             medicalPurchase3504Param.setMedListCodg(medicationDefinition.getYbNo())
                 .setFixmedinsBchno(inventoryItem.getLotNumber()).setFixmedinsHilistId(medicationDefinition.getBusNo())
@@ -1707,21 +1707,21 @@ public class YbParamBuilderUtil {
                 .setExpyEnd(inventoryItem.getExpirationDate()).setPurcRetnCnt(supplyDelivery.getQuantity())
                 .setPurcRetnStoinTime(supplyDelivery.getOccurrenceTime()).setPurcRetnOpterName(practitioner.getName());
         } else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(supplyDelivery.getItemTable())) {
-            // 查询耗材信息
+            // 查询耗材信息
             DeviceDefinition deviceDefinition = iDeviceDefinitionService.getById(supplyDelivery.getItemId());
             if (deviceDefinition == null) {
-                throw new ServiceException("未查询到耗材信息");
+                throw new ServiceException("未查询到耗材信息");
             }
-            // 查询定价信息
+            // 查询定价信息
             ChargeItemDefinition chargeItemDefinition =
                 iChargeItemDefinitionService.getOne(new LambdaQueryWrapper<ChargeItemDefinition>()
                     .eq(ChargeItemDefinition::getInstanceTable, CommonConstants.TableName.ADM_DEVICE_DEFINITION)
                     .eq(ChargeItemDefinition::getInstanceId, deviceDefinition.getId())
                     .eq(ChargeItemDefinition::getTenantId, talentId));
             if (chargeItemDefinition == null) {
-                throw new ServiceException("未查询到定价信息");
+                throw new ServiceException("未查询到定价信息");
             }
-            // 查查询定价子表
+            // 查查询定价子表
             ChargeItemDefDetail chargeItemDefDetail =
                 iChargeItemDefDetailService.getOne(new LambdaQueryWrapper<ChargeItemDefDetail>()
                     .eq(ChargeItemDefDetail::getDefinitionId, chargeItemDefinition.getId())
@@ -1729,12 +1729,12 @@ public class YbParamBuilderUtil {
                     .eq(ChargeItemDefDetail::getTenantId, talentId).orderByDesc(ChargeItemDefDetail::getConditionValue)
                     .last(YbCommonConstants.sqlConst.LIMIT1));
             if (chargeItemDefDetail == null) {
-                throw new ServiceException("未查询到定价信息");
+                throw new ServiceException("未查询到定价信息");
             }
-            // 查询供应商
+            // 查询供应商
             Supplier supplier = iSupplierService.getById(deviceDefinition.getSupplyId());
             if (supplier == null) {
-                throw new ServiceException("未查询到供应商信息");
+                throw new ServiceException("未查询到供应商信息");
             }
             medicalPurchase3504Param.setMedListCodg(deviceDefinition.getYbNo())
                 .setFixmedinsBchno(inventoryItem.getLotNumber()).setFixmedinsHilistId(deviceDefinition.getBusNo())
@@ -1744,41 +1744,41 @@ public class YbParamBuilderUtil {
                 .setPurcRetnCnt(supplyDelivery.getQuantity()).setPurcRetnStoinTime(supplyDelivery.getOccurrenceTime())
                 .setPurcRetnOpterName(practitioner.getName()).setPurcInvoNo(supplyRequest.getInvoiceNo());
         } else {
-            throw new ServiceException("未查询到信息");
+            throw new ServiceException("未查询到信息");
         }
         return medicalPurchase3504Param;
     }
 
     /**
-     * 【3505】商品销售
+     * 【3505】商品销售
      * 
-     * @param id 发放id
-     * @param ListType 耗材/药品
-     * @param tenantId 租户id
+     * @param id 发放id
+     * @param ListType 耗材/药品
+     * @param tenantId 租户id
      * @return
      */
     public Medical3505Param getMedical3505Param(Long id, String ListType, Integer tenantId) {
         Medical3505Param medical3505Param = new Medical3505Param();
-        // 销售商品的种类
+        // 销售商品的种类
         YbListType type = YbListType.getByValue(ListType);
         if (type == YbListType.MEDICAL_CONSUMABLES) {
-            // 耗材的相关处理
+            // 耗材的相关处理
             DeviceDispense deviceDispense = iDeviceDispenseService.getById(id);
             if (deviceDispense == null) {
-                throw new ServiceException("未查询到耗材信息");
+                throw new ServiceException("未查询到耗材信息");
             }
             if (!deviceDispense.getStatusEnum().equals(DispenseStatus.COMPLETED.getValue())) {
-                throw new ServiceException("耗材未发放");
+                throw new ServiceException("耗材未发放");
             }
             DeviceRequest deviceRequest = iDeviceRequestService.getById(deviceDispense.getDeviceReqId());
             if (deviceRequest == null) {
-                throw new ServiceException("未查询到耗材请求信息");
+                throw new ServiceException("未查询到耗材请求信息");
             }
             DeviceDefinition deviceDefinition = iDeviceDefinitionService.getById(deviceDispense.getDeviceDefId());
             if (deviceDefinition == null) {
-                throw new ServiceException("未查询到耗材信息");
+                throw new ServiceException("未查询到耗材信息");
             }
-            // 查询库存信息
+            // 查询库存信息
             InventoryItem inventoryItem = inventoryItemService.getOne(
                 new LambdaQueryWrapper<InventoryItem>().eq(InventoryItem::getLotNumber, deviceDispense.getLotNumber())
                     .eq(InventoryItem::getLocationId, deviceDispense.getLocationId())
@@ -1786,9 +1786,9 @@ public class YbParamBuilderUtil {
                     .eq(InventoryItem::getItemId, deviceDispense.getDeviceDefId())
                     .eq(InventoryItem::getTenantId, tenantId));
             if (inventoryItem == null) {
-                throw new ServiceException("未查询到库存信息");
+                throw new ServiceException("未查询到库存信息");
             }
-            // 查询供应申请单 2025/04/18经在微信群中确认，仅能通过locid，lotnumber，定义id定位库存记录，无法继续准确追到供应请求
+            // 查询供应申请单 2025/04/18经在微信群中确认，仅能通过locid，lotnumber，定义id定位库存记录，无法继续准确追到供应请求
             // SupplyRequest supplyRequest = iSupplyRequestService.getOne(
             // new LambdaQueryWrapper<SupplyRequest>().eq(SupplyRequest::getLotNumber, deviceDispense.getLotNumber())
             // .eq(SupplyRequest::getPurposeLocationId, deviceDispense.getLocationId())
@@ -1798,23 +1798,23 @@ public class YbParamBuilderUtil {
             // if (supplyRequest == null) {
             // return null;
             // }
-            // 查询开方医生姓名
+            // 查询开方医生姓名
             Practitioner practitioner = iPractitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
                 .eq(Practitioner::getUserId, deviceRequest.getRequesterId()).eq(Practitioner::getTenantId, tenantId));
-            // 查询当前登录用户的姓名(药师)
+            // 查询当前登录用户的姓名(药师)
             Practitioner medDoctor = iPractitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
                 .eq(Practitioner::getUserId, SecurityUtils.getUserId()).eq(Practitioner::getTenantId, tenantId));
-            // 查询发药人
+            // 查询发药人
             Practitioner performer = iPractitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
                 .eq(Practitioner::getUserId, deviceDispense.getPerformerId()).eq(Practitioner::getTenantId, tenantId));
-            // 查询费用结算信息
+            // 查询费用结算信息
             ChargeItem chargeItem = iChargeItemService.getOne(new LambdaQueryWrapper<ChargeItem>()
                 .eq(ChargeItem::getServiceTable, CommonConstants.TableName.WOR_DEVICE_REQUEST)
                 .eq(ChargeItem::getServiceId, deviceRequest.getId()).eq(ChargeItem::getTenantId, tenantId));
             if (chargeItem == null) {
-                throw new ServiceException("未查询到收费项信息");
+                throw new ServiceException("未查询到收费项信息");
             }
-            // 查询付款信息
+            // 查询付款信息
             PaymentReconciliation paymentReconciliation =
                 iPaymentReconciliationService.getOne(new LambdaQueryWrapper<PaymentReconciliation>()
                     .eq(PaymentReconciliation::getEncounterId, chargeItem.getEncounterId())
@@ -1824,31 +1824,31 @@ public class YbParamBuilderUtil {
                     .eq(PaymentReconciliation::getPatientId, chargeItem.getPatientId())
                     .eq(PaymentReconciliation::getPaymentEnum, PaymentType.PAY.getValue()));
             if (paymentReconciliation == null) {
-                throw new ServiceException("未查询到付款信息");
+                throw new ServiceException("未查询到付款信息");
             }
-            // 查询合同实体
+            // 查询合同实体
             Contract contract = iContractService.getOne(
                 new LambdaQueryWrapper<Contract>().eq(Contract::getBusNo, paymentReconciliation.getContractNo()));
             if (contract == null) {
-                throw new ServiceException("未查询到合同信息");
+                throw new ServiceException("未查询到合同信息");
             }
-            // 查询就诊信息
+            // 查询就诊信息
             Encounter encounter = iEncounterService.getById(deviceDispense.getEncounterId());
             if (encounter == null) {
-                throw new ServiceException("未查询到就诊信息");
+                throw new ServiceException("未查询到就诊信息");
             }
-            // 查询账户信息
+            // 查询账户信息
             Account account = accountService
                 .getOne(new LambdaQueryWrapper<Account>().eq(Account::getEncounterId, chargeItem.getEncounterId())
                     .eq(Account::getTenantId, tenantId).eq(Account::getEncounterFlag, Whether.YES.getValue()));
             if (account == null) {
-                throw new ServiceException("未查询到账户信息");
+                throw new ServiceException("未查询到账户信息");
             }
             YbMdtrtCertType mdtrtCertType = YbMdtrtCertType.getByValue(account.getTypeCode());
             if (mdtrtCertType == null) {
-                throw new ServiceException("未查询到就诊凭证类型");
+                throw new ServiceException("未查询到就诊凭证类型");
             }
-            // 查询就诊id
+            // 查询就诊id
             if (contract.getCategoryEnum().equals(Category.SELF.getValue())
                 || contract.getCategoryEnum().equals(Category.PUBLIC.getValue())) {
                 medical3505Param.setMdtrtSn(encounter.getBusNo());
@@ -1860,17 +1860,17 @@ public class YbParamBuilderUtil {
                     medical3505Param.setMdtrtSn(one.getMdtrtId());
                 }
             }
-            // 判断拆零标志
+            // 判断拆零标志
             Whether flag;
             if (deviceDefinition.getSalesUnitCode().equals(deviceDispense.getUnitCode())) {
                 flag = Whether.NO;
             } else {
                 flag = Whether.YES;
             }
-            // 查询发票信息
+            // 查询发票信息
             Invoice invoice = iInvoiceService.getById(paymentReconciliation.getInvoiceId());
             if (invoice == null) {
-                throw new ServiceException("未查询到发票信息");
+                throw new ServiceException("未查询到发票信息");
             }
             medical3505Param.setMedListCodg(deviceDefinition.getYbNo()).setFixmedinsBchno(inventoryItem.getLotNumber())
                 .setFixmedinsHilistId(deviceDefinition.getBusNo())
@@ -1883,7 +1883,7 @@ public class YbParamBuilderUtil {
                 .setSelRetnOpterName(performer.getName()).setRxFlag(deviceDefinition.getRxFlag().toString())
                 .setExpyEnd(inventoryItem.getExpirationDate());
 
-            // 溯源码
+            // 溯源码
             SupplyDelivery supplyDelivery = iSupplyDeliveryService.getOne(
                 new LambdaQueryWrapper<SupplyDelivery>().eq(SupplyDelivery::getLotNumber, deviceDispense.getLotNumber())
                     .eq(SupplyDelivery::getItemTable, CommonConstants.TableName.ADM_DEVICE_DEFINITION)
@@ -1891,29 +1891,29 @@ public class YbParamBuilderUtil {
             if (supplyDelivery != null) {
                 Map map = new HashMap<>();
                 map.put("drug_trac_codg", supplyDelivery.getTraceNo());
-                // medical3505Param.setDrugtracinfo(JsonUtils.toJson(map));
+                // medical3505Param.setDrugtracinfo(JSON.toJSONString(map));
             }
 
         } else if (type != YbListType.MEDICAL_SERVICE_ITEM) {
-            // 药品的相关处理
+            // 药品的相关处理
             MedicationDispense medicationDispense = iMedicationDispenseService.getById(id);
             if (medicationDispense == null) {
-                throw new ServiceException("未查询到药品信息");
+                throw new ServiceException("未查询到药品信息");
             }
             if (medicationDispense.getStatusEnum() != DispenseStatus.COMPLETED.getValue()) {
-                throw new ServiceException("未发药");
+                throw new ServiceException("未发药");
             }
             MedicationRequest medicationRequest = iMedicationRequestService.getById(medicationDispense.getMedReqId());
             if (medicationRequest == null) {
-                throw new ServiceException("未查询到药品请求信息");
+                throw new ServiceException("未查询到药品请求信息");
             }
             MedicationDefinition medicationDefinition =
                 iMedicationDefinitionService.getById(medicationDispense.getMedicationId());
             if (medicationDefinition == null) {
-                throw new ServiceException("未查询到药品信息");
+                throw new ServiceException("未查询到药品信息");
             }
 
-            // 查询库存信息
+            // 查询库存信息
             InventoryItem inventoryItem = inventoryItemService.getOne(new LambdaQueryWrapper<InventoryItem>()
                 .eq(InventoryItem::getLotNumber, medicationDispense.getLotNumber())
                 .eq(InventoryItem::getLocationId, medicationDispense.getLocationId())
@@ -1921,9 +1921,9 @@ public class YbParamBuilderUtil {
                 .eq(InventoryItem::getItemId, medicationDispense.getMedicationId())
                 .eq(InventoryItem::getTenantId, tenantId));
             if (inventoryItem == null) {
-                throw new ServiceException("未查询到库存信息");
+                throw new ServiceException("未查询到库存信息");
             }
-            // 查询供应申请单 2025/04/18经在微信群中确认，仅能通过locid，lotnumber，定义id定位库存记录，无法继续准确追到供应请求
+            // 查询供应申请单 2025/04/18经在微信群中确认，仅能通过locid，lotnumber，定义id定位库存记录，无法继续准确追到供应请求
             // SupplyRequest supplyRequest = iSupplyRequestService.getOne(new LambdaQueryWrapper<SupplyRequest>()
             // .eq(SupplyRequest::getLotNumber, medicationDispense.getLotNumber())
             // .eq(SupplyRequest::getPurposeLocationId, medicationDispense.getLocationId())
@@ -1933,25 +1933,25 @@ public class YbParamBuilderUtil {
             // if (supplyRequest == null) {
             // return null;
             // }
-            // 查询开方医生姓名
+            // 查询开方医生姓名
             Practitioner practitioner = iPractitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
                 .eq(Practitioner::getUserId, medicationRequest.getPractitionerId())
                 .eq(Practitioner::getTenantId, tenantId));
-            // 查询当前登录用户的姓名(药师)
+            // 查询当前登录用户的姓名(药师)
             Practitioner medDoctor = iPractitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
                 .eq(Practitioner::getUserId, SecurityUtils.getUserId()).eq(Practitioner::getTenantId, tenantId));
-            // 查询发药人
+            // 查询发药人
             Practitioner performer = iPractitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
                 .eq(Practitioner::getUserId, medicationDispense.getPractitionerId())
                 .eq(Practitioner::getTenantId, tenantId));
-            // 查询费用结算信息
+            // 查询费用结算信息
             ChargeItem chargeItem = iChargeItemService.getOne(new LambdaQueryWrapper<ChargeItem>()
                 .eq(ChargeItem::getServiceTable, CommonConstants.TableName.MED_MEDICATION_REQUEST)
                 .eq(ChargeItem::getServiceId, medicationRequest.getId()).eq(ChargeItem::getTenantId, tenantId));
             if (chargeItem == null) {
-                throw new ServiceException("未查询到收费信息");
+                throw new ServiceException("未查询到收费信息");
             }
-            // 查询付款信息
+            // 查询付款信息
             PaymentReconciliation paymentReconciliation =
                 iPaymentReconciliationService.getOne(new LambdaQueryWrapper<PaymentReconciliation>()
                     .eq(PaymentReconciliation::getEncounterId, chargeItem.getEncounterId())
@@ -1961,31 +1961,31 @@ public class YbParamBuilderUtil {
                     .eq(PaymentReconciliation::getPatientId, chargeItem.getPatientId())
                     .eq(PaymentReconciliation::getPaymentEnum, PaymentType.PAY.getValue()));
             if (paymentReconciliation == null) {
-                throw new ServiceException("未查询到收费信息");
+                throw new ServiceException("未查询到收费信息");
             }
-            // 查询合同实体
+            // 查询合同实体
             Contract contract = iContractService.getOne(
                 new LambdaQueryWrapper<Contract>().eq(Contract::getBusNo, paymentReconciliation.getContractNo()));
             if (contract == null) {
-                throw new ServiceException("未查询到合同信息");
+                throw new ServiceException("未查询到合同信息");
             }
-            // 查询就诊信息
+            // 查询就诊信息
             Encounter encounter = iEncounterService.getById(medicationDispense.getEncounterId());
             if (encounter == null) {
-                throw new ServiceException("未查询到就诊信息");
+                throw new ServiceException("未查询到就诊信息");
             }
-            // 查询账户信息
+            // 查询账户信息
             Account account = accountService
                 .getOne(new LambdaQueryWrapper<Account>().eq(Account::getEncounterId, chargeItem.getEncounterId())
                     .eq(Account::getTenantId, tenantId).eq(Account::getEncounterFlag, Whether.YES.getValue()));
             if (account == null) {
-                throw new ServiceException("未查询到账号信息");
+                throw new ServiceException("未查询到账号信息");
             }
             YbMdtrtCertType mdtrtCertType = YbMdtrtCertType.getByValue(account.getTypeCode());
             if (mdtrtCertType == null) {
-                throw new ServiceException("未查询到就诊凭证信息");
+                throw new ServiceException("未查询到就诊凭证信息");
             }
-            // 查询就诊id
+            // 查询就诊id
             if (contract.getCategoryEnum().equals(Category.SELF.getValue())
                 || contract.getCategoryEnum().equals(Category.PUBLIC.getValue())) {
                 medical3505Param.setMdtrtSn(encounter.getBusNo());
@@ -1997,19 +1997,19 @@ public class YbParamBuilderUtil {
                     medical3505Param.setMdtrtSn(one.getMdtrtId());
                 }
             }
-            // 判断拆零标志
+            // 判断拆零标志
             Whether flag;
             if (medicationDefinition.getDefEncounterUnitCode().equals(medicationDispense.getUnitCode())) {
                 flag = Whether.NO;
             } else {
                 flag = Whether.YES;
             }
-            // 查询发票信息
+            // 查询发票信息
             Invoice invoice = iInvoiceService.getById(paymentReconciliation.getInvoiceId());
             if (invoice == null) {
-                throw new ServiceException("未查询到发票信息");
+                throw new ServiceException("未查询到发票信息");
             }
-            // todo：sjq 商品销售的数量是根据是否拆零计算出来的数量吗？
+            // todo：sjq 商品销售的数量是根据是否拆零计算出来的数量吗？
             medical3505Param.setMedListCodg(medicationDefinition.getYbNo())
                 .setFixmedinsBchno(inventoryItem.getLotNumber()).setFixmedinsHilistId(medicationDefinition.getBusNo())
                 .setFixmedinsHilistName(CommonConstants.TableName.ADM_DEVICE_DEFINITION)
@@ -2021,7 +2021,7 @@ public class YbParamBuilderUtil {
                 .setSelRetnTime(medicationDispense.getDispenseTime()).setSelRetnOpterName(performer.getName())
                 .setRxFlag(medicationDefinition.getRxFlag().toString()).setExpyEnd(inventoryItem.getExpirationDate());
 
-            // 溯源码
+            // 溯源码
             SupplyDelivery supplyDelivery = iSupplyDeliveryService.getOne(new LambdaQueryWrapper<SupplyDelivery>()
                 .eq(SupplyDelivery::getLotNumber, medicationDispense.getLotNumber())
                 .eq(SupplyDelivery::getItemTable, CommonConstants.TableName.MED_MEDICATION_DEFINITION)
@@ -2029,42 +2029,42 @@ public class YbParamBuilderUtil {
             if (supplyDelivery != null) {
                 Map map = new HashMap<>();
                 map.put("drug_trac_codg", supplyDelivery.getTraceNo());
-                // medical3505Param.setDrugtracinfo(JsonUtils.toJson(map));
+                // medical3505Param.setDrugtracinfo(JSON.toJSONString(map));
             }
         }
         return medical3505Param;
     }
 
     /**
-     * 【3506】商品销售退货
+     * 【3506】商品销售退货
      * 
-     * @param id 对应发放业务的主键id
-     * @param ListType 目录种类
-     * @param tenantId 租户id
-     * @return 3506参数
+     * @param id 对应发放业务的主键id
+     * @param ListType 目录种类
+     * @param tenantId 租户id
+     * @return 3506参数
      */
     public Medical3506Param getMedical3506Param(Long id, String ListType, Integer tenantId) {
         Medical3506Param medical3506Param = new Medical3506Param();
-        // 销售商品的种类
+        // 销售商品的种类
         YbListType type = YbListType.getByValue(ListType);
         if (type == YbListType.MEDICAL_CONSUMABLES) {
-            // 耗材的相关处理
+            // 耗材的相关处理
             DeviceDispense deviceDispense = iDeviceDispenseService.getById(id);
             if (deviceDispense == null) {
-                throw new ServiceException("未查询到耗材信息");
+                throw new ServiceException("未查询到耗材信息");
             }
             if (deviceDispense.getStatusEnum() != DispenseStatus.REFUNDED.getValue()) {
-                throw new ServiceException("未退耗材");
+                throw new ServiceException("未退耗材");
             }
             DeviceRequest deviceRequest = iDeviceRequestService.getById(deviceDispense.getDeviceReqId());
             if (deviceRequest == null) {
-                throw new ServiceException("未查询到耗材请求信息");
+                throw new ServiceException("未查询到耗材请求信息");
             }
             DeviceDefinition deviceDefinition = iDeviceDefinitionService.getById(deviceDispense.getDeviceDefId());
             if (deviceDefinition == null) {
-                throw new ServiceException("未查询到耗材信息");
+                throw new ServiceException("未查询到耗材信息");
             }
-            // 查询库存信息
+            // 查询库存信息
             InventoryItem inventoryItem = inventoryItemService.getOne(
                 new LambdaQueryWrapper<InventoryItem>().eq(InventoryItem::getLotNumber, deviceDispense.getLotNumber())
                     .eq(InventoryItem::getLocationId, deviceDispense.getLocationId())
@@ -2072,9 +2072,9 @@ public class YbParamBuilderUtil {
                     .eq(InventoryItem::getItemId, deviceDispense.getDeviceDefId())
                     .eq(InventoryItem::getTenantId, tenantId));
             if (inventoryItem == null) {
-                throw new ServiceException("未查询到库存信息");
+                throw new ServiceException("未查询到库存信息");
             }
-            // 查询供应申请单 2025/04/18经在微信群中确认，仅能通过locid，lotnumber，定义id定位库存记录，无法继续准确追到供应请求
+            // 查询供应申请单 2025/04/18经在微信群中确认，仅能通过locid，lotnumber，定义id定位库存记录，无法继续准确追到供应请求
             SupplyRequest supplyRequest = iSupplyRequestService.getOne(
                 new LambdaQueryWrapper<SupplyRequest>().eq(SupplyRequest::getLotNumber, deviceDispense.getLotNumber())
                     .eq(SupplyRequest::getPurposeLocationId, deviceDispense.getLocationId())
@@ -2082,25 +2082,25 @@ public class YbParamBuilderUtil {
                     .eq(SupplyRequest::getItemId, deviceDispense.getDeviceDefId())
                     .eq(SupplyRequest::getTenantId, tenantId));
             if (supplyRequest == null) {
-                throw new ServiceException("未查询到供应信息");
+                throw new ServiceException("未查询到供应信息");
             }
-            // 查询开方医生姓名
+            // 查询开方医生姓名
             Practitioner practitioner = iPractitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
                 .eq(Practitioner::getUserId, deviceRequest.getRequesterId()).eq(Practitioner::getTenantId, tenantId));
-            // 查询当前登录用户的姓名(药师)
+            // 查询当前登录用户的姓名(药师)
             Practitioner medDoctor = iPractitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
                 .eq(Practitioner::getUserId, SecurityUtils.getUserId()).eq(Practitioner::getTenantId, tenantId));
-            // 查询发药人
+            // 查询发药人
             Practitioner performer = iPractitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
                 .eq(Practitioner::getUserId, deviceDispense.getPerformerId()).eq(Practitioner::getTenantId, tenantId));
-            // 查询费用结算信息
+            // 查询费用结算信息
             ChargeItem chargeItem = iChargeItemService.getOne(new LambdaQueryWrapper<ChargeItem>()
                 .eq(ChargeItem::getServiceTable, CommonConstants.TableName.WOR_DEVICE_REQUEST)
                 .eq(ChargeItem::getServiceId, deviceRequest.getId()).eq(ChargeItem::getTenantId, tenantId));
             if (chargeItem == null) {
-                throw new ServiceException("未查询到收费信息");
+                throw new ServiceException("未查询到收费信息");
             }
-            // 查询付款信息
+            // 查询付款信息
             PaymentReconciliation paymentReconciliation =
                 iPaymentReconciliationService.getOne(new LambdaQueryWrapper<PaymentReconciliation>()
                     .eq(PaymentReconciliation::getEncounterId, chargeItem.getEncounterId())
@@ -2110,30 +2110,30 @@ public class YbParamBuilderUtil {
                     .eq(PaymentReconciliation::getPatientId, chargeItem.getPatientId())
                     .eq(PaymentReconciliation::getPaymentEnum, PaymentType.PAY.getValue()));
             if (paymentReconciliation == null) {
-                throw new ServiceException("未查询到付款信息");
+                throw new ServiceException("未查询到付款信息");
             }
-            // 查询合同实体
+            // 查询合同实体
             Contract contract = iContractService.getOne(
                 new LambdaQueryWrapper<Contract>().eq(Contract::getBusNo, paymentReconciliation.getContractNo()));
             if (contract == null) {
-                throw new ServiceException("未查询到合同信息");
+                throw new ServiceException("未查询到合同信息");
             }
-            // 查询就诊信息
+            // 查询就诊信息
             Encounter encounter = iEncounterService.getById(deviceDispense.getEncounterId());
             if (encounter == null) {
-                throw new ServiceException("未查询到就诊信息");
+                throw new ServiceException("未查询到就诊信息");
             }
-            // 查询账户信息
+            // 查询账户信息
             Account account = accountService.getOne(new LambdaQueryWrapper<Account>()
                 .eq(Account::getEncounterId, chargeItem.getEncounterId()).eq(Account::getTenantId, tenantId));
             if (account == null) {
-                throw new ServiceException("未查询到账户信息");
+                throw new ServiceException("未查询到账户信息");
             }
             YbMdtrtCertType mdtrtCertType = YbMdtrtCertType.getByValue(account.getTypeCode());
             if (mdtrtCertType == null) {
-                throw new ServiceException("未查询到就诊凭证信息");
+                throw new ServiceException("未查询到就诊凭证信息");
             }
-            // 查询就诊id
+            // 查询就诊id
             if (contract.getCategoryEnum().equals(Category.SELF.getValue())
                 || contract.getCategoryEnum().equals(Category.PUBLIC.getValue())) {
                 medical3506Param.setMdtrtSn(encounter.getBusNo());
@@ -2145,17 +2145,17 @@ public class YbParamBuilderUtil {
                     medical3506Param.setMdtrtSn(one.getMdtrtId());
                 }
             }
-            // 判断拆零标志
+            // 判断拆零标志
             Whether flag;
             if (deviceDefinition.getSalesUnitCode().equals(deviceDispense.getUnitCode())) {
                 flag = Whether.NO;
             } else {
                 flag = Whether.YES;
             }
-            // 查询发票信息
+            // 查询发票信息
             Invoice invoice = iInvoiceService.getById(paymentReconciliation.getInvoiceId());
             if (invoice == null) {
-                throw new ServiceException("未查询到发票信息");
+                throw new ServiceException("未查询到发票信息");
             }
             medical3506Param.setMedListCodg(deviceDefinition.getYbNo()).setTrdnFlag(flag.getCode())
                 .setFixmedinsBchno(inventoryItem.getLotNumber()).setFixmedinsHilistId(deviceDefinition.getBusNo())
@@ -2167,25 +2167,25 @@ public class YbParamBuilderUtil {
                 .setRxFlag(deviceDefinition.getRxFlag().toString()).setExpyEnd(inventoryItem.getExpirationDate());
 
         } else if (type != YbListType.MEDICAL_SERVICE_ITEM) {
-            // 药品的相关处理
+            // 药品的相关处理
             MedicationDispense medicationDispense = iMedicationDispenseService.getById(id);
             if (medicationDispense == null) {
-                throw new ServiceException("未查询到药品信息");
+                throw new ServiceException("未查询到药品信息");
             }
             if (medicationDispense.getStatusEnum() != DispenseStatus.REFUNDED.getValue()) {
-                throw new ServiceException("未退药");
+                throw new ServiceException("未退药");
             }
             MedicationRequest medicationRequest = iMedicationRequestService.getById(medicationDispense.getMedReqId());
             if (medicationRequest == null) {
-                throw new ServiceException("未查询到药品信息");
+                throw new ServiceException("未查询到药品信息");
             }
             MedicationDefinition medicationDefinition =
                 iMedicationDefinitionService.getById(medicationDispense.getMedicationId());
             if (medicationDefinition == null) {
-                throw new ServiceException("未查询到药品信息");
+                throw new ServiceException("未查询到药品信息");
             }
 
-            // 查询库存信息
+            // 查询库存信息
             InventoryItem inventoryItem = inventoryItemService.getOne(new LambdaQueryWrapper<InventoryItem>()
                 .eq(InventoryItem::getLotNumber, medicationDispense.getLotNumber())
                 .eq(InventoryItem::getLocationId, medicationDispense.getLocationId())
@@ -2193,9 +2193,9 @@ public class YbParamBuilderUtil {
                 .eq(InventoryItem::getItemId, medicationDispense.getMedicationId())
                 .eq(InventoryItem::getTenantId, tenantId));
             if (inventoryItem == null) {
-                throw new ServiceException("未查询到库存信息");
+                throw new ServiceException("未查询到库存信息");
             }
-            // 查询供应申请单 2025/04/18经在微信群中确认，仅能通过locid，lotnumber，定义id定位库存记录，无法继续准确追到供应请求
+            // 查询供应申请单 2025/04/18经在微信群中确认，仅能通过locid，lotnumber，定义id定位库存记录，无法继续准确追到供应请求
             SupplyRequest supplyRequest = iSupplyRequestService.getOne(new LambdaQueryWrapper<SupplyRequest>()
                 .eq(SupplyRequest::getLotNumber, medicationDispense.getLotNumber())
                 .eq(SupplyRequest::getPurposeLocationId, medicationDispense.getLocationId())
@@ -2203,27 +2203,27 @@ public class YbParamBuilderUtil {
                 .eq(SupplyRequest::getItemId, medicationDispense.getMedicationId())
                 .eq(SupplyRequest::getTenantId, tenantId));
             if (supplyRequest == null) {
-                throw new ServiceException("未查询到供应信息");
+                throw new ServiceException("未查询到供应信息");
             }
-            // 查询开方医生姓名
+            // 查询开方医生姓名
             Practitioner practitioner = iPractitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
                 .eq(Practitioner::getUserId, medicationRequest.getPractitionerId())
                 .eq(Practitioner::getTenantId, tenantId));
-            // 查询当前登录用户的姓名(药师)
+            // 查询当前登录用户的姓名(药师)
             Practitioner medDoctor = iPractitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
                 .eq(Practitioner::getUserId, SecurityUtils.getUserId()).eq(Practitioner::getTenantId, tenantId));
-            // 查询发药人
+            // 查询发药人
             Practitioner performer = iPractitionerService.getOne(new LambdaQueryWrapper<Practitioner>()
                 .eq(Practitioner::getUserId, medicationDispense.getPractitionerId())
                 .eq(Practitioner::getTenantId, tenantId));
-            // 查询费用结算信息
+            // 查询费用结算信息
             ChargeItem chargeItem = iChargeItemService.getOne(new LambdaQueryWrapper<ChargeItem>()
                 .eq(ChargeItem::getServiceTable, CommonConstants.TableName.MED_MEDICATION_REQUEST)
                 .eq(ChargeItem::getServiceId, medicationRequest.getId()).eq(ChargeItem::getTenantId, tenantId));
             if (chargeItem == null) {
-                throw new ServiceException("未查询到收费信息");
+                throw new ServiceException("未查询到收费信息");
             }
-            // 查询付款信息
+            // 查询付款信息
             PaymentReconciliation paymentReconciliation =
                 iPaymentReconciliationService.getOne(new LambdaQueryWrapper<PaymentReconciliation>()
                     .eq(PaymentReconciliation::getEncounterId, chargeItem.getEncounterId())
@@ -2233,31 +2233,31 @@ public class YbParamBuilderUtil {
                     .eq(PaymentReconciliation::getPatientId, chargeItem.getPatientId())
                     .eq(PaymentReconciliation::getPaymentEnum, PaymentType.PAY.getValue()));
             if (paymentReconciliation == null) {
-                throw new ServiceException("未查询到付款信息");
+                throw new ServiceException("未查询到付款信息");
             }
-            // 查询合同实体
+            // 查询合同实体
             Contract contract = iContractService.getOne(
                 new LambdaQueryWrapper<Contract>().eq(Contract::getBusNo, paymentReconciliation.getContractNo()));
             if (contract == null) {
-                throw new ServiceException("未查询到合同信息");
+                throw new ServiceException("未查询到合同信息");
             }
-            // 查询就诊信息
+            // 查询就诊信息
             Encounter encounter = iEncounterService.getById(medicationDispense.getEncounterId());
             if (encounter == null) {
-                throw new ServiceException("未查询到就诊信息");
+                throw new ServiceException("未查询到就诊信息");
             }
-            // 查询账户信息
+            // 查询账户信息
             Account account = accountService
                 .getOne(new LambdaQueryWrapper<Account>().eq(Account::getEncounterId, chargeItem.getEncounterId())
                     .eq(Account::getTenantId, tenantId).eq(Account::getEncounterFlag, Whether.YES.getValue()));
             if (account == null) {
-                throw new ServiceException("未查询到账户信息");
+                throw new ServiceException("未查询到账户信息");
             }
             YbMdtrtCertType mdtrtCertType = YbMdtrtCertType.getByValue(account.getTypeCode());
             if (mdtrtCertType == null) {
-                throw new ServiceException("未查询到就诊凭证信息");
+                throw new ServiceException("未查询到就诊凭证信息");
             }
-            // 查询就诊id
+            // 查询就诊id
             if (contract.getCategoryEnum().equals(Category.SELF.getValue())
                 || contract.getCategoryEnum().equals(Category.PUBLIC.getValue())) {
                 medical3506Param.setMdtrtSn(encounter.getBusNo());
@@ -2269,19 +2269,19 @@ public class YbParamBuilderUtil {
                     medical3506Param.setMdtrtSn(one.getMdtrtId());
                 }
             }
-            // 判断拆零标志
+            // 判断拆零标志
             Whether flag;
             if (medicationDefinition.getDefEncounterUnitCode().equals(medicationDispense.getUnitCode())) {
                 flag = Whether.NO;
             } else {
                 flag = Whether.YES;
             }
-            // 查询发票信息
+            // 查询发票信息
             Invoice invoice = iInvoiceService.getById(paymentReconciliation.getInvoiceId());
             if (invoice == null) {
-                throw new ServiceException("未查询到发票信息");
+                throw new ServiceException("未查询到发票信息");
             }
-            // todo：sjq 商品销售的数量是根据是否拆零计算出来的数量吗？
+            // todo：sjq 商品销售的数量是根据是否拆零计算出来的数量吗？
             medical3506Param.setMedListCodg(medicationDefinition.getYbNo())
                 .setFixmedinsBchno(inventoryItem.getLotNumber()).setFixmedinsHilistId(medicationDefinition.getBusNo())
                 .setFixmedinsHilistName(CommonConstants.TableName.ADM_DEVICE_DEFINITION)
@@ -2295,20 +2295,20 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * 【3507】商品信息删除参数
+     * 【3507】商品信息删除参数
      * 
-     * @param id 库存项目id
-     * @param invDataType 进销存类型
-     * @return 3507参数
+     * @param id 库存项目id
+     * @param invDataType 进销存类型
+     * @return 3507参数
      */
     public Medical3507Param getMedical3507Param(Long id, String invDataType) {
         InventoryItem inventoryItem = inventoryItemService.getById(id);
         if (inventoryItem == null) {
-            throw new ServiceException("未查询到库存信息");
+            throw new ServiceException("未查询到库存信息");
         }
         YbInvDataType dataType = YbInvDataType.getByValue(invDataType);
         if (dataType == null) {
-            throw new ServiceException("未查询进销存类型");
+            throw new ServiceException("未查询进销存类型");
         }
         Medical3507Param medical3507Param = new Medical3507Param();
         medical3507Param.setFixmedinsBchno(inventoryItem.getLotNumber()).setInvDataType(dataType.getValue());
@@ -2316,10 +2316,10 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * 【9001】签到
+     * 【9001】签到
      *
-     * @param id 员工id
-     * @return 9001参数
+     * @param id 员工id
+     * @return 9001参数
      */
     public Sign getSignParam(Long id, String mac) {
         Practitioner practitioner = iPractitionerService.getPractitionerByUserId(id);
@@ -2333,10 +2333,10 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * 【3209A】查询跨省三方对账未成功数据(吉林省)
+     * 【3209A】查询跨省三方对账未成功数据(吉林省)
      * 
-     * @param settlement3209AWebParam 前台参数
-     * @return 3209A参数
+     * @param settlement3209AWebParam 前台参数
+     * @return 3209A参数
      */
     public FinancialSettlement3209AParam
         getFinancialSettlement3209AParam(Settlement3209AWebParam settlement3209AWebParam) {
@@ -2346,10 +2346,10 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * 【13203】医药机构费用结算日对账结果查询
+     * 【13203】医药机构费用结算日对账结果查询
      * 
-     * @param financial13203WebParam 13203 前台参数
-     * @return 13203参数
+     * @param financial13203WebParam 13203 前台参数
+     * @return 13203参数
      */
     public Financial13203Param getFinancial13203Param(Financial13203WebParam financial13203WebParam) {
         Financial13203Param financial13203Param = new Financial13203Param();
@@ -2358,9 +2358,9 @@ public class YbParamBuilderUtil {
     }
 
     /**
-     * 基础信息获取
+     * 基础信息获取
      * 
-     * @return 基础信息
+     * @return 基础信息
      */
     public BaseInfo getBaseInfo(JsonNode jsonObj, Contract contract) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -2373,7 +2373,7 @@ public class YbParamBuilderUtil {
         if (jsonObj != null && jsonObj.get("filePath") != null) {
             baseInfo.setFilePath(String.valueOf(jsonObj.get("filePath")));
         }
-        // 异地患者问题
+        // 异地患者问题
         // if (contract.getBusNo() != null) {
         // baseInfo.setInsuplcAdmdvs(contract.getBusNo());
         // }
@@ -2382,7 +2382,7 @@ public class YbParamBuilderUtil {
         } else {
             baseInfo.setDecryptFlag("1");
         }
-        // 电子处方
+        // 电子处方
         // var optionJson = SecurityUtils.getLoginUser().getOptionJson();
 
         if (contract == null) {
@@ -2391,7 +2391,7 @@ public class YbParamBuilderUtil {
             if (max.isPresent()) {
                 contract = max.get();
             } else {
-                throw new ServiceException("没有对合同进行优先级排序");
+                throw new ServiceException("没有对合同进行优先级排序");
             }
         }
 
@@ -2404,33 +2404,33 @@ public class YbParamBuilderUtil {
     }
 
     public BaseInfo getBaseInfo(String medType, String dutyDoctorName) {
-        // 随机获取一个合同
+        // 随机获取一个合同
         List<Contract> contractListByYb = iContractService.getContractListByYb();
         if (contractListByYb.isEmpty()) {
-            throw new ServiceException("无医保配置信息");
+            throw new ServiceException("无医保配置信息");
         }
         Contract contract = contractListByYb.get(0);
         LoginUser loginUser = SecurityUtils.getLoginUser();
         Long hospitalId = loginUser.getHospitalId();
         Organization hospital = iOrganizationService.getById(hospitalId);
         BaseInfo baseInfo = new BaseInfo();
-        // 电子处方
+        // 电子处方
         var optionJson = SecurityUtils.getLoginUser().getOptionJson();
-        String prePrvKey = optionJson.path(CommonConstants.Option.APP_PRVKEY).asText();
+        String prePrvKey = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.APP_PRVKEY);
         String prePubKey = contract.getCliPubKey();
         String clientId = contract.getClientId();
-        String eleAddress = optionJson.path(CommonConstants.Option.ELE_ADDRESS).asText();
+        String eleAddress = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.ELE_ADDRESS);
         String username = contract.getUsername();
         String password = contract.getPassword();
         String scope = contract.getScope();
         String grantType = contract.getGrantType();
         String clientSecret = contract.getClientSecret();
-        String time = optionJson.path(CommonConstants.Option.TIME).asText();
-        String preAppId = optionJson.path(CommonConstants.Option.PRE_APP_ID).asText();
-        String preAppSecret = optionJson.path(CommonConstants.Option.PRE_APP_SECRET).asText();
-        String templatePath = optionJson.path(CommonConstants.Option.TEMPLATE_PATH).asText();
-        String outputPath = optionJson.path(CommonConstants.Option.OUTPUT_PATH).asText();
-        String hospitalSealPath = optionJson.path(CommonConstants.Option.HOSPITAL_SEAL_PATH).asText();
+        String time = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.TIME);
+        String preAppId = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.PRE_APP_ID);
+        String preAppSecret = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.PRE_APP_SECRET);
+        String templatePath = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.TEMPLATE_PATH);
+        String outputPath = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.OUTPUT_PATH);
+        String hospitalSealPath = SecurityUtils.getLoginUser().getOptionJsonValue(CommonConstants.Option.HOSPITAL_SEAL_PATH);
 
         return baseInfo.setUserId(loginUser.getUserId()).setRealname(loginUser.getUsername())
             .setAdmvs(contract.getAdmVs()).setFixmedinsCode(contract.getFixmedinsCode())