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

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

0

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

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/OperLogAspect.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/YbCommonConstants.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AcceptanceResult.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountBillingStatus.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountStatus.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AccountType.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActPriority.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActivityDefCategory.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ActivityType.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdmissionMethod.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdmissionType.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AdviceOpType.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AnesthesiaTypeEnum.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ApplicableScope.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BindingType.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeABO.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeRH.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CallType.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CatalogType.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Category.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CategoryType.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemContext.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemEnum.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemStatus.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClaimType.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClaimUse.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ClinicalStatus.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionCategory.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionClinicalStatus.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionCode.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionDefinitionSource.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionSeverity.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ConditionVerificationStatus.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ContractCategory.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ContrastTypeEnum.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/Criticality.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DbOpType.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DeviceSafety.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DeviceStatus.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DiagnosisCertainty.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DispenseStatus.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocDefinitionEnum.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocPermissionEnum.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocStatisticsDefinitionTypeEnum.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocStatusEnum.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocTypeEnum.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/DocUseRangeEnum.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EducationLevel.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ElePrescriptionType.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterActivityStatus.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterClass.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterStatus.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterSubjectStatus.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterType.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterYbClass.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EncounterZyStatus.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/EventStatus.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FamilyRelationshipType.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FeeTypeClass.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FinCategory.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FinancialResourceStatus.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/FrequencyType.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GenerateSource.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfApplicationStatus.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfApprovalRole.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfItemType.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/GfRatioType.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/HealingLevelEnum.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/HisEnumInterface.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/HospitalCodeEnum.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IdentifierStatusEnum.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IdentityDocumentType.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/IncisionLevelEnum.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InstrumentCategory.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InstrumentStatus.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InsuranceLevel.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InventoryType.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InvoiceStatus.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/InvoiceType.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ItemCategoryCode.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ItemType.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationBedStatus.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationForm.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationMode.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationOperational.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/LocationStatus.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MaritalStatus.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MedCategoryCode.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/MedicalRecordStatus.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReason.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReasonEnum.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/NursingOrdersClass.java Normal file → Executable file

0

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ObservationType.java Normal file → Executable file

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