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

Browse Source

当手术计费弹窗中点击"签发"耗材时，因耗材的locationId（发放库房）为空导致后端异常。
在DoctorStationAdviceAppServiceImpl.handDevice方法中，当locationId为null时，使用登录用户的科室ID作为默认值，
与NurseBillingAppService中的处理方式保持一致。

...

This commit is contained in:

张飞

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

parent 06f257f4be

commit 9c3e603b94

5424 changed files with 9 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

.config/zentao/.env Normal file → Executable file

0

.gitattributes vendored Normal file → Executable file

0

.gitignore vendored Normal file → Executable file

0

.openclaw/workspace-state.json Normal file → Executable file

0

.qwen/agents/full-stack-developer.md Normal file → Executable file

0

.qwen/agents/his-architect-developer.md Normal file → Executable file

0

.qwen/agents/his-developer-architect.md Normal file → Executable file

0

.qwen/settings.json Normal file → Executable file

0

AGENTS.md Normal file → Executable file

0

BUGFIX_ANALYSIS.md Normal file → Executable file

0

BUGFIX_PLAN.md Normal file → Executable file

0

BUG_355_ANALYSIS.md Normal file → Executable file

0

BUG_355_FIX.md Normal file → Executable file

0

BUG_355_FIX_NOTES.md Normal file → Executable file

0

BUG_362_ANALYSIS.md Normal file → Executable file

0

BUG_362_FIX_COMPLETE.md Normal file → Executable file

0

BUG_364_362_ANALYSIS.md Normal file → Executable file

0

BUG_364_362_FIX.md Normal file → Executable file

0

BUG_FIX_PROGRESS.md Normal file → Executable file

0

BUG_FIX_SUMMARY.md Normal file → Executable file

0

GIT_TEST.md Normal file → Executable file

0

GIT_TEST_CHENLIN.md Normal file → Executable file

0

GIT_TEST_GUANYU.md Normal file → Executable file

0

GIT_TEST_ZHANGFEI.md Normal file → Executable file

0

GIT_TEST_ZHUGELIANG.md Normal file → Executable file

0

HEARTBEAT.md Normal file → Executable file

0

IDENTITY.md Normal file → Executable file

0

SOUL.md Normal file → Executable file

0

TEST.md Normal file → Executable file

0

TEST2.md Normal file → Executable file

0

TOMORROW_TODO.md Normal file → Executable file

0

TOOLS.md Normal file → Executable file

0

USER.md Normal file → Executable file

0

ZENTAO_BUG_UPDATE.md Normal file → Executable file

0

ZHAOYUN_PROGRESS.md Normal file → Executable file

0

ZHAOYUN_TEST.md Normal file → Executable file

0

claude-test.txt Normal file → Executable file

0

docs/specs/backend-checklist.md Normal file → Executable file

0

docs/specs/cicd-gatekeeper.md Normal file → Executable file

0

docs/specs/commit-template.md Normal file → Executable file

0

docs/specs/frontend-checklist.md Normal file → Executable file

0

docs/specs/his-release-checklist-v1.0.md Normal file → Executable file

0

docs/specs/playwright-e2e-testing-plan.md Normal file → Executable file

0

g.txt Normal file → Executable file

0

git_test3.md Normal file → Executable file

0

git_test4.md Normal file → Executable file

0

gitea_test_huatuo.txt Normal file → Executable file

0

gitea_test_xunyu.txt Normal file → Executable file

0

md/BUG_ANALYSIS.md Normal file → Executable file

0

md/前端UI规范文档.md Normal file → Executable file

0

md/需求/100-门诊手术中临时医嘱生成界面PRD_2026-1-23.md Normal file → Executable file

0

md/需求/102-门诊医生站传染病报告卡登记-2026-1-28.md Normal file → Executable file

0

md/需求/103-医生个人报卡管理界面-2026-1-29.md Normal file → Executable file

0

md/需求/104-报卡管理界面_2026-02-05.md Normal file → Executable file

0

md/需求/94-手术室维护界面_2026-1-9.md Normal file → Executable file

0

md/需求/95-门诊医生站开立会诊申请单界面PRD_2026-01-15.md Normal file → Executable file

0

md/需求/96-门诊医生站会诊申请确认界面_2026-01-15.md Normal file → Executable file

0

md/需求/97-门诊会诊申请管理界面_2026-1-19.md Normal file → Executable file

0

md/需求/99-门诊手术中计费界面PRD_2026-1-22.md Normal file → Executable file

0

md/需求/media/2756f39fb624c7f686d56b675b4d4d10.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 224 KiB After Width:  |  Height:  |  Size: 224 KiB

0

md/需求/media/4fa3fca6b8362de7b938ded77d6e4982.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 219 KiB After Width:  |  Height:  |  Size: 219 KiB

0

md/需求/media/clip_image001.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 268 KiB After Width:  |  Height:  |  Size: 268 KiB

0

md/需求/media/e577cd26f9a82835f3ac3690259eb357.png Normal file → Executable file

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 216 KiB After Width:  |  Height:  |  Size: 216 KiB

0

openhis-server-new/.gitignore vendored Normal file → Executable file

0

openhis-server-new/LICENSE Normal file → Executable file

0

openhis-server-new/com/openhis/tool/DatabaseFieldAdder.java Normal file → Executable file

0

openhis-server-new/core-admin/pom.xml Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CaptchaController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CommonController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/FileUploadController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/FrontRouterController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/CacheController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/ServerController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysLogininforController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysOperlogController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysUserOnlineController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysConfigController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDeptController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictDataController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictTypeController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysIndexController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysLoginController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysMenuController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysNoticeController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysPostController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysProfileController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysRegisterController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysRoleController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysTenantController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysTenantOptionController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysUserController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysVersionController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/controller/tool/TestController.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/core/config/SwaggerConfig.java Normal file → Executable file

0

openhis-server-new/core-admin/src/main/java/com/core/web/util/TenantOptionUtil.java Normal file → Executable file

0

openhis-server-new/core-common/pom.xml Normal file → Executable file

0

openhis-server-new/core-common/src/main/java/com/core/common/annotation/Anonymous.java Normal file → Executable file

0

openhis-server-new/core-common/src/main/java/com/core/common/annotation/DataScope.java Normal file → Executable file

0

openhis-server-new/core-common/src/main/java/com/core/common/annotation/DataSource.java Normal file → Executable file

0

openhis-server-new/core-common/src/main/java/com/core/common/annotation/Excel.java Normal file → Executable file

Some files were not shown because too many files have changed in this diff Show More