Revert "Merge remote-tracking branch 'origin/develop' into develop"

This reverts commit 5946c1ea4b, reversing
changes made to 8d905c9844.

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

@@ -389,8 +389,7 @@
                     </el-checkbox>
                     <span class="item-price">¥{{ item.price }}/{{ item.unit || "次" }}</span>
                   </div>
-                  <!-- Bug #500修复: 使用 v-show + 占位符，避免加载提示出现/消失时高度跳变 -->
-                  <div v-show="categoryLoadingSet.has(cat.typeId)" class="category-loading-hint">
+                  <div v-if="categoryLoadingSet.has(cat.typeId)" class="category-loading-hint">
                     加载中...
                   </div>
                   <!-- Bug #428修复: 渲染分类联动加载的检查方法列表 -->
@@ -1363,9 +1362,8 @@ async function handleMethodSelect(checked, method, cat) {
         existingItem.isPackage = true;
         existingItem.packageId = method.packageId;
         existingItem.packageName = method.packageName || existingItem.packageName;  // #428修复: 确保 packageName 同步
-        existingItem.expanded = true;  // #428修复: 有套餐时默认展开，展示套餐明细
         // 预加载套餐明细
-        await loadPackageDetailsForItem(existingItem);
+        loadPackageDetailsForItem(existingItem);
       }
       updateMethodDisplay();
       return;
@@ -1401,10 +1399,9 @@ async function handleMethodSelect(checked, method, cat) {
     };
     selectedItems.value.push(newItem);
 
-    // 如果是套餐，预加载套餐明细并默认展开
+    // 如果是套餐，预加载套餐明细
     if (newItem.isPackage && newItem.packageId) {
-      newItem.expanded = true;
-      await loadPackageDetailsForItem(newItem);
+      loadPackageDetailsForItem(newItem);
     }
 
     // 自动回填执行科室
@@ -1526,10 +1523,7 @@ async function handleItemSelect(checked, item, cat) {
 // Bug #384修复 + #426修复: 展开/收起项目卡片
 async function toggleItemExpand(item) {
   item.expanded = !item.expanded;
-  const carrier = getPackageCarrier(item);
-  const hasDetails = Array.isArray(item.packageDetailsDisplay) && item.packageDetailsDisplay.length > 0
-    || Array.isArray(carrier?.packageDetails) && carrier.packageDetails.length > 0;
-  if (item.expanded && (item.isPackage || item.packageName) && !hasDetails && !item.packageDetailsLoading) {
+  if (item.expanded && (item.isPackage || item.packageName) && (!item.packageDetails || item.packageDetails.length === 0) && !item.packageDetailsLoading) {
     await loadPackageDetailsForItem(item);
   }
   if (item.expanded && shouldShowPackageBody(item)) {
@@ -1583,7 +1577,7 @@ async function loadMethodPackageDetails(item, method) {
     const packageId = packages[0].id;
     // 查询套餐明细
     const detailRes = await request({
-      url: `/system/check-type/package/${packageId}/details`,
+      url: `/system/package/${packageId}/details`,
       method: 'get'
     });
     if (detailRes.code === 200 && detailRes.data) {
@@ -1805,8 +1799,8 @@ defineExpose({ getList });
 .collapse-scroll {
   flex: 1;
   overflow-y: auto;
-  overflow-x: hidden;
-  min-height: 350px;   /* Bug #500: 增大最小高度，确保切换分类时容器高度不会收缩导致抖动 */
+  overflow-x: hidden;  /* Bug #500: 防止切换时水平方向溢出导致抖动 */
+  min-height: 120px;   /* Bug #500: 固定最小高度，避免分类切换时 flex 容器高度突变 */
 }
 .empty-hint {
   color: #909399;
@@ -2120,18 +2114,18 @@ defineExpose({ getList });
   height: auto;
   line-height: 1.5;
 }
-/* Bug #500修复: 折叠内容不添加额外过渡动画，避免与 el-collapse 内部动画冲突导致双重动画/闪烁 */
+/* Bug #500修复: 折叠内容使用明确属性过渡，避免 transition: all 导致子元素意外动画 */
 :deep(.el-collapse-item__content) {
   padding-bottom: 4px;
+  transition: height 0.3s ease, max-height 0.3s ease;
 }
-/* Bug #500: 折叠面板容器不加 border，保持简洁 */
+/* Bug #500: 折叠面板动画容器，添加 overflow:hidden 防止展开时内容溢出导致闪烁 */
 :deep(.el-collapse-item__wrap) {
   border: none;
   overflow: hidden;
 }
-/* Bug #500: 分类项不加 margin 过渡，避免展开/收起时意外位移 */
 :deep(.el-collapse-item) {
-  /* 不使用 transition，依赖 el-collapse 原生动画 */
+  transition: margin 0.2s ease;
 }
 /* Bug #500: 分类加载中提示样式 */
 .category-loading-hint {