Fix Bug #443: 手术计费:点击签发耗材时异常报错
当手术计费弹窗中点击"签发"耗材时,因耗材的locationId(发放库房)为空导致后端异常。 在DoctorStationAdviceAppServiceImpl.handDevice方法中,当locationId为null时,使用登录用户的科室ID作为默认值, 与NurseBillingAppService中的处理方式保持一致。
This commit is contained in:
0
openhis-ui-vue3/src/views/clinicmanagement/bargain/component/adviceBaseList.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/bargain/component/adviceBaseList.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/bargain/component/api.js
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/bargain/component/api.js
Normal file → Executable file
3
openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue
Normal file → Executable file
3
openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue
Normal file → Executable file
@@ -1010,8 +1010,9 @@ function handleSave() {
|
||||
// }
|
||||
// 此处签发处方和单行保存处方传参相同,后台已经将传参存为JSON字符串,此处直接转换为JSON即可
|
||||
let list = saveList.map((item) => {
|
||||
const parsedContent = item.contentJson ? JSON.parse(item.contentJson) : {};
|
||||
return {
|
||||
...JSON.parse(item.contentJson),
|
||||
...parsedContent,
|
||||
requestId: item.requestId,
|
||||
dbOpType: '1',
|
||||
groupId: item.groupId,
|
||||
|
||||
0
openhis-ui-vue3/src/views/clinicmanagement/bargain/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/bargain/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/chargeDetail/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/chargeDetail/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/consultationCharge/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/consultationCharge/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/consultationRefund/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/consultationRefund/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/consultationconfirmation/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/consultationconfirmation/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/dayEnd/component/api.js
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/dayEnd/component/api.js
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/dayEnd/component/template.json
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/dayEnd/component/template.json
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/dayEnd/indexccu.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/dayEnd/indexccu.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/disposal/components/api.js
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/disposal/components/api.js
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/disposal/components/bloodTemplate.json
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/disposal/components/bloodTemplate.json
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/disposal/components/disposalTemplate.json
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/disposal/components/disposalTemplate.json
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/disposal/components/performRecordDialog.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/disposal/components/performRecordDialog.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/disposal/components/prescriptionTemplate.json
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/disposal/components/prescriptionTemplate.json
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/disposal/components/template.json
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/disposal/components/template.json
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/components/api.js
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/components/api.js
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/components/ePrescribingDetailDialog.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/components/ePrescribingDetailDialog.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/components/medicinePickupQueryDialog.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/components/medicinePickupQueryDialog.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/components/prescriptionQueryDialog.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/components/prescriptionQueryDialog.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/api.js
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/api.js
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/details.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/details.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/prescription.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/prescription.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/incomeStatement/components/api.js
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/incomeStatement/components/api.js
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/incomeStatement/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/incomeStatement/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/component/adviceListDialog.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/component/adviceListDialog.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/component/api.js
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/component/api.js
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/lisPascResult/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/lisPascResult/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/orderViewPrint/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/orderViewPrint/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/refundNumber/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/refundNumber/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/requisition/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/requisition/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/returnDrug/components/api.js
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/returnDrug/components/api.js
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/returnDrug/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/returnDrug/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/skinrecord/component/api.js
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/skinrecord/component/api.js
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/skinrecord/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/skinrecord/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/techExecute/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/techExecute/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/techfundApprove/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/techfundApprove/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/withdrawal/index.vue
Normal file → Executable file
0
openhis-ui-vue3/src/views/clinicmanagement/withdrawal/index.vue
Normal file → Executable file
Reference in New Issue
Block a user