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/ybmanage/config/YbServiceConfig.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/config/YbServiceConfig.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbElepController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbElepController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbInpatientController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/controller/YbInpatientController.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Catalogue1312Output.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Catalogue1312Output.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clearing3205AWebParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2207OrderOutput.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2207OrderOutput.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Clinic2208UnSetlInfoOutput.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ClinicReg2201Output.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ClinicReg2201Output.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/EncounterDiagnosisDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/EncounterDiagnosisDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial13203WebParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial13203WebParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3202WebParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3202WebParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203AWebParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203AWebParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203WebParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Financial3203WebParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3201WebParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3201WebParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3203AWebParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/FinancialHand3203AWebParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Info1101Output.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Info1101Output.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/PatientInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/PatientInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/PerinfoParamDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/PerinfoParamDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Result.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Result.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ResultBody.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/ResultBody.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3201WebParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3201WebParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3202WebParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3202WebParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3209AWebParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Settlement3209AWebParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionDetailInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionInfoDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/VeriPrescriptionParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301FeeDetailParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301FeeDetailParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301InpatientOutput.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2301InpatientOutput.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientOutput.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientOutput.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientPram.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2303InpatientPram.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientExpContentParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientExpContentParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientOutput.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientOutput.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2304InpatientParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientOutput.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientOutput.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2305InpatientParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2401InpatientRegParamDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2401InpatientRegParamDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2401InputInpatientParamDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2401InputInpatientParamDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2403InputInpatientParamDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb2403InputInpatientParamDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb5205SpecialDiseaseWebParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/Yb5205SpecialDiseaseWebParam.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/YbInHospitalRegisterQueryDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/dto/YbInHospitalRegisterQueryDto.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbElepMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbElepMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/mapper/YbMapper.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleBaseService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleHttpService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbEleHttpService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/IYbService.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbEleHttpServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbElepBaseServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/service/impl/YbServiceImpl.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/CsvHelperZipProcessor.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/CsvHelperZipProcessor.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/util/YbEleParamBuilderUtil.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Financial3203VO.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Financial3203VO.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201DetailVO.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201DetailVO.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201VO.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3201VO.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3202VO.java
Normal file → Executable file
0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/vo/Settlement3202VO.java
Normal file → Executable file
Reference in New Issue
Block a user