Merge remote-tracking branch 'origin/关羽' - resolve conflicts

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

@@ -682,7 +682,6 @@ async function handleCategoryExpand(cat) {
         code: m.code,
         price: m.price || 0,
         packageName: m.packageName || '',
-        packageId: m.packageId || null,
         packagePrice: m.packagePrice || null,
         serviceFee: m.serviceFee || null
       }));
@@ -1026,18 +1025,12 @@ function handleRowClick(row) {
                   code: md.code,
                   price: m.itemFee || 0,  // fallback 到已保存的价格
                   packageName: md.packageName || '',
-                  packageId: md.packageId || null,
                   packagePrice: md.packagePrice || null,  // Bug #384修复: 套餐价格
                   serviceFee: md.serviceFee || null
                 }));
                 // 如果有已保存的检查方法信息，尝试匹配
                 if (m.checkMethodId) {
                   item.selectedMethod = item.methods.find(md => md.id === m.checkMethodId) || null;
-                  // 从已保存的方法中获取套餐信息
-                  if (item.selectedMethod?.packageId) {
-                    item.isPackage = true;
-                    item.packageId = item.selectedMethod.packageId;
-                  }
                 }
               }
             } catch (err) {
@@ -1098,13 +1091,6 @@ async function handleMethodSelect(checked, method, cat) {
     const existingItem = selectedItems.value.find(s => s.id === targetItem.id);
     if (existingItem) {
       existingItem.selectedMethod = method;
-      // 从方法中获取套餐信息
-      if (method.packageId) {
-        existingItem.isPackage = true;
-        existingItem.packageId = method.packageId;
-        // 预加载套餐明细
-        loadPackageDetailsForItem(existingItem);
-      }
       updateMethodDisplay();
       return;
     }
@@ -1119,7 +1105,7 @@ async function handleMethodSelect(checked, method, cat) {
       }
     }
 
-    const newItem = {
+    selectedItems.value.push({
       id: targetItem.id, name: targetItem.name,
       price: targetItem.price, quantity: 1,
       serviceFee: targetItem.serviceFee || 0,
@@ -1131,16 +1117,9 @@ async function handleMethodSelect(checked, method, cat) {
       methods: [method],
       selectedMethod: method,
       expanded: false,
-      // 从方法中获取套餐信息（优先级高于项目本身的 packageName）
-      isPackage: !!method.packageId || !!targetItem.packageName,
-      packageId: method.packageId || targetItem.packageId || null
-    };
-    selectedItems.value.push(newItem);
-
-    // 如果是套餐，预加载套餐明细
-    if (newItem.isPackage && newItem.packageId) {
-      loadPackageDetailsForItem(newItem);
-    }
+      isPackage: !!targetItem.packageName,
+      packageId: targetItem.packageId || null
+    });
 
     // 自动回填执行科室
     if (selectedItems.value.length === 1 && cat?.performDeptName) {
@@ -1185,7 +1164,6 @@ async function handleItemSelect(checked, item, cat) {
             code: m.code,
             price: m.price || item.price,  // fallback 到项目价格
             packageName: m.packageName || '',
-            packageId: m.packageId || null,
             packagePrice: m.packagePrice || null,  // Bug #384修复: 套餐价格
             serviceFee: m.serviceFee || null      // Bug #384修复: 服务费
           }));

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

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

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

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