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/document/appservice/IDocDefinitionAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocDefinitionAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocRecordAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocRecordAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsDefinitionAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocStatisticsDefinitionAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocTemplateAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/IDocTemplateAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionAppServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocDefinitionAppServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocRecordAppServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocRecordAppServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsAppServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocStatisticsAppServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocTemplateAppServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/appservice/impl/DocTemplateAppServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocDefinitionController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocRecordController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocRecordController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsDefinitionController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocStatisticsDefinitionController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocTemplateController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/controller/DocTemplateController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DirectoryNode.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DirectoryNode.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitionDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitionDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitionOrganizationDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitionOrganizationDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitonParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocDefinitonParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientQueryParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordPatientQueryParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordQueryParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocRecordQueryParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionOptionDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionOptionDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionOptionList.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDefinitionOptionList.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsQueryParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocStatisticsQueryParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocTemplateDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocTemplateDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocTemplateQueryParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/DocTemplateQueryParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/OptionDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/OptionDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsBig.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsBig.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsOutput.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsOutput.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsSmall.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/dto/TrendChartsSmall.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocDefinitionAppMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocDefinitionAppMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocRecordAppMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocRecordAppMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocStatisticsDefinitionAppMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/mapper/DocStatisticsDefinitionAppMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/ConvertToDocStatistics.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/ConvertToDocStatistics.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/DocumentDirectoryProcessor.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/DocumentDirectoryProcessor.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/EnumUtil.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/EnumUtil.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/OperationDayCalculator.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/OperationDayCalculator.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/PermissionProcessor.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/document/util/PermissionProcessor.java
Normal file → Executable file
Reference in New Issue
Block a user