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

sql/迁移记录-DB变更记录/0000add_table__MigrationsHistory迁移记录表,在初始化脚本执行完成后执行.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/0000清库脚本.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/2025-11-19 ALTER TABLE PUBLIC.doc_statistics ADD COLUMN definition_id.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/2025-11-21 ALTER TABLE public.doc_statistics ADD COLUMN time_point.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/2025-12-30 add_column_sys_notice_priority.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/2025-12-30 add_column_sys_notice_publish_status.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/2025-12-30 add_table_sys_notice_read.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/2025-12-31 add_tenant_id_to_cli_surgery.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250104_update_cli_surgery_tenant_id.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250105_add_apply_doctor_dept_name_simple.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250105_add_apply_doctor_dept_name_to_cli_surgery.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250105_add_columns_dept_appointment_hours.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250106_insert_test_data_dept_appointment_hours.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202509021111add_table_doc_order_process.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202509021111add_table_doc_template.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202507311413 yb_inpatient_info_recorde.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202507311518 yb_inpatient_cancel_fee_detail.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202507311620 yb_inpatient_pre_settle.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202507311706 wor_aut_supply_request.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508011023 yb_inpatient_un_settle.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508011250 yb_inpatient_un_discharge.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508011421 yb_inpatient_un_reg.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508011554 adm_device_definition.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508060915 wor_service_request.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508081428 med_medication_request.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508081554 fin_payment_rec_static.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508081601 fin_payment_rec_static.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508110809 med_medication_request.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508111126 wor_service_request.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508111427 cli_procedure.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508111501 med_medication_request.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508111526 wor_service_request.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508120915 wor_supply_delivery.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508151030 med_medication_dispense.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508171145 doc_request_form.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508181333 doc_definition.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508181410 doc_definition_organization.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508190837 med_medication_dispense.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508191056 wor_device_dispense.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508191408 wor_supply_delivery.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508191539 cli_procedure.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508201044 adm_frequency.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508211125 cli_procedure.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508221059 doc_record.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508221231 doc_record_log.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508221455 频次菜单路由.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508261129 adm_encounter.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202508261536 adm_patient.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202509011447 doc_statistics_definition.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202509011634 doc_statistics_definition_option.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/20250902前变更记录/202509011722 doc_template.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202509031200add_table_doc_statistics.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202509031300alter_table_doc_statistics_definiton.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202509040915alter_table_xx_request.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202509041015add_column_wor_service_request.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202509041017 insert_sys_menu.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202509081020add_table_tmp_orders_group_package.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202509081022add_table_tmp_orders_group_package_detail.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202509101025add_column_adm_practitioner.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202509101030add_column_wor_service_request.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202509161311 add_column_cli_reservation_record.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202509180852 add_column_wor_device_dispense.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202509191411 add_column_tmp_activity_device.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202509231011 add_table_nd_review_prescription_records.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202509261212 add_column _doc_statistics_definition.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202510131311 add_column_elep_medication_request.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202510131411 add_column_adm_charge_item.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202510151011 alter_table_request.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202510151413 add_talble_cli_condition_no_definition.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202510211012 add_column_tmp_orders_group_package_detail.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202510211414 add_column_med_medication_dispense.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202510211414 alter_table_med_medication_dispense.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202510211511 alter_column_wor_supply_delivery.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202510221011 add_column_tmp_orders_group_package_detail.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202510271011 add_column_ med_medication_definition&med_medication_request.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202510271311 add_column_requests.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202510281101 add_column_adm_practitioner.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202510301113 add_column adm_healthcare_service.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202511031415 add_column tmp_orders_group_package_detail.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202511031515 add_column adm_charge_item.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202511041214 add_table doc_inventory_item_static.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202511051215 add_table adm_change_price_record.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202511061215 ALTER TABLE sys_oper_log.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202511131215 add_table doc_inventory_item_static.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202511171215 add_table tmp_encounter_auto_roll.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202511191103 ALTER TABLE PUBLIC.doc_record ADD COLUMN print_count.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202511191303 alter_table doc_statistics_definition.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202511191403 alter_table doc_statistics.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202511201011 alter_table doc_inventory_item_static.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202511201214 alter_table wor_inventory_item.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202511201516 alter_table tmp_encounter_auto_roll.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202511211515 alter_table doc_statistics.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202511211815 alter_table doc_statistics.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202511221516 alter_table cli_allergy_intolerance.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202511271311 alter_table adm_organization_location.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202511281422 inset_sys_menu.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202512020818 add_column_adm_charge_item.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202512041212 add_table fin_three_part_pay_call_back.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202512121015 add_column _wor_supply_request.sql Normal file → Executable file

0

sql/迁移记录-DB变更记录/202512131015 add_column_adm_charge_item_defintion.sql Normal file → Executable file

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