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/inhospitalnursestation/appservice/IATDManageAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/IATDManageAppService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/ATDManageController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/controller/ATDManageController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/ATDManageInitDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/ATDManageInitDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionBedPageDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionBedPageDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPageParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPageParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientPageDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdmissionPatientPageDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdviceExecuteDetailParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdviceExecuteDetailParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdviceExecuteParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AdviceExecuteParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollBasicServiceDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollBasicServiceDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollNursingDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollNursingDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollSourceDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/AutoRollSourceDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/CostDetailExcelOutDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/CostDetailExcelOutDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/DispenseFormSearchParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/DispenseFormSearchParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAccountDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAccountDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAutoRollQueryDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAutoRollQueryDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAutoRollSaveDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/EncounterAutoRollSaveDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InBedPatientInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InBedPatientInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicationRequestUseExe.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicationRequestUseExe.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineDispenseFormDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineDispenseFormDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryFormDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryFormDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/MedicineSummaryParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceSummaryFromDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceSummaryFromDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceSummaryParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/OrgDeviceSummaryParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/PendingMedicationDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/PendingMedicationDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/ServiceRequestUseExe.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/ServiceRequestUseExe.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/ATDManageAppMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/ATDManageAppMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/AdviceProcessAppMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/AdviceProcessAppMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/MedicineSummaryAppMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/MedicineSummaryAppMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/NurseBillingAppMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/NurseBillingAppMapper.java
Normal file → Executable file
Reference in New Issue
Block a user