bug 362 428 436

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

@@ -402,6 +402,21 @@
                         <span class="method-price">¥{{ method.packagePrice || item.price }}</span>
                       </el-checkbox>
                     </div>
+                    <!-- 选中方法后，显示对应的套餐明细 -->
+                    <div v-if="item.selectedMethod && item.methodPackageDetails && item.methodPackageDetails.length > 0" class="method-package-details">
+                      <div class="method-package-header">
+                        <span class="method-package-title">套餐明细 - {{ item.selectedMethod.name }}</span>
+                      </div>
+                      <div v-for="detail in item.methodPackageDetails" :key="detail.id" class="method-option">
+                        <el-checkbox v-model="detail.checked">
+                          <span class="method-name">{{ detail.name }}</span>
+                          <span class="method-price">数量: {{ detail.quantity }} ¥{{ detail.price }}</span>
+                        </el-checkbox>
+                      </div>
+                    </div>
+                    <div v-if="item.selectedMethod && item.methodPackageLoading" class="method-package-loading">
+                      加载套餐明细中...
+                    </div>
                   </div>
                 </div>
               </div>
@@ -419,7 +434,7 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 import { Printer, Delete, ArrowDown, ArrowUp, Close } from '@element-plus/icons-vue';
 import useUserStore from '@/store/modules/user';
 import request from '@/utils/request';
-import { listCheckMethod, searchCheckMethod } from '@/api/system/checkType';
+import { listCheckMethod, searchCheckMethod, listCheckPackage } from '@/api/system/checkType';
 import { getEncounterDiagnosis } from '../api.js';
 
 const props = defineProps({
@@ -445,7 +460,7 @@ async function loadPackageDetails(row, treeNode, resolve) {
   }
   try {
     const res = await request({
-      url: `/exam/package/${row.packageId}/details`,
+      url: `/system/package/${row.packageId}/details`,
       method: 'get'
     });
     if (res.code === 200 && res.data) {
@@ -474,7 +489,7 @@ async function loadPackageDetailsForItem(item) {
   }
   try {
     const res = await request({
-      url: `/exam/package/${item.packageId}/details`,
+      url: `/system/package/${item.packageId}/details`,
       method: 'get'
     });
     if (res.code === 200 && res.data) {
@@ -1250,21 +1265,68 @@ async function toggleItemExpand(item) {
 }
 
 // Bug #384修复: 勾选框选择检查方法（单选逻辑）
-function selectMethodCheckbox(checked, item, method) {
+async function selectMethodCheckbox(checked, item, method) {
   if (checked) {
     item.selectedMethod = method;
+    // 动态加载该方法对应的套餐明细
+    await loadMethodPackageDetails(item, method);
   } else {
     item.selectedMethod = null;
+    item.methodPackageDetails = [];
   }
   // 联动更新表单检查方法显示字段
   updateMethodDisplay();
-  
+
   // #430: 套餐金额实时同步到申请单
   nextTick(() => {
     form.totalAmount = totalAmountCalc.value;
   });
 }
 
+// 根据检查方法的packageName加载对应的套餐明细
+async function loadMethodPackageDetails(item, method) {
+  item.methodPackageLoading = true;
+  item.methodPackageDetails = [];
+  try {
+    if (!method.packageName) {
+      item.methodPackageLoading = false;
+      return;
+    }
+    // 通过packageName查询套餐获取packageId
+    const pkgRes = await listCheckPackage({ packageName: method.packageName });
+    let packages = pkgRes?.data || [];
+    if (!Array.isArray(packages)) {
+      packages = packages.records || packages.data || [];
+    }
+    if (packages.length === 0) {
+      item.methodPackageLoading = false;
+      return;
+    }
+    const packageId = packages[0].id;
+    // 查询套餐明细
+    const detailRes = await request({
+      url: `/system/package/${packageId}/details`,
+      method: 'get'
+    });
+    if (detailRes.code === 200 && detailRes.data) {
+      item.methodPackageDetails = detailRes.data.map(d => ({
+        id: d.id,
+        name: d.itemName || d.name,
+        quantity: d.quantity || 1,
+        unit: d.unit || '次',
+        price: d.unitPrice || d.price || 0,
+        amount: d.amount || d.total || 0,
+        checked: true  // 默认勾选
+      }));
+    }
+  } catch (err) {
+    console.error('加载方法套餐明细失败:', err);
+    item.methodPackageDetails = [];
+  } finally {
+    item.methodPackageLoading = false;
+  }
+}
+
 // Bug #384修复: 更新检查方法显示字段（联动）
 function updateMethodDisplay() {
   // 找到第一个有选中检查方法的项目
@@ -1670,6 +1732,29 @@ defineExpose({ getList });
   margin-left: 8px;
 }
 
+/* 选中方法后显示的套餐明细 */
+.method-package-details {
+  margin-top: 4px;
+  padding: 4px 0;
+  border-top: 1px dashed #dcdfe6;
+}
+
+.method-package-header {
+  padding: 2px 0 4px 24px;
+}
+
+.method-package-title {
+  font-size: 10px;
+  color: #909399;
+  font-weight: 500;
+}
+
+.method-package-loading {
+  padding: 4px 0 4px 24px;
+  font-size: 10px;
+  color: #c0c4cc;
+}
+
 /* 折叠组件细节 */
 :deep(.el-collapse) {
   border: none;