Fix Bug #486: [住院医生工作站-临床医嘱] 医嘱检索框不支持全局模糊搜索，未选"医嘱类型"时检索结果为空

根因：handleFocus/handleChange 中 categoryCode 的计算逻辑错误。当新增行未选择
医嘱类型时（row.adviceType 为 undefined），代码回退到 adviceQueryParams 的默认值并
匹配到具体药品分类（如西药 categoryCode='2'），导致搜索被限制在单一分类而非全局药库。

修复：简化 categoryCode 判定为 `row.adviceType !== undefined ? selectedItem.categoryCode : ''`，
未选类型时传空 categoryCode，使 searchKey 在全药库范围内模糊匹配。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java

@@ -135,7 +135,8 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation
         BeanUtils.copyProperties(orgLocQueryDto, orgLoc);
 
         Long activityDefinitionId = orgLoc.getActivityDefinitionId();
-        String activityName = activityDefinitionId != null ? activityDefinitionMapper.selectById(activityDefinitionId).getName() : "";
+        String activityName = activityDefinitionId != null
+            ? activityDefinitionMapper.selectById(activityDefinitionId).getName() : "";
 
         List<OrganizationLocation> organizationLocationList =
             organizationLocationService.getOrgLocListByOrgIdAndActivityDefinitionId(orgLoc.getActivityDefinitionId());
@@ -147,8 +148,8 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation
             for (OrganizationLocation organizationLocation : organizationLocationList)
                 if (DateTimeUtils.isOverlap(organizationLocation.getStartTime(), organizationLocation.getEndTime(),
                     orgLoc.getStartTime(), orgLoc.getEndTime())) {
-                    String organizationName =
+                    Organization org = organizationService.getById(organizationLocation.getOrganizationId());
-                        organizationService.getById(organizationLocation.getOrganizationId()).getName();
+                    String organizationName = org != null ? org.getName() : "未知科室";
                     return R.fail("当前诊疗：" + activityName + CommonConstants.Common.DASH + orgLoc.getStartTime()
                         + CommonConstants.Common.DASH + orgLoc.getEndTime() + "与" + organizationName + "时间冲突");
                 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java

@@ -33,7 +33,7 @@ public interface IRequestFormManageAppService {
     List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode);
 
     /**
-     * 查询申请单（支持筛选）
+     * 查询申请单（支持日期和状态筛选）
      *
      * @param encounterId 就诊id
      * @param typeCode 申请单类型
@@ -44,6 +44,19 @@ public interface IRequestFormManageAppService {
      */
     List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status);
 
+    /**
+     * 查询申请单（支持日期、状态和关键字筛选）
+     *
+     * @param encounterId 就诊id
+     * @param typeCode 申请单类型
+     * @param startDate 开始日期（可选，格式：yyyy-MM-dd）
+     * @param endDate 结束日期（可选，格式：yyyy-MM-dd）
+     * @param status 单据状态（可选）
+     * @param keyword 关键字（可选，申请单号/检查项目名称模糊匹配）
+     * @return 申请单列表
+     */
+    List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status, String keyword);
+
     /**
      * 分页查询申请单
      *
@@ -51,4 +64,20 @@ public interface IRequestFormManageAppService {
      * @return 申请单
      */
      IPage<RequestFormPageDto> getRequestFormPage(RequestFormDto requestFormDto);
+
+    /**
+     * 删除申请单（仅待签发状态可删除）
+     *
+     * @param requestFormId 申请单ID
+     * @return 结果
+     */
+    R<?> deleteRequestForm(Long requestFormId);
+
+    /**
+     * 撤回申请单（已签发状态撤回至待签发）
+     *
+     * @param requestFormId 申请单ID
+     * @return 结果
+     */
+    R<?> withdrawRequestForm(Long requestFormId);
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java

@@ -415,7 +415,7 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
     @Override
     public List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode) {
         // 调用重载方法，不传筛选参数
-        return getRequestForm(encounterId, typeCode, null, null, null);
+        return getRequestForm(encounterId, typeCode, null, null, null, null);
     }
 
     /**
@@ -426,16 +426,17 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
      * @param startDate 开始日期（可选，格式：yyyy-MM-dd）
      * @param endDate 结束日期（可选，格式：yyyy-MM-dd）
      * @param status 单据状态（可选）
+     * @param keyword 关键字（可选，申请单号/检查项目名称模糊匹配）
      * @return 申请单列表
      */
     @Override
-    public List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status) {
+    public List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status, String keyword) {
         // 检查参数
         if (encounterId == null) {
             return new java.util.ArrayList<>(); // 返回空列表而不是查询数据库
         }
 
-        List<RequestFormQueryDto> requestFormList = requestFormManageAppMapper.getRequestForm(encounterId, typeCode, startDate, endDate, status);
+        List<RequestFormQueryDto> requestFormList = requestFormManageAppMapper.getRequestForm(encounterId, typeCode, startDate, endDate, status, keyword);
         for (RequestFormQueryDto requestFormQueryDto : requestFormList) {
             // 查询处方详情
             List<RequestFormDetailQueryDto> requestFormDetail =
@@ -457,4 +458,68 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
         return requestFormManageAppMapper.getRequestFormPage(requestFormDto, page);
     }
 
+    /**
+     * 删除申请单（仅待签发状态可删除）
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> deleteRequestForm(Long requestFormId) {
+        if (requestFormId == null) {
+            return R.fail("申请单ID不能为空");
+        }
+        RequestForm requestForm = iRequestFormService.getById(requestFormId);
+        if (requestForm == null) {
+            return R.fail("申请单不存在");
+        }
+        if (!Integer.valueOf(0).equals(requestForm.getStatus())) {
+            return R.fail("仅待签发状态的申请单可删除");
+        }
+        // 删除申请单
+        iRequestFormService.removeById(requestFormId);
+        // 删除关联的诊疗项目及账单
+        String prescriptionNo = requestForm.getPrescriptionNo();
+        List<Long> serviceRequestIds = iServiceRequestService
+            .list(new LambdaQueryWrapper<ServiceRequest>().eq(ServiceRequest::getPrescriptionNo, prescriptionNo))
+            .stream().map(ServiceRequest::getId).collect(Collectors.toList());
+        for (Long serviceRequestId : serviceRequestIds) {
+            iServiceRequestService.removeById(serviceRequestId);
+            iChargeItemService.deleteByServiceTableAndId(CommonConstants.TableName.WOR_SERVICE_REQUEST, serviceRequestId);
+        }
+        return R.ok(null, "删除成功");
+    }
+
+    /**
+     * 撤回申请单（已签发状态撤回至待签发）
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> withdrawRequestForm(Long requestFormId) {
+        if (requestFormId == null) {
+            return R.fail("申请单ID不能为空");
+        }
+        RequestForm requestForm = iRequestFormService.getById(requestFormId);
+        if (requestForm == null) {
+            return R.fail("申请单不存在");
+        }
+        if (!Integer.valueOf(1).equals(requestForm.getStatus())) {
+            return R.fail("仅已签发状态的申请单可撤回");
+        }
+        // 将申请单状态回滚至待签发
+        RequestForm updateForm = new RequestForm();
+        updateForm.setId(requestFormId);
+        updateForm.setStatus(0);
+        iRequestFormService.updateById(updateForm);
+        // 将关联的诊疗项目状态回滚至DRAFT
+        String prescriptionNo = requestForm.getPrescriptionNo();
+        List<ServiceRequest> serviceRequests = iServiceRequestService
+            .list(new LambdaQueryWrapper<ServiceRequest>().eq(ServiceRequest::getPrescriptionNo, prescriptionNo));
+        for (ServiceRequest serviceRequest : serviceRequests) {
+            ServiceRequest updateService = new ServiceRequest();
+            updateService.setId(serviceRequest.getId());
+            updateService.setStatusEnum(RequestStatus.DRAFT.getValue());
+            iServiceRequestService.updateById(updateService);
+        }
+        return R.ok(null, "撤回成功");
+    }
+
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java

@@ -84,6 +84,7 @@ public class RequestFormManageController {
      * @param startDate 开始日期（可选，格式：yyyy-MM-dd）
      * @param endDate 结束日期（可选，格式：yyyy-MM-dd）
      * @param status 单据状态（可选）
+     * @param keyword 关键字（可选，申请单号/检查项目名称模糊匹配）
      * @return 检查申请单
      */
     @GetMapping(value = "/get-check")
@@ -91,11 +92,12 @@ public class RequestFormManageController {
             @RequestParam(required = false) Long encounterId,
             @RequestParam(required = false) String startDate,
             @RequestParam(required = false) String endDate,
-            @RequestParam(required = false) String status) {
+            @RequestParam(required = false) String status,
+            @RequestParam(required = false) String keyword) {
         if (encounterId == null) {
             return R.fail("就诊ID不能为空");
         }
-        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.TEST.getCode(), startDate, endDate, status));
+        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.TEST.getCode(), startDate, endDate, status, keyword));
     }
 
     /**
@@ -105,6 +107,7 @@ public class RequestFormManageController {
      * @param startDate 开始日期（可选，格式：yyyy-MM-dd）
      * @param endDate 结束日期（可选，格式：yyyy-MM-dd）
      * @param status 单据状态（可选）
+     * @param keyword 关键字（可选，申请单号/检验项目名称模糊匹配）
      * @return 检验申请单
      */
     @GetMapping(value = "/get-inspection")
@@ -112,11 +115,12 @@ public class RequestFormManageController {
             @RequestParam(required = false) Long encounterId,
             @RequestParam(required = false) String startDate,
             @RequestParam(required = false) String endDate,
-            @RequestParam(required = false) String status) {
+            @RequestParam(required = false) String status,
+            @RequestParam(required = false) String keyword) {
         if (encounterId == null) {
             return R.fail("就诊ID不能为空");
         }
-        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.PROOF.getCode(), startDate, endDate, status));
+        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.PROOF.getCode(), startDate, endDate, status, keyword));
     }
 
     /**

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/RequestFormManageAppMapper.java

@@ -37,13 +37,15 @@ public interface RequestFormManageAppMapper {
      * @param startDate 开始日期（可选，格式：yyyy-MM-dd）
      * @param endDate 结束日期（可选，格式：yyyy-MM-dd）
      * @param status 单据状态（可选）
+     * @param keyword 关键字（可选，申请单号/检查项目名称模糊匹配）
      * @return 申请单列表
      */
     List<RequestFormQueryDto> getRequestForm(@Param("encounterId") Long encounterId,
         @Param("typeCode") String typeCode,
         @Param("startDate") String startDate,
         @Param("endDate") String endDate,
-        @Param("status") String status);
+        @Param("status") String status,
+        @Param("keyword") String keyword);
 
     /**
      * 查询申请单详情

openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml

@@ -31,6 +31,16 @@
           <if test="status != null and status != ''">
               AND drf.status = #{status}::integer
           </if>
+          <if test="keyword != null and keyword != ''">
+              AND (drf.prescription_no LIKE CONCAT('%', #{keyword}, '%')
+                   OR EXISTS (
+                       SELECT 1 FROM wor_service_request wsr_kw
+                       LEFT JOIN wor_activity_definition wad_kw ON wad_kw.id = wsr_kw.activity_id
+                       WHERE wsr_kw.prescription_no = drf.prescription_no
+                         AND wsr_kw.delete_flag = '0'
+                         AND wad_kw.name LIKE CONCAT('%', #{keyword}, '%')
+                   ))
+          </if>
     </select>
 
     <select id="getRequestFormDetail" resultType="com.openhis.web.regdoctorstation.dto.RequestFormDetailQueryDto">

openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/RequestForm.java

@@ -59,4 +59,9 @@ public class RequestForm extends HisBaseEntity {
      */
     private String typeCode;
 
+    /**
+     * 单据状态 0=待签发 1=已签发 2=已校对 3=待接收 4=已接收 5=已检查 6=已出报告 7=已作废
+     */
+    private Integer status;
+
 }

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

@@ -522,6 +522,7 @@ const categoryList = ref([]);   // 原始分类+项目数据
 const dictSearchKey = ref('');
 const activeNames = ref('');    // 当前展开的折叠项
 const categoryLoadingSet = ref(new Set());  // Bug #500: 正在加载方法的分类集合
+const isAnimating = ref(false);  // Bug #500: 防止快速切换时折叠动画重叠导致抖动
 
 const allMethods = ref([]);
 
@@ -669,8 +670,13 @@ async function handleCategoryExpand(cat) {
     categoryLoadingSet.value.delete(cat.typeId);
   }
 }
-// Bug #500: 改为非 async 函数，避免 el-collapse 的 @change 等待异步完成导致抖动
+// Bug #500: 添加防抖逻辑，快速切换时跳过中间状态的动画，避免高度跳变和白屏闪烁
 function handleCollapseChange(activeName) {
+  if (isAnimating.value) return;  // 动画进行中，忽略后续点击
+
+  isAnimating.value = true;
+  setTimeout(() => { isAnimating.value = false; }, 300);  // 与 CSS 过渡时长一致
+
   if (activeName) {
     const cat = filteredCategoryList.value.find(c => c.typeId == activeName);
     if (cat && (!cat.methods || cat.methods.length === 0)) {
@@ -1307,6 +1313,7 @@ defineExpose({ getList });
 .collapse-scroll {
   flex: 1;
   overflow-y: auto;
+  overflow-x: hidden;  /* Bug #500: 防止切换时水平方向溢出导致抖动 */
 }
 .empty-hint {
   color: #909399;
@@ -1479,10 +1486,10 @@ defineExpose({ getList });
   padding-bottom: 4px;
   transition: all 0.3s ease;
 }
-/* Bug #500: 折叠面板展开/收起动画使用 will-change 优化性能 */
+/* Bug #500: 折叠面板动画容器，添加 overflow:hidden 防止展开时内容溢出导致闪烁 */
 :deep(.el-collapse-item__wrap) {
   border: none;
-  will-change: height;
+  overflow: hidden;
 }
 :deep(.el-collapse-item) {
   transition: margin 0.2s ease;

openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/bloodTtransfusionAapplication.vue

@@ -175,10 +175,9 @@ const hasMatchedFields = computed(() => {
 });
 
 /** 查询科室 */
-const getLocationInfo = () => {
+const getLocationInfo = async () => {
-  getOrgList().then((res) => {
+  const res = await getOrgList();
-    orgOptions.value = res.data.records;
+  orgOptions.value = res.data.records;
-  });
 };
 
 const recursionFun = (targetDepartment) => {
@@ -199,7 +198,12 @@ const recursionFun = (targetDepartment) => {
   return name;
 };
 
-const handleViewDetail = (row) => {
+const handleViewDetail = async (row) => {
+  // 确保科室数据已加载，以便将 ID 解析为名称
+  if (!orgOptions.value || orgOptions.value.length === 0) {
+    await getLocationInfo();
+  }
+
   currentDetail.value = row;
   // 解析 descJson
   if (row.descJson) {
@@ -220,10 +224,9 @@ const handleViewDetail = (row) => {
 
 watch(
   () => patientInfo.value?.encounterId,
-  (val) => {
+  async (val) => {
     if (val) {
-      fetchData();
+      await Promise.all([fetchData(), getLocationInfo()]);
-      getLocationInfo();
     } else {
       tableData.value = [];
     }

openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue

@@ -496,10 +496,9 @@ const hasMatchedFields = computed(() => {
 });
 
 /** 查询科室 */
-const getLocationInfo = () => {
+const getLocationInfo = async () => {
-  getOrgList().then((res) => {
+  const res = await getOrgList();
-    orgOptions.value = res.data.records;
+  orgOptions.value = res.data.records;
-  });
 };
 
 const recursionFun = (targetDepartment) => {
@@ -527,9 +526,14 @@ const recursionFun = (targetDepartment) => {
   return name;
 };
 
-const handleViewDetail = (row) => {
+const handleViewDetail = async (row) => {
   console.log('targetDepartment========>', JSON.stringify(row));
 
+  // 确保科室数据已加载，以便将 ID 解析为名称
+  if (!orgOptions.value || orgOptions.value.length === 0) {
+    await getLocationInfo();
+  }
+
   currentDetail.value = row;
   // 解析 descJson
   if (row.descJson) {
@@ -780,10 +784,9 @@ const handleViewReport = async (row) => {
 
 watch(
   () => patientInfo.value?.encounterId,
-  (val) => {
+  async (val) => {
     if (val) {
-      fetchData();
+      await Promise.all([fetchData(), getLocationInfo()]);
-      getLocationInfo();
     } else {
       tableData.value = [];
       filterForm.value.dateRange = getDefaultDateRange();

openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/surgeryApplication.vue

@@ -181,10 +181,9 @@ const hasMatchedFields = computed(() => {
 });
 
 /** 查询科室 */
-const getLocationInfo = () => {
+const getLocationInfo = async () => {
-  getOrgList().then((res) => {
+  const res = await getOrgList();
-    orgOptions.value = res.data.records;
+  orgOptions.value = res.data.records;
-  });
 };
 
 const recursionFun = (targetDepartment) => {
@@ -205,7 +204,12 @@ const recursionFun = (targetDepartment) => {
   return name;
 };
 
-const handleViewDetail = (row) => {
+const handleViewDetail = async (row) => {
+  // 确保科室数据已加载，以便将 ID 解析为名称
+  if (!orgOptions.value || orgOptions.value.length === 0) {
+    await getLocationInfo();
+  }
+
   currentDetail.value = row;
   // 解析 descJson
   if (row.descJson) {
@@ -226,10 +230,9 @@ const handleViewDetail = (row) => {
 
 watch(
   () => patientInfo.value?.encounterId,
-  (val) => {
+  async (val) => {
     if (val) {
-      fetchData();
+      await Promise.all([fetchData(), getLocationInfo()]);
-      getLocationInfo();
     } else {
       tableData.value = [];
     }

openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue

@@ -47,6 +47,15 @@
               <el-option label="已作废" value="5" />
             </el-select>
           </el-form-item>
+          <el-form-item label="关键字">
+            <el-input
+              v-model="filterForm.keyword"
+              placeholder="申请单号/检验项目"
+              clearable
+              style="width: 200px"
+              @keyup.enter="handleSearch"
+            />
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="handleSearch" :loading="loading">
               <el-icon><Search /></el-icon>
@@ -188,6 +197,7 @@ const orgOptions = ref([]);
 const filterForm = ref({
   dateRange: [], // [startDate, endDate]
   status: '', // 单据状态
+  keyword: '', // 关键字搜索
 });
 
 const fetchData = async () => {
@@ -211,7 +221,12 @@ const fetchData = async () => {
     if (filterForm.value.status !== '' && filterForm.value.status !== undefined) {
       params.status = filterForm.value.status;
     }
-    
+
+    // 添加关键字搜索
+    if (filterForm.value.keyword && filterForm.value.keyword.trim()) {
+      params.keyword = filterForm.value.keyword.trim();
+    }
+
     const res = await getInspection(params);
     if (res.code === 200 && res.data) {
       const raw = res.data?.records || res.data;
@@ -251,6 +266,7 @@ const handleReset = () => {
   // 重置筛选条件为默认值
   filterForm.value.dateRange = [];
   filterForm.value.status = '';
+  filterForm.value.keyword = '';
   // 重新加载数据
   fetchData();
 };
@@ -331,10 +347,9 @@ const hasMatchedFields = computed(() => {
 });
 
 /** 查询科室 */
-const getLocationInfo = () => {
+const getLocationInfo = async () => {
-  getDepartmentList().then((res) => {
+  const res = await getDepartmentList();
-    orgOptions.value = res.data || [];
+  orgOptions.value = res.data || [];
-  });
 };
 
 const recursionFun = (targetDepartment) => {
@@ -357,7 +372,12 @@ const recursionFun = (targetDepartment) => {
   return name;
 };
 
-const handleViewDetail = (row) => {
+const handleViewDetail = async (row) => {
+  // 确保科室数据已加载，以便将 ID 解析为名称
+  if (!orgOptions.value || orgOptions.value.length === 0) {
+    await getLocationInfo();
+  }
+
   currentDetail.value = row;
   // 解析 descJson
   if (row.descJson) {
@@ -378,13 +398,13 @@ const handleViewDetail = (row) => {
 
 watch(
   () => patientInfo.value?.encounterId,
-  (val) => {
+  async (val) => {
     if (val) {
       // 设置默认日期范围为近7天
       const today = new Date();
       const sevenDaysAgo = new Date(today);
       sevenDaysAgo.setDate(today.getDate() - 6); // 包含今天共7天
-      
+
       // 格式化为 YYYY-MM-DD
       const formatDate = (date) => {
         const year = date.getFullYear();
@@ -392,19 +412,19 @@ watch(
         const day = String(date.getDate()).padStart(2, '0');
         return `${year}-${month}-${day}`;
       };
-      
+
       filterForm.value.dateRange = [
         formatDate(sevenDaysAgo),
         formatDate(today)
       ];
-      
+
-      fetchData();
+      await Promise.all([fetchData(), getLocationInfo()]);
-      getLocationInfo();
     } else {
       tableData.value = [];
       // 重置筛选条件
       filterForm.value.dateRange = [];
       filterForm.value.status = '';
+      filterForm.value.keyword = '';
     }
   },
   { immediate: true }

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

@@ -881,8 +881,9 @@ function handleFocus(row, index) {
   // 用 adviceType + categoryCode 组合查找匹配的选项
   const selectValue = (adviceType == 1 && row.categoryCode) ? '1-' + row.categoryCode : adviceType;
   const selectedItem = adviceTypeList.value.find(item => item.value === selectValue) || adviceTypeList.value.find(item => item.adviceType === adviceType);
-  // 修复Bug #486：当行没有显式选择医嘱类型时，不传categoryCode，让搜索在全药库中进行
+  // 修复Bug #486：当行没有显式选择医嘱类型时（row.adviceType为undefined），
-  const categoryCode = selectedItem ? selectedItem.categoryCode : (row.adviceType !== undefined ? (adviceQueryParams.value.categoryCode || '') : '');
+  // 不传categoryCode，让搜索在全药库中进行；只有行已选择类型时才用对应categoryCode过滤
+  const categoryCode = row.adviceType !== undefined ? (selectedItem ? selectedItem.categoryCode : '') : '';
   const searchKey = row.adviceName || '';
 
   nextTick(() => {
@@ -919,8 +920,9 @@ function handleChange(value) {
       // 用 adviceType + categoryCode 组合查找匹配的选项
       const selectValue = (adviceType == 1 && row?.categoryCode) ? '1-' + row.categoryCode : adviceType;
       const selectedItem = adviceTypeList.value.find(item => item.value === selectValue) || adviceTypeList.value.find(item => item.adviceType === adviceType);
-      // 修复Bug #486：当行没有显式选择医嘱类型时，不传categoryCode，让搜索在全药库中进行
+      // 修复Bug #486：当行没有显式选择医嘱类型时（row?.adviceType为undefined），
-      const categoryCode = selectedItem ? selectedItem.categoryCode : (row?.adviceType !== undefined ? (adviceQueryParams.value.categoryCode || '') : '');
+      // 不传categoryCode，让搜索在全药库中进行；只有行已选择类型时才用对应categoryCode过滤
+      const categoryCode = row?.adviceType !== undefined ? (selectedItem ? selectedItem.categoryCode : '') : '';
       tableRef.refresh(adviceType, categoryCode, value);
     }
   }