bug550\556569

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java

@@ -198,8 +198,10 @@ public class AdviceBaseDto {
     /**
      * 所属科室
      */
+    @Dict(dictTable = "adm_organization", dictCode = "id", dictText = "name")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
+    private String orgId_dictText;
 
     /**
      * 所在位置

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java

@@ -78,12 +78,10 @@ public class MedicineSummaryAppServiceImpl implements IMedicineSummaryAppService
                         .map(notPerformedReason -> new DispenseInitDto.NotPerformedReasonOption(notPerformedReason.getValue(),
                         notPerformedReason.getInfo()))
                         .collect(Collectors.toList());
-        // 发药状态
+        // 发药状态（汇总单：待配药→已提交，已发放→已发药）
         List<DispenseStatusOption> dispenseStatusOptions = new ArrayList<>();
-        dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.PREPARATION.getValue(),
+        dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.PREPARATION.getValue(), "已提交"));
-                DispenseStatus.PREPARATION.getInfo()));
+        dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.COMPLETED.getValue(), "已发药"));
-        dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.COMPLETED.getValue(),
-                DispenseStatus.COMPLETED.getInfo()));
 
         initDto.setNotPerformedReasonOptions(notPerformedReasonOptions).setDispenseStatusOptions(dispenseStatusOptions);
         return R.ok(initDto);
@@ -161,8 +159,8 @@ public class MedicineSummaryAppServiceImpl implements IMedicineSummaryAppService
                 new Page<>(pageNo, pageSize), queryWrapper, DispenseStatus.COMPLETED.getValue(),
                 DispenseStatus.PREPARATION.getValue(), SupplyType.SUMMARY_DISPENSE.getValue());
         medicineSummaryFormPage.getRecords().forEach(e -> {
-            // 发药状态
+            // 发药状态（汇总单展示文案）
-            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(DispenseStatus.class, e.getStatusEnum()));
+            e.setStatusEnum_enumText(getSummaryFormStatusText(e.getStatusEnum()));
         });
         return R.ok(medicineSummaryFormPage);
     }
@@ -292,4 +290,17 @@ public class MedicineSummaryAppServiceImpl implements IMedicineSummaryAppService
         }
         return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[]{"取消"}));
     }
+
+    /**
+     * 汇总发药单状态展示文案（药品医嘱状态映射表：汇总申请→已提交，发药→已发药）
+     */
+    private String getSummaryFormStatusText(Integer statusEnum) {
+        if (DispenseStatus.PREPARATION.getValue().equals(statusEnum)) {
+            return "已提交";
+        }
+        if (DispenseStatus.COMPLETED.getValue().equals(statusEnum)) {
+            return "已发药";
+        }
+        return EnumUtils.getInfoByValue(DispenseStatus.class, statusEnum);
+    }
 }

openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue

@@ -397,41 +397,41 @@
             </div>
           </div>
 
-          <!-- 右侧：已选择 项目卡片（可展开显示检查方法） -->
+          <!-- 右侧：已选择（检查项目、检查方法为两类独立选择结果） -->
           <div class="selected-panel">
             <div class="panel-label">已选择:</div>
             <div class="selected-tags">
-              <div v-if="selectedItems.length === 0" class="empty-selected">–</div>
+              <template v-if="selectedItems.length === 0 && selectedMethods.length === 0 && methodsForActiveCategory.length === 0">
+                <div class="empty-selected">–</div>
+              </template>
+              <template v-else>
               <div
-                v-else
                 v-for="(item, idx) in selectedItems"
-                :key="idx"
+                :key="'project-' + item.id"
                 class="selected-item-card"
-                :class="{ 'is-expanded': item.expanded }"
+                :class="{ 'is-expanded': item.projectFoldExpanded }"
               >
-                <!-- 项目卡片头部：项目和检查方法解耦，点击展开查看方法/明细 -->
+                <div
-                <div class="card-header" @click="toggleItemExpand(item)">
+                  class="fold-strip fold-strip-project"
-                  <el-tooltip :content="getDisplayItemName(item)" placement="top" :show-after="400">
+                  :class="{ 'is-open': item.projectFoldExpanded }"
-                    <span class="card-name">{{ getDisplayItemName(item) }}</span>
+                >
-                  </el-tooltip>
+                  <div class="fold-strip-header" @click="toggleProjectFold(item)">
-                  <span class="card-price">¥{{ formatDetailAmount(getSelectedItemAmount(item)) }}</span>
+                    <el-icon :class="['fold-chevron', { open: item.projectFoldExpanded }]">
-                  <el-icon :class="['expand-icon', { expanded: item.expanded }]">
                       <ArrowDown />
                     </el-icon>
-                  <!-- 删除按钮 -->
+                    <div class="fold-header-main">
+                      <span class="fold-kicker">检查项目</span>
+                      <el-tooltip :content="getDisplayItemName(item)" placement="top" :show-after="400">
+                        <span class="fold-title line-clamp-2">{{ getDisplayItemName(item) }}</span>
+                      </el-tooltip>
+                    </div>
+                    <span class="fold-price-strong">¥{{ formatDetailAmount(item.price || 0) }}</span>
                     <el-button link type="danger" size="small" @click.stop="handleRemoveItem(idx, item)">
                       <el-icon><Close /></el-icon>
                     </el-button>
                   </div>
-                <div v-if="item.expanded" class="selected-card-body">
+                  <div v-show="item.projectFoldExpanded" class="fold-strip-body">
-                  <div v-if="shouldShowItemPackageBody(item)">
+                    <div v-if="shouldShowItemPackageBody(item)" class="fold-package-wrap">
-                    <div class="package-toggle" @click.stop="toggleItemPackageExpand(item)">
-                      <span>项目套餐明细</span>
-                      <el-icon :class="['expand-icon', { expanded: item.itemPackageExpanded }]">
-                        <ArrowDown />
-                      </el-icon>
-                    </div>
-                    <div v-show="item.itemPackageExpanded">
                       <div v-if="item.packageDetailsLoading" class="package-details-loading">加载中...</div>
                       <template v-else>
                         <div v-if="getPackageDetailsList(item).length === 0" class="package-details-empty">
@@ -454,43 +454,55 @@
                         </div>
                       </template>
                     </div>
+                    <div v-else class="fold-strip-muted">暂无项目套餐明细</div>
                   </div>
-                  <div class="selected-card-section">
-                    <div class="selected-section-title">检查方法</div>
-                    <div v-if="!item.methods || item.methods.length === 0" class="selected-method-empty">
-                      暂无检查方法
                 </div>
+              </div>
+
               <div
-                      v-for="method in item.methods"
+                v-for="(method, idx) in selectedMethods"
-                      :key="method.id"
+                :key="'method-' + method.id"
-                      class="selected-method-option"
+                class="selected-item-card"
+                :class="{ 'is-expanded': method.expanded }"
               >
-                      <el-checkbox
+                <div
-                        :model-value="item.selectedMethod?.id === method.id"
+                  class="fold-strip fold-strip-method"
-                        @change="(val) => selectMethodCheckbox(val, item, method)"
+                  :class="{ 'is-open': method.expanded }"
-                        class="method-checkbox"
                 >
-                        {{ method.name }}
+                  <div class="fold-strip-header" @click="toggleSelectedMethodFold(method)">
-                      </el-checkbox>
+                    <el-icon :class="['fold-chevron', { open: method.expanded }]">
-                      <span class="method-price-tag">¥{{ method.packagePrice || method.price || 0 }}</span>
-                    </div>
-                  </div>
-                  <div v-if="shouldShowMethodPackageBody(item)">
-                    <div class="package-toggle" @click.stop="toggleMethodPackageExpand(item)">
-                      <span>检查方法套餐明细</span>
-                      <el-icon :class="['expand-icon', { expanded: item.methodPackageExpanded }]">
                       <ArrowDown />
                     </el-icon>
+                    <div class="fold-header-main">
+                      <span class="fold-kicker">检查方法</span>
+                      <span
+                        class="fold-title fold-title-plain line-clamp-2"
+                        :title="getDisplayMethodName(method)"
+                      >
+                        {{ getDisplayMethodName(method) }}
+                      </span>
                     </div>
-                    <div v-show="item.methodPackageExpanded">
+                    <span
-                      <div v-if="item.methodPackageLoading" class="package-details-loading">加载中...</div>
+                      v-if="hasStandaloneMethodPackage(method)"
+                      class="fold-price-strong warn"
+                    >
+                      ¥{{ formatDetailAmount(method.packagePrice || method.price || 0) }}
+                    </span>
+                    <el-button link type="danger" size="small" @click.stop="handleRemoveMethod(idx)">
+                      <el-icon><Close /></el-icon>
+                    </el-button>
+                  </div>
+                  <div v-show="method.expanded" class="fold-strip-body">
+                    <template v-if="hasStandaloneMethodPackage(method)">
+                      <div class="fold-package-wrap fold-method-package-wrap">
+                        <div v-if="method.packageLoading" class="package-details-loading">加载中...</div>
                         <template v-else>
-                        <div v-if="getMethodPackageDetailsList(item).length === 0" class="package-details-empty">
+                          <div v-if="getStandaloneMethodPackageDetailsList(method).length === 0" class="package-details-empty">
                             暂无检查方法套餐明细
                           </div>
                           <div v-else class="package-details-list method-package-list">
                             <div
-                          v-for="(detail, dIdx) in getMethodPackageDetailsList(item)"
+                              v-for="(detail, dIdx) in getStandaloneMethodPackageDetailsList(method)"
                               :key="detail.id ?? detail.itemCode ?? `md-${dIdx}`"
                               class="detail-row"
                             >
@@ -505,9 +517,45 @@
                           </div>
                         </template>
                       </div>
+                    </template>
+                    <template v-else>
+                      <div class="fold-strip-muted">无单独的检查方法套餐明细。</div>
+                    </template>
                   </div>
                 </div>
               </div>
+
+              <!-- 底部：独立勾选检查方法，样式与左侧项目选择一致 -->
+              <div
+                v-if="methodsForActiveCategory.length > 0"
+                class="selected-global-method-picker"
+                @click.stop
+              >
+                <div class="method-picker-collapse-title" @click="methodPickerExpanded = !methodPickerExpanded">
+                  <span class="method-picker-title-main">检查方法</span>
+                  <span v-if="activeCategoryName" class="global-method-picker-scope">{{ activeCategoryName }}</span>
+                  <el-icon :class="['method-picker-arrow', { expanded: methodPickerExpanded }]">
+                    <ArrowDown />
+                  </el-icon>
+                </div>
+                <div v-show="methodPickerExpanded" class="global-method-picker-list">
+                  <div
+                    v-for="method in methodsForActiveCategory"
+                    :key="'g-m-' + method.id"
+                    class="item-row method-picker-row"
+                  >
+                    <el-checkbox
+                      :model-value="isStandaloneMethodSelected(method)"
+                      @change="(val) => onStandaloneMethodChange(!!val, method)"
+                      class="item-checkbox"
+                    >
+                      <span class="method-label-inner">{{ formatExamMethodCaption(method.name) }}</span>
+                    </el-checkbox>
+                    <span class="item-price">¥{{ formatDetailAmount(method.packagePrice || method.price || 0) }}</span>
+                  </div>
+                </div>
+              </div>
+              </template>
             </div>
           </div>
         </div>
@@ -539,6 +587,8 @@ const dictLoading = ref(false);
 const activeDetailTab = ref('applyForm');
 const applicationList = ref([]);
 const selectedItems = ref([]);
+const selectedMethods = ref([]);
+const methodPickerExpanded = ref(true);
 
 // Bug #499: 查询过滤状态
 const searchForm = reactive({
@@ -705,13 +755,25 @@ function getDisplayItemName(item) {
   return String(item?.name || '').replace(/^套餐[：:\-\s]*/, '');
 }
 
-function getSelectedItemAmount(item) {
+/** 检查方法展示：避免与后端文案重复出现「(方法)(方法)」 */
-  const itemPrice = Number(item?.price || 0);
+function formatExamMethodCaption(name) {
-  const methodPrice = Number(item?.selectedMethod?.packagePrice || 0);
+  const raw = String(name || '').trim();
-  if (!hasMethodPackage(item) || isSamePackage(item)) {
+  if (!raw) return '';
-    return itemPrice;
+  if (/^\(方法\)/.test(raw) || /^（方法）/.test(raw)) {
+    return raw;
   }
-  return itemPrice + methodPrice;
+  return `(方法) ${raw}`;
+}
+
+/** 已选方法纯文本（用于标题下级展示，不包含「勾选」前缀，去掉后端自带的 (方法) 前缀） */
+function getDisplaySelectedMethodName(item) {
+  const raw = String(item?.selectedMethod?.name || '').trim();
+  if (!raw) return '';
+  return raw.replace(/^\(方法\)\s*/, '').replace(/^（方法）\s*/, '').trim();
+}
+
+function getSelectedItemAmount(item) {
+  return Number(item?.price || 0);
 }
 
 function parsePackageDetailsPayload(res) {
@@ -843,6 +905,19 @@ const currentActiveCategory = ref(null);  // Bug #500: 记录当前激活的分
 
 const allMethods = ref([]);
 
+const activeCategory = computed(() => {
+  const id = activeNames.value;
+  if (id === '' || id === null || id === undefined) return null;
+  return categoryList.value.find((cat) => String(cat.typeId) === String(id)) || null;
+});
+
+const activeCategoryName = computed(() => activeCategory.value?.typeName || activeCategory.value?.categoryName || '');
+
+const methodsForActiveCategory = computed(() => {
+  const arr = activeCategory.value?.methods;
+  return Array.isArray(arr) ? arr : [];
+});
+
 // ====== 科室下拉（来源：科室管理）======
 const orgLoading = ref(false);
 const orgOptions = ref([]); // { label, value }
@@ -953,6 +1028,44 @@ const availableMethods = computed(() => {
   return allMethods.value;
 });
 
+function isStandaloneMethodSelected(method) {
+  return selectedMethods.value.some((m) => String(m.id) === String(method?.id));
+}
+
+function getDisplayMethodName(method) {
+  const raw = String(method?.name || '').trim();
+  if (!raw) return '';
+  return raw.replace(/^\(方法\)\s*/, '').replace(/^（方法）\s*/, '').trim();
+}
+
+function hasStandaloneMethodPackage(method) {
+  return !!(method?.packageId || method?.packageName);
+}
+
+function getStandaloneMethodPackageDetailsList(method) {
+  return Array.isArray(method?.packageDetails) ? method.packageDetails : [];
+}
+
+async function onStandaloneMethodChange(checked, method) {
+  if (!method) return;
+  if (checked) {
+    if (!isStandaloneMethodSelected(method)) {
+      selectedMethods.value.push({
+        ...method,
+        expanded: false,
+        packageLoading: false,
+        packageDetails: []
+      });
+    }
+  } else {
+    const idx = selectedMethods.value.findIndex((m) => String(m.id) === String(method.id));
+    if (idx > -1) selectedMethods.value.splice(idx, 1);
+  }
+  updateMethodDisplay();
+  await nextTick();
+  form.totalAmount = totalAmountCalc.value;
+}
+
 // 当可选方法列表改变时，如果当前选中的方法不在新列表中，则清空
 // #428: 分类展开时联动加载检查方法
 // Bug #500: 使用 categoryLoadingSet 替代 dictLoading，避免切换分类时整个区域闪烁
@@ -996,6 +1109,8 @@ async function handleCategoryExpand(cat) {
 function handleCollapseChange(activeName) {
   // 始终记录当前激活的分类，确保 handleCategoryExpand 能正确忽略过期请求
   currentActiveCategory.value = activeName || null;
+  // 底部「检查方法」勾选区默认展开，不因切换左侧分类而收起
+  methodPickerExpanded.value = true;
 
   if (activeName) {
     // Bug #428修复: 直接从 categoryList（原始响应式数组）查找分类，
@@ -1005,6 +1120,7 @@ function handleCollapseChange(activeName) {
       handleCategoryExpand(cat);  // 异步加载，不 await
     }
   }
+  updateMethodDisplay();
 }
 
 watch(availableMethods, (newMethods) => {
@@ -1130,17 +1246,26 @@ const filteredCategoryList = computed(() => {
 
 // ====== 合计 ======
 const totalAmountCalc = computed(() => {
-  const total = selectedItems.value.reduce((sum, item) => {
+  const itemTotal = selectedItems.value.reduce((sum, item) => {
     const effectivePrice = getSelectedItemAmount(item);
     return sum + (effectivePrice * (item.quantity || 1));
   }, 0);
+  const methodTotal = selectedMethods.value.reduce((sum, method) => {
+    return sum + Number(method?.packagePrice ?? method?.price ?? 0);
+  }, 0);
+  const total = itemTotal + methodTotal;
   return total.toFixed(2);
 });
 
 // 监听已选项：自动更新申检部位
 watch(selectedItems, () => {
   form.inspectionArea = selectedItems.value.map(i => i.name).join('+');
-  form.isCharged = selectedItems.value.length > 0 ? 1 : 0;
+  form.isCharged = selectedItems.value.length > 0 || selectedMethods.value.length > 0 ? 1 : 0;
+}, { deep: true });
+
+watch(selectedMethods, () => {
+  form.isCharged = selectedItems.value.length > 0 || selectedMethods.value.length > 0 ? 1 : 0;
+  updateMethodDisplay();
 }, { deep: true });
 
 // 监听患者变化
@@ -1231,6 +1356,7 @@ function handleAdd() {
     selectedMethodDisplay: ''  // Bug #384修复: 重置检查方法显示
   });
   selectedItems.value = [];
+  selectedMethods.value = [];
   resetCategoryChecked();
   activeDetailTab.value = 'applyForm';
   // 自动加载临床诊断
@@ -1244,22 +1370,27 @@ function handleSave() {
       ElMessage.warning('请至少选择一个检查明细项目');
       return;
     }
-    // 检查每个项目是否已选择检查方法
+    if (selectedMethods.value.length === 0) {
-    const itemsWithoutMethod = selectedItems.value.filter(item => !item.selectedMethod);
+      ElMessage.warning('请选择检查方法');
-    if (itemsWithoutMethod.length > 0) {
-      const names = itemsWithoutMethod.map(item => item.name).join('、');
-      ElMessage.warning(`以下项目未选择检查方法：${names}，请在右侧勾选后再保存`);
       return;
     }
     // 从已选项目推导检查类型编码（取第一个项目的 checkType，如 CT / ECG / GI）
     const firstCheckType = selectedItems.value[0]?.checkType || 'unknown';
     form.examTypeCode = firstCheckType;
+    form.totalAmount = totalAmountCalc.value;
 
 
+    const primaryMethod = selectedMethods.value[0] || null;
     const payload = {
       ...form,
       encounterId: props.patientInfo?.encounterId || null,
       patientIdNum: props.patientInfo?.patientId || null,
+      checkMethods: selectedMethods.value.map((method) => ({
+        checkMethodId: method.id || null,
+        checkMethodName: method.name || null,
+        checkMethodCode: method.code || null,
+        checkMethodPackageName: method.packageName || null
+      })),
       items: selectedItems.value.map((item, index) => ({
         itemCode: String(item.id),
         itemName: item.name,
@@ -1269,10 +1400,10 @@ function handleSave() {
         itemStatus: 0,
         itemSeq: index + 1,
         // 检查方法信息
-        checkMethodId: item.selectedMethod?.id || null,
+        checkMethodId: primaryMethod?.id || null,
-        checkMethodName: item.selectedMethod?.name || null,
+        checkMethodName: primaryMethod?.name || null,
-        checkMethodCode: item.selectedMethod?.code || null,
+        checkMethodCode: primaryMethod?.code || null,
-        checkMethodPackageName: item.selectedMethod?.packageName || null  // Bug #384修复: 保存套餐名称
+        checkMethodPackageName: primaryMethod?.packageName || null  // Bug #384修复: 保存套餐名称
       }))
     };
     request({
@@ -1293,6 +1424,7 @@ function handleRowClick(row) {
   Object.assign(form, row);
   form.selectedMethodDisplay = '';  // Bug #384修复: 先清空，后面根据回充数据更新
   selectedItems.value = [];
+  selectedMethods.value = [];
   activeDetailTab.value = 'applyForm';
   request({ url: `/exam/apply/${row.applyNo}`, method: 'get' }).then(async res => {
     // 响应结构: Axios拦截器对code===200返回res.data（AjaxResult体）
@@ -1317,8 +1449,9 @@ function handleRowClick(row) {
             methods: [],
             selectedMethod: null,
             expanded: false,
-            itemPackageExpanded: true,
+            projectFoldExpanded: false,
-            methodPackageExpanded: true,
+            methodFoldExpanded: false,
+            methodPackageExpanded: false,
             packageDetailsLoading: false,
             isPackage: false,
             packageId: null,
@@ -1362,7 +1495,21 @@ function handleRowClick(row) {
           return item;
         }));
         // Bug #408修复: 确保明细数据正确加载到selectedItems
+        const methodMap = new Map();
+        for (const item of itemsWithMethods) {
+          if (item.selectedMethod && !methodMap.has(String(item.selectedMethod.id))) {
+            methodMap.set(String(item.selectedMethod.id), {
+              ...item.selectedMethod,
+              expanded: false,
+              packageLoading: false,
+              packageDetails: []
+            });
+          }
+          item.selectedMethod = null;
+          item.methodPackageDetails = [];
+        }
         selectedItems.value = itemsWithMethods;
+        selectedMethods.value = Array.from(methodMap.values());
         // 加载套餐明细（单个失败不影响其他项目和明细显示）
         for (const it of selectedItems.value) {
           if (hasItemPackage(it)) {
@@ -1372,14 +1519,17 @@ function handleRowClick(row) {
               console.error('加载套餐明细失败:', it.name, e);
             }
           }
-          if (hasMethodPackage(it) && !isSamePackage(it)) {
+          it.methodFoldExpanded = false;
+          syncItemExpandedFlag(it);
+        }
+        for (const method of selectedMethods.value) {
+          if (hasStandaloneMethodPackage(method)) {
             try {
-              await loadMethodPackageDetails(it, it.selectedMethod);
+              await loadStandaloneMethodPackageDetails(method);
             } catch (e) {
-              console.error('加载检查方法套餐明细失败:', it.name, e);
+              console.error('加载检查方法套餐明细失败:', method.name, e);
             }
           }
-          it.expanded = shouldShowPackageBody(it);
         }
         syncCategoryChecked();
         // Bug #384修复: 回充后更新检查方法显示
@@ -1465,8 +1615,9 @@ async function handleItemSelect(checked, item, cat) {
       methods: methods,
       selectedMethod: null,
       expanded: false,
-      itemPackageExpanded: true,
+      projectFoldExpanded: false,
-      methodPackageExpanded: true,
+      methodFoldExpanded: false,
+      methodPackageExpanded: false,
       isPackage: !!(item.packageId || item.packageName),
       packageName: item.packageName || null,
       packageDetailsLoading: false,
@@ -1475,19 +1626,13 @@ async function handleItemSelect(checked, item, cat) {
     };
     selectedItems.value.push(newRow);
     // 必须用数组里的响应式行，不能继续改局部 newRow：push 后列表内是 proxy，改 raw 对象不会触发右侧卡片更新（会一直卡在「加载中」）
-    const row = selectedItems.value[selectedItems.value.length - 1];
 
-    // 勾选项目只加入项目列表，检查方法由用户在“检查方法”区域手动选择
+    const rowJustAdded = selectedItems.value[selectedItems.value.length - 1];
-    row.selectedMethod = null;
+    syncItemExpandedFlag(rowJustAdded);
+
     updateMethodDisplay();
-
+    await nextTick();
-    // 新勾选项目后默认展开，直接展示检查方法状态和套餐明细
+    form.totalAmount = totalAmountCalc.value;
-    row.expanded = true;
-    row.itemPackageExpanded = true;
-    row.methodPackageExpanded = true;
-    if (hasItemPackage(row)) {
-      await loadPackageDetailsForItem(row);
-    }
 
     // 自动回填执行科室：按检查项目类型 → 检查类型管理里配置的执行科室
     if (selectedItems.value.length === 1 && cat?.performDeptName) {
@@ -1508,25 +1653,16 @@ async function handleItemSelect(checked, item, cat) {
   // Bug #382 修复：移除自动切换页签逻辑，保持当前页签状态
 }
 
-// Bug #384修复 + #426修复: 展开/收起项目卡片
+/** expanded 与各折叠条保持一致（明细表等仍可依赖 expanded） */
-async function toggleItemExpand(item) {
+function syncItemExpandedFlag(row) {
-  item.expanded = !item.expanded;
+  if (!row) return;
-  if (item.expanded && hasItemPackage(item) && getPackageDetailsList(item).length === 0 && !item.packageDetailsLoading) {
+  row.expanded = !!(row.projectFoldExpanded || row.methodFoldExpanded);
-    await loadPackageDetailsForItem(item);
-  }
-  if (
-    item.expanded &&
-    shouldShowMethodPackageBody(item) &&
-    getMethodPackageDetailsList(item).length === 0 &&
-    !item.methodPackageLoading
-  ) {
-    await loadMethodPackageDetails(item, item.selectedMethod);
-  }
 }
 
-async function toggleItemPackageExpand(item) {
+async function toggleProjectFold(item) {
-  item.itemPackageExpanded = !item.itemPackageExpanded;
+  item.projectFoldExpanded = !item.projectFoldExpanded;
-  if (item.itemPackageExpanded && getPackageDetailsList(item).length === 0 && !item.packageDetailsLoading) {
+  syncItemExpandedFlag(item);
+  if (item.projectFoldExpanded && hasItemPackage(item) && getPackageDetailsList(item).length === 0 && !item.packageDetailsLoading) {
     await loadPackageDetailsForItem(item);
   }
 }
@@ -1543,25 +1679,64 @@ async function toggleMethodPackageExpand(item) {
   }
 }
 
-// Bug #384修复: 勾选框选择检查方法（单选逻辑）
+async function toggleSelectedMethodFold(method) {
-async function selectMethodCheckbox(checked, item, method) {
+  method.expanded = !method.expanded;
-  if (checked) {
+  if (
-    item.selectedMethod = method;
+    method.expanded &&
-    item.expanded = true;
+    hasStandaloneMethodPackage(method) &&
-    item.methodPackageExpanded = true;
+    getStandaloneMethodPackageDetailsList(method).length === 0 &&
-    // 动态加载该方法对应的套餐明细
+    !method.packageLoading
-    await loadMethodPackageDetails(item, method);
+  ) {
-  } else {
+    await loadStandaloneMethodPackageDetails(method);
-    item.selectedMethod = null;
-    item.methodPackageDetails = [];
   }
-  // 联动更新表单检查方法显示字段
+}
-  updateMethodDisplay();
 
-  // #430: 套餐金额实时同步到申请单
+function handleRemoveMethod(idx) {
-  nextTick(() => {
+  selectedMethods.value.splice(idx, 1);
-    form.totalAmount = totalAmountCalc.value;
+  updateMethodDisplay();
+}
+
+async function loadStandaloneMethodPackageDetails(method) {
+  method.packageLoading = true;
+  method.packageDetails = [];
+  try {
+    let packageId = method.packageId;
+    if (!packageId && !method.packageName) {
+      method.packageLoading = false;
+      return;
+    }
+    if (!packageId && method.packageName) {
+      const pkgRes = await listCheckPackage({ packageName: method.packageName });
+      let packages = pkgRes?.data || [];
+      if (!Array.isArray(packages)) {
+        packages = packages.records || packages.data || [];
+      }
+      if (packages.length === 0) {
+        method.packageLoading = false;
+        return;
+      }
+      packageId = packages[0].id;
+      method.packageId = packageId;
+    }
+    const detailRes = await request({
+      url: `/system/check-type/package/${packageId}/details`,
+      method: 'get'
     });
+    method.packageDetails = parsePackageDetailsPayload(detailRes).map(d => ({
+      id: d.id,
+      name: d.name || d.itemName,
+      quantity: d.quantity || 1,
+      unit: d.unit || '次',
+      price: d.price ?? d.unitPrice ?? d.itemPrice ?? 0,
+      amount: d.amount || d.total || 0,
+      checked: true
+    }));
+  } catch (err) {
+    console.error('加载检查方法套餐明细失败:', err);
+    method.packageDetails = [];
+  } finally {
+    method.packageLoading = false;
+  }
 }
 
 // 根据检查方法的packageName加载对应的套餐明细
@@ -1623,9 +1798,12 @@ async function onDetailMethodChange(row, val) {
   }
   row.methodPackageDetails = [];
   updateMethodDisplay();
-  row.expanded = shouldShowPackageBody(row);
+  const open = shouldShowPackageBody(row);
-  row.itemPackageExpanded = true;
+  row.expanded = open;
-  row.methodPackageExpanded = true;
+  row.projectFoldExpanded = shouldShowItemPackageBody(row) && open;
+  row.methodFoldExpanded = shouldShowMethodPackageBody(row) && open;
+  row.methodPackageExpanded = false;
+  syncItemExpandedFlag(row);
   if (hasItemPackage(row)) {
     await loadPackageDetailsForItem(row);
   }
@@ -1637,26 +1815,13 @@ async function onDetailMethodChange(row, val) {
   });
 }
 
-// Bug #384修复: 更新检查方法显示字段（联动）
+// Bug #384修复: 更新检查方法显示字段（取自独立已选检查方法）
 function updateMethodDisplay() {
-  // 找到第一个有选中检查方法的项目
+  if (selectedMethods.value.length > 0) {
-  const itemWithMethod = selectedItems.value.find(item => item.selectedMethod);
+    form.selectedMethodDisplay = selectedMethods.value.map((method) => method.name).join('、');
-  if (itemWithMethod?.selectedMethod) {
+    return;
-    form.selectedMethodDisplay = itemWithMethod.selectedMethod.name;  // 显示检查方法名称，不显示套餐名称
+  }
-  } else {
   form.selectedMethodDisplay = '';
-  }
-}
-
-// 选择检查方法
-function selectMethod(item, method) {
-  if (item.selectedMethod?.id === method.id) {
-    item.selectedMethod = null;
-  } else {
-    item.selectedMethod = method;
-  }
-  // Bug #384修复: 联动更新表单检查方法显示字段
-  updateMethodDisplay();
 }
 
 function handleRemoveItem(idx, item) {
@@ -1670,7 +1835,7 @@ function handleRemoveItem(idx, item) {
   if (selectedItems.value.length === 0) {
     form.performDeptCode = '';
     form.examTypeCode = '';
-    form.selectedMethodDisplay = '';  // Bug #384修复: 清空检查方法显示
+    updateMethodDisplay();
   } else {
     // Bug #384修复: 移除后重新计算检查方法显示
     updateMethodDisplay();
@@ -1976,39 +2141,167 @@ defineExpose({ getList });
   overflow: hidden;
 }
 
-.selected-item-card .card-header {
+/* 项目上 / 方法下：各自独立下拉条 */
-  display: flex;
+.fold-strip {
-  align-items: center;
+  border-bottom: 1px solid var(--el-border-color-lighter);
-  padding: 10px 10px;
-  cursor: pointer;
-  gap: 8px;
-  background: linear-gradient(180deg, #f8fafc 0%, #f0f4f8 100%);
-  border-bottom: 1px solid transparent;
 }
 
-.selected-item-card .card-header:hover {
+.fold-strip:last-child {
+  border-bottom: none;
+}
+
+.fold-strip-header {
+  display: flex;
+  align-items: flex-start;
+  gap: 8px;
+  padding: 10px 10px;
+  cursor: pointer;
+  background: linear-gradient(180deg, #f8fafc 0%, #f0f4f8 100%);
+}
+
+.fold-strip-header:hover {
   background: linear-gradient(180deg, #ecf5ff 0%, #e3eef8 100%);
 }
 
-.selected-item-card.is-expanded .card-header {
+.fold-strip-method.is-method-target .fold-strip-header {
-  border-bottom-color: #ebeef5;
+  background: linear-gradient(180deg, #e8f3ff 0%, #dceaff 100%);
 }
 
-.card-name {
+.fold-chevron {
+  font-size: 14px;
+  color: #909399;
+  transition: transform 0.2s ease;
+  flex-shrink: 0;
+  margin-top: 2px;
+  transform: rotate(-90deg);
+}
+
+.fold-chevron.open {
+  transform: rotate(0deg);
+}
+
+.fold-header-main {
   flex: 1;
   min-width: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.fold-kicker {
+  font-size: 11px;
+  font-weight: 600;
+  color: #909399;
+  letter-spacing: 0.03em;
+}
+
+.fold-title {
   font-size: 13px;
-  font-weight: 500;
+  font-weight: 600;
   color: #303133;
-  line-height: 1.4;
+  line-height: 1.35;
   word-break: break-word;
 }
 
-.card-price {
+.fold-title-plain {
+  font-weight: 500;
+  color: #606266;
+}
+
+.line-clamp-2 {
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+}
+
+.fold-price-strong {
   font-size: 13px;
   color: #409eff;
   font-weight: 600;
   flex-shrink: 0;
+  margin-top: 2px;
+}
+
+.fold-price-strong.warn {
+  color: #e6a23c;
+}
+
+.fold-strip-body {
+  background: #fafbfc;
+  padding: 0 10px 10px 36px;
+  border-top: 1px dashed var(--el-border-color-lighter);
+}
+
+.fold-package-wrap {
+  padding-top: 6px;
+}
+
+.fold-strip-muted {
+  font-size: 12px;
+  color: #909399;
+  padding: 10px 0 4px;
+}
+
+.selected-global-method-picker {
+  flex-shrink: 0;
+  margin-top: 8px;
+  border-radius: 6px;
+  border: 1px solid #e4e7ed;
+  background: #fff;
+  overflow: hidden;
+}
+
+.method-picker-collapse-title {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  padding: 10px 10px;
+  cursor: pointer;
+  background: #fff;
+}
+
+.method-picker-collapse-title:hover {
+  background: #f5f7fa;
+}
+
+.method-picker-title-main {
+  flex: 1;
+  min-width: 0;
+  font-size: 13px;
+  font-weight: 600;
+  color: #303133;
+}
+
+.global-method-picker-scope {
+  font-size: 12px;
+  color: #909399;
+  flex-shrink: 0;
+}
+
+.method-picker-arrow {
+  font-size: 14px;
+  color: #909399;
+  transition: transform 0.2s ease;
+  flex-shrink: 0;
+  transform: rotate(-90deg);
+}
+
+.method-picker-arrow.expanded {
+  transform: rotate(0deg);
+}
+
+.global-method-picker-list {
+  display: flex;
+  flex-direction: column;
+  gap: 0;
+  padding: 6px 8px 8px;
+  border-top: 1px solid #ebeef5;
+}
+
+.method-picker-row {
+  padding: 6px 4px;
+  border-radius: 3px;
 }
 
 .expand-icon {
@@ -2058,11 +2351,6 @@ defineExpose({ getList });
   white-space: nowrap;
 }
 
-/* 展开区域 */
-.selected-card-body {
-  background: #fafbfc;
-}
-
 .selected-card-section {
   padding: 10px;
   border-bottom: 1px solid #ebeef5;
@@ -2112,6 +2400,49 @@ defineExpose({ getList });
   color: #409eff;
 }
 
+/* 收起态：仅展示折叠箭头，不显示「套餐明细」等冗余标题 */
+.package-toggle-minimal {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  padding: 8px 10px;
+  font-size: 12px;
+  color: var(--el-text-color-secondary);
+  cursor: pointer;
+  border-bottom: 1px dashed #e4e7ed;
+  background: #fafafa;
+}
+
+.package-toggle-minimal:hover {
+  color: #409eff;
+  background: #f5f9ff;
+}
+
+
+
+.nested-empty-text {
+  font-size: 12px;
+  color: var(--el-text-color-placeholder);
+  padding-left: 2px;
+}
+
+.nested-label-row {
+  margin-bottom: 6px;
+}
+
+.nested-label {
+  font-size: 11px;
+  font-weight: 600;
+  color: var(--el-text-color-secondary);
+  letter-spacing: 0.03em;
+}
+
+
+
+.method-label-inner {
+  font-size: 13px;
+}
+
 .package-details-loading,
 .package-details-empty {
   padding: 12px 10px;

openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue

@@ -179,8 +179,8 @@
                       type="datetime"
                       placeholder="选择执行时间"
                       size="small"
-                      format="YYYY-MM-DD HH:mm:ss"
+                      format="YYYY-MM-DD HH:mm"
-                      value-format="YYYY-MM-DD HH:mm:ss"
+                      value-format="YYYY-MM-DD HH:mm"
                       style="width: 100%"
                     />
                   </el-form-item>
@@ -445,7 +445,6 @@
                 >
                   <el-table-column label="项目名称" prop="itemName" min-width="180">
                     <template #default="scope">
-                      <el-tag v-if="scope.row.isPackage" size="small" type="warning" style="margin-right: 4px">套餐</el-tag>
                       <span :style="{ fontWeight: scope.row.isPackage ? 'bold' : 'normal' }">
                         {{ scope.row.itemName }}
                       </span>
@@ -563,7 +562,6 @@
                     @change="toggleInspectionItem(item)"
                     @click.stop
                   />
-                  <el-tag v-if="item.isPackage" size="small" type="warning" style="margin-right: 4px">套餐</el-tag>
                   <span class="item-itemName">{{ item.itemName }}</span>
                   <span class="item-price">¥{{ item.itemPrice }}/{{ item.unit || "次" }}</span>
                 </div>
@@ -614,7 +612,6 @@
                     <template v-if="item.isPackage">{{ item.expanded ? '▼' : '▶' }}</template>
                     <template v-else>•</template>
                   </span>
-                  <el-tag v-if="item.isPackage" size="small" type="warning" style="margin-right: 4px">套餐</el-tag>
                   <span class="item-itemName">{{ item.itemName }}</span>
                   <span class="item-price">¥{{ item.itemPrice }}/{{ item.unit || "次" }}</span>
                   <el-button
@@ -875,6 +872,30 @@ let applyTimeTimer = null
 const userStore = useUserStore()
 const { id: userId, name: userName, nickName: userNickName } = storeToRefs(userStore)
 
+/** 执行时间默认值：当前系统时间，精确到分钟 */
+const getDefaultExecuteTime = () => {
+  const d = new Date()
+  const year = d.getFullYear()
+  const month = String(d.getMonth() + 1).padStart(2, '0')
+  const day = String(d.getDate()).padStart(2, '0')
+  const hours = String(d.getHours()).padStart(2, '0')
+  const minutes = String(d.getMinutes()).padStart(2, '0')
+  return `${year}-${month}-${day} ${hours}:${minutes}`
+}
+
+/** 将后端时间规范为 YYYY-MM-DD HH:mm */
+const normalizeExecuteTime = (value) => {
+  if (!value) return getDefaultExecuteTime()
+  const d = new Date(String(value).replace(/-/g, '/'))
+  if (Number.isNaN(d.getTime())) return getDefaultExecuteTime()
+  const year = d.getFullYear()
+  const month = String(d.getMonth() + 1).padStart(2, '0')
+  const day = String(d.getDate()).padStart(2, '0')
+  const hours = String(d.getHours()).padStart(2, '0')
+  const minutes = String(d.getMinutes()).padStart(2, '0')
+  return `${year}-${month}-${day} ${hours}:${minutes}`
+}
+
 // 修改 initData 函数
 const initData = async () => {
   // 先初始化患者信息（如果有）
@@ -899,6 +920,10 @@ const initData = async () => {
     formData.executeTime = formatDateTime(new Date())
     // 申请日期实时更新（启动定时器）
     startApplyTimeTimer()
+    // 执行时间默认当前系统时间（精确到分钟）
+    if (!formData.executeTime) {
+      formData.executeTime = getDefaultExecuteTime()
+    }
 
     // 执行时间默认填充当前系统时间
     formData.executeTime = formatDateTime(new Date())
@@ -980,7 +1005,7 @@ const formData = reactive({
   applyDeptCode: '',
   specimenName: '血液',
   encounterId: '',
-  executeTime: null,
+  executeTime: getDefaultExecuteTime(),
   applicationType: 0
 })
 
@@ -1552,7 +1577,7 @@ const resetForm = async () => {
     visitNo: '',
     specimenName: '血液',
     encounterId: props.patientInfo.encounterId || '',
-    executeTime: formatDateTime(new Date()),
+    executeTime: getDefaultExecuteTime(),
     applicationType: 0,
   })
   selectedInspectionItems.value = []
@@ -1990,7 +2015,7 @@ const loadApplicationToForm = async (row) => {
         visitNo: detail.visitNo,
         specimenName: detail.specimenName,
         encounterId: detail.encounterId,
-        executeTime: detail.executeTime || null,
+        executeTime: normalizeExecuteTime(detail.executeTime),
         applicationType: detail.applicationType ?? 0
       })
 

openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionHistory.vue

@@ -18,16 +18,12 @@
       <!-- <el-table-column label="组套类型" align="center" prop="typeEnum_enumText" /> -->
       <el-table-column label="单次剂量" align="center" prop="rangeCode_dictText">
         <template #default="scope">
-          {{
+          {{ formatHistoryDose(scope.row) }}
-            scope.row.dose
-              ? formatNumber(scope.row.dose) + ' ' + scope.row.doseUnitCode_dictText
-              : ''
-          }}
         </template>
       </el-table-column>
       <el-table-column label="总量" align="center" prop="rangeCode_dictText">
         <template #default="scope">
-          {{ scope.row.quantity ? scope.row.quantity + ' ' + scope.row.unitCode_dictText : '' }}
+          {{ formatHistoryTotalQuantity(scope.row) }}
         </template>
       </el-table-column>
       <el-table-column label="频次/用法" align="center" prop="rangeCode_dictText" width="200">
@@ -90,6 +86,31 @@ const queryParams = ref({
   typeEnum: 1,
 });
 
+function formatHistoryTotalQuantity(row) {
+  if (!row || row.quantity == null || row.quantity === '') return '';
+  const fromDict = row.unitCode_dictText ?? row.minUnitCode_dictText ?? row.unitCodeName;
+  let u =
+    fromDict != null && String(fromDict).trim() !== ''
+    && String(fromDict).toLowerCase() !== 'null'
+      ? String(fromDict).trim()
+      : '';
+  if (!u) {
+    const t = Number(row.adviceType);
+    if (t === 3 || t === 6 || t === 23 || t === 5) u = '次';
+    else if (t === 4) u = '个';
+  }
+  return u ? `${row.quantity} ${u}` : String(row.quantity);
+}
+
+function formatHistoryDose(row) {
+  if (!row?.dose) return '';
+  const du = row.doseUnitCode_dictText;
+  if (du != null && String(du).trim() !== '' && String(du).toLowerCase() !== 'null') {
+    return formatNumber(row.dose) + ' ' + du;
+  }
+  return formatNumber(row.dose);
+}
+
 function handleOpen() {
   drawer.value = true;
   getList();

openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionInfo.vue

@@ -82,7 +82,7 @@
             <span>{{ index + 1 + '. ' }}</span>
             <span>{{ medItem.adviceName }}</span>
             <span>{{ '(' + medItem.volume + ')' }}</span>
-            <span>{{ medItem.quantity + ' ' + medItem.unitCode_dictText }}</span>
+            <span>{{ formatPrintLineQuantity(medItem) }}</span>
             <span>{{ '批次号：' + medItem.lotNumber }}</span>
             <div>
               <span>用法用量：</span>
@@ -161,6 +161,22 @@ const props = defineProps({
 const emit = defineEmits(['close']);
 
 //合计
+function formatPrintLineQuantity(row) {
+  if (row == null || row.quantity == null || row.quantity === '') return '';
+  const fromDict = row.unitCode_dictText ?? row.minUnitCode_dictText ?? row.unitCodeName;
+  let u =
+    fromDict != null && String(fromDict).trim() !== ''
+    && String(fromDict).toLowerCase() !== 'null'
+      ? String(fromDict).trim()
+      : '';
+  if (!u) {
+    const t = Number(row.adviceType);
+    if (t === 3 || t === 6 || t === 23 || t === 5) u = '次';
+    else if (t === 4) u = '个';
+  }
+  return u ? `${row.quantity} ${u}` : String(row.quantity);
+}
+
 function getTotalPrice(item) {
   let totalPrice = new Decimal(0);
   item.prescriptionInfoDetailList.forEach((medItem) => {

openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue

@@ -686,7 +686,15 @@
             <span style="margin-left: 4px">{{ scope.row.doseUnitCode_dictText }}</span>
           </template>
           <span v-else>
-            {{ scope.row.dose ? scope.row.dose + ' ' + scope.row.doseUnitCode_dictText : '' }}
+            {{
+              scope.row.dose
+                ? scope.row.dose +
+                  (scope.row.doseUnitCode_dictText &&
+                  String(scope.row.doseUnitCode_dictText).toLowerCase() !== 'null'
+                    ? ' ' + scope.row.doseUnitCode_dictText
+                    : '')
+                : ''
+            }}
           </span>
         </template>
       </el-table-column>
@@ -703,10 +711,10 @@
               @change="calculateTotalPrice(scope.row, scope.$index)"
               @input="calculateTotalPrice(scope.row, scope.$index)"
             />
-            <span style="margin-left: 4px">{{ scope.row.unitCode_dictText }}</span>
+            <span style="margin-left: 4px">{{ resolveTotalQuantityUnit(scope.row) }}</span>
           </template>
           <span v-else>
-            {{ scope.row.quantity ? scope.row.quantity + ' ' + scope.row.unitCode_dictText : '' }}
+            {{ formatTotalQuantityWithUnit(scope.row) }}
           </span>
         </template>
       </el-table-column>
@@ -917,6 +925,39 @@ const unitMap = ref({
   minUnit: 'minUnit',
   unit: 'unit',
 });
+
+/** 解析总量单位文案（无字典时：诊疗/手术/检查默认「次」，耗材默认「个」） */
+const resolveTotalQuantityUnit = (row) => {
+  if (row == null) return '';
+  const fromDict =
+    row.unitCode_dictText ?? row.minUnitCode_dictText ?? row.unitCodeName;
+  let unitStr =
+    fromDict != null && String(fromDict).trim() !== ''
+      && String(fromDict).toLowerCase() !== 'null'
+      ? String(fromDict).trim()
+      : '';
+  if (!unitStr) {
+    const t = Number(row.adviceType);
+    // drord_doctor_type: 3=诊疗 4=耗材 5=会诊 6=手术；23=检查（特殊）
+    // 注意：2=中成药（药品），不可用「次」作为默认单位
+    if (t === 3 || t === 6 || t === 23 || t === 5) {
+      unitStr = '次';
+    } else if (t === 4) {
+      unitStr = '个';
+    }
+  }
+  return unitStr;
+};
+
+/** 总量列展示：避免 unitCode_dictText 为空时显示「1 null」 */
+const formatTotalQuantityWithUnit = (row) => {
+  if (row == null) return '';
+  const q = row.quantity;
+  if (q === undefined || q === null || q === '') return '';
+  const unitStr = resolveTotalQuantityUnit(row);
+  return unitStr ? `${q} ${unitStr}` : String(q);
+};
+
 const buttonDisabled = computed(() => {
   return !props.patientInfo;
 });
@@ -2714,7 +2755,8 @@ function handleEmrTreatment() {
         treatment += '诊疗[' + (index + 1) + ']' + '  ';
         treatment += item.adviceName + '  ';
         if (item.quantity) {
-          treatment += '数量：' + item.quantity + item.unitCode_dictText + '  ';
+          const u = resolveTotalQuantityUnit(item);
+          treatment += '数量：' + item.quantity + (u ? ' ' + u : '') + '  ';
         }
         treatment += '频次：' + item.rateCode_dictText + '  ';
         if (item.methodCode_dictText) {

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

@@ -58,7 +58,11 @@
           <el-table-column prop="busNo" label="单据号" align="center" width="150" />
           <el-table-column prop="applicantName" label="申请人" align="center" width="100" />
           <el-table-column prop="locationName" label="发药药房" align="center" />
-          <el-table-column prop="statusEnum_enumText" label="状态" align="center" />
+          <el-table-column prop="statusEnum_enumText" label="状态" align="center">
+            <template #default="scope">
+              {{ formatSummaryStatusText(scope.row) }}
+            </template>
+          </el-table-column>
           <el-table-column prop="applyTime" label="汇总日期" align="center" width="140">
             <template #default="scope">
               {{ scope.row.applyTime ? parseTime(scope.row.applyTime, '{y}-{m}-{d}') : '-' }}
@@ -139,6 +143,32 @@ import {getCurrentInstance, ref} from 'vue';
 import {getFromSummaryDetails, getFromSummaryInit, getFromSummaryList, totalSendDrug,} from './api.js';
 
 const { proxy } = getCurrentInstance();
+
+/** 发药汇总单状态展示（汇总申请→已提交，发药→已发药） */
+const SUMMARY_STATUS_DISPLAY = {
+  2: '已提交',
+  4: '已发药',
+};
+const LEGACY_SUMMARY_STATUS_TEXT = {
+  待配药: '已提交',
+  已发放: '已发药',
+};
+
+function formatSummaryStatusText(row) {
+  const code = Number(row?.statusEnum);
+  if (SUMMARY_STATUS_DISPLAY[code]) {
+    return SUMMARY_STATUS_DISPLAY[code];
+  }
+  return LEGACY_SUMMARY_STATUS_TEXT[row?.statusEnum_enumText] || row?.statusEnum_enumText || '-';
+}
+
+function mapSummaryStatusOptions(options = []) {
+  return options.map((item) => ({
+    ...item,
+    label: SUMMARY_STATUS_DISPLAY[item.value] ?? LEGACY_SUMMARY_STATUS_TEXT[item.label] ?? item.label,
+  }));
+}
+
 const statusEnumOptions = ref([]);
 const summaryList = ref([]);
 const queryParams = ref({
@@ -222,7 +252,7 @@ function handleSend(row) {
 const getStatusOption = async () => {
   try {
     const res = await getFromSummaryInit();
-    statusEnumOptions.value = res.data.dispenseStatusOptions;
+    statusEnumOptions.value = mapSummaryStatusOptions(res.data.dispenseStatusOptions);
   } catch (error) {}
 };
 getStatusOption();

openhis-ui-vue3/src/views/inpatientDoctor/home/components/api.js

@@ -250,10 +250,11 @@ export function getContract(params) {
 /**
  * 获取科室列表
  */
-export function getOrgTree() {
+export function getOrgTree(params = {}) {
   return request({
     url: '/base-data-manage/organization/organization',
     method: 'get',
+    params: { pageNo: 1, pageSize: 5000, ...params },
   });
 }
 

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

@@ -24,22 +24,20 @@
           </el-col> -->
           <el-col :span="12">
             <el-form-item label="发往科室" prop="targetDepartment" style="width: 100%">
-              <!-- <el-input v-model="form.targetDepartment" autocomplete="off" /> -->
+              <el-select
-              <el-tree-select
-                clearable
-                style="width: 100%"
                 v-model="form.targetDepartment"
                 filterable
-                :data="orgOptions"
+                clearable
-                :props="{
-                  value: 'id',
-                  label: 'name',
-                  children: 'children',
-                }"
-                value-key="id"
-                check-strictly
                 placeholder="请选择科室"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="opt in flatOrgOptions"
+                  :key="opt.value"
+                  :label="opt.label"
+                  :value="opt.value"
                 />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -78,18 +76,33 @@
   </div>
 </template>
 <script setup name="BloodTransfusion">
-import {getCurrentInstance, onBeforeMount, onMounted, reactive, ref} from 'vue';
+import {computed, getCurrentInstance, nextTick, onBeforeMount, onMounted, reactive, ref, watch} from 'vue';
+import {ElMessage} from 'element-plus';
 import {patientInfo} from '../../../store/patient.js';
 import {getDepartmentList} from '@/api/public.js';
+import request from '@/utils/request';
+import {getDiagnosisTreatmentOne} from '@/views/catalog/diagnosistreatment/components/diagnosistreatment';
 import {getEncounterDiagnosis} from '../../api.js';
 import {getApplicationList, saveBloodTransfusio} from './api';
 
 const { proxy } = getCurrentInstance();
+
+/** 科室树节点 id 统一为字符串，避免大整数精度丢失导致 tree-select 无法匹配 */
+const normalizeOrgTreeIds = (nodes) => {
+  if (!Array.isArray(nodes)) return [];
+  return nodes.map((node) => ({
+    ...node,
+    id: node.id != null ? String(node.id) : node.id,
+    children: node.children?.length ? normalizeOrgTreeIds(node.children) : undefined,
+  }));
+};
+
 // 递归查找树形科室节点
 const findTreeItem = (list, id) => {
-  if (!list || list.length === 0) return null;
+  if (!list || list.length === 0 || id == null || id === '') return null;
+  const strId = String(id);
   for (const item of list) {
-    if (item.id == id) return item;
+    if (String(item.id) === strId) return item;
     if (item.children && item.children.length > 0) {
       const found = findTreeItem(item.children, id);
       if (found) return found;
@@ -97,11 +110,149 @@ const findTreeItem = (list, id) => {
   }
   return null;
 };
+
+/** 在科室树中解析 orgId（兼容 Long 转 Number 后的精度丢失） */
+const resolveOrgIdInTree = (rawOrgId) => {
+  if (rawOrgId == null || rawOrgId === '') return '';
+  const strOrgId = String(rawOrgId);
+  const findInTree = (nodes) => {
+    if (!nodes?.length) return null;
+    for (const node of nodes) {
+      if (String(node.id) === strOrgId) return String(node.id);
+      if (
+        typeof node.id === 'string' &&
+        node.id.length >= 16 &&
+        strOrgId.length >= 16 &&
+        node.id.substring(0, 15) === strOrgId.substring(0, 15)
+      ) {
+        return String(node.id);
+      }
+      if (node.children?.length) {
+        const found = findInTree(node.children);
+        if (found) return found;
+      }
+    }
+    return null;
+  };
+  return findInTree(orgOptions.value) || strOrgId;
+};
+
+const resolveTargetDepartmentId = (rawId) => {
+  if (rawId == null || rawId === '') return '';
+  const resolved = resolveOrgIdInTree(rawId);
+  const node = findTreeItem(orgOptions.value, resolved);
+  return node ? String(node.id) : resolved;
+};
+
+/** 诊疗目录「所属科室」→ AdviceBaseDto.orgId */
+const getBelongingOrgId = (item) => {
+  if (!item) return null;
+  return item.orgId ?? item.org_id ?? null;
+};
+
+/** 诊疗目录所属科室名称（字典翻译字段） */
+const getBelongingOrgName = (item) => {
+  if (!item) return '';
+  return item.orgId_dictText || item.orgName || item.org_name || '';
+};
+
+/** 按机构 ID 拉取科室名称（树中无节点时兜底） */
+const fetchOrgNameById = async (orgId) => {
+  if (orgId == null || orgId === '') return '';
+  const fromTree = findOrgName(orgId);
+  if (fromTree) return fromTree;
+  try {
+    const res = await request({
+      url: '/base-data-manage/organization/organization-getById',
+      method: 'get',
+      params: { orgId },
+    });
+    if (res.code === 200 && res.data?.name) {
+      return res.data.name;
+    }
+  } catch (e) {
+    console.error('查询科室名称失败', e);
+  }
+  return '';
+};
+
+/** 从机构树解析科室名称 */
+const findOrgName = (orgId) => {
+  if (orgId == null || orgId === '') return '';
+  const node = findTreeItem(orgOptions.value, orgId);
+  if (node?.name) return node.name;
+  const resolved = resolveOrgIdInTree(orgId);
+  const resolvedNode = findTreeItem(orgOptions.value, resolved);
+  return resolvedNode?.name || '';
+};
+
+/** 自动填充时缓存的科室名称 */
+const targetDepartmentName = ref('');
+
+/** 扁平化科室选项，保证 el-select 能稳定显示 label */
+const flatOrgOptions = computed(() => {
+  const options = [];
+  const seen = new Set();
+  const walk = (nodes) => {
+    for (const node of nodes || []) {
+      if (node?.id == null) continue;
+      const value = String(node.id);
+      if (seen.has(value)) continue;
+      seen.add(value);
+      options.push({ value, label: node.name || value });
+      if (node.children?.length) walk(node.children);
+    }
+  };
+  walk(orgOptions.value);
+  const curId = form.targetDepartment;
+  const curName = targetDepartmentName.value || findOrgName(curId);
+  if (curId && curName && !seen.has(String(curId))) {
+    options.unshift({ value: String(curId), label: curName });
+  }
+  return options;
+});
+
+/** 从诊疗目录详情补全所属科室（医嘱下拉接口不带 orgId_dictText） */
+const resolveProjectOrgInfo = async (item) => {
+  if (!item) return { orgId: null, orgName: '' };
+  let orgId = getBelongingOrgId(item);
+  let orgName = getBelongingOrgName(item);
+  if ((!orgId || !orgName) && item.adviceDefinitionId) {
+    try {
+      const res = await getDiagnosisTreatmentOne(item.adviceDefinitionId);
+      const detail = res?.data;
+      if (detail) {
+        orgId = orgId ?? detail.orgId ?? detail.org_id ?? null;
+        orgName = orgName || detail.orgId_dictText || detail.orgName || '';
+      }
+    } catch (e) {
+      console.error('查询诊疗目录所属科室失败', e);
+    }
+  }
+  if (orgId && !orgName) {
+    orgName = await fetchOrgNameById(orgId);
+  }
+  return { orgId, orgName };
+};
+
+/** 写入发往科室 */
+const applyTargetDepartment = async (belongOrgId, nameHint = '') => {
+  if (belongOrgId == null || belongOrgId === '') {
+    form.targetDepartment = '';
+    targetDepartmentName.value = '';
+    return;
+  }
+  const resolvedDeptId = resolveTargetDepartmentId(belongOrgId);
+  const deptName =
+    nameHint || findOrgName(belongOrgId) || findOrgName(resolvedDeptId) || (await fetchOrgNameById(belongOrgId));
+  targetDepartmentName.value = deptName;
+  form.targetDepartment = resolvedDeptId;
+};
 const emits = defineEmits(['submitOk']);
 const props = defineProps({});
 const state = reactive({});
-const applicationListAll = ref();
+const applicationListAll = ref([]);
-const applicationList = ref();
+const applicationList = ref([]);
 const loading = ref(false);
 const orgOptions = ref([]); // 科室选项
 const getList = () => {
@@ -118,29 +269,48 @@ const getList = () => {
     adviceTypes: [3], //1 药品 2耗材 3诊疗
   })
     .then((res) => {
-      if (res.code === 200) {
+      if (res.code === 200 && Array.isArray(res.data?.records)) {
-        applicationListAll.value = res.data.records;
+        const records = res.data.records.filter((item) => item.adviceDefinitionId != null);
-        applicationList.value = res.data.records.map((item) => {
+        applicationListAll.value = records;
+        applicationList.value = records.map((item) => {
           const priceInfo = item.priceList?.[0] || {};
           const price = priceInfo.price != null ? Number(priceInfo.price).toFixed(2) : '0.00';
           const unit = item.unitCode_dictText || item.unitCode || '';
+          const id = item.adviceDefinitionId;
           return {
-            adviceDefinitionId: item.adviceDefinitionId,
+            adviceDefinitionId: id,
             orgId: item.orgId,
             label: item.adviceName + ' (￥' + price + '/' + unit + ')',
-            key: item.adviceDefinitionId,
+            key: id,
           };
         });
       } else {
-        proxy.$message.error(res.message);
+        proxy.$message.error(res.message || '加载输血项目失败');
+        applicationListAll.value = [];
         applicationList.value = [];
       }
     })
     .finally(() => {
       loading.value = false;
+      if (transferValue.value.length > 0) {
+        nextTick(async () => {
+          const valid = await validateTransferOrgConsistency(transferValue.value);
+          if (valid) {
+            lastValidTransferValue.value = [...transferValue.value];
+            fillTargetDepartmentFromSelection(transferValue.value, 1);
+          } else {
+            transferValue.value = [];
+            lastValidTransferValue.value = [];
+          }
+        });
+      }
     });
 };
 const transferValue = ref([]);
+/** 上一次通过校验的已选项目（科室不一致时回滚到此状态） */
+const lastValidTransferValue = ref([]);
+const isRevertingTransfer = ref(false);
+let transferValidateSeq = 0;
 const form = reactive({
   // categoryType: '', // 项目类别
   targetDepartment: '', // 发往科室
@@ -157,86 +327,140 @@ const rules = reactive({});
 onBeforeMount(() => {});
 onMounted(() => {
   getList();
+  getLocationInfo();
 });
+const collectSelectedProjects = (selectProjectIds) => {
+  return (selectProjectIds || [])
+    .map((element) =>
+      applicationListAll.value.find((item) => String(item.adviceDefinitionId) === String(element))
+    )
+    .filter(Boolean);
+};
+
+/** 校验已选项目的所属科室是否一致（超过 1 项时才校验） */
+const validateTransferOrgConsistency = async (selectProjectIds) => {
+  const arr = collectSelectedProjects(selectProjectIds);
+  if (arr.length <= 1) {
+    return true;
+  }
+  const orgInfoList = await Promise.all(arr.map((item) => resolveProjectOrgInfo(item)));
+  const firstOrgId = orgInfoList[0]?.orgId;
+  return orgInfoList.every((info) => String(info?.orgId ?? '') === String(firstOrgId ?? ''));
+};
+
 /**
  * type(1：watch监听类型 2:点击保存类型)
- * selectProjectIds(选中项目的id数组)
+ */
- * */
+const fillTargetDepartmentFromSelection = async (selectProjectIds, type) => {
-const projectWithDepartment = (selectProjectIds, type) => {
+  const manualDept = type === 2 && form.targetDepartment ? form.targetDepartment : '';
-  //1.获取选中的项目 2.判断项目的执行科室是否相同 3.判断执行科室是否配置 4.将项目的执行科室复值到执行科室下拉选位置
+  const arr = collectSelectedProjects(selectProjectIds);
-  let isRelease = true;
-  // 选中项目的数组
-  const arr = [];
-  // 根据选中的项目id查找对应的项目
-  selectProjectIds.forEach((element) => {
-    const searchData = applicationList.value.find((item) => {
-      return element == item.adviceDefinitionId;
-    });
-    arr.push(searchData);
-  });
-  // 清空科室
-  form.targetDepartment = '';
-  if (arr.length > 0) {
-    const obj = arr[0];
-    // 判断科室是否相同
-    const isCompare = arr.every((item) => {
-      return item.orgId == obj.orgId;
-    });
-    if (!isCompare) {
-      ElMessage({
-        type: 'error',
-        message: '执行科室不同',
-      });
-      isRelease = false;
-    }
-    // 选中项目中的执行科室id与全部科室数据做匹配
-    const findItem = findTreeItem(orgOptions.value, obj.orgId);
 
-    if (!findItem) {
+  if (arr.length === 0) {
-      isRelease = false;
+    // 项目列表尚未加载完时，已选 ID 存在则先不清空（避免误清发往科室）
-      ElMessage({
+    if ((selectProjectIds || []).length > 0 && applicationListAll.value.length === 0) {
-        type: 'error',
+      return type === 2 ? !!manualDept : true;
-        message: '未找到项目执行的科室',
-      });
     }
-    if (type == 1) {
+    form.targetDepartment = '';
-      if (isRelease) {
+    targetDepartmentName.value = '';
-        form.targetDepartment = findItem.id;
+    return type === 2 ? !!manualDept : true;
   }
+
+  const orgInfoList = await Promise.all(arr.map((item) => resolveProjectOrgInfo(item)));
+  const firstOrg = orgInfoList[0];
+  const belongOrgId = firstOrg?.orgId;
+  const allSameOrg = orgInfoList.every((info) => String(info?.orgId ?? '') === String(belongOrgId ?? ''));
+  if (!allSameOrg) {
+    if (type === 2) {
+      ElMessage.error('所选项目的所属科室不一致，请分开申请');
     }
+    return false;
   }
-  return isRelease;
+
+  if (belongOrgId == null || belongOrgId === '') {
+    if (type === 2 && manualDept) {
+      await applyTargetDepartment(manualDept, findOrgName(manualDept));
+      return true;
+    }
+    if (type === 2) {
+      ElMessage.warning('所选项目未在诊疗目录配置所属科室，请手动选择发往科室');
+      return false;
+    }
+    form.targetDepartment = '';
+    targetDepartmentName.value = '';
+    return true;
+  }
+
+  if (type === 2 && manualDept) {
+    await applyTargetDepartment(manualDept, findOrgName(manualDept));
+    return true;
+  }
+
+  await applyTargetDepartment(belongOrgId, firstOrg?.orgName || '');
+  return true;
 };
-// 监听选择项目变化
+
+// 选中项目：先校验所属科室一致，不通过则回滚穿梭框，不允许进入「已选择」
 watch(
   () => transferValue.value,
-  (newValue) => {
+  async (newValue) => {
-    projectWithDepartment(newValue, 1);
+    if (isRevertingTransfer.value) return;
+
+    const seq = ++transferValidateSeq;
+    const valid = await validateTransferOrgConsistency(newValue);
+    if (seq !== transferValidateSeq) return;
+
+    if (!valid) {
+      ElMessage.error('所选项目的所属科室不一致，请分开申请');
+      isRevertingTransfer.value = true;
+      transferValue.value = [...lastValidTransferValue.value];
+      await nextTick();
+      isRevertingTransfer.value = false;
+      return;
+    }
+
+    lastValidTransferValue.value = [...newValue];
+    await fillTargetDepartmentFromSelection(newValue, 1);
   }
 );
-const submit = () => {
+
+watch(
+  () => orgOptions.value,
+  () => {
+    if (transferValue.value.length > 0) {
+      nextTick(() => {
+        fillTargetDepartmentFromSelection(transferValue.value, 1);
+      });
+    }
+  },
+  { deep: true }
+);
+const submit = async () => {
   if (transferValue.value.length == 0) {
     return proxy.$message.error('请选择申请单');
   }
-  if (!projectWithDepartment(transferValue.value, 2)) {
+  if (!(await fillTargetDepartmentFromSelection(transferValue.value, 2))) {
     return;
   }
+  if (!form.targetDepartment) {
+    return proxy.$message.error('请选择发往科室');
+  }
   let applicationListAllFilter = applicationListAll.value.filter((item) => {
-    return transferValue.value.includes(item.adviceDefinitionId);
+    return transferValue.value.some((id) => String(id) === String(item.adviceDefinitionId));
   });
   applicationListAllFilter = applicationListAllFilter.map((item) => {
+    const priceInfo = item.priceList?.[0] || {};
     return {
       adviceDefinitionId: item.adviceDefinitionId /** 诊疗定义id */,
       quantity: 1, // /** 请求数量 */
-      unitCode: item.priceList[0].unitCode /** 请求单位编码 */,
+      unitCode: priceInfo.unitCode /** 请求单位编码 */,
-      unitPrice: item.priceList[0].price /** 单价 */,
+      unitPrice: priceInfo.price /** 单价 */,
-      totalPrice: item.priceList[0].price /** 总价 */,
+      totalPrice: priceInfo.price /** 总价 */,
-      positionId: item.positionId, //执行科室id
+      positionId: form.targetDepartment || item.positionId, //执行科室id
       ybClassEnum: item.ybClassEnum, //类别医保编码
       conditionId: item.conditionId, //诊断ID
       encounterDiagnosisId: item.encounterDiagnosisId, //就诊诊断id
       adviceType: item.adviceType, ///** 医嘱类型 */
-      definitionId: item.priceList[0].definitionId, //费用定价主表ID */
+      definitionId: priceInfo.definitionId, //费用定价主表ID */
       definitionDetailId: item.definitionDetailId, //费用定价子表ID */
       accountId: patientInfo.value.accountId, // // 账户id
     };
@@ -254,16 +478,22 @@ const submit = () => {
     if (res.code === 200) {
       proxy.$message.success(res.msg);
       applicationList.value = [];
+      applicationListAll.value = [];
+      transferValue.value = [];
+      lastValidTransferValue.value = [];
       emits('submitOk');
     } else {
       proxy.$message.error(res.message);
     }
   });
 };
-/** 查询科室 */
+/** 查询科室（与检验申请单一致） */
 const getLocationInfo = () => {
-  getDepartmentList().then((res) => {
+  return getDepartmentList().then((res) => {
-    orgOptions.value = res.data || [];
+    orgOptions.value = normalizeOrgTreeIds(res?.data || []);
+    if (transferValue.value.length > 0) {
+      nextTick(() => fillTargetDepartmentFromSelection(transferValue.value, 1));
+    }
   });
 };
 // 获取诊断目录
@@ -300,7 +530,7 @@ function getDiagnosisList() {
     }
   });
 }
-defineExpose({ state, submit, getLocationInfo, getDiagnosisList });
+defineExpose({ state, submit, getLocationInfo, getDiagnosisList, getList });
 </script>
 <style lang="scss" scoped>
 .bloodTransfusion-container {
@@ -312,8 +542,22 @@ defineExpose({ state, submit, getLocationInfo, getDiagnosisList });
     min-height: 300px;
   }
 
-  .el-transfer {
+  :deep(.el-transfer) {
     --el-transfer-panel-width: 480px !important;
+    display: flex !important;
+    flex-direction: row !important;
+  }
+
+  :deep(.el-transfer__buttons) {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    padding: 0 4px;
+  }
+
+  :deep(.el-transfer__button) {
+    margin: 4px 0;
   }
 
   .bloodTransfusion-form {

openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue

@@ -90,6 +90,13 @@
                 </span>
               </template>
             </el-table-column>
+            <el-table-column label="医嘱状态" width="100" align="center">
+              <template #default="scope">
+                <el-tag :type="getStatusType(scope.row)" size="small">
+                  {{ getStatusDisplayText(scope.row) }}
+                </el-tag>
+              </template>
+            </el-table-column>
             <el-table-column label="医嘱内容" prop="adviceName">
               <template #default="scope">
                 <span>
@@ -169,6 +176,43 @@ import {formatDateStr} from '@/utils/index';
 import {getCurrentInstance, ref} from 'vue';
 import useUserStore from '@/store/modules/user';
 
+/** 发药状态 → 医嘱状态（药品医嘱状态映射表） */
+const DISPENSE_STATUS_TO_ADVICE_TEXT = {
+  2: '已执行',
+  8: '已提交',
+  4: '已发药',
+};
+
+function getStatusDisplayText(row) {
+  const params = row?.medicineSummaryParamList || [];
+  const pending = params.filter((p) => Number(p.dispenseStatus) !== 8);
+  if (pending.length === 0) {
+    return params.length ? '已提交' : '已执行';
+  }
+  const texts = [
+    ...new Set(
+      pending
+        .map((p) => DISPENSE_STATUS_TO_ADVICE_TEXT[Number(p.dispenseStatus)])
+        .filter(Boolean),
+    ),
+  ];
+  if (texts.length === 1) {
+    return texts[0];
+  }
+  return '已执行';
+}
+
+function getStatusType(row) {
+  const text = getStatusDisplayText(row);
+  if (text === '已发药') {
+    return 'success';
+  }
+  if (text === '已提交') {
+    return 'warning';
+  }
+  return 'primary';
+}
+
 const activeNames = ref([]);
 
 const userStore = useUserStore();
@@ -290,6 +334,7 @@ function handleMedicineSummary() {
   medicineSummary(ids).then((res) => {
     if (res.code == 200) {
       proxy.$message.success('操作成功');
+      handleGetPrescription();
     }
   });
 }

openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/summaryMedicineList.vue

@@ -16,7 +16,13 @@
         <el-table-column label="药房" align="center" prop="locationName" />
         <el-table-column label="申请人" align="center" prop="applicantName" />
         <el-table-column label="领药人" align="center" prop="receiverName" />
-        <el-table-column label="发药状态" align="center" prop="statusEnum_enumText" />
+        <el-table-column label="医嘱状态" align="center" prop="statusEnum_enumText">
+          <template #default="scope">
+            <el-tag :type="getSummaryStatusType(scope.row)" size="small">
+              {{ formatSummaryStatusText(scope.row) }}
+            </el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" width="100" align="center">
           <template #default="scope">
             <el-button link type="primary" @click="getDetail(scope.row)">详情</el-button>
@@ -52,6 +58,35 @@ import {getMedicineSummary, getMedicineSummaryDetail} from './api';
 import {patientInfoList} from '../../components/store/patient.js';
 import {getCurrentInstance, ref} from 'vue';
 
+const SUMMARY_STATUS_DISPLAY = {
+  2: '已提交',
+  4: '已发药',
+};
+
+const LEGACY_SUMMARY_STATUS_TEXT = {
+  待配药: '已提交',
+  已发放: '已发药',
+};
+
+function formatSummaryStatusText(row) {
+  const code = Number(row?.statusEnum);
+  if (SUMMARY_STATUS_DISPLAY[code]) {
+    return SUMMARY_STATUS_DISPLAY[code];
+  }
+  return LEGACY_SUMMARY_STATUS_TEXT[row?.statusEnum_enumText] || row?.statusEnum_enumText || '-';
+}
+
+function getSummaryStatusType(row) {
+  const text = formatSummaryStatusText(row);
+  if (text === '已发药') {
+    return 'success';
+  }
+  if (text === '已提交') {
+    return 'warning';
+  }
+  return 'info';
+}
+
 const medicineSummaryFormList = ref([]);
 const medicineSummaryFormDetails = ref([]);
 const dialogVisible = ref(false);

openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue

@@ -159,6 +159,13 @@
                 </span>
               </template>
             </el-table-column>
+            <el-table-column label="医嘱状态" prop="requestStatus_enumText" width="100" align="center">
+              <template #default="scope">
+                <el-tag :type="getStatusType(scope.row)" size="small">
+                  {{ getStatusDisplayText(scope.row) }}
+                </el-tag>
+              </template>
+            </el-table-column>
             <el-table-column label="医嘱内容" prop="adviceName">
               <template #default="scope">
                 <span>
@@ -229,8 +236,80 @@ import {adviceCancel, adviceExecute, adviceNoExecute, getPrescriptionList} from
 import {patientInfoList} from '../../components/store/patient.js';
 import {lotNumberMatch} from '@/api/public';
 import {formatDateStr} from '@/utils/index';
+import {RequestStatus} from '@/utils/medicalConstants';
 import {getCurrentInstance, nextTick, ref, provide} from 'vue';
 
+/** 请求状态 → 医嘱状态映射表（开具/签发/校对） */
+const REQUEST_STATUS_DISPLAY = {
+  [RequestStatus.DRAFT]: '待签发',
+  [RequestStatus.ACTIVE]: '已签发',
+  [RequestStatus.COMPLETED]: '已校对',
+};
+
+/** 发药状态 → 医嘱状态映射表（汇总申请/发药） */
+const DISPENSE_STATUS_DISPLAY = {
+  8: '已提交',
+  4: '已发药',
+};
+
+/** 执行页签对应的医嘱状态展示 */
+const STATUS_DISPLAY_BY_EXE_TAB = {
+  1: { text: '已校对', type: 'success' },
+  6: { text: '已执行', type: 'success' },
+  5: { text: '不执行', type: 'warning' },
+  9: { text: '取消执行', type: 'info' },
+};
+
+const LEGACY_STATUS_TEXT = {
+  待发送: '待签发',
+  已发送: '已签发',
+  '已发送/待执行': '已签发',
+  已完成: '已校对',
+  待配药: '已提交',
+  已汇总: '已提交',
+  已发放: '已发药',
+};
+
+function getStatusDisplayText(row) {
+  const dispenseCode = Number(row?.dispenseStatus);
+  if (DISPENSE_STATUS_DISPLAY[dispenseCode]) {
+    return DISPENSE_STATUS_DISPLAY[dispenseCode];
+  }
+  const tabText = STATUS_DISPLAY_BY_EXE_TAB[props.exeStatus]?.text;
+  if (tabText) {
+    return tabText;
+  }
+  const requestCode = Number(row?.requestStatus);
+  if (REQUEST_STATUS_DISPLAY[requestCode]) {
+    return REQUEST_STATUS_DISPLAY[requestCode];
+  }
+  return (
+    LEGACY_STATUS_TEXT[row?.requestStatus_enumText] ||
+    LEGACY_STATUS_TEXT[row?.dispenseStatus_enumText] ||
+    row?.requestStatus_enumText ||
+    row?.dispenseStatus_enumText ||
+    '-'
+  );
+}
+
+function getStatusType(row) {
+  const tabType = STATUS_DISPLAY_BY_EXE_TAB[props.exeStatus]?.type;
+  if (tabType) {
+    return tabType;
+  }
+  const status = row?.requestStatus;
+  const map = {
+    1: 'info',
+    2: 'primary',
+    3: 'success',
+    4: 'warning',
+    5: 'danger',
+    6: 'danger',
+    7: 'warning',
+  };
+  return map[status] || 'info';
+}
+
 const activeNames = ref([]);
 const prescriptionList = ref([]);
 const deadline = ref(formatDateStr(new Date(), 'YYYY-MM-DD') + ' 23:59:59');

openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/index.vue

@@ -89,7 +89,7 @@ function handleClick(tabName) {
       // 执行状态待执行
       exeStatus.value = 1;
       // 请求状态已校对
-      requestStatus.value = 3;
+      requestStatus.value = RequestStatus.COMPLETED;
       break;
     case 'completed':
       exeStatus.value = 6;

openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue

@@ -145,7 +145,7 @@
             <el-table-column label="医嘱状态" prop="requestStatus_enumText" width="100">
               <template #default="scope">
                 <el-tag :type="getStatusType(scope.row.requestStatus)" size="small">
-                  {{ scope.row.requestStatus_enumText }}
+                  {{ getStatusDisplayText(scope.row) }}
                 </el-tag>
               </template>
             </el-table-column>
@@ -163,6 +163,7 @@ import {ref, computed, getCurrentInstance} from 'vue';
 import {adviceVerify, cancel, getPrescriptionList} from './api';
 import {patientInfoList} from '../../components/store/patient.js';
 import {formatDateStr} from '@/utils/index';
+import {RequestStatus} from '@/utils/medicalConstants';
 
 const activeNames = ref([]);
 const prescriptionList = ref([]);
@@ -173,18 +174,34 @@ const loading = ref(false);
 const chooseAll = ref(false);
 const selectionTrigger = ref(0);
 
+/** 各页签对应的医嘱状态展示文案（与后端枚举值解耦，贴合校对业务语义） */
+const STATUS_DISPLAY_BY_TAB = {
+  [RequestStatus.ACTIVE]: { text: '已签发', type: 'primary' },
+  [RequestStatus.COMPLETED]: { text: '已校对', type: 'success' },
+  [RequestStatus.DRAFT]: { text: '待签发', type: 'info' },
+  [RequestStatus.STOPPED]: { text: '已停止', type: 'danger' },
+};
+
 const getStatusType = (status) => {
+  const tabType = STATUS_DISPLAY_BY_TAB[props.requestStatus]?.type;
+  if (tabType) return tabType;
   const map = {
-    1: 'info',      // 待发送
+    1: 'info',
-    2: 'primary',   // 已发送
+    2: 'primary',
-    3: 'success',   // 已完成
+    3: 'success',
-    4: 'warning',   // 暂停
+    4: 'warning',
-    5: 'danger',    // 取消/待退
+    5: 'danger',
-    6: 'danger',    // 停嘱
+    6: 'danger',
-    7: 'info'       // 不执行
+    7: 'info',
-  }
+  };
-  return map[status] || 'info'
+  return map[status] || 'info';
-}
+};
+
+const getStatusDisplayText = (row) => {
+  const tabText = STATUS_DISPLAY_BY_TAB[props.requestStatus]?.text;
+  if (tabText) return tabText;
+  return row.requestStatus_enumText || '';
+};
 const hasDispensedSelected = computed(() => {
   selectionTrigger.value;
   return getSelectRows().some(item => item.dispenseStatus === 4);

openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/index.vue

@@ -82,16 +82,16 @@ function handleTabClick(tabName) {
 
   switch (activeTabName) {
     case 'unverified':
-      requestStatus.value = 2;
+      requestStatus.value = RequestStatus.ACTIVE;
       break;
     case 'verified':
-      requestStatus.value = 3;
+      requestStatus.value = RequestStatus.COMPLETED;
       break;
     case 'stopped':
-      requestStatus.value = 6;
+      requestStatus.value = RequestStatus.STOPPED;
       break;
     case 'cancelled':
-      requestStatus.value = 1;
+      requestStatus.value = RequestStatus.DRAFT;
       break;
   }
   // 调用子组件方法