Fix Bug #443: 手术计费:点击签发耗材时异常报错
当手术计费弹窗中点击"签发"耗材时,因耗材的locationId(发放库房)为空导致后端异常。 在DoctorStationAdviceAppServiceImpl.handDevice方法中,当locationId为null时,使用登录用户的科室ID作为默认值, 与NurseBillingAppService中的处理方式保持一致。
This commit is contained in:
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChangePriceService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChangePriceService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChargeBillService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChargeBillService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IEleInvoiceService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IEleInvoiceService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IPaymentRecService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IPaymentRecService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/ThreePartPayService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/ThreePartPayService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ChangePriceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ChangePriceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ThreePartPayServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ThreePartPayServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ChargeBillController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ChargeBillController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/EleInvoiceController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/EleInvoiceController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentContractController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentContractController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ThreePartPayController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ThreePartPayController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentInpatientDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentInpatientDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelRegPaymentDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelRegPaymentDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChangePriceListDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChangePriceListDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDetailVO.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDetailVO.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemExtendInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemExtendInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemGroupDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemGroupDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeSummaryDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeSummaryDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2206OrderResultDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2206OrderResultDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/DispenseQuantityDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/DispenseQuantityDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvioceBillDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvioceBillDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceChargeDetailDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceChargeDetailDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceListDetailDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceListDetailDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePatientInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePatientInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePaymentInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePaymentInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceResultDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceResultDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleResultDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleResultDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceBaseInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceBaseInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceWriteOffDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceWriteOffDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/MakeInvoiceDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/MakeInvoiceDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/NenuBpcPayDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/NenuBpcPayDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/OrgIncomeDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/OrgIncomeDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentSettleDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentSettleDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentVO.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentVO.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReportVo.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReportVo.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReturnBillVO.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReturnBillVO.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartCallBackVo.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartCallBackVo.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartCompareDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartCompareDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartComparePaymentDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartComparePaymentDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartCompareRequestDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartCompareRequestDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChangePriceMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChangePriceMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChargeBillMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChargeBillMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/EleInvoiceMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/EleInvoiceMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/PaymentMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/PaymentMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ThreePartPayMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ThreePartPayMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/util/MD5Util.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/util/MD5Util.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/util/ReverseMappingProperties.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/util/ReverseMappingProperties.java
Normal file → Executable file
Reference in New Issue
Block a user