diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java index dd32d54d..90c4d116 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientPricingAppServiceImpl.java @@ -73,11 +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=[] String categoryCode = adviceBaseDto != null ? adviceBaseDto.getCategoryCode() : null; + // 门诊划价:仅返回划价标记为“是”的项目 return iDoctorStationAdviceAppService.getAdviceBaseInfo(adviceBaseDto, searchKey, locationId, null, - organizationId, pageNo, pageSize, null, adviceTypes, null, categoryCode); + organizationId, pageNo, pageSize, Whether.YES.getValue(), adviceTypes, null, categoryCode); } } diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/VitalSigns.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/VitalSigns.java index 953513ed..d6160a97 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/VitalSigns.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/VitalSigns.java @@ -17,7 +17,7 @@ import java.util.Date; * @date 2025-06-03 */ @Data -@TableName("doc_ital_signs") +@TableName("doc_vital_signs") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) public class VitalSigns extends HisBaseEntity { diff --git a/openhis-ui-vue3/src/views/appoinmentmanage/outpatientAppointment/index.vue b/openhis-ui-vue3/src/views/appoinmentmanage/outpatientAppointment/index.vue index aa36accd..5635bbfc 100644 --- a/openhis-ui-vue3/src/views/appoinmentmanage/outpatientAppointment/index.vue +++ b/openhis-ui-vue3/src/views/appoinmentmanage/outpatientAppointment/index.vue @@ -195,7 +195,7 @@ >