诊疗下面没有诊疗项目

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java

@@ -73,8 +73,10 @@ public class OutpatientPricingAppServiceImpl implements IOutpatientPricingAppSer
         } else {
             adviceTypes = List.of(1, 2, 3);
         }
+        // 门诊划价：不要强制 pricingFlag=1 参与过滤（wor_activity_definition.pricing_flag 可能为 0），
+        // 否则会导致诊疗项目(adviceType=3)查询结果为空 records=[]
         return iDoctorStationAdviceAppService.getAdviceBaseInfo(adviceBaseDto, searchKey, locationId, null,
-            organizationId, pageNo, pageSize, Whether.YES.getValue(), adviceTypes, null);
+            organizationId, pageNo, pageSize, null, adviceTypes, null);
     }
 
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java

@@ -127,8 +127,11 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
 
         log.info("从数据库查询医嘱基础信息");
 
-        // 设置默认科室 (不取前端传的了)
-        organizationId = SecurityUtils.getLoginUser().getOrgId();
+        // 设置默认科室：仅当前端/调用方未传 organizationId 时才回退到登录人科室
+        // 否则会导致门诊划价等场景（按患者挂号科室查询）返回空
+        if (organizationId == null) {
+            organizationId = SecurityUtils.getLoginUser().getOrgId();
+        }
 
         // 医嘱定价来源
         String orderPricingSource = TenantOptionUtil.getOptionContent(TenantOptionDict.ORDER_PRICING_SOURCE);