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/document/domain/DocDefinition.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocDefinition.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocDefinitionOrganization.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocDefinitionOrganization.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocInventoryItemStatic.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocInventoryItemStatic.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocRecord.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocRecord.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatistics.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatistics.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinition.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinition.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinitionOption.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinitionOption.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocTemplate.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocTemplate.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/Emr.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/Emr.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrDetail.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrDetail.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrDict.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrDict.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrTemplate.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/EmrTemplate.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/OrderProcess.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/OrderProcess.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/RequestForm.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/RequestForm.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/VitalSigns.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/VitalSigns.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionOrganizationMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocDefinitionOrganizationMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocInventoryItemStaticMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocInventoryItemStaticMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocRecordMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocRecordMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsDefinitionMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsDefinitionMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsDefinitionOptionMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsDefinitionOptionMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocTemplateMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocTemplateMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDetailMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDetailMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDictMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrDictMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrTemplateMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/EmrTemplateMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/OrderProcessMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/OrderProcessMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/RequestFormMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/RequestFormMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/VitalSignsMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/VitalSignsMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocDefinitionOrganizationService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocDefinitionOrganizationService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocDefinitionService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocDefinitionService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocInventoryItemStaticService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocInventoryItemStaticService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocRecordService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocRecordService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsDefinitionOptionService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsDefinitionOptionService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsDefinitionService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsDefinitionService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocStatisticsService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocTemplateService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocTemplateService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrDetailService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrDetailService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrDictService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrDictService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrTemplateService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IEmrTemplateService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IOrderProcessService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IOrderProcessService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IRequestFormService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IRequestFormService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IVitalSignsService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IVitalSignsService.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionOrganizationServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionOrganizationServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocDefinitionServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocInventoryItemStaticServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocInventoryItemStaticServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocRecordServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocRecordServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionOptionServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionOptionServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsDefinitionServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocStatisticsServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocTemplateServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocTemplateServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDetailServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDetailServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDictServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrDictServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrTemplateServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/EmrTemplateServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/OrderProcessServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/OrderProcessServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/RequestFormServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/RequestFormServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/VitalSignsServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/VitalSignsServiceImpl.java
Normal file → Executable file
Reference in New Issue
Block a user