bug 467 569

openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue

@@ -667,12 +667,10 @@ const buildApplicationName = (row) => {
     // 单一项目：直接显示项目全名
     return details[0].adviceName || row.name || '-';
   }
-  // 多个项目：首项 + 第二项 + 等n项
+  // 多个项目：项目1 + 项目2 + ...
   const names = details.map((d) => d.adviceName).filter(Boolean);
   if (names.length === 0) return row.name || '-';
-  const first = names[0];
-  const second = names.length > 1 ? ` + ${names[1]}` : '';
-  return `${first}${second} 等${details.length}项`;
+  return names.join(' + ');
 };
 
 /**

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

@@ -717,13 +717,15 @@ const submit = () => {
       accountId: patientInfo.value.accountId, // // 账户id
     };
   }).filter(Boolean);
+  // 从选中项目中提取检验项目名称，用于申请单名称字段
+  const selectedNames = applicationListAllFilter.map(item => item.adviceName).filter(Boolean).join('、');
   const params = {
     activityList: applicationListAllFilter,
     patientId: patientInfo.value.patientId, //患者ID
     encounterId: patientInfo.value.encounterId, // 就诊ID
     organizationId: patientInfo.value.inHospitalOrgId, // 医疗机构ID
     requestFormId: isEditMode.value ? props.editData.requestFormId : '', // 申请单ID（编辑模式传入，新增为空）
-    name: '检验申请单',
+    name: selectedNames || '检验申请单',
     descJson: JSON.stringify({
       ...form,
       // 标本类型显示名称（供申请单查看页使用，避免查看页依赖字典加载）

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

@@ -61,8 +61,7 @@
           刷新
         </el-button> -->
       </div>
-      <div class="operate-btns">
-        <el-space>
+      <div class="operate-btns" style="display: flex; align-items: center; gap: 12px;">
           <el-radio-group v-model="therapyEnum">
             <el-radio-button value="">全部</el-radio-button>
             <el-radio-button value="1">长期</el-radio-button>
@@ -90,7 +89,6 @@
           </el-button>
           <el-button link type="primary" @click="onNursingStatus">护理状态</el-button>
           <el-button link type="primary" @click="refresh()">刷新数据</el-button>
-        </el-space>
       </div>
     </div>
     <div class="inpatientDoctor-order-table">
@@ -254,8 +252,9 @@
             <el-tag v-else-if="scope.row.statusEnum == 1" type="primary">待签发</el-tag>
             <el-tag v-else-if="scope.row.statusEnum == 10" type="primary">已校对</el-tag>
             <el-tag v-else-if="scope.row.statusEnum == 11" type="primary">待接收</el-tag>
-            <el-tag v-else-if="scope.row.statusEnum == 3" type="success">已完成</el-tag>
+            <el-tag v-else-if="scope.row.statusEnum == 3" type="success">已校对</el-tag>
             <el-tag v-else-if="scope.row.statusEnum == 6" type="danger">停止</el-tag>
+            <el-tag v-else-if="scope.row.statusEnum == 20" type="success">已完成</el-tag>
             <el-tag v-else type="info">{{ scope.row.chargeStatus_enumText }}</el-tag>
           </template>
         </vxe-column>
@@ -1239,7 +1238,7 @@ function resolveAllOrgIds() {
 }
 
 function handleDelete() {
-  let selectRows = prescriptionRef.value.getSelectionRows();
+  let selectRows = prescriptionRef.value.getCheckboxRecords();
   if (selectRows.length === 0) {
     proxy.$modal.msgWarning('请选择要删除的医嘱');
     return;
@@ -1326,7 +1325,7 @@ function handleSave() {
     expandOrder.value = [];
   }
 
-  const selectedRows = prescriptionRef.value ? prescriptionRef.value.getSelectionRows() : [];
+  const selectedRows = prescriptionRef.value ? prescriptionRef.value.getCheckboxRecords() : [];
   let sourceList = [];
   if (selectedRows.length > 0) {
     sourceList = selectedRows;
@@ -1990,7 +1989,7 @@ function escKeyListener(e) {
 
 // 签退
 function handleSingOut() {
-  let selectRows = prescriptionRef.value.getSelectionRows();
+  let selectRows = prescriptionRef.value.getCheckboxRecords();
   // 是否存在未保存数据
   let isSave = true;
   // statusEnum = 2
@@ -2054,7 +2053,7 @@ function handleSingOut() {
 
 // 停嘱 - 弹出时间选择弹窗
 function handleStopAdvice() {
-  let selectRows = prescriptionRef.value.getSelectionRows();
+  let selectRows = prescriptionRef.value.getCheckboxRecords();
   console.log('selectRows======>', JSON.stringify(selectRows));
   if ((selectRows || []).length <= 0) {
     ElMessage({
@@ -2159,7 +2158,7 @@ function confirmStopAdvice() {
 }
 // 恢复（取消停嘱）
 function handleResumeAdvice() {
-  let selectRows = prescriptionRef.value.getSelectionRows();
+  let selectRows = prescriptionRef.value.getCheckboxRecords();
   console.log('handleResumeAdvice selectRows======>', JSON.stringify(selectRows));
   if ((selectRows || []).length <= 0) {
     ElMessage({
@@ -2224,7 +2223,7 @@ function handleGroupId(paramList) {
 
 // 组合
 function combination() {
-  let selectRows = prescriptionRef.value.getSelectionRows();
+  let selectRows = prescriptionRef.value.getCheckboxRecords();
   if (selectRows.length <= 1) {
     proxy.$modal.msgWarning('至少选择两项');
     return;
@@ -2322,7 +2321,7 @@ function combination() {
 
 // 拆组
 function split() {
-  let selectRows = prescriptionRef.value.getSelectionRows();
+  let selectRows = prescriptionRef.value.getCheckboxRecords();
   if (selectRows.length < 1) {
     proxy.$modal.msgWarning('至少选择一项');
     return;
@@ -2564,7 +2563,7 @@ function calculateTotalAmount(row, index) {
 
 // 选择框改变时的处理
 function handleSelectionChange({ selection, row }) {
-  if (!row) return;
+  if (!row || !selection) return;
   const isSelected = selection.some((item) => item.uniqueKey === row.uniqueKey);
   prescriptionList.value
     .filter((item) => {