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/pharmacymanage/appservice/IMedicationDetailsAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IMedicationDetailsAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IReturnMedicineAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/IReturnMedicineAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicationDetailsController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/MedicationDetailsController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/ReturnMedicineController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/controller/ReturnMedicineController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInitDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInitDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInventoryDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseInventoryDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseItemDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseItemDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseStatusOption.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/DispenseStatusOption.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoSearchParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/EncounterInfoSearchParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSearchParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSearchParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSummaryDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSummaryDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSummarySearchParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/FromSummarySearchParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InventoryDetailDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/InventoryDetailDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ItemDispenseOrderDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ItemDispenseOrderDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/JlauDispenseParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/JlauDispenseParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailedAccountPageDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailedAccountPageDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsInitDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsInitDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsSearchParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedDetailsSearchParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummaryDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummaryDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummaryInitDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummaryInitDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummarySearchParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/MedicineSummarySearchParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationPageDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationPageDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationSearchParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/PendingMedicationSearchParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInitDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/ReturnMedicineInitDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/UnDispenseInventoryDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/dto/UnDispenseInventoryDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicalDeviceDispenseMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicalDeviceDispenseMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicationDetailsMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/MedicationDetailsMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/ReturnMedicineMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/ReturnMedicineMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/SummaryDispenseMedicineMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/SummaryDispenseMedicineMapper.java
Normal file → Executable file
Reference in New Issue
Block a user