Fix Bug #443: 手术计费:点击签发耗材时异常报错
当手术计费弹窗中点击"签发"耗材时,因耗材的locationId(发放库房)为空导致后端异常。 在DoctorStationAdviceAppServiceImpl.handDevice方法中,当locationId为null时,使用登录用户的科室ID作为默认值, 与NurseBillingAppService中的处理方式保持一致。
This commit is contained in:
0
openhis-server-new/core-flowable/pom.xml
Normal file → Executable file
0
openhis-server-new/core-flowable/pom.xml
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/common/constant/ProcessConstants.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/common/constant/ProcessConstants.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/common/enums/FlowComment.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/common/enums/FlowComment.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/common/expand/el/BaseEl.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/common/expand/el/BaseEl.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/common/expand/el/FlowEl.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/common/expand/el/FlowEl.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/config/FlowableConfig.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/config/FlowableConfig.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowDefinitionController.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowDefinitionController.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowInstanceController.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowInstanceController.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowTaskController.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/FlowTaskController.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysExpressionController.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysExpressionController.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysFormController.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysFormController.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysListenerController.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/controller/SysListenerController.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowCommentDto.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowCommentDto.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowFromFieldDTO.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowFromFieldDTO.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowNextDto.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowNextDto.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowSaveXmlVo.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowSaveXmlVo.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowTaskDto.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowTaskDto.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowViewerDto.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/dto/FlowViewerDto.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowQueryVo.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowQueryVo.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowTaskVo.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/FlowTaskVo.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/ReturnTaskNodeVo.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/domain/vo/ReturnTaskNodeVo.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/factory/FlowServiceFactory.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/factory/FlowServiceFactory.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramCanvas.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramCanvas.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramGenerator.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/CustomProcessDiagramGenerator.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/FindNextNodeUtil.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/FindNextNodeUtil.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/FlowableUtils.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/flow/FlowableUtils.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/listener/FlowExecutionListener.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/listener/FlowExecutionListener.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/listener/FlowTaskListener.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/listener/FlowTaskListener.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowDefinitionService.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowDefinitionService.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowInstanceService.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowInstanceService.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowTaskService.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/IFlowTaskService.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/ISysDeployFormService.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/ISysDeployFormService.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/ISysFormService.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/ISysFormService.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowDefinitionServiceImpl.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowDefinitionServiceImpl.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowInstanceServiceImpl.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowInstanceServiceImpl.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowTaskServiceImpl.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/FlowTaskServiceImpl.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/SysDeployFormServiceImpl.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/SysDeployFormServiceImpl.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/SysFormServiceImpl.java
Normal file → Executable file
0
openhis-server-new/core-flowable/src/main/java/com/core/flowable/service/impl/SysFormServiceImpl.java
Normal file → Executable file
Reference in New Issue
Block a user