Fix Bug #443: 手术计费:点击签发耗材时异常报错
当手术计费弹窗中点击"签发"耗材时,因耗材的locationId(发放库房)为空导致后端异常。 在DoctorStationAdviceAppServiceImpl.handDevice方法中,当locationId为null时,使用登录用户的科室ID作为默认值, 与NurseBillingAppService中的处理方式保持一致。
This commit is contained in:
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/AllergyIntolerance.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/AllergyIntolerance.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionNoDefinition.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionNoDefinition.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/DiagnosisBelongBinding.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/DiagnosisBelongBinding.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Order.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Order.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ReservationRecord.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/ReservationRecord.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Surgery.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Surgery.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Ticket.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/Ticket.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/AllergyIntoleranceMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/AllergyIntoleranceMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionDefinitionMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionDefinitionMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionNoDefinitionMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ConditionNoDefinitionMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/DiagnosisBelongBindingMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/DiagnosisBelongBindingMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/OrderMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/OrderMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedureMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedureMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedurePerformerMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ProcedurePerformerMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ReservationRecordMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/ReservationRecordMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/SurgeryMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/SurgeryMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/TicketMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/TicketMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IAllergyIntoleranceService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IAllergyIntoleranceService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionDefinitionService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionDefinitionService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionNoDefinitionService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionNoDefinitionService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IDiagnosisBelongBindingService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IDiagnosisBelongBindingService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IOrderService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IOrderService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedurePerformerService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedurePerformerService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedureService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedureService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IReservationRecordService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IReservationRecordService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/ISurgeryService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/ISurgeryService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/ITicketService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/ITicketService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/AllergyIntoleranceServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/AllergyIntoleranceServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionDefinitionServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionDefinitionServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionNoDefinitionServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionNoDefinitionServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/DiagnosisBelongBindingServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/DiagnosisBelongBindingServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/OrderServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/OrderServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedurePerformerServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedurePerformerServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedureServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedureServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ReservationRecordServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ReservationRecordServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/SurgeryServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/SurgeryServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/TicketServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/TicketServiceImpl.java
Normal file → Executable file
Reference in New Issue
Block a user