wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/华佗' - resolve conflicts

Browse Source
This commit is contained in:
赵云
2026-05-13 01:05:18 +08:00
parent 87155a1091 de90f60a53
commit 086467c4da
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue
View File

@@ -164,7 +164,7 @@ onMounted(() => {
* type(1：watch监听类型 2:点击保存类型) * type(1：watch监听类型 2:点击保存类型)
* selectProjectIds(选中项目的id数组) * selectProjectIds(选中项目的id数组)
* */ * */
const projectWithDepartment = (selectProjectIds, type) => { const projectWithDepartment = (selectProjectIds) => {
//1.获取选中的项目 2.判断项目的执行科室是否相同 3.判断执行科室是否配置 4.将项目的执行科室复值到执行科室下拉选位置 //1.获取选中的项目 2.判断项目的执行科室是否相同 3.判断执行科室是否配置 4.将项目的执行科室复值到执行科室下拉选位置
let isRelease = true; let isRelease = true;
// 选中项目的数组 // 选中项目的数组

2
openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue
View File

@@ -483,7 +483,7 @@ const submit = () => {
encounterId: patientInfo.value.encounterId, encounterId: patientInfo.value.encounterId,
organizationId: patientInfo.value.inHospitalOrgId, organizationId: patientInfo.value.inHospitalOrgId,
requestFormId: '', requestFormId: '',
name: applicationListAllFilter.map(item => item.adviceName).join('、'), name: '检查申请单',
descJson: JSON.stringify(submitForm), descJson: JSON.stringify(submitForm),
categoryEnum: '2', categoryEnum: '2',
}).then((res) => { }).then((res) => {

4
openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
View File

@@ -801,7 +801,9 @@ function clickRowDb(row, column, event) {
return; return;
} }
row.showPopover = false; row.showPopover = false;
// 仅”待签发(statusEnum==1)”允许编辑；”已签发(statusEnum==2)”及之后状态不允许编辑 // 允许所有 statusEnum==1 的医嘱进入编辑：
// 1. 新医嘱（无 requestId）：待保存
// 2. 护士退回医嘱（有 requestId）：退回后状态重置为 DRAFT(1)，需允许医生编辑修改后重新签发
if (row.statusEnum == 1) { if (row.statusEnum == 1) {
// 确保治疗类型为字符串，方便与单选框 label 对齐，默认为长期医嘱('1') // 确保治疗类型为字符串，方便与单选框 label 对齐，默认为长期医嘱('1')
row.therapyEnum = String(row.therapyEnum ?? '1'); row.therapyEnum = String(row.therapyEnum ?? '1');

9
openhis-ui-vue3/src/views/surgicalschedule/index.vue
View File

@@ -1416,12 +1416,9 @@ function closeChargeDialog() {
if (prescriptionRef.value && prescriptionRef.value.closeAllPopovers) { if (prescriptionRef.value && prescriptionRef.value.closeAllPopovers) {
prescriptionRef.value.closeAllPopovers() prescriptionRef.value.closeAllPopovers()
} }
// 等 Vue 完成 DOM 更新后再关闭弹窗，确保 popover 先消失 showChargeDialog.value = false
nextTick(() => { chargePatientInfo.value = {}
showChargeDialog.value = false chargeSurgeryInfo.value = {}
chargePatientInfo.value = {}
chargeSurgeryInfo.value = {}
})
} }
// 🔧 新增：标志位，用于区分是"打开"还是"刷新" // 🔧 新增：标志位，用于区分是"打开"还是"刷新"