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/datadictionary/appservice/ICDCodeService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ICDCodeService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDeviceManageAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDeviceManageAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiagTreatMAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiagTreatMAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiseaseManageAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IDiseaseManageAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IItemDefinitionService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IItemDefinitionService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IMedicationManageAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/IMedicationManageAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ItemDefinitionAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/ItemDefinitionAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ICDCodeServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/ICDCodeServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/assembler/ItemDefinitionAssembler.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/assembler/ItemDefinitionAssembler.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DeviceManageController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiseaseManageController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ICDCodeController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ICDCodeController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/MedicationManageController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/MedicationManageController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/SupplierManagementController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ActivityChildJsonDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ActivityChildJsonDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemOptionDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemOptionDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceImportDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceImportDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageInitDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageInitDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageSelParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageSelParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DeviceManageUpDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentImportDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentImportDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentInitDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentInitDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentSelParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentSelParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageInitDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageInitDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageSelParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageSelParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageUpDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiseaseManageUpDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeAddDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeAddDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeUpdateDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ICDCodeUpdateDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefSearchParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefSearchParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDetailDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDetailDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionInitDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionInitDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemUpFromDirectoryDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemUpFromDirectoryDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationImportDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationImportDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageInitDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageUpDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationSearchParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationSearchParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierInitDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierInitDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierSearchParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierSearchParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierUpDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/SupplierUpDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ActivityDefinitionManageMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ActivityDefinitionManageMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/DeviceManageMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/DeviceManageMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ICDCodeMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ICDCodeMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ItemDefinitionAppMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ItemDefinitionAppMapper.java
Normal file → Executable file
Reference in New Issue
Block a user