bug 467 569

openhis-ui-vue3/src/views/drug/inpatientMedicationDispensing/components/MedicationDetails.vue

@@ -477,7 +477,7 @@ const data = reactive({
     pageSize: 10,
     condition: null,
     departmentId: null,
-    statusEnum: 3,
+    statusEnum: 18,
     classEnum: 1,
   },
 });
@@ -556,7 +556,7 @@ function getList() {
 }
 //打印中西药处方
 async function printPrescription() {
-  const selectedRows = tableRef.value.getSelectionRows();
+  const selectedRows = tableRef.value.getCheckboxRecords();
   if (selectedRows.length === 0) {
     proxy.$modal.msgWarning('未选择要打印的项目，请重新选择，打印失败');
     return;
@@ -762,7 +762,8 @@ function formatPrice(row, column, cellValue) {
 
 /** 发药状态 → 规范状态名称映射（与《药品医嘱状态映射表》保持一致） */
 const DRUG_STATUS_DISPLAY = {
-  2: '待配药',
+  11: '已执行',
+  18: '已提交',
   4: '已发药',
 };
 
@@ -1000,27 +1001,19 @@ function submitMedicine(saveList) {
         proxy.$modal.msgError('发药失败: ' + error.message);
       });
   } else if (projectTypeCode.value == 2) {
-    let preparationList = saveList.filter((item) => {
-      return item.statusEnum == 2;
-    }); // 待配药列表
-    let preparedList = saveList.filter((item) => {
-      return item.statusEnum == 14;
-    }); // 已配药列表
-    if (preparedList.length > 0) {
-      updateMedicion(preparedList).then((response) => {
+    let submittedList = saveList.filter((item) => {
+      return item.statusEnum == 18;
+    }); // 已提交列表
+    if (submittedList.length === 0) {
+      proxy.$modal.msgWarning('没有可操作的发药项目');
+      return;
+    }
+    updateMedicion(submittedList).then((response) => {
+      if (response.code == 200) {
         proxy.$modal.msgSuccess('发药成功');
         getMedicineList(currentRow.value.encounterId);
-      });
-    } else {
-      prepareMedicion(preparationList).then((res) => {
-        if (res.code == 200) {
-          updateMedicion(preparationList).then((response) => {
-            proxy.$modal.msgSuccess('发药成功');
-            getMedicineList(currentRow.value.encounterId);
-          });
-        }
-      });
-    }
+      }
+    });
   } else {
     deviceDispense(saveList).then((res) => {
       if (res.code == 200) {
@@ -1129,8 +1122,8 @@ function handleBatch(row) {
         };
       });
   } else {
-    if (tableRef.value.getSelectionRows().length > 0) {
-      saveList = tableRef.value.getSelectionRows().map((item) => {
+    if (tableRef.value.getCheckboxRecords().length > 0) {
+      saveList = tableRef.value.getCheckboxRecords().map((item) => {
         return {
           requestId: item.requestId,
           dispenseId: item.dispenseId,