Compare commits
22 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
38d706cc04 | ||
|
|
bea661a416 | ||
|
|
8757969f20 | ||
|
|
6a0db01308 | ||
|
|
37c5157e4e | ||
|
|
d1b9b87f9e | ||
|
|
f1b36f02e1 | ||
|
|
9b41258409 | ||
|
|
9200c01062 | ||
|
|
de143de774 | ||
|
|
b07048e094 | ||
|
|
db2329e7a3 | ||
|
|
1a2ec3ee88 | ||
|
|
eb5262d33c | ||
|
|
246ad5a8fb | ||
|
|
84b1e36065 | ||
|
|
0301301ff6 | ||
|
|
2407d06bcf | ||
|
|
38d289b5d8 | ||
|
|
b87df3c268 | ||
|
|
222409da3a | ||
|
|
6258aa2589 |
@@ -881,13 +881,16 @@ import {
|
||||
deleteSurgerySchedule,
|
||||
getSurgeryScheduleDetail
|
||||
} from '@/api/surgicalschedule'
|
||||
import { listUser } from '@/api/system/user'
|
||||
import { deptTreeSelect } from '@/api/system/user'
|
||||
import { listOperatingRoom } from '@/api/operatingroom'
|
||||
import { getSurgeryPage} from '@/views/inpatientDoctor/home/components/applicationShow/api.js'
|
||||
import { getContract } from '@/views/inpatientDoctor/home/components/api.js'
|
||||
import request from '@/utils/request'
|
||||
import SurgeryCharge from '../charge/surgerycharge/index.vue'
|
||||
import TemporaryMedical from './temporaryMedical.vue'
|
||||
|
||||
// 静默获取字典列表(跳过拦截器错误提示,手术室护士等角色可能无此权限)
|
||||
// 静默获取卫生机构列表(跳过拦截器错误提示,手术室护士等角色可能无此权限)
|
||||
function getTenantPageSilent(query) {
|
||||
return request({
|
||||
url: '/system/tenant/page',
|
||||
@@ -897,36 +900,6 @@ function getTenantPageSilent(query) {
|
||||
})
|
||||
}
|
||||
|
||||
// 静默获取科室树(跳过拦截器错误提示)
|
||||
function deptTreeSelectSilent(params = {}) {
|
||||
return request({
|
||||
url: '/base-data-manage/organization/organization',
|
||||
method: 'get',
|
||||
params: { typeEnum: 2, ...params },
|
||||
skipErrorMsg: true
|
||||
})
|
||||
}
|
||||
|
||||
// 静默获取用户列表(跳过拦截器错误提示)
|
||||
function listUserSilent(query) {
|
||||
return request({
|
||||
url: '/base-data-manage/practitioner/user-practitioner-page',
|
||||
method: 'get',
|
||||
params: query,
|
||||
skipErrorMsg: true
|
||||
})
|
||||
}
|
||||
|
||||
// 静默获取手术室列表(跳过拦截器错误提示)
|
||||
function listOperatingRoomSilent(query) {
|
||||
return request({
|
||||
url: '/base-data-manage/operating-room/list',
|
||||
method: 'get',
|
||||
params: query,
|
||||
skipErrorMsg: true
|
||||
})
|
||||
}
|
||||
|
||||
const { proxy } = getCurrentInstance()
|
||||
const userStore = useUserStore()
|
||||
const loading = ref(true)
|
||||
@@ -1175,7 +1148,7 @@ function loadOrgList() {
|
||||
|
||||
// 加载科室列表
|
||||
function loadDeptList() {
|
||||
deptTreeSelectSilent()
|
||||
deptTreeSelect()
|
||||
.then(res => {
|
||||
if (res.code === 200) {
|
||||
const tree = res.data?.records || res.data || []
|
||||
@@ -1195,7 +1168,7 @@ function loadDeptList() {
|
||||
|
||||
// 加载医生列表
|
||||
function loadDoctorList() {
|
||||
listUserSilent({ pageNo: 1, pageSize: 1000 })
|
||||
listUser({ pageNo: 1, pageSize: 1000 })
|
||||
.then(res => {
|
||||
if (res.code === 200) {
|
||||
const records = res.data?.records || []
|
||||
@@ -1215,7 +1188,7 @@ function loadDoctorList() {
|
||||
|
||||
// 加载护士列表
|
||||
function loadNurseList() {
|
||||
listUserSilent({ pageNo: 1, pageSize: 1000 })
|
||||
listUser({ pageNo: 1, pageSize: 1000 })
|
||||
.then(res => {
|
||||
if (res.code === 200) {
|
||||
const records = res.data?.records || []
|
||||
@@ -1235,7 +1208,7 @@ function loadNurseList() {
|
||||
|
||||
// 加载手术室列表
|
||||
function loadOperatingRoomList() {
|
||||
listOperatingRoomSilent({ pageNo: 1, pageSize: 1000, statusEnum: 1 })
|
||||
listOperatingRoom({ pageNo: 1, pageSize: 1000, statusEnum: 1 })
|
||||
.then(res => {
|
||||
if (res.code === 200) {
|
||||
const records = res.data?.records || []
|
||||
@@ -1540,8 +1513,6 @@ function handleMedicalAdvice(row) {
|
||||
const filteredItems = res.data.filter(item => {
|
||||
// 匹配 encounterId
|
||||
if (item.encounterId !== row.visitId) return false;
|
||||
// 只保留药品类型(adviceType=1),过滤掉耗材(2)和诊疗项目(3)
|
||||
if (item.adviceType !== 1) return false;
|
||||
// 过滤掉名称为空的项目
|
||||
const medicineName = item.adviceName || item.advice_name;
|
||||
if (!medicineName || medicineName.trim() === '') return false;
|
||||
@@ -1800,12 +1771,10 @@ function handleQuoteBilling() {
|
||||
temporaryBillingMedicines.value = []
|
||||
temporaryAdvices.value = []
|
||||
|
||||
// 只保留药品类型(adviceType=1),过滤掉耗材(2)和诊疗项目(3)
|
||||
// 🔧 修复:显示所有药品请求数据,不管有没有计费项目
|
||||
const filteredItems = res.data.filter(item => {
|
||||
// 匹配 encounterId
|
||||
if (item.encounterId !== temporaryPatientInfo.value.visitId) return false;
|
||||
// 只保留药品类型(adviceType=1),过滤掉耗材(2)和诊疗项目(3)
|
||||
if (item.adviceType !== 1) return false;
|
||||
// 过滤掉名称为空的项目
|
||||
const medicineName = item.adviceName || item.advice_name;
|
||||
return medicineName && medicineName.trim() !== '';
|
||||
|
||||
Reference in New Issue
Block a user