guanyu 0a777ee700 Fix Bug #491: 【执行科室配置】保存配置时系统报错 ...

根因：时间冲突检查中 organizationService.getById() 返回 null 时直接调用 getName() 导致 NPE；
同时 getOrgLocListByOrgIdAndActivityDefinitionId 方法只按 activityDefinitionId 查询，未按 organizationId 过滤，
导致跨科室误判冲突且可能查询到已删除机构的脏数据。

修复：
1. 增加 org.getName() 前的双重判空（org != null && org.getName() != null）
2. getOrgLocListByOrgIdAndActivityDefinitionId 增加 organizationId 参数并加入查询条件

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

2026-05-17 19:22:27 +08:00

.analysis

Fix Bug #403: 住院医生工作站：应用医嘱组套后，药品明细字段内容丢失未正确引入表格

2026-05-16 11:57:54 +08:00

.config/zentao

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

.openclaw

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

.qwen

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

backup

Fix: #333/#335/#336 添加医嘱保存参数校验

2026-04-08 23:12:24 +08:00

docs

Fix Bug #498: 补充修复结果到分析报告

2026-05-17 13:16:02 +08:00

his-repo @ 414c204578

Fix Bug #445: update submodule his-repo to latest

2026-05-08 09:32:40 +08:00

his-source @ 7827e58aac

Fix: #333/#335/#336 添加医嘱保存参数校验

2026-04-08 23:12:24 +08:00

logs

Fix Bug #497: 【住院医生工作站-检查申请】检查申请列表缺失“申请单状态”列及全流程闭环状态流转逻辑

2026-05-10 10:25:35 +08:00

md

Fix Bug #444: 根因+修复方案摘要

2026-05-17 19:11:25 +08:00

openhis-server-new

Fix Bug #491: 【执行科室配置】保存配置时系统报错

2026-05-17 19:22:27 +08:00

openhis-ui-vue3

Fix Bug #469: [住院医生工作站-检验申请] 操作列"详情"按钮未包裹在条件分支中导致始终显示

2026-05-17 19:17:32 +08:00

scripts

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

sql

Fix Bug #462: [目录管理-诊疗目录] 编辑弹窗中"所需标本"下拉框数据加载失败，显示为"无数据"

2026-05-16 18:17:22 +08:00

.gitattributes

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

.gitignore

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

AGENTS.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

ANALYSIS_433.md

Fix Bug #433: 门诊手术安排：编辑弹窗内"麻醉方法"回显为代码且"外请专家姓名"数据未加载

2026-05-16 12:17:15 +08:00

ANALYSIS_434.md

Fix Bug #434: 根因+修复方案摘要

2026-05-16 12:51:11 +08:00

ANALYSIS.md

Fix Bug #428: 根因+修复方案摘要

2026-05-16 12:11:12 +08:00

bug432_analysis.md

Fix Bug #432: 门诊手术安排：新增手术安排保存时报错 - 根因+修复方案

2026-05-16 12:20:06 +08:00

bug461_analysis.md

Fix Bug #468: 根因+修复方案摘要

2026-05-17 19:17:32 +08:00

bug468_analysis.md

Fix Bug #491: 根因+修复方案摘要

2026-05-17 19:22:27 +08:00

bug491_analysis.md

Fix Bug #491: 【执行科室配置】保存配置时系统报错

2026-05-17 19:22:27 +08:00

BUG516_ANALYSIS.md

Fix Bug #516: 根因+修复方案摘要

2026-05-17 13:48:43 +08:00

BUG_355_ANALYSIS.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

BUG_355_FIX_NOTES.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

BUG_355_FIX.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

BUG_362_ANALYSIS.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

BUG_362_FIX_COMPLETE.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

BUG_364_362_ANALYSIS.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

BUG_364_362_FIX.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

BUG_401_ANALYSIS.md

Fix Bug #444: 根因+修复方案摘要

2026-05-17 18:12:30 +08:00

BUG_426_ANALYSIS.md

Fix Bug #428: 根因+修复方案摘要

2026-05-16 16:41:37 +08:00

BUG_428_ANALYSIS.md

Fix Bug #428: 门诊医生站-检查申请：未实现分类联动检查方法及套餐明细展示与勾选逻辑

2026-05-16 17:11:04 +08:00

BUG_470_ANALYSIS.md

Fix Bug #470: 住院医生工作站-手术申请单加载手术项目添加Redis缓存+修复loading状态

2026-05-16 14:18:55 +08:00

BUG_472_ANALYSIS.md

Fix Bug #476: 根因+修复方案摘要

2026-05-16 14:55:05 +08:00

BUG_497_ANALYSIS.md

Fix Bug #497: 【住院医生工作站-检查申请】检查申请列表缺失状态列——动态计算状态修复

2026-05-17 13:18:53 +08:00

BUG_FIX_PROGRESS.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

BUG_FIX_SUMMARY.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

BUGFIX_ANALYSIS.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

BUGFIX_PLAN.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

claude-test.txt

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

g.txt

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

git_test3.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

git_test4.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

GIT_TEST_CHENLIN.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

GIT_TEST_GUANYU.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

GIT_TEST_ZHANGFEI.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

GIT_TEST_ZHUGELIANG.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

GIT_TEST.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

gitea_test_huatuo.txt

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

gitea_test_xunyu.txt

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

HEARTBEAT.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

IDENTITY.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

package-lock.json

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

package.json

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

SOUL.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

TEST2.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

test-acp.txt

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

test-liubei-gitea.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

test-password.txt

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

TEST.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

TOMORROW_TODO.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

TOOLS.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

USER.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

zentao_api_example.py

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

zentao_api.sh

fix: Bug#362 添加入科时间字段并修正显示

2026-04-09 01:20:52 +08:00

ZENTAO_BUG_UPDATE.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

ZHAOYUN_PROGRESS.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

ZHAOYUN_TEST.md

Fix Bug #443: 手术计费：点击签发耗材时异常报错

2026-05-08 09:14:18 +08:00

Description

No description provided

164 MiB

Languages

Java 49.4%

Vue 44.9%

JavaScript 4.6%

HTML 0.7%

SCSS 0.1%