From f6b39a48157a294da29123b9eeae1ab4f268a054 Mon Sep 17 00:00:00 2001
From: yangkexiang <1677036288@qq.com>
Date: Fri, 3 Apr 2026 16:35:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E9=97=A8=E8=AF=8A?=
 =?UTF-8?q?=E5=AE=9A=E4=BB=B7=E6=9C=8D=E5=8A=A1=E4=BB=A5=E4=BB=85=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=88=92=E4=BB=B7=E6=A0=87=E8=AE=B0=E4=B8=BA=E2=80=9C?=
 =?UTF-8?q?=E6=98=AF=E2=80=9D=E7=9A=84=E9=A1=B9=E7=9B=AE=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=97=A5=E5=BF=97=E8=B7=AF=E5=BE=84=E5=92=8C?=
 =?UTF-8?q?VitalSigns=E8=A1=A8=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 OutpatientPricingAppServiceImpl.java，确保仅返回划价标记为“是”的项目
- 修正 VitalSigns.java 中的表名为 "doc_vital_signs"
---
 .../appservice/impl/OutpatientPricingAppServiceImpl.java     | 5 ++---
 .../main/java/com/openhis/document/domain/VitalSigns.java    | 2 +-
 .../views/appoinmentmanage/outpatientAppointment/index.vue   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

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 @@
                 >
                   <td>{{ index + 1 }}</td>
                   <td>{{ patient.name }}</td>
-                  <td>{{ patient.id || patient.medicalCard }}</td>
+                  <td>{{ patient.identifierNo }}</td>
                   <td>{{ getGenderText(patient.genderEnum_enumText || patient.genderEnum || patient.gender || patient.sex) }}</td>
                   <td>{{ patient.idCard }}</td>
                   <td>{{ patient.phone }}</td>