Fix Bug #443: 手术计费:点击签发耗材时异常报错
当手术计费弹窗中点击"签发"耗材时,因耗材的locationId(发放库房)为空导致后端异常。 在DoctorStationAdviceAppServiceImpl.handDevice方法中,当locationId为null时,使用登录用户的科室ID作为默认值, 与NurseBillingAppService中的处理方式保持一致。
This commit is contained in:
0
openhis-server-new/core-framework/pom.xml
Normal file → Executable file
0
openhis-server-new/core-framework/pom.xml
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/DataScopeAspect.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/DataScopeAspect.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/DataSourceAspect.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/DataSourceAspect.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/LogAspect.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/LogAspect.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/RateLimiterAspect.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/RateLimiterAspect.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/TransactionAspect.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/aspectj/TransactionAspect.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/ApplicationConfig.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/ApplicationConfig.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/CaptchaConfig.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/CaptchaConfig.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/DruidConfig.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/DruidConfig.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/FastJson2JsonRedisSerializer.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/FastJson2JsonRedisSerializer.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/FilterConfig.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/FilterConfig.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/I18nConfig.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/I18nConfig.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/KaptchaTextCreator.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/KaptchaTextCreator.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/RedisConfig.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/RedisConfig.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/ResourcesConfig.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/ResourcesConfig.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/SecurityConfig.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/SecurityConfig.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/ServerConfig.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/ServerConfig.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/TenantContext.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/TenantContext.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/ThreadPoolConfig.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/ThreadPoolConfig.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/properties/DruidProperties.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/properties/DruidProperties.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/properties/PermitAllUrlProperties.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/config/properties/PermitAllUrlProperties.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/datasource/DynamicDataSource.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/datasource/DynamicDataSource.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/datasource/DynamicDataSourceContextHolder.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/datasource/DynamicDataSourceContextHolder.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/handler/MybastisColumnsHandler.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/handler/MybastisColumnsHandler.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/interceptor/RepeatSubmitInterceptor.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/interceptor/RepeatSubmitInterceptor.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/interceptor/impl/SameUrlDataInterceptor.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/interceptor/impl/SameUrlDataInterceptor.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/manager/AsyncManager.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/manager/AsyncManager.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/manager/ShutdownManager.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/manager/ShutdownManager.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/manager/factory/AsyncFactory.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/manager/factory/AsyncFactory.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/security/context/AuthenticationContextHolder.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/security/context/AuthenticationContextHolder.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/security/context/PermissionContextHolder.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/security/context/PermissionContextHolder.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/security/filter/JwtAuthenticationTokenFilter.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/security/filter/JwtAuthenticationTokenFilter.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/security/handle/AuthenticationEntryPointImpl.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/security/handle/AuthenticationEntryPointImpl.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/security/handle/LogoutSuccessHandlerImpl.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/security/handle/LogoutSuccessHandlerImpl.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/Server.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/Server.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/Cpu.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/Cpu.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/Jvm.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/Jvm.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/Mem.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/Mem.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/Sys.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/Sys.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/SysFile.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/domain/server/SysFile.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/exception/GlobalExceptionHandler.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/exception/GlobalExceptionHandler.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/PermissionService.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/PermissionService.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysLoginService.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysPasswordService.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysPasswordService.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysPermissionService.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysPermissionService.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysRegisterService.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/SysRegisterService.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/TokenService.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/TokenService.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/UserDetailsServiceImpl.java
Normal file → Executable file
0
openhis-server-new/core-framework/src/main/java/com/core/framework/web/service/UserDetailsServiceImpl.java
Normal file → Executable file
Reference in New Issue
Block a user