修改新增耗材“一次性静脉采血器” 点击保存categoryEnum为空值的问题。

- 将原有的 header-top 和 header-bottom 结构替换为 info-row 统一布局
- 新增姓名、性别年龄、房间床号、住院号、保险类型等独立信息行
- 使用 el-text 组件优化姓名显示效果
- 为性别标签添加女性样式标识
- 调整床位信息展示方式，支持溢出省略
- 修改溢出属性从 hidden 为 visible 确保内容正常显示
- 优化标签样式和间距布局
- 隐藏已废弃的旧布局元素
- 调整 pending 患者列表的换行和对齐方式

openhis-server-new/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java

@@ -1,22 +1,29 @@
 package com.core.framework.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
 import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import com.core.common.utils.SecurityUtils;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.LongValue;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.sql.DataSource;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
@@ -149,4 +156,41 @@ public class MybatisPlusConfig {
 
         return result != null ? result : 1; // 默认租户ID
     }
+
+    /**
+     * 配置 SqlSessionFactory
+     * 由于排除了 DataSourceAutoConfiguration，需要手动配置
+     */
+    @Bean
+    @Primary
+    public SqlSessionFactory sqlSessionFactory(
+            @Qualifier("dynamicDataSource") DataSource dataSource,
+            MybatisPlusInterceptor mybatisPlusInterceptor) throws Exception {
+        MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean();
+        sessionFactory.setDataSource(dataSource);
+        // 设置 mapper 文件位置
+        sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
+            .getResources("classpath*:mapper/**/*Mapper.xml"));
+        // 设置 typeAliases 包路径
+        sessionFactory.setTypeAliasesPackage("com.core.**.domain,com.openhis.**.domain");
+        
+        // 配置 MyBatis-Plus
+        MybatisConfiguration configuration = new MybatisConfiguration();
+        // 使用驼峰命名法转换字段
+        configuration.setMapUnderscoreToCamelCase(true);
+        // 开启缓存
+        configuration.setCacheEnabled(true);
+        // 允许JDBC支持自动生成主键
+        configuration.setUseGeneratedKeys(true);
+        // 配置默认的执行器
+        configuration.setDefaultExecutorType(org.apache.ibatis.session.ExecutorType.SIMPLE);
+        // 配置日志实现
+        configuration.setLogImpl(org.apache.ibatis.logging.slf4j.Slf4jImpl.class);
+        sessionFactory.setConfiguration(configuration);
+        
+        // 设置拦截器（通过参数注入避免循环依赖）
+        sessionFactory.setPlugins(mybatisPlusInterceptor);
+        
+        return sessionFactory.getObject();
+    }
 }

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/IDoctorStationMainAppService.java

@@ -90,4 +90,10 @@ public interface IDoctorStationMainAppService {
      */
     List<ReceptionStatisticsDto> getReceptionStatistics(String startTime,String endTime,Long practitionerId);
 
+    /**
+     * 过号重排
+     * @param encounterId 就诊ID
+     * @return 操作结果
+     */
+    R<?> rearrangeMissedEncounter(Long encounterId);
 }

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);

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

@@ -26,9 +26,11 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -323,4 +325,45 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
             practitionerId);
     }
 
+    /**
+     * 过号重排核心实现
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class) // 事务保证原子性
+    public R<?> rearrangeMissedEncounter(Long encounterId) {
+        // 1. 校验就诊记录是否存在
+        Encounter encounter = encounterMapper.selectById(encounterId);
+        if (encounter == null) {
+            return R.fail("就诊记录不存在");
+        }
+
+        // 2. 校验状态：仅「在诊（IN_PROGRESS=2）」可重排
+        if (!EncounterStatus.IN_PROGRESS.getValue().equals(encounter.getStatusEnum())) {
+            return R.fail("仅「在诊」状态的患者可执行过号重排");
+        }
+
+        // 3. 核心更新：改回待诊+更新missed_time
+        Date now = new Date();
+        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        int updateCount = encounterMapper.update(null,
+                new LambdaUpdateWrapper<Encounter>()
+                        .eq(Encounter::getId, encounterId)
+                        .set(Encounter::getStatusEnum, EncounterStatus.PLANNED.getValue()) // 改回1-待诊
+                        .set(Encounter::getMissedTime, now) // 新增：设置过号时间为当前时间
+                        .set(Encounter::getUpdateBy, practitionerId.toString()) // 操作医生ID
+                        .eq(Encounter::getStatusEnum, EncounterStatus.IN_PROGRESS.getValue())); // 防并发
+
+        if (updateCount == 0) {
+            return R.fail("过号重排失败：状态更新异常");
+        }
+
+        // 4. 同步更新接诊参与记录
+        iEncounterParticipantService.update(new LambdaUpdateWrapper<EncounterParticipant>()
+                .eq(EncounterParticipant::getEncounterId, encounterId)
+                .eq(EncounterParticipant::getTypeCode, ParticipantType.ADMITTER.getCode())
+                .set(EncounterParticipant::getStatusEnum, EncounterActivityStatus.COMPLETED.getValue()));
+
+        return R.ok("过号重排成功");
+    }
+
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationMainController.java

@@ -133,6 +133,29 @@ public class DoctorStationMainController {
         }
     }
 
+    /**
+     * 过号重排
+     *
+     * @param encounterId 就诊id
+     * @return 结果
+     */
+    @GetMapping(value = "/rearrange-missed-encounter")
+    public R<?> rearrangeMissedEncounter(@RequestParam(value = "encounterId", required = false) String encounterId) {
+        // 1. 空值校验（和现有接口保持一致）
+        if (encounterId == null || "undefined".equals(encounterId) || "null".equals(encounterId)) {
+            return R.fail("就诊ID不能为空");
+        }
+        try {
+            // 2. 字符串转Long（和现有接口保持一致）
+            Long id = Long.parseLong(encounterId);
+            // 3. 调用AppService的过号重排方法
+            return iDoctorStationMainAppService.rearrangeMissedEncounter(id);
+        } catch (NumberFormatException e) {
+            // 4. 格式错误处理（和现有接口保持一致）
+            return R.fail("就诊ID格式错误");
+        }
+    }
+
     /**
      * 查询处方号列表信息
      * 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientInfoDto.java

@@ -1,5 +1,6 @@
 package com.openhis.web.doctorstation.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.openhis.common.annotation.Dict;
@@ -127,4 +128,9 @@ public class PatientInfoDto {
      * 就诊卡号
      */
     private String identifierNo;
+
+    /**
+     * 过号时间
+     */
+    private Date missedTime;
 }

openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml

@@ -112,6 +112,7 @@
                            ON T1.context_enum = #{activity}
                                AND T1.product_id = T2.id
                                AND T2.delete_flag = '0'
+                               AND T2.status_enum = 1
                  LEFT JOIN med_medication_definition AS T3
                            ON T1.context_enum = #{medication}
                                AND T1.product_id = T3.id
@@ -205,6 +206,7 @@
                                  ON T1.context_enum = #{activity}
                                      AND T1.product_id = T2.id
                                      AND T2.delete_flag = '0'
+                                     AND T2.status_enum = 1
                        LEFT JOIN med_medication_definition AS T3
                                  ON T1.context_enum = #{medication}
                                      AND T1.product_id = T3.id

openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml

@@ -227,8 +227,11 @@
                 AND T2.instance_table = #{activityTableName}
                 LEFT JOIN adm_organization_location AS T3 ON T3.activity_definition_id = T1.ID
                 AND T3.delete_flag = '0' AND (CURRENT_TIME :: time (6) BETWEEN T3.start_time AND T3.end_time)
+                <if test="organizationId != null">
+                    AND T3.organization_id = #{organizationId}
+                </if>
                 WHERE T1.delete_flag = '0'
-                <if test="pricingFlag ==1">
+                <if test="pricingFlag != null and pricingFlag == 1">
                     AND (T1.pricing_flag = #{pricingFlag} OR T1.pricing_flag IS NULL)
                 </if>
                 <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">

openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml

@@ -24,7 +24,8 @@
         T10.practitioner_user_id,
         T10.jz_practitioner_user_id,
         T10.bus_no,
-        T10.identifier_no
+        T10.identifier_no,
+        T10.missed_time
         from
         (
         SELECT T1.tenant_id AS tenant_id,
@@ -50,7 +51,8 @@
         T1.reception_time AS reception_time,
         T1.organization_id AS org_id,
         T8.bus_no AS bus_no,
-        T9.identifier_no AS identifier_no
+        T9.identifier_no AS identifier_no,
+        T1.missed_time AS missed_time
         FROM adm_encounter AS T1
         LEFT JOIN adm_organization AS T2 ON T1.organization_id = T2.ID AND T2.delete_flag = '0'
         LEFT JOIN adm_healthcare_service AS T3 ON T1.service_type_id = T3.ID AND T3.delete_flag = '0'
@@ -70,18 +72,18 @@
         LEFT JOIN fin_contract AS T7 ON T6.contract_no = T7.bus_no AND T7.delete_flag = '0'
         LEFT JOIN adm_patient AS T8 ON T1.patient_id = T8.ID AND T8.delete_flag = '0'
         LEFT JOIN (
-           SELECT patient_id,
-                  identifier_no
-           FROM (
-                SELECT patient_id,
-                       identifier_no,
-                       ROW_NUMBER() OVER (PARTITION BY patient_id ORDER BY create_time ASC) AS rn
-                FROM adm_patient_identifier
-                WHERE delete_flag = '0'
-                  AND identifier_no IS NOT NULL
-                  AND identifier_no != ''
-           ) t
-           WHERE rn = 1
+        SELECT patient_id,
+        identifier_no
+        FROM (
+        SELECT patient_id,
+        identifier_no,
+        ROW_NUMBER() OVER (PARTITION BY patient_id ORDER BY create_time ASC) AS rn
+        FROM adm_patient_identifier
+        WHERE delete_flag = '0'
+        AND identifier_no IS NOT NULL
+        AND identifier_no != ''
+        ) t
+        WHERE rn = 1
         ) AS T9 ON T8.id = T9.patient_id
         WHERE
         T1.delete_flag = '0'

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

@@ -5,7 +5,8 @@
 <mapper namespace="com.openhis.web.regdoctorstation.mapper.AdviceManageAppMapper">
 
     <select id="getRegPatientMainInfo" resultType="com.openhis.web.regdoctorstation.dto.RegPatientMainInfoDto">
-        SELECT rpmi.tenant_id,
+        SELECT DISTINCT ON (rpmi.patient_id)
+               rpmi.tenant_id,
                rpmi.encounter_id,
                rpmi.status_enum,
                rpmi.bus_no,
@@ -26,7 +27,7 @@
                rpmi.contract_name,
                rpmi.reg_diagnosis_name,
                rpmi.account_id
-        from (SELECT ae.tenant_id,
+        FROM (SELECT ae.tenant_id,
                      ae.ID                                                             AS encounter_id,
                      ae.status_enum                                                    AS status_enum,
                      ae.bus_no                                                         AS bus_no,
@@ -94,7 +95,90 @@
                     AND practitioner_id = #{practitionerId}
                     AND org_id = ae.organization_id
               )) AS rpmi
-            ${ew.customSqlSegment}
+        <if test="ew != null and ew.sqlSegment != null and ew.sqlSegment != ''">
+            WHERE ${ew.sqlSegment}
+        </if>
+        ORDER BY rpmi.patient_id, rpmi.encounter_id DESC
+    </select>
+
+    <!-- 用于分页的COUNT查询，与主查询保持一致的去重逻辑 -->
+    <select id="getRegPatientMainInfoCount" resultType="java.lang.Long">
+        SELECT COUNT(*) FROM (
+            SELECT DISTINCT ON (rpmi.patient_id)
+                   rpmi.patient_id
+            FROM (SELECT ae.tenant_id,
+                         ae.ID                                                             AS encounter_id,
+                         ae.status_enum                                                    AS status_enum,
+                         ae.bus_no                                                         AS bus_no,
+                         ae.start_time                                                     AS in_hospital_time,
+                         (EXTRACT(DAY FROM (CURRENT_DATE - ae.start_time)) :: INTEGER + 1) AS in_hospital_days,
+                         ae.end_time                                                       AS out_hospital_time,
+                         ap.ID                                                             AS patient_id,
+                         ap.NAME                                                           AS patient_name,
+                         ap.gender_enum                                                    AS gender_enum,
+                         ap.birth_date                                                     AS birth_date,
+                         alw.NAME                                                          AS ward_name,
+                         alh.NAME                                                          AS house_name,
+                         alb.NAME                                                          AS bed_name,
+                         aelb.start_time                                                   AS in_org_time,
+                         ao.id                                                             AS in_hospital_org_id,
+                         ao.NAME                                                           AS in_hospital_org_name,
+                         aa.id                                                             AS account_id,
+                         aa.contract_no                                                    AS contract_no,
+                         fc.contract_name                                                  AS contract_name,
+                         ccd.NAME                                                          AS reg_diagnosis_name
+                  FROM adm_encounter AS ae
+                           LEFT JOIN adm_patient AS ap ON ap.ID = ae.patient_id
+                      AND ap.delete_flag = '0'
+                           LEFT JOIN adm_organization AS ao ON ao.ID = ae.organization_id
+                      AND ao.delete_flag = '0'
+                           LEFT JOIN adm_encounter_location AS aelw ON aelw.encounter_id = ae.ID
+                      AND aelw.delete_flag = '0'
+                      AND aelw.form_enum = #{wardEnum}
+                      AND aelw.status_enum = #{encounterActivityStatus}
+                           LEFT JOIN adm_location AS alw ON alw.ID = aelw.location_id
+                      AND alw.delete_flag = '0'
+                           LEFT JOIN adm_encounter_location AS aelh ON aelh.encounter_id = ae.ID
+                      AND aelh.delete_flag = '0'
+                      AND aelh.form_enum = #{houseEnum}
+                      AND aelh.status_enum = #{encounterActivityStatus}
+                           LEFT JOIN adm_location AS alh ON alh.ID = aelh.location_id
+                      AND alh.delete_flag = '0'
+                           LEFT JOIN adm_encounter_location AS aelb ON aelb.encounter_id = ae.ID
+                      AND aelb.delete_flag = '0'
+                      AND aelb.form_enum = #{bedEnum}
+                      AND aelb.status_enum = #{encounterActivityStatus}
+                           LEFT JOIN adm_location AS alb ON alb.ID = aelb.location_id
+                      AND alb.delete_flag = '0'
+                           INNER JOIN adm_account AS aa ON aa.encounter_id = ae.ID
+                      AND aa.delete_flag = '0'
+                      AND aa.encounter_flag = 1
+                           LEFT JOIN fin_contract AS fc ON fc.bus_no = aa.contract_no
+                      AND fc.delete_flag = '0'
+                           LEFT JOIN adm_encounter_diagnosis AS aed ON aed.encounter_id = ae.ID
+                      AND aed.delete_flag = '0'
+                      AND aed.maindise_flag = #{maindiseFlag}
+                           LEFT JOIN cli_condition AS cc ON cc.ID = aed.condition_id
+                      AND cc.delete_flag = '0'
+                           LEFT JOIN cli_condition_definition AS ccd ON ccd.ID = cc.definition_id
+                      AND ccd.delete_flag = '0'
+                  WHERE ae.delete_flag = '0'
+                    AND ae.class_enum = #{classEnum}
+                    AND ae.status_enum != #{toBeRegistered}
+                    AND ae.status_enum != #{alreadySettled}
+                    AND ae.status_enum != #{registered}
+                    AND EXISTS(
+                      SELECT 1
+                      FROM adm_practitioner_role
+                      WHERE delete_flag = '0'
+                        AND practitioner_id = #{practitionerId}
+                        AND org_id = ae.organization_id
+                  )) AS rpmi
+            <if test="ew != null and ew.sqlSegment != null and ew.sqlSegment != ''">
+                WHERE ${ew.sqlSegment}
+            </if>
+            ORDER BY rpmi.patient_id, rpmi.encounter_id DESC
+        ) AS distinct_patients
     </select>
 
     <select id="getRegRequestBaseInfo" resultType="com.openhis.web.regdoctorstation.dto.RegRequestBaseDto">
@@ -275,7 +359,9 @@
               WHERE aa.type_code = #{personalCashAccount}
                 AND aa.delete_flag = '0'
               GROUP BY aa.tenant_id, aa.id, aa.insutype, aa.encounter_id, aa.balance_amount) AS final_res
-            ${ew.customSqlSegment}
+        <if test="ew != null and ew.sqlSegment != null and ew.sqlSegment != ''">
+            WHERE ${ew.sqlSegment}
+        </if>
     </select>
 
 </mapper>

openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java

@@ -116,11 +116,16 @@ public class DictAspect {
     }
 
     private String queryDictLabel(String dictTable, String dictCode, String dictText, String dictValue) {
-        if (StringUtils.hasText(dictTable)) {
-            // 场景 1：默认字典走DictUtils缓存
+        if (!StringUtils.hasText(dictTable)) {
+            // 场景 1：默认字典走DictUtils缓存（dictTable 为空时）
             return DictUtils.getDictLabel(dictCode, dictValue);
         } else {
-            // 场景 2：查询指定表
+            // 场景 2：查询指定表（dictTable 有值时）
+            // 必须同时有 dictTable 和 dictText 才能执行 SQL 查询
+            if (!StringUtils.hasText(dictText)) {
+                // 如果 dictText 为空，回退到字典缓存查询
+                return DictUtils.getDictLabel(dictCode, dictValue);
+            }
             String sql = String.format("SELECT %s FROM %s WHERE %s::varchar = ? LIMIT 1", dictText, dictTable, dictCode);
             try {
                 return jdbcTemplate.queryForObject(sql, String.class, dictValue);

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java

@@ -1,8 +1,6 @@
 package com.openhis.administration.domain;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.core.common.core.domain.HisBaseEntity;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -145,4 +143,9 @@ public class Encounter extends HisBaseEntity {
      */
     private Long registrarId;
 
+    /**
+     * 过号时间
+     */
+    @TableField("missed_time")
+    private Date missedTime;
 }

openhis-server-new/sql/check_outpatient_charge_activity_data.sql

@@ -0,0 +1,94 @@
+-- ============================================
+-- 检查门诊划价"诊疗判断"下没有数据的原因
+-- ============================================
+
+-- 1. 检查是否有诊疗类型的收费项目（context_enum = 3）
+SELECT 
+    COUNT(*) AS total_activity_charge_items,
+    COUNT(CASE WHEN delete_flag = '0' THEN 1 END) AS active_charge_items
+FROM adm_charge_item
+WHERE context_enum = 3;  -- ACTIVITY = 3
+
+-- 2. 检查诊疗类型的收费项目是否能关联到 wor_activity_definition
+SELECT 
+    T1.id AS charge_item_id,
+    T1.encounter_id,
+    T1.context_enum,
+    T1.product_id,
+    T1.status_enum AS charge_status,
+    T2.id AS activity_def_id,
+    T2.name AS activity_name,
+    T2.status_enum AS activity_status,
+    T2.delete_flag AS activity_delete_flag,
+    CASE 
+        WHEN T2.id IS NULL THEN '❌ 无法关联到诊疗项目定义'
+        WHEN T2.delete_flag != '0' THEN '❌ 诊疗项目定义已删除'
+        WHEN T2.status_enum != 1 THEN '❌ 诊疗项目定义未激活（status_enum != 1）'
+        ELSE '✅ 正常'
+    END AS match_status
+FROM adm_charge_item AS T1
+LEFT JOIN wor_activity_definition AS T2
+    ON T1.context_enum = 3
+    AND T1.product_id = T2.id
+    AND T2.delete_flag = '0'
+    AND T2.status_enum = 1  -- 当前查询条件
+WHERE T1.context_enum = 3
+  AND T1.delete_flag = '0'
+LIMIT 20;
+
+-- 3. 检查如果移除 status_enum = 1 条件，能关联多少条
+SELECT 
+    COUNT(*) AS total_count,
+    COUNT(CASE WHEN T2.id IS NOT NULL AND T2.delete_flag = '0' AND T2.status_enum = 1 THEN 1 END) AS matched_active,
+    COUNT(CASE WHEN T2.id IS NOT NULL AND T2.delete_flag = '0' AND T2.status_enum != 1 THEN 1 END) AS matched_inactive,
+    COUNT(CASE WHEN T2.id IS NULL THEN 1 END) AS unmatched
+FROM adm_charge_item AS T1
+LEFT JOIN wor_activity_definition AS T2
+    ON T1.context_enum = 3
+    AND T1.product_id = T2.id
+    AND T2.delete_flag = '0'
+WHERE T1.context_enum = 3
+  AND T1.delete_flag = '0';
+
+-- 4. 检查具体某个就诊的诊疗项目（替换 encounterId 为实际值）
+-- SELECT 
+--     T1.id AS charge_item_id,
+--     T1.encounter_id,
+--     T1.product_id,
+--     T1.status_enum AS charge_status,
+--     T2.id AS activity_def_id,
+--     T2.name AS activity_name,
+--     T2.status_enum AS activity_status,
+--     CASE 
+--         WHEN T2.id IS NULL THEN '无法关联'
+--         WHEN T2.status_enum != 1 THEN '诊疗项目未激活'
+--         ELSE '正常'
+--     END AS status
+-- FROM adm_charge_item AS T1
+-- LEFT JOIN wor_activity_definition AS T2
+--     ON T1.context_enum = 3
+--     AND T1.product_id = T2.id
+--     AND T2.delete_flag = '0'
+--     AND T2.status_enum = 1
+-- WHERE T1.encounter_id = :encounterId  -- 替换为实际的encounterId
+--   AND T1.context_enum = 3
+--   AND T1.delete_flag = '0';
+
+-- 5. 如果诊疗项目 status_enum != 1，查看这些项目
+SELECT 
+    T1.id AS charge_item_id,
+    T1.encounter_id,
+    T1.product_id,
+    T2.name AS activity_name,
+    T2.status_enum AS activity_status,
+    '诊疗项目未激活，导致无法显示' AS issue
+FROM adm_charge_item AS T1
+INNER JOIN wor_activity_definition AS T2
+    ON T1.context_enum = 3
+    AND T1.product_id = T2.id
+    AND T2.delete_flag = '0'
+    AND T2.status_enum != 1  -- 未激活
+WHERE T1.context_enum = 3
+  AND T1.delete_flag = '0'
+LIMIT 20;
+

openhis-server-new/sql/check_pricing_flag_zero_data.sql

@@ -0,0 +1,142 @@
+-- ============================================
+-- 检查 wor_activity_definition 表中 pricing_flag = 0 的数据
+-- 用途：分析哪些项目被标记为"不允许划价"，是否符合业务预期
+-- ============================================
+
+-- 1. 查看所有 pricing_flag = 0 的项目详情
+SELECT 
+    id,
+    bus_no,
+    name AS activity_name,
+    category_code,
+    type_enum,
+    pricing_flag,
+    status_enum,
+    org_id,
+    location_id,
+    description_text,
+    create_time,
+    update_time
+FROM wor_activity_definition
+WHERE delete_flag = '0'
+  AND pricing_flag = '0'  -- 注意：字段类型是 char(1)，所以是字符串 '0'
+ORDER BY id;
+
+-- 2. 统计 pricing_flag = 0 的项目数量（按状态）
+SELECT 
+    status_enum,
+    COUNT(*) AS count,
+    CASE 
+        WHEN status_enum = 1 THEN '激活'
+        WHEN status_enum = 2 THEN '停用'
+        ELSE '其他'
+    END AS status_desc
+FROM wor_activity_definition
+WHERE delete_flag = '0'
+  AND pricing_flag = '0'
+GROUP BY status_enum
+ORDER BY status_enum;
+
+-- 3. 检查 pricing_flag = 0 的项目是否有关联的费用定价
+SELECT 
+    T1.id,
+    T1.bus_no,
+    T1.name AS activity_name,
+    T1.pricing_flag,
+    T1.status_enum,
+    T2.id AS charge_item_definition_id,
+    T2.charge_name,
+    T2.price,
+    T2.status_enum AS charge_status,
+    CASE 
+        WHEN T2.id IS NOT NULL THEN '有费用定价但不允许划价（可能异常）'
+        ELSE '无费用定价，不允许划价（正常）'
+    END AS analysis
+FROM wor_activity_definition AS T1
+LEFT JOIN adm_charge_item_definition AS T2
+    ON T2.instance_id = T1.id
+    AND T2.delete_flag = '0'
+    AND T2.status_enum = 1
+    AND T2.instance_table = 'wor_activity_definition'
+WHERE T1.delete_flag = '0'
+  AND T1.pricing_flag = '0'
+ORDER BY T1.id;
+
+-- 4. 检查 pricing_flag = 0 的项目是否在收费项目表中被使用
+SELECT 
+    T1.id AS activity_id,
+    T1.bus_no,
+    T1.name AS activity_name,
+    T1.pricing_flag,
+    COUNT(T3.id) AS charge_item_count,
+    CASE 
+        WHEN COUNT(T3.id) > 0 THEN '已被使用（可能异常：不允许划价但已有收费记录）'
+        ELSE '未被使用（正常）'
+    END AS analysis
+FROM wor_activity_definition AS T1
+LEFT JOIN adm_charge_item AS T3
+    ON T3.product_id = T1.id
+    AND T3.context_enum = 3  -- ACTIVITY
+    AND T3.delete_flag = '0'
+WHERE T1.delete_flag = '0'
+  AND T1.pricing_flag = '0'
+GROUP BY T1.id, T1.bus_no, T1.name, T1.pricing_flag
+HAVING COUNT(T3.id) > 0  -- 只显示已被使用的
+ORDER BY charge_item_count DESC;
+
+-- 5. 按类别统计 pricing_flag = 0 的项目
+SELECT 
+    category_code,
+    COUNT(*) AS count,
+    STRING_AGG(name, ', ') AS activity_names  -- 列出项目名称
+FROM wor_activity_definition
+WHERE delete_flag = '0'
+  AND pricing_flag = '0'
+  AND status_enum = 1  -- 只统计激活的
+GROUP BY category_code
+ORDER BY category_code;
+
+-- 6. 对比：pricing_flag = 0 和 pricing_flag = 1 的项目特征
+SELECT 
+    pricing_flag,
+    COUNT(*) AS count,
+    COUNT(DISTINCT category_code) AS category_count,
+    COUNT(DISTINCT org_id) AS org_count,
+    STRING_AGG(DISTINCT category_code::text, ', ') AS categories
+FROM wor_activity_definition
+WHERE delete_flag = '0'
+  AND status_enum = 1
+  AND pricing_flag IN ('0', '1')
+GROUP BY pricing_flag
+ORDER BY pricing_flag;
+
+-- 7. 检查是否有子项的项目（childrenJson 不为空）被标记为 pricing_flag = 0
+SELECT 
+    id,
+    bus_no,
+    name AS activity_name,
+    pricing_flag,
+    children_json,
+    CASE 
+        WHEN children_json IS NOT NULL AND children_json != '' THEN '有子项但不允许划价（可能是套餐子项）'
+        ELSE '无子项'
+    END AS analysis
+FROM wor_activity_definition
+WHERE delete_flag = '0'
+  AND pricing_flag = '0'
+  AND children_json IS NOT NULL
+  AND children_json != ''
+ORDER BY id;
+
+-- 8. 查看 pricing_flag 字段的所有可能值（包括 NULL）
+SELECT 
+    COALESCE(pricing_flag::text, 'NULL') AS pricing_flag_value,
+    COUNT(*) AS count,
+    ROUND(COUNT(*) * 100.0 / SUM(COUNT(*)) OVER (), 2) AS percentage
+FROM wor_activity_definition
+WHERE delete_flag = '0'
+  AND status_enum = 1
+GROUP BY pricing_flag
+ORDER BY pricing_flag NULLS LAST;
+
+

openhis-server-new/sql/check_treatment_items_detailed.sql

@@ -0,0 +1,116 @@
+-- 详细检查诊疗项目检索问题
+-- 已知：wor_activity_definition 表中有4条数据
+
+-- 1. 检查这4条诊疗项目定义的详细信息
+SELECT 
+    id,
+    name,
+    bus_no,
+    delete_flag,
+    tenant_id,
+    create_time
+FROM wor_activity_definition
+ORDER BY id;
+
+-- 2. 检查收费项目中是否有诊疗项目类型的记录
+-- 注意：ChargeItemContext.ACTIVITY.getValue() 返回的是 Integer 3
+-- 但数据库中 context_enum 可能是字符串类型，需要检查是 '3' 还是 3
+SELECT 
+    COUNT(*) as total_activity_charge_items,
+    COUNT(CASE WHEN delete_flag = '0' THEN 1 END) as active_activity_charge_items,
+    COUNT(CASE WHEN delete_flag != '0' THEN 1 END) as deleted_activity_charge_items
+FROM adm_charge_item
+WHERE context_enum::text = '3' OR context_enum = 3;  -- 诊疗项目类型是3
+
+-- 3. 检查收费项目中的product_id是否能匹配到诊疗项目定义
+-- 注意：诊疗项目类型的 context_enum = 3（ChargeItemContext.ACTIVITY.getValue()）
+SELECT 
+    aci.id as charge_item_id,
+    aci.encounter_id,
+    aci.context_enum,
+    aci.product_id as charge_product_id,
+    aci.status_enum,
+    aci.delete_flag as charge_delete_flag,
+    wad.id as activity_def_id,
+    wad.name as activity_name,
+    wad.delete_flag as activity_delete_flag,
+    CASE 
+        WHEN wad.id IS NULL THEN '❌ 诊疗项目定义不存在'
+        WHEN wad.delete_flag != '0' THEN '❌ 诊疗项目定义已删除'
+        WHEN aci.delete_flag != '0' THEN '❌ 收费项目已删除'
+        ELSE '✅ 正常'
+    END as match_status
+FROM adm_charge_item aci
+LEFT JOIN wor_activity_definition wad 
+    ON aci.product_id = wad.id
+WHERE (aci.context_enum::text = '3' OR aci.context_enum = 3)  -- 诊疗项目类型是3
+LIMIT 20;
+
+-- 4. 检查context_enum的所有可能值（确认诊疗项目的枚举值是什么）
+SELECT DISTINCT 
+    context_enum,
+    COUNT(*) as count
+FROM adm_charge_item
+WHERE delete_flag = '0'
+GROUP BY context_enum
+ORDER BY context_enum;
+
+-- 5. 检查是否有收费项目，但无法匹配到诊疗项目定义
+SELECT 
+    COUNT(*) as unmatched_count,
+    STRING_AGG(DISTINCT CAST(product_id AS VARCHAR), ', ') as unmatched_product_ids,
+    STRING_AGG(DISTINCT CAST(id AS VARCHAR), ', ') as unmatched_charge_item_ids
+FROM adm_charge_item aci
+WHERE (aci.context_enum::text = '3' OR aci.context_enum = 3)  -- 诊疗项目类型是3
+    AND aci.delete_flag = '0'
+    AND NOT EXISTS (
+        SELECT 1 
+        FROM wor_activity_definition wad
+        WHERE wad.id = aci.product_id
+            AND wad.delete_flag = '0'
+    );
+
+-- 6. 检查具体某个就诊的诊疗项目（如果有具体的encounterId）
+-- SELECT 
+--     T1.encounter_id,
+--     T1.id as charge_item_id,
+--     T1.context_enum,
+--     T1.product_id,
+--     T1.status_enum,
+--     T1.delete_flag,
+--     T2.id as activity_def_id,
+--     T2.name as activity_name,
+--     T2.delete_flag as activity_delete_flag
+-- FROM adm_charge_item AS T1
+-- LEFT JOIN wor_activity_definition AS T2
+--     ON T1.product_id = T2.id
+-- WHERE T1.encounter_id = :encounterId  -- 替换为实际的encounterId
+--     AND T1.context_enum IN ('ACTIVITY', '1', 'ACTIVITY_CODE')  -- 尝试多种可能的值
+--     AND T1.delete_flag = '0';
+
+-- 7. 检查后端代码中使用的context_enum值
+-- ChargeItemContext.ACTIVITY.getValue() 的实际返回值需要查看枚举类
+-- 可能是：'ACTIVITY', '1', 'ACTIVITY_CODE', 或其他值
+-- 建议先运行查询4，查看数据库中实际使用的context_enum值
+
+-- 8. 检查status_enum的值（查询条件中需要匹配的状态）
+-- SQL查询中要求 status_enum IN (1, 2, 3, 4, 5, 6)
+-- 检查收费项目中的状态值是否在这个范围内
+SELECT 
+    status_enum,
+    COUNT(*) as count,
+    CASE 
+        WHEN status_enum IN (1, 2, 3, 4, 5, 6) THEN '✅ 在查询范围内'
+        ELSE '❌ 不在查询范围内'
+    END as status_check
+FROM adm_charge_item
+WHERE context_enum IN (
+    SELECT DISTINCT context_enum 
+    FROM adm_charge_item 
+    WHERE delete_flag = '0'
+    LIMIT 10
+)
+AND delete_flag = '0'
+GROUP BY status_enum
+ORDER BY status_enum;
+

openhis-server-new/sql/diagnose_treatment_items_issue.sql

@@ -0,0 +1,92 @@
+-- 诊断：门诊划价检索不出诊疗项目的问题
+-- 问题描述：在门诊划价页面，检索不出诊疗项目
+
+-- 1. 检查是否有诊疗项目定义数据
+SELECT 
+    COUNT(*) as total_count,
+    COUNT(CASE WHEN delete_flag = '0' THEN 1 END) as active_count,
+    COUNT(CASE WHEN delete_flag != '0' THEN 1 END) as deleted_count
+FROM wor_activity_definition;
+
+-- 2. 检查是否有收费项目（诊疗项目类型）
+SELECT 
+    T1.id,
+    T1.encounter_id,
+    T1.context_enum,
+    T1.product_id,
+    T1.status_enum,
+    T1.delete_flag,
+    T2.id as activity_def_id,
+    T2.name as activity_name,
+    T2.delete_flag as activity_delete_flag
+FROM adm_charge_item AS T1
+LEFT JOIN wor_activity_definition AS T2
+    ON T1.context_enum = 'ACTIVITY'  -- 诊疗项目类型
+    AND T1.product_id = T2.id
+    AND T2.delete_flag = '0'
+WHERE T1.context_enum = 'ACTIVITY'
+    AND T1.delete_flag = '0'
+LIMIT 20;
+
+-- 3. 检查是否有诊疗项目定义，但收费项目中的product_id无法匹配
+SELECT 
+    '诊疗项目定义存在，但收费项目无法匹配' as issue_type,
+    COUNT(*) as count
+FROM wor_activity_definition wad
+WHERE wad.delete_flag = '0'
+    AND NOT EXISTS (
+        SELECT 1 
+        FROM adm_charge_item aci
+        WHERE aci.context_enum = 'ACTIVITY'
+            AND aci.product_id = wad.id
+            AND aci.delete_flag = '0'
+    );
+
+-- 4. 检查收费项目中的诊疗项目，但定义表中没有对应数据
+SELECT 
+    '收费项目存在，但诊疗项目定义缺失' as issue_type,
+    COUNT(*) as count
+FROM adm_charge_item aci
+WHERE aci.context_enum = 'ACTIVITY'
+    AND aci.delete_flag = '0'
+    AND NOT EXISTS (
+        SELECT 1 
+        FROM wor_activity_definition wad
+        WHERE wad.id = aci.product_id
+            AND wad.delete_flag = '0'
+    );
+
+-- 5. 检查某个具体就诊的诊疗项目（替换encounterId为实际值）
+-- SELECT 
+--     T1.encounter_id,
+--     T1.id as charge_item_id,
+--     T1.context_enum,
+--     T1.product_id,
+--     T1.status_enum,
+--     T2.id as activity_def_id,
+--     T2.name as activity_name,
+--     T2.delete_flag as activity_delete_flag,
+--     CASE 
+--         WHEN T2.id IS NULL THEN '诊疗项目定义不存在或已删除'
+--         WHEN T2.delete_flag != '0' THEN '诊疗项目定义已删除'
+--         ELSE '正常'
+--     END as status
+-- FROM adm_charge_item AS T1
+-- LEFT JOIN wor_activity_definition AS T2
+--     ON T1.context_enum = 'ACTIVITY'
+--     AND T1.product_id = T2.id
+-- WHERE T1.encounter_id = :encounterId  -- 替换为实际的encounterId
+--     AND T1.context_enum = 'ACTIVITY'
+--     AND T1.delete_flag = '0'
+--     AND T1.status_enum IN (1, 2, 3, 4, 5, 6);  -- PLANNED, BILLABLE, BILLED, REFUNDING, REFUNDED, PART_REFUND
+
+
+
+
+
+
+
+
+
+
+

openhis-server-new/sql/query_pricing_flag_distribution.sql

@@ -0,0 +1,144 @@
+-- ============================================
+-- 查询诊疗项目 pricing_flag 字段分布情况
+-- 用途：了解哪些项目允许划价，哪些不允许
+-- ============================================
+
+-- 1. 统计 pricing_flag 字段的分布情况
+SELECT 
+    COUNT(*) AS total_count,
+    COUNT(CASE WHEN pricing_flag = 1 THEN 1 END) AS pricing_flag_1_count,  -- 允许划价
+    COUNT(CASE WHEN pricing_flag = 0 THEN 1 END) AS pricing_flag_0_count,  -- 不允许划价
+    COUNT(CASE WHEN pricing_flag IS NULL THEN 1 END) AS pricing_flag_null_count,  -- 未设置
+    ROUND(COUNT(CASE WHEN pricing_flag = 1 THEN 1 END) * 100.0 / COUNT(*), 2) AS flag_1_percent,
+    ROUND(COUNT(CASE WHEN pricing_flag = 0 THEN 1 END) * 100.0 / COUNT(*), 2) AS flag_0_percent,
+    ROUND(COUNT(CASE WHEN pricing_flag IS NULL THEN 1 END) * 100.0 / COUNT(*), 2) AS flag_null_percent
+FROM wor_activity_definition
+WHERE delete_flag = '0'
+  AND status_enum = 1;  -- 只统计激活状态的项目
+
+-- 2. 查看所有允许划价的项目（pricing_flag = 1 或 NULL）
+SELECT 
+    id,
+    bus_no,
+    name AS activity_name,
+    pricing_flag,
+    status_enum,
+    org_id,
+    category_code,
+    type_enum,
+    CASE 
+        WHEN pricing_flag = 1 THEN '允许划价'
+        WHEN pricing_flag = 0 THEN '不允许划价'
+        WHEN pricing_flag IS NULL THEN '未设置（默认允许）'
+        ELSE '未知'
+    END AS pricing_flag_desc
+FROM wor_activity_definition
+WHERE delete_flag = '0'
+  AND status_enum = 1
+  AND (pricing_flag = 1 OR pricing_flag IS NULL)  -- 之前过滤条件
+ORDER BY id;
+
+-- 3. 查看不允许划价的项目（pricing_flag = 0）
+SELECT 
+    id,
+    bus_no,
+    name AS activity_name,
+    pricing_flag,
+    status_enum,
+    org_id,
+    category_code,
+    type_enum,
+    description_text,
+    '不允许划价' AS pricing_flag_desc
+FROM wor_activity_definition
+WHERE delete_flag = '0'
+  AND status_enum = 1
+  AND pricing_flag = 0  -- 这些项目之前不会显示
+ORDER BY id;
+
+-- 4. 查看未设置 pricing_flag 的项目（NULL）
+SELECT 
+    id,
+    bus_no,
+    name AS activity_name,
+    pricing_flag,
+    status_enum,
+    org_id,
+    category_code,
+    type_enum,
+    '未设置（默认允许）' AS pricing_flag_desc
+FROM wor_activity_definition
+WHERE delete_flag = '0'
+  AND status_enum = 1
+  AND pricing_flag IS NULL
+ORDER BY id;
+
+-- 5. 按科室统计 pricing_flag 分布
+SELECT 
+    org_id,
+    COUNT(*) AS total_count,
+    COUNT(CASE WHEN pricing_flag = 1 THEN 1 END) AS flag_1_count,
+    COUNT(CASE WHEN pricing_flag = 0 THEN 1 END) AS flag_0_count,
+    COUNT(CASE WHEN pricing_flag IS NULL THEN 1 END) AS flag_null_count
+FROM wor_activity_definition
+WHERE delete_flag = '0'
+  AND status_enum = 1
+GROUP BY org_id
+ORDER BY org_id;
+
+-- 6. 按类别统计 pricing_flag 分布
+SELECT 
+    category_code,
+    COUNT(*) AS total_count,
+    COUNT(CASE WHEN pricing_flag = 1 THEN 1 END) AS flag_1_count,
+    COUNT(CASE WHEN pricing_flag = 0 THEN 1 END) AS flag_0_count,
+    COUNT(CASE WHEN pricing_flag IS NULL THEN 1 END) AS flag_null_count
+FROM wor_activity_definition
+WHERE delete_flag = '0'
+  AND status_enum = 1
+GROUP BY category_code
+ORDER BY category_code;
+
+-- 7. 检查是否有费用定价关联的项目，但 pricing_flag = 0
+SELECT 
+    T1.id,
+    T1.bus_no,
+    T1.name AS activity_name,
+    T1.pricing_flag,
+    T2.id AS charge_item_definition_id,
+    T2.charge_name,
+    T2.price,
+    '有费用定价但不允许划价' AS issue_desc
+FROM wor_activity_definition AS T1
+LEFT JOIN adm_charge_item_definition AS T2
+    ON T2.instance_id = T1.id
+    AND T2.delete_flag = '0'
+    AND T2.status_enum = 1
+    AND T2.instance_table = 'wor_activity_definition'
+WHERE T1.delete_flag = '0'
+  AND T1.status_enum = 1
+  AND T1.pricing_flag = 0
+  AND T2.id IS NOT NULL  -- 有关联的费用定价
+ORDER BY T1.id;
+
+-- 8. 检查没有费用定价关联的项目，但 pricing_flag = 1
+SELECT 
+    T1.id,
+    T1.bus_no,
+    T1.name AS activity_name,
+    T1.pricing_flag,
+    T2.id AS charge_item_definition_id,
+    '允许划价但没有费用定价' AS issue_desc
+FROM wor_activity_definition AS T1
+LEFT JOIN adm_charge_item_definition AS T2
+    ON T2.instance_id = T1.id
+    AND T2.delete_flag = '0'
+    AND T2.status_enum = 1
+    AND T2.instance_table = 'wor_activity_definition'
+WHERE T1.delete_flag = '0'
+  AND T1.status_enum = 1
+  AND (T1.pricing_flag = 1 OR T1.pricing_flag IS NULL)
+  AND T2.id IS NULL  -- 没有关联的费用定价
+ORDER BY T1.id;
+
+

openhis-server-new/sql/quick_check_pricing_flag_issue.sql

@@ -0,0 +1,86 @@
+-- ============================================
+-- 快速检查 pricing_flag = '0' 的数据问题
+-- 注意：pricing_flag 是 char(1) 类型，所以要用字符串 '0'
+-- ============================================
+
+-- 问题1：检查是否有费用定价但 pricing_flag = '0' 的项目（可能异常）
+SELECT 
+    '异常：有费用定价但不允许划价' AS issue_type,
+    T1.id,
+    T1.bus_no,
+    T1.name AS activity_name,
+    T1.pricing_flag,
+    T2.charge_name,
+    T2.price
+FROM wor_activity_definition AS T1
+INNER JOIN adm_charge_item_definition AS T2
+    ON T2.instance_id = T1.id
+    AND T2.delete_flag = '0'
+    AND T2.status_enum = 1
+    AND T2.instance_table = 'wor_activity_definition'
+WHERE T1.delete_flag = '0'
+  AND T1.status_enum = 1
+  AND T1.pricing_flag = '0'  -- 不允许划价，但有费用定价（矛盾）
+ORDER BY T1.id;
+
+-- 问题2：检查是否已被使用但 pricing_flag = '0' 的项目（可能异常）
+SELECT 
+    '异常：已有收费记录但不允许划价' AS issue_type,
+    T1.id,
+    T1.bus_no,
+    T1.name AS activity_name,
+    T1.pricing_flag,
+    COUNT(DISTINCT T3.encounter_id) AS encounter_count,
+    COUNT(T3.id) AS charge_item_count
+FROM wor_activity_definition AS T1
+INNER JOIN adm_charge_item AS T3
+    ON T3.product_id = T1.id
+    AND T3.context_enum = 3  -- ACTIVITY
+    AND T3.delete_flag = '0'
+WHERE T1.delete_flag = '0'
+  AND T1.pricing_flag = '0'
+GROUP BY T1.id, T1.bus_no, T1.name, T1.pricing_flag
+ORDER BY charge_item_count DESC;
+
+-- 问题3：查看所有 pricing_flag = '0' 的项目，判断哪些可能应该改为 '1'
+SELECT 
+    T1.id,
+    T1.bus_no,
+    T1.name AS activity_name,
+    T1.category_code,
+    T1.pricing_flag,
+    T1.status_enum,
+    CASE 
+        WHEN T2.id IS NOT NULL THEN '有费用定价'
+        ELSE '无费用定价'
+    END AS has_charge_definition,
+    CASE 
+        WHEN EXISTS (
+            SELECT 1 FROM adm_charge_item 
+            WHERE product_id = T1.id 
+            AND context_enum = 3 
+            AND delete_flag = '0'
+        ) THEN '已被使用'
+        ELSE '未使用'
+    END AS usage_status,
+    CASE 
+        WHEN T2.id IS NOT NULL OR EXISTS (
+            SELECT 1 FROM adm_charge_item 
+            WHERE product_id = T1.id 
+            AND context_enum = 3 
+            AND delete_flag = '0'
+        ) THEN '建议改为 pricing_flag = ''1'''
+        ELSE '保持 pricing_flag = ''0''（可能正常）'
+    END AS suggestion
+FROM wor_activity_definition AS T1
+LEFT JOIN adm_charge_item_definition AS T2
+    ON T2.instance_id = T1.id
+    AND T2.delete_flag = '0'
+    AND T2.status_enum = 1
+    AND T2.instance_table = 'wor_activity_definition'
+WHERE T1.delete_flag = '0'
+  AND T1.status_enum = 1
+  AND T1.pricing_flag = '0'
+ORDER BY T1.id;
+
+

openhis-server-new/sql/update_pricing_flag_to_one.sql

@@ -0,0 +1,123 @@
+-- ============================================
+-- 将 wor_activity_definition 表中的一两条记录的 pricing_flag 改成 '1'
+-- 注意：pricing_flag 是 char(1) 类型，所以要用字符串 '1'
+-- ============================================
+
+-- 方式1：更新前两条 pricing_flag = '0' 的记录（推荐）
+UPDATE wor_activity_definition
+SET pricing_flag = '1',
+    update_time = CURRENT_TIMESTAMP
+WHERE id IN (
+    SELECT id
+    FROM wor_activity_definition
+    WHERE delete_flag = '0'
+      AND pricing_flag = '0'
+      AND status_enum = 1  -- 只更新激活状态的项目
+    ORDER BY id
+    LIMIT 2
+);
+
+-- 方式2：更新指定 ID 的记录（更精确，推荐使用）
+-- 请将下面的 ID 替换为实际要更新的记录 ID
+UPDATE wor_activity_definition
+SET pricing_flag = '1',
+    update_time = CURRENT_TIMESTAMP
+WHERE id IN (1906532604116348929, 1906544768434053121)  -- 替换为实际的 ID
+  AND delete_flag = '0';
+
+-- 方式3：更新前两条记录（不管当前 pricing_flag 值是什么）
+UPDATE wor_activity_definition
+SET pricing_flag = '1',
+    update_time = CURRENT_TIMESTAMP
+WHERE id IN (
+    SELECT id
+    FROM wor_activity_definition
+    WHERE delete_flag = '0'
+      AND status_enum = 1
+    ORDER BY id
+    LIMIT 2
+);
+
+-- 方式4：更新有费用定价但 pricing_flag = '0' 的前两条记录（业务逻辑更合理）
+UPDATE wor_activity_definition
+SET pricing_flag = '1',
+    update_time = CURRENT_TIMESTAMP
+WHERE id IN (
+    SELECT wad.id
+    FROM wor_activity_definition wad
+    INNER JOIN adm_charge_item_definition acid
+        ON acid.instance_id = wad.id
+        AND acid.delete_flag = '0'
+        AND acid.status_enum = 1
+        AND acid.instance_table = 'wor_activity_definition'
+    WHERE wad.delete_flag = '0'
+      AND wad.status_enum = 1
+      AND wad.pricing_flag = '0'
+    ORDER BY wad.id
+    LIMIT 2
+);
+
+-- ============================================
+-- 执行前可以先查询要更新的记录（验证用）
+-- ============================================
+
+-- 查询前两条 pricing_flag = '0' 的记录
+SELECT 
+    id,
+    bus_no,
+    name AS activity_name,
+    pricing_flag,
+    status_enum,
+    create_time,
+    update_time
+FROM wor_activity_definition
+WHERE delete_flag = '0'
+  AND pricing_flag = '0'
+  AND status_enum = 1
+ORDER BY id
+LIMIT 2;
+
+-- 查询有费用定价但 pricing_flag = '0' 的记录
+SELECT 
+    wad.id,
+    wad.bus_no,
+    wad.name AS activity_name,
+    wad.pricing_flag,
+    acid.charge_name,
+    acid.price
+FROM wor_activity_definition wad
+INNER JOIN adm_charge_item_definition acid
+    ON acid.instance_id = wad.id
+    AND acid.delete_flag = '0'
+    AND acid.status_enum = 1
+    AND acid.instance_table = 'wor_activity_definition'
+WHERE wad.delete_flag = '0'
+  AND wad.status_enum = 1
+  AND wad.pricing_flag = '0'
+ORDER BY wad.id
+LIMIT 2;
+
+-- ============================================
+-- 执行后验证更新结果
+-- ============================================
+
+-- 验证更新是否成功
+SELECT 
+    id,
+    bus_no,
+    name AS activity_name,
+    pricing_flag,
+    update_time
+FROM wor_activity_definition
+WHERE id IN (
+    -- 这里放刚才更新的 ID，或者用子查询
+    SELECT id
+    FROM wor_activity_definition
+    WHERE delete_flag = '0'
+      AND pricing_flag = '1'
+      AND status_enum = 1
+    ORDER BY update_time DESC
+    LIMIT 2
+);
+
+

openhis-server-new/sql/快速诊断诊疗项目问题.sql

@@ -0,0 +1,86 @@
+-- 快速诊断诊疗项目检索问题
+-- 已知：wor_activity_definition 表中有4条数据
+-- 关键：ChargeItemContext.ACTIVITY.getValue() = 3（整数）
+
+-- 步骤1：检查这4条诊疗项目定义的delete_flag状态
+SELECT 
+    id,
+    name,
+    delete_flag,
+    CASE WHEN delete_flag = '0' THEN '✅ 可用' ELSE '❌ 已删除' END as status
+FROM wor_activity_definition
+ORDER BY id;
+
+-- 步骤2：检查收费项目中是否有诊疗项目类型（context_enum = 3）的记录
+SELECT 
+    COUNT(*) as total_count,
+    COUNT(CASE WHEN delete_flag = '0' THEN 1 END) as active_count
+FROM adm_charge_item
+WHERE (context_enum::text = '3' OR context_enum = 3);
+
+-- 步骤3：检查收费项目能否匹配到诊疗项目定义（最关键！）
+SELECT 
+    aci.id as charge_item_id,
+    aci.encounter_id,
+    aci.product_id,
+    aci.status_enum,
+    wad.id as activity_def_id,
+    wad.name as activity_name,
+    CASE 
+        WHEN wad.id IS NULL THEN '❌ 无法匹配：product_id=' || aci.product_id || ' 在诊疗项目定义表中不存在'
+        WHEN wad.delete_flag != '0' THEN '❌ 无法匹配：诊疗项目定义已删除'
+        WHEN aci.delete_flag != '0' THEN '❌ 无法匹配：收费项目已删除'
+        WHEN aci.status_enum NOT IN (1,2,3,4,5,6) THEN '❌ 无法匹配：状态不在查询范围内 status=' || aci.status_enum
+        ELSE '✅ 可以匹配'
+    END as match_result
+FROM adm_charge_item aci
+LEFT JOIN wor_activity_definition wad 
+    ON aci.product_id = wad.id AND wad.delete_flag = '0'
+WHERE (aci.context_enum::text = '3' OR aci.context_enum = 3)
+    AND aci.delete_flag = '0'
+LIMIT 50;
+
+-- 步骤4：统计匹配情况
+SELECT 
+    COUNT(*) as total_charge_items,
+    COUNT(CASE WHEN wad.id IS NOT NULL AND wad.delete_flag = '0' THEN 1 END) as matched_count,
+    COUNT(CASE WHEN wad.id IS NULL THEN 1 END) as unmatched_def_count,
+    COUNT(CASE WHEN wad.delete_flag != '0' THEN 1 END) as deleted_def_count,
+    COUNT(CASE WHEN wad.id IS NOT NULL AND wad.delete_flag = '0' AND aci.status_enum IN (1,2,3,4,5,6) THEN 1 END) as final_matched_count
+FROM adm_charge_item aci
+LEFT JOIN wor_activity_definition wad 
+    ON aci.product_id = wad.id
+WHERE (aci.context_enum::text = '3' OR aci.context_enum = 3)
+    AND aci.delete_flag = '0';
+
+-- 步骤5：检查具体就诊的诊疗项目（如果有encounterId，取消注释并替换）
+-- SELECT 
+--     T1.encounter_id,
+--     T1.id as charge_item_id,
+--     T1.product_id,
+--     T1.status_enum,
+--     T2.id as activity_def_id,
+--     T2.name as activity_name,
+--     CASE 
+--         WHEN T2.id IS NULL THEN '❌ 无法匹配'
+--         WHEN T2.delete_flag != '0' THEN '❌ 定义已删除'
+--         WHEN T1.status_enum NOT IN (1,2,3,4,5,6) THEN '❌ 状态不符合'
+--         ELSE '✅ 正常'
+--     END as status
+-- FROM adm_charge_item AS T1
+-- LEFT JOIN wor_activity_definition AS T2
+--     ON T1.product_id = T2.id AND T2.delete_flag = '0'
+-- WHERE T1.encounter_id = :encounterId  -- 替换为实际的encounterId
+--     AND (T1.context_enum::text = '3' OR T1.context_enum = 3)
+--     AND T1.delete_flag = '0';
+
+
+
+
+
+
+
+
+
+
+

openhis-server-new/sql/诊断门诊划价检索不出诊疗项目问题.md

@@ -0,0 +1,165 @@
+# 诊断：门诊划价检索不出诊疗项目问题
+
+## 问题描述
+在门诊划价页面，检索不出诊疗项目，显示"暂无数据"。
+
+## 问题分析
+
+### SQL查询逻辑
+根据 `OutpatientChargeAppMapper.xml` 中的 `selectEncounterPatientPrescription` 查询：
+
+1. **查询主表**：`adm_charge_item`（收费项目表）
+2. **关联诊疗项目定义表**：`wor_activity_definition`
+   - 关联条件：`T1.context_enum = #{activity}` AND `T1.product_id = T2.id` AND `T2.delete_flag = '0'`
+3. **返回字段**：`item_name` 来自 `wor_activity_definition.name`
+
+### 可能的原因
+
+#### 1. 数据库中没有诊疗项目定义数据
+- **检查**：`wor_activity_definition` 表中是否有数据
+- **SQL**：
+```sql
+SELECT COUNT(*) FROM wor_activity_definition WHERE delete_flag = '0';
+```
+
+#### 2. 收费项目中的product_id无法匹配到诊疗项目定义
+- **检查**：`adm_charge_item` 表中的 `product_id` 是否存在于 `wor_activity_definition` 表中
+- **SQL**：
+```sql
+SELECT 
+    aci.id,
+    aci.encounter_id,
+    aci.product_id,
+    aci.context_enum,
+    wad.id as activity_def_id,
+    wad.name as activity_name
+FROM adm_charge_item aci
+LEFT JOIN wor_activity_definition wad ON aci.product_id = wad.id AND wad.delete_flag = '0'
+WHERE aci.context_enum = 'ACTIVITY'
+    AND aci.delete_flag = '0'
+    AND wad.id IS NULL;  -- 无法匹配的记录
+```
+
+#### 3. 诊疗项目定义被标记为删除
+- **检查**：`wor_activity_definition` 表中的 `delete_flag` 是否为 '0'
+- **SQL**：
+```sql
+SELECT 
+    id,
+    name,
+    delete_flag
+FROM wor_activity_definition
+WHERE delete_flag != '0';
+```
+
+#### 4. context_enum 值不匹配
+- **检查**：`adm_charge_item` 表中的 `context_enum` 值是否正确
+- **SQL**：
+```sql
+SELECT DISTINCT context_enum FROM adm_charge_item WHERE delete_flag = '0';
+```
+- **注意**：后端代码中传入的 `#{activity}` 参数值应该是 `ChargeItemContext.ACTIVITY.getValue()`
+
+## 诊断步骤
+
+### 步骤1：检查诊疗项目定义表是否有数据
+```sql
+SELECT 
+    COUNT(*) as total_count,
+    COUNT(CASE WHEN delete_flag = '0' THEN 1 END) as active_count,
+    COUNT(CASE WHEN delete_flag != '0' THEN 1 END) as deleted_count
+FROM wor_activity_definition;
+```
+
+**预期结果**：`active_count` 应该 > 0
+
+### 步骤2：检查收费项目中的诊疗项目是否能匹配到定义
+```sql
+SELECT 
+    COUNT(*) as total_charge_items,
+    COUNT(CASE WHEN wad.id IS NOT NULL THEN 1 END) as matched_count,
+    COUNT(CASE WHEN wad.id IS NULL THEN 1 END) as unmatched_count
+FROM adm_charge_item aci
+LEFT JOIN wor_activity_definition wad 
+    ON aci.context_enum = 'ACTIVITY'
+    AND aci.product_id = wad.id
+    AND wad.delete_flag = '0'
+WHERE aci.context_enum = 'ACTIVITY'
+    AND aci.delete_flag = '0';
+```
+
+**预期结果**：`matched_count` 应该 > 0，`unmatched_count` 应该 = 0
+
+### 步骤3：检查具体就诊的诊疗项目
+```sql
+-- 替换 :encounterId 为实际的就诊ID
+SELECT 
+    T1.encounter_id,
+    T1.id as charge_item_id,
+    T1.context_enum,
+    T1.product_id,
+    T1.status_enum,
+    T2.id as activity_def_id,
+    T2.name as activity_name,
+    T2.delete_flag as activity_delete_flag,
+    CASE 
+        WHEN T2.id IS NULL THEN '诊疗项目定义不存在或已删除'
+        WHEN T2.delete_flag != '0' THEN '诊疗项目定义已删除'
+        ELSE '正常'
+    END as status
+FROM adm_charge_item AS T1
+LEFT JOIN wor_activity_definition AS T2
+    ON T1.context_enum = 'ACTIVITY'
+    AND T1.product_id = T2.id
+WHERE T1.encounter_id = :encounterId  -- 替换为实际的encounterId
+    AND T1.context_enum = 'ACTIVITY'
+    AND T1.delete_flag = '0'
+    AND T1.status_enum IN (1, 2, 3, 4, 5, 6);
+```
+
+### 步骤4：检查后端传入的参数值
+检查 `OutpatientChargeAppServiceImpl.java` 中：
+```java
+ChargeItemContext.ACTIVITY.getValue()
+```
+确认这个值是什么（应该是 'ACTIVITY' 或对应的枚举值）
+
+## 解决方案
+
+### 如果是数据问题：
+1. **缺少诊疗项目定义数据**：
+   - 需要在 `wor_activity_definition` 表中添加诊疗项目数据
+   - 或者在系统管理-目录管理-诊疗项目中添加
+
+2. **product_id无法匹配**：
+   - 检查 `adm_charge_item` 表中的 `product_id` 是否正确
+   - 检查 `wor_activity_definition` 表中的 `id` 是否与 `product_id` 匹配
+
+3. **delete_flag不正确**：
+   - 将 `wor_activity_definition` 表中需要使用的记录的 `delete_flag` 设置为 '0'
+
+### 如果是代码问题：
+1. **context_enum值不匹配**：
+   - 检查后端代码中 `ChargeItemContext.ACTIVITY.getValue()` 返回的值
+   - 确保与数据库中的 `context_enum` 值一致
+
+2. **SQL查询条件错误**：
+   - 检查 SQL 中的关联条件是否正确
+   - 检查是否有其他过滤条件导致数据被过滤掉
+
+## 快速诊断SQL
+运行以下SQL可以快速诊断问题：
+```sql
+-- 见 diagnose_treatment_items_issue.sql 文件
+```
+
+
+
+
+
+
+
+
+
+
+

openhis-ui-vue3/src/components/PatientList/index.vue

@@ -33,18 +33,32 @@
                 :class="{ actived: activeCardId === item.encounterId }"
               >
                 <div class="patient-card-header">
-                  <div class="header-top">
-                    <div class="bed-container">
-                      <div class="bed">
-                        <div class="bed-info">
-                          <div v-if="item.houseName" class="house-name">{{ item.houseName }}</div>
-                          <div class="bed-name">{{ item.bedName || '未分床' }}</div>
-                        </div>
-                      </div>
+                  <!-- 第1行：姓名 -->
+                  <div class="info-row name-row">
+                    <div class="name">
+                      <el-text :text="item.patientName" tclass="name" width="auto">
+                        {{ item.patientName || '-' }}
+                      </el-text>
                     </div>
-                    <el-space>
+                  </div>
+
+                  <!-- 第2行：性别 年龄 + 入院状态 -->
+                  <div class="info-row gender-age-row">
+                    <div class="age">
+                      <el-tag
+                        size="small"
+                        class="age-tag"
+                        effect="plain"
+                        :class="{ 'age-tag-female': item.genderEnum_enumText === '女性' }"
+                      >
+                        {{ item.genderEnum_enumText || '-' }}
+                        <span v-if="item.age"> · {{ item.age }}</span>
+                      </el-tag>
+                    </div>
+
+                    <!-- 入院状态放在性别年龄旁边 -->
+                    <div class="status-inline" v-if="item.statusEnum_enumText">
                       <el-tag
-                        v-if="item.statusEnum_enumText"
                         size="small"
                         class="payer-tag-status"
                         effect="light"
@@ -52,22 +66,31 @@
                       >
                         {{ item.statusEnum_enumText }}
                       </el-tag>
-                      <el-tag
-                        v-if="item.contractName"
-                        size="small"
-                        class="payer-tag"
-                        effect="light"
-                      >
-                        {{ item.contractName }}
-                      </el-tag>
-                    </el-space>
+                    </div>
                   </div>
 
-                  <div class="header-bottom">
+                  <!-- 第3行：房间号-分床状态 -->
+                  <div class="info-row room-bed-row">
+                    <div class="bed-info">
+                      <div v-if="item.houseName" class="house-name">{{ item.houseName }}</div>
+                      <div class="bed-name">{{ item.bedName || '未分床' }}</div>
+                    </div>
+                  </div>
+
+                  <!-- 第4行：住院号 -->
+                  <div class="info-row busno-row">
                     <span class="bus-no">住院号：{{ item.busNo || '-' }}</span>
-                    <span class="insurance-type" v-if="item.insutype_dictText">
-                      险种类型：{{ item.insutype_dictText }}
-                    </span>
+                  </div>
+
+                  <!-- 第5行：居民保险类型 -->
+                  <div class="info-row insurance-row" v-if="item.contractName">
+                    <el-tag
+                      size="small"
+                      class="payer-tag"
+                      effect="light"
+                    >
+                      {{ item.contractName }}
+                    </el-tag>
                   </div>
                 </div>
 
@@ -360,7 +383,7 @@ watch(
 <style lang="scss" scoped>
 .patient-card {
   width: 100%;
-  overflow: hidden;
+  overflow: visible; /* 改为visible以确保内容可见 */
   background-color: #fff;
   border-radius: 6px;
   border: 1px solid rgba(0, 0, 0, 0.04);
@@ -383,77 +406,128 @@ watch(
     display: flex;
     flex-direction: column;
     padding: 10px 12px 4px;
+    overflow: visible; /* 确保内容可见 */
+    gap: 4px; /* 行与行之间的间距 */
 
-    .header-top {
+    .info-row {
       display: flex;
-      align-items: center;
-      justify-content: space-between;
       width: 100%;
 
-      .bed-container {
-        display: flex;
-        flex: 1;
+      &.room-bed-row {
         align-items: center;
-        min-width: 0;
+        font-weight: 600;
+        font-size: 16px;
+        color: #1f2933;
 
-        .bed {
-          flex-grow: 0;
-          flex-shrink: 1;
-          min-width: 0;
+        .bed-info {
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          gap: 4px;
+          min-width: 0; /* 允许收缩 */
 
-          .bed-info {
-            display: flex;
-            flex-direction: column;
-            line-height: 1.4;
+          .house-name {
+            color: #1f2933;
+            font-weight: 600;
+            font-size: 16px;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
 
-            .house-name {
-              color: #1f2933;
-              font-weight: 600;
-              font-size: 16px;
-              white-space: normal;
-              word-break: break-all;
-            }
-
-            .bed-name {
-              color: #1f2933;
-              font-weight: 600;
-              font-size: 16px;
-              white-space: normal;
-              word-break: break-all;
-            }
+          .bed-name {
+            color: #1f2933;
+            font-weight: 600;
+            font-size: 16px;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
           }
         }
       }
 
-      .payer-tag {
-        max-width: 120px;
-        font-size: 12px;
-        border-radius: 999px;
-        font-weight: bolder;
+      &.insurance-row {
+        align-items: center;
+        margin-left: 8px; /* 添加一点左边距，与第一行对齐 */
       }
-      .payer-tag-status {
-        font-weight: bolder;
-        border-radius: 999px;
+
+      &.busno-row {
+        color: #6b7280;
+        font-size: 12px;
+        align-items: center;
+
+        .bus-no {
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+      }
+
+      &.name-row {
+        align-items: center;
+        color: #111827;
+
+        .name {
+          color: #111827;
+          font-weight: 700 !important; /* 更粗的字体，使用important确保优先级 */
+          font-size: 18px !important;  /* 更大的字体，使用important确保优先级 */
+          flex: 1;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+
+          :deep(.el-text),
+          :deep(.el-text__inner) {
+            font-weight: 700 !important; /* 确保el-text组件也应用粗体 */
+            font-size: 18px !important;  /* 确保el-text组件也应用更大字体 */
+          }
+        }
+      }
+
+      &.gender-age-row {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        width: 100%;
+
+        .age {
+          flex-shrink: 0;
+
+          .age-tag {
+            border-radius: 999px;
+            padding: 0 8px;
+          }
+
+          .age-tag-female {
+            border-color: rgb(255, 55, 158);
+            color: rgb(255, 126, 184);
+          }
+        }
+
+        .status-inline {
+          flex-shrink: 0;
+          margin-left: 8px;
+        }
       }
     }
 
-    .header-bottom {
-      margin-top: 4px;
-      width: 100%;
-      display: flex;
-      flex-direction: column;
-      align-items: flex-start;
-      gap: 2px;
-      color: #6b7280;
+    .payer-tag {
+      max-width: 100%;
       font-size: 12px;
+      border-radius: 999px;
+      font-weight: bolder;
+    }
+    .payer-tag-status {
+      font-weight: bolder;
+      border-radius: 999px;
+    }
 
-      .bus-no {
-        white-space: nowrap;
-      }
-
-      .insurance-type {
-        white-space: nowrap;
-      }
+    /* 隐藏旧的布局结构，因为已被新的info-row结构替代 */
+    .header-top,
+    .header-bottom,
+    .bed-container,
+    .tags-container {
+      display: none;
     }
   }
 
@@ -476,6 +550,7 @@ watch(
         justify-content: space-between;
         gap: 8px;
         width: 100%;
+        display: none; /* 新的布局中，name-container已在header中显示，这里隐藏 */
 
         .name {
           color: #111827;
@@ -522,15 +597,16 @@ watch(
   height: 100%;
   display: flex;
   flex-direction: column;
-  height: 100%;
   border-right: 1px solid #ebeef5;
   background-color: #ffffff;
   width: 240px;
   min-width: 240px;
+
   &-unexpand {
     width: 84px;
     min-width: 84px;
   }
+
   .patientList-operate {
     display: flex;
     align-items: center;
@@ -551,22 +627,14 @@ watch(
     flex-direction: column;
     height: 0;
     width: 240px;
+
     &-unexpand {
       width: 84px;
     }
 
-    .search-operate {
-      padding: 0 8px;
-      height: 48px;
-      display: flex;
-      align-items: center;
-      flex: none;
-    }
-
     .patient-cards {
       flex: 1;
       padding: 0 8px;
-
       overflow: hidden;
 
       :deep(.patient-cards-scrollbar) {
@@ -610,6 +678,7 @@ watch(
   display: flex;
   justify-content: flex-end;
   padding: 4px 16px 8px;
+
   &-unexpand {
     justify-content: center;
   }

openhis-ui-vue3/src/components/PendingPatientList/index.vue

@@ -187,6 +187,7 @@ const getStatusClass = (item: any) => {
     align-items: center;
     justify-content: space-between;
     width: 100%;
+    flex-wrap: nowrap; /* 防止换行 */
 
     .bed-container {
       display: flex;
@@ -216,9 +217,10 @@ const getStatusClass = (item: any) => {
     .header-tags {
       flex-shrink: 0;
       display: flex;
-      align-items: flex-end;
+      align-items: center;
       justify-content: flex-end;
       gap: 6px;
+      flex-wrap: nowrap; /* 防止换行 */
     }
   }
 

openhis-ui-vue3/src/router/index.js

@@ -1,4 +1,4 @@
-import {createWebHistory, createRouter} from 'vue-router'
+import { createWebHistory, createRouter } from 'vue-router'
 /* Layout */
 import Layout from '@/layout'
 
@@ -61,7 +61,7 @@ export const constantRoutes = [
                 path: '/index',
                 component: () => import('@/views/index'),
                 name: 'Index',
-                meta: {title: '首页', icon: 'dashboard', affix: true}
+                meta: { title: '首页', icon: 'dashboard', affix: true }
             }
         ]
     },
@@ -75,7 +75,21 @@ export const constantRoutes = [
                 path: 'profile',
                 component: () => import('@/views/system/user/profile/index'),
                 name: 'Profile',
-                meta: {title: '个人中心', icon: 'user'}
+                meta: { title: '个人中心', icon: 'user' }
+            }
+        ]
+    },
+    // 添加套餐管理相关路由到公共路由，确保始终可用
+    {
+        path: '/maintainSystem/Inspection/PackageManagement',
+        component: Layout,
+        hidden: true,
+        children: [
+            {
+                path: '',
+                component: () => import('@/views/maintainSystem/Inspection/PackageManagement.vue'),
+                name: 'DirectPackageManagement',
+                meta: { title: '套餐管理' }
             }
         ]
     }
@@ -83,6 +97,162 @@ export const constantRoutes = [
 
 // 动态路由，基于用户权限动态去加载
 export const dynamicRoutes = [
+    {
+        path: '/basicmanage',
+        component: Layout,
+        redirect: '/basicmanage/invoice-management',
+        name: 'BasicManage',
+        meta: { title: '基础管理', icon: 'component' },
+        children: [
+            {
+                path: 'invoice-management',
+                component: () => import('@/views/basicmanage/InvoiceManagement/index.vue'),
+                name: 'invoice-management',
+                meta: { title: '发票管理' }
+            }
+        ]
+    },
+
+    {
+        path: '/system/tenant-user',
+        component: Layout,
+        hidden: true,
+        permissions: ['*:*:*'],
+        children: [
+            {
+                path: 'set/:tenantId(\\d+)',
+                component: () => import('@/views/system/tenant/setUser'),
+                name: 'SetUser',
+                meta: { title: '所属用户', activeMenu: '/system/tenant' }
+            }
+        ]
+    },
+    {
+        path: '/system/tenant-contract',
+        component: Layout,
+        hidden: true,
+        permissions: ['*:*:*'],
+        children: [
+            {
+                path: 'set/:tenantId(\\d+)',
+                component: () => import('@/views/system/tenant/setContract'),
+                name: 'SetContract',
+                meta: { title: '合同管理', activeMenu: '/system/tenant' }
+            }
+        ]
+    },
+    {
+        path: '/system/user-auth',
+        component: Layout,
+        hidden: true,
+        permissions: ['system:user:edit'],
+        children: [
+            {
+                path: 'role/:userId(\\d+)',
+                component: () => import('@/views/system/user/authRole'),
+                name: 'AuthRole',
+                meta: { title: '分配角色', activeMenu: '/system/user' }
+            }
+        ]
+    },
+    {
+        path: '/system/role-auth',
+        component: Layout,
+        hidden: true,
+        permissions: ['system:role:edit'],
+        children: [
+            {
+                path: 'user/:roleId(\\d+)',
+                component: () => import('@/views/system/role/authUser'),
+                name: 'AuthUser',
+                meta: { title: '分配用户', activeMenu: '/system/role' }
+            }
+        ]
+    },
+    {
+        path: '/system/dict-data',
+        component: Layout,
+        hidden: true,
+        permissions: ['system:dict:list'],
+        children: [
+            {
+                path: 'index/:dictId(\\d+)',
+                component: () => import('@/views/system/dict/data'),
+                name: 'Data',
+                meta: { title: '字典数据', activeMenu: '/system/dict' }
+            }
+        ]
+    },
+    {
+        path: '/monitor',
+        component: Layout,
+        redirect: '/monitor/operlog',
+        name: 'Monitor',
+        meta: { title: '系统监控', icon: 'monitor' },
+        children: [
+            {
+                path: 'operlog',
+                component: () => import('@/views/monitor/operlog/index.vue'),
+                name: 'Operlog',
+                meta: { title: '操作日志', icon: 'operlog', permissions: ['monitor:operlog:list'] }
+            },
+            {
+                path: 'logininfor',
+                component: () => import('@/views/monitor/logininfor/index.vue'),
+                name: 'Logininfor',
+                meta: { title: '登录日志', icon: 'logininfor', permissions: ['monitor:logininfor:list'] }
+            },
+            {
+                path: 'job',
+                component: () => import('@/views/monitor/job/index.vue'),
+                name: 'Job',
+                meta: { title: '定时任务', icon: 'job', permissions: ['monitor:job:list'] }
+            }
+        ]
+    },
+    {
+        path: '/tool',
+        component: Layout,
+        redirect: '/tool/gen',
+        name: 'Tool',
+        meta: { title: '系统工具', icon: 'tool' },
+        children: [
+            {
+                path: 'gen',
+                component: () => import('@/views/tool/gen/index.vue'),
+                name: 'Gen',
+                meta: { title: '代码生成', icon: 'gen', permissions: ['tool:gen:list'] }
+            }
+        ]
+    },
+    {
+        path: '/monitor/job-log',
+        component: Layout,
+        hidden: true,
+        permissions: ['monitor:job:list'],
+        children: [
+            {
+                path: 'index/:jobId(\\d+)',
+                component: () => import('@/views/monitor/job/log'),
+                name: 'JobLog',
+                meta: { title: '调度日志', activeMenu: '/monitor/job' }
+            }
+        ]
+    },
+    {
+        path: '/tool/gen-edit',
+        component: Layout,
+        hidden: true,
+        permissions: ['tool:gen:edit'],
+        children: [
+            {
+                path: 'index/:tableId(\\d+)',
+                component: () => import('@/views/tool/gen/editTable'),
+                name: 'GenEdit',
+                meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
+            }
+        ]
+    },
     {
         path: '/help-center',
         component: Layout,
@@ -92,7 +262,7 @@ export const dynamicRoutes = [
                 path: '',
                 component: () => import('@/views/helpcenter/index.vue'),
                 name: 'HelpCenter',
-                meta: {title: '帮助中心'},
+                meta: { title: '帮助中心'},
             },
         ],
     },
@@ -141,7 +311,7 @@ const router = createRouter({
         if (savedPosition) {
             return savedPosition
         } else {
-            return {top: 0}
+            return { top: 0 }
         }
     },
 });

openhis-ui-vue3/src/views/basicmanage/organization/index.vue

@@ -386,6 +386,12 @@ function parseClassEnumValues(value) {
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNo = 1;
+  if (Array.isArray(queryParams.value.classEnum)) {
+    queryParams.value.classEnum =
+      queryParams.value.classEnum.length > 0
+        ? queryParams.value.classEnum.join(',')
+        : undefined;
+  }
   getPageList();
 }
 

openhis-ui-vue3/src/views/basicmanage/pharmacyDepartment/index.vue

@@ -44,6 +44,7 @@
             align="center"
             key="name"
             prop="name"
+            width="300"
             :show-overflow-tooltip="true"
           >
             <template #default="scope">
@@ -51,8 +52,10 @@
                 <el-select
                   v-model="scope.row.organizationId"
                   placeholder="请选择"
-                  :class="{ 'error-border': scope.row.error }"
                   clearable
+                  style="width: 200px"
+                  :class="{ 'error-border': scope.row.error }"
+                  filterable
                 >
                   <el-option
                     v-for="item in departmentOptions"

openhis-ui-vue3/src/views/catalog/diagnosistreatment/index.vue

@@ -183,6 +183,23 @@
             prop="statusEnum_enumText"
             :show-overflow-tooltip="true"
           />
+          <el-table-column
+            label="划价标记"
+            align="center"
+            key="pricingFlag_enumText"
+            prop="pricingFlag_enumText"
+            :show-overflow-tooltip="true"
+            width="100"
+          >
+            <template #default="scope">
+              <el-tag
+                :type="scope.row.pricingFlag === 1 ? 'success' : scope.row.pricingFlag === 0 ? 'danger' : 'info'"
+                size="small"
+              >
+                {{ scope.row.pricingFlag_enumText || (scope.row.pricingFlag === 1 ? '允许' : scope.row.pricingFlag === 0 ? '不允许' : '未设置') }}
+              </el-tag>
+            </template>
+          </el-table-column>
           <el-table-column
             label="操作"
             align="center"

openhis-ui-vue3/src/views/clinicmanagement/bargain/component/adviceBaseList.vue

@@ -8,6 +8,7 @@
       @current-change="handleCurrentChange"
       row-key="patientId"
       @cell-click="clickRow"
+      @row-click="clickRow"
     >
       <el-table-column label="名称" align="center" prop="adviceName" />
       <el-table-column label="类型" align="center" prop="activityType_enumText" />
@@ -38,6 +39,10 @@ const props = defineProps({
     type: Object,
     required: true,
   },
+  popoverVisible: {
+    type: Boolean,
+    default: false,
+  },
 });
 const emit = defineEmits(['selectAdviceBase']);
 const total = ref(0);
@@ -61,30 +66,80 @@ const throttledGetList = throttle(
 watch(
   () => props.adviceQueryParams,
   (newValue) => {
-    queryParams.value.searchKey = newValue.searchKey;
-    queryParams.value.adviceType = newValue.adviceType;
+    // 只有在弹窗打开时才响应 adviceQueryParams 的变化，避免选择项目后弹窗关闭时触发不必要的请求
+    if (!props.popoverVisible) {
+      return;
+    }
+    queryParams.value.searchKey = newValue?.searchKey;
+    queryParams.value.adviceType = newValue?.adviceType;
     throttledGetList();
   },
   { deep: true }
 );
 
-getList();
+// 监听弹窗打开状态，当弹窗打开时主动加载数据
+watch(
+  () => props.popoverVisible,
+  (visible) => {
+    if (visible) {
+      // 弹窗打开时，确保 adviceQueryParams 同步到 queryParams
+      if (props.adviceQueryParams) {
+        queryParams.value.searchKey = props.adviceQueryParams.searchKey;
+        queryParams.value.adviceType = props.adviceQueryParams.adviceType;
+      }
+      // 主动触发数据加载
+      getList();
+    } else {
+      // 弹窗关闭时，清空列表数据，避免显示错误的数据
+      adviceBaseList.value = [];
+      total.value = 0;
+    }
+  }
+);
+
+// 移除组件初始化时的 getList() 调用，避免在没有 adviceType 时查询所有类型的数据
+// getList();
 function getList() {
   // 验证是否已选择患者
   if (!props.patientInfo || Object.keys(props.patientInfo).length === 0) {
+    console.log('[adviceBaseList] getList() 跳过：未选择患者');
     return; // 不执行API调用
   }
   
+  // 只有在弹窗打开时才执行查询
+  if (!props.popoverVisible) {
+    console.log('[adviceBaseList] getList() 跳过：弹窗未打开');
+    return;
+  }
+  
+  // 必须有 adviceType 才查询，避免查询所有类型的数据
+  if (!queryParams.value.adviceType) {
+    console.log('[adviceBaseList] getList() 跳过：adviceType 未设置，当前值:', queryParams.value.adviceType);
+    return;
+  }
+  
   queryParams.value.organizationId = props.patientInfo.orgId;
+  console.log('[adviceBaseList] getList() 请求参数:', JSON.stringify(queryParams.value));
+  
   getAdviceBaseInfo(queryParams.value).then((res) => {
-    adviceBaseList.value = res.data.records;
-    total.value = res.data.total;
+    console.log('[adviceBaseList] getList() 响应数据:', {
+      total: res.data?.total,
+      recordsCount: res.data?.records?.length || 0,
+      firstRecord: res.data?.records?.[0]?.adviceName || '无数据',
+      adviceType: queryParams.value.adviceType
+    });
+    adviceBaseList.value = res.data.records || [];
+    total.value = res.data.total || 0;
     nextTick(() => {
       currentIndex.value = 0;
       if (adviceBaseList.value.length > 0) {
-        adviceBaseRef.value.setCurrentRow(adviceBaseList.value[0]);
+        adviceBaseRef.value?.setCurrentRow(adviceBaseList.value[0]);
       }
     });
+  }).catch((err) => {
+    console.error('[adviceBaseList] getList() 请求失败:', err);
+    adviceBaseList.value = [];
+    total.value = 0;
   });
 }
 
@@ -136,8 +191,12 @@ const handleCurrentChange = (currentRow) => {
   currentSelectRow.value = currentRow;
 };
 
-function clickRow(row) {
-  emit('selectAdviceBase', row);
+function clickRow(row, column, cell, event) {
+  // cell-click 事件会传递 row, column, cell, event 四个参数
+  // 确保传递的是完整的行数据
+  if (row) {
+    emit('selectAdviceBase', row);
+  }
 }
 
 defineExpose({

openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue

@@ -301,6 +301,7 @@ const nextId = ref(1);
 const unitCodeList = ref([]);
 const adviceTableRef = ref([]);
 const organization = ref([]);
+const orgTreeLoaded = ref(false);
 const rowRules = ref({
   conditionDefinitionId: [{ required: true, message: '请选择诊断', trigger: 'change' }],
   dose: [{ required: true, message: '请输入单次剂量', trigger: 'change' }],
@@ -449,6 +450,10 @@ function handleDiagnosisChange(item, row) {
 
 function handleFocus(row, index) {
   rowIndex.value = index;
+  // 打开当前行弹窗前，先关闭其它行，避免多个弹窗同时存在
+  prescriptionList.value.forEach((r, i) => {
+    if (i !== index) r.showPopover = false;
+  });
   // 如果当前行已选择adviceType，同步到adviceQueryParams
   if (row.adviceType !== undefined) {
     adviceQueryParams.value.adviceType = row.adviceType;
@@ -457,7 +462,9 @@ function handleFocus(row, index) {
 }
 
 function handleBlur(row) {
-  row.showPopover = false;
+  // 不能在 input blur 时立刻关闭弹窗：
+  // 点击弹窗里的表格会先触发 blur，导致弹窗瞬间关闭，从而“点了项目没反应”
+  // 弹窗关闭交给 selectAdviceBase()（选中后关闭）以及 handleFocus()（切行时关闭其他行）
 }
 
 function handleChange(value) {
@@ -465,10 +472,37 @@ function handleChange(value) {
 }
 
 /**
- * 选择药品回调
+ * 选择药品/诊疗项目回调
+ * 这里恢复为之前“能正常工作”的简单逻辑，只做最小必要的修正
  */
 function selectAdviceBase(key, row) {
-  getOrgList();
+  if (!row) {
+    console.error('[selectAdviceBase] row 为空');
+    return;
+  }
+
+  // rowIndex 理论上由 handleFocus 设置；防御一下越界
+  if (rowIndex.value < 0 || rowIndex.value >= prescriptionList.value.length) {
+    const foundIndex = prescriptionList.value.findIndex((item) => item.uniqueKey === key);
+    if (foundIndex === -1) {
+      console.error('[selectAdviceBase] 找不到对应行，key =', key);
+      return;
+    }
+    rowIndex.value = foundIndex;
+  }
+
+  // 关闭当前行弹窗
+  const currentRow = prescriptionList.value[rowIndex.value];
+  if (currentRow) {
+    currentRow.showPopover = false;
+  }
+
+  // 诊疗(adviceType=3) 才需要加载执行科室树，且只加载一次
+  if (row.adviceType === 3) {
+    ensureOrgTreeLoaded();
+  }
+
+  // 构建单位列表（保持原有逻辑）
   unitCodeList.value = [];
   unitCodeList.value.push({ value: row.unitCode, label: row.unitCode_dictText, type: 'unit' });
   if (row.doseUnitCode != row.minUnitCode) {
@@ -488,10 +522,14 @@ function selectAdviceBase(key, row) {
       type: 'minUnit',
     });
   }
+
+  // 将选中的基础项“覆盖”到当前处方行（这是之前正常工作的核心逻辑）
   prescriptionList.value[rowIndex.value] = {
     ...prescriptionList.value[rowIndex.value],
     ...JSON.parse(JSON.stringify(row)),
   };
+
+  // 后续字段处理保持原样
   prescriptionList.value[rowIndex.value].orgId = undefined;
   prescriptionList.value[rowIndex.value].dose = undefined;
   prescriptionList.value[rowIndex.value].unitCodeList = unitCodeList.value;
@@ -500,12 +538,11 @@ function selectAdviceBase(key, row) {
   prescriptionList.value[rowIndex.value].minUnitCode = JSON.parse(JSON.stringify(row.doseUnitCode));
   prescriptionList.value[rowIndex.value].unitCode =
     row.partAttributeEnum == 1 ? row.minUnitCode : row.unitCode;
-  // prescriptionList.value[rowIndex.value].doseUnitCode_dictText = row.minUnitCode_dictText;
   prescriptionList.value[rowIndex.value].definitionId = JSON.parse(
     JSON.stringify(row)
   ).chargeItemDefinitionId;
 
-  // 库存列表 + 价格列表拼成批次号的下拉框
+  // 库存列表 + 价格列表拼成批次号的下拉框（非诊疗）
   if (row.adviceType != 3) {
     if (row.inventoryList && row.inventoryList.length == 0) {
       expandOrder.value = [];
@@ -532,9 +569,15 @@ function selectAdviceBase(key, row) {
       prescriptionList.value[rowIndex.value].positionName = stock.locationName;
     }
   } else {
+    // 诊疗：设置执行科室和价格
     prescriptionList.value[rowIndex.value].orgId = JSON.parse(JSON.stringify(row)).positionId;
-    prescriptionList.value[rowIndex.value].unitPrice = row.priceList[0].price;
+    if (row.priceList && row.priceList.length > 0) {
+      prescriptionList.value[rowIndex.value].unitPrice = row.priceList[0].price;
+    } else {
+      prescriptionList.value[rowIndex.value].unitPrice = 0;
+    }
   }
+
   expandOrder.value = [key];
   nextTick(() => {
     if (row.adviceType == 1) {
@@ -549,11 +592,18 @@ function selectAdviceBase(key, row) {
   });
 }
 
-function getOrgList() {
-  getOrgTree().then((res) => {
-    organization.value = res.data.records;
-    console.log(organization.value,"organization.value")
-  });
+function ensureOrgTreeLoaded() {
+  if (orgTreeLoaded.value) return;
+  orgTreeLoaded.value = true;
+  getOrgTree()
+    .then((res) => {
+      // 组织机构树接口通常返回分页 records，这里做兼容兜底
+      organization.value = res?.data?.records ?? res?.data ?? [];
+    })
+    .catch(() => {
+      // 加载失败时允许重试
+      orgTreeLoaded.value = false;
+    });
 }
 
 function handleDelete() {
@@ -706,6 +756,8 @@ function handleSaveSign(row, index) {
       row.contentJson = JSON.stringify(row);
       row.dbOpType = row.requestId ? '2' : '1';
       row.minUnitQuantity = row.quantity * row.partPercent;
+      row.categoryEnum = row.adviceType
+      console.log('row', row)
       savePrescription({ adviceSaveList: [row] }).then((res) => {
         if (res.code === 200) {
           proxy.$modal.msgSuccess('保存成功');

openhis-ui-vue3/src/views/doctorstation/components/api.js

@@ -54,6 +54,17 @@ export function leaveEncounter(encounterId) {
   });
 }
 
+/**
+ * 重新排序未到诊患者
+ */
+export const rearrangeMissedNumber = (encounterId) => {
+  return request({
+    url: '/doctor-station/main/rearrange-missed-encounter', // 对应Controller的路径
+    method: 'get', // 注意：现有接口都是GET，这里和后端保持一致
+    params: { encounterId } // GET请求用params传参
+  });
+};
+
 /**
  * 完诊
  */

openhis-ui-vue3/src/views/doctorstation/components/callQueue/DoctorCallDialog.vue

@@ -0,0 +1,675 @@
+<template>
+  <el-dialog :model-value="dialogVisible" @update:model-value="val => emit('update:dialogVisible', val)" title=""
+    width="90%" :close-on-click-modal="false" custom-class="call-dialog-custom">
+    <!-- 顶部标题栏 -->
+    <div class="dialog-header">
+      <div class="header-title">医生叫号界面 - {{ department }}</div>
+      <div class="header-time">{{ formatDate(new Date(), 'YYYY-MM-DD HH:mm:ss') }}</div>
+    </div>
+
+    <!-- 当前就诊患者区域 -->
+    <div class="current-patient">
+      <div class="current-label">当前就诊患者</div>
+      <div class="current-info">
+        <div>
+          <span>患者姓名：</span>
+          <span class="info-value">{{ getPatientNo(currentCallPatient) }} {{ currentCallPatient.patientName || '暂无'
+          }}</span>
+        </div>
+        <div>
+          <span>诊室：</span>
+          <span class="info-value">{{ roomNo || '4号' }}</span>
+        </div>
+      </div>
+    </div>
+
+    <!-- 叫号按钮区 -->
+    <div class="call-buttons">
+      <el-button class="btn-next" @click="callNextPatient">下一患者</el-button>
+      <el-button class="btn-recall" @click="showRecallDialog">选呼</el-button>
+      <el-button class="btn-finish" @click="finishCallPatient">完成</el-button>
+      <el-button class="btn-skip" @click="skipPatient">跳过</el-button>
+      <el-button class="btn-requeue" @click="requeuePatient">过号重排</el-button>
+      <el-button class="btn-seen" @click="markSeenPatient">已就诊</el-button>
+    </div>
+
+    <!-- 选呼对话框 -->
+    <el-dialog v-model="recallDialogVisible" title="选择患者呼叫" width="600px" :close-on-click-modal="false">
+      <div style="padding: 20px 0;">
+        <el-select v-model="selectedPatientEncounterId" filterable remote reserve-keyword placeholder="搜索患者姓名、身份证号或就诊ID"
+          :remote-method="remoteSearchPatient" :loading="patientSearchLoading" clearable
+          style="width: 100%; margin-bottom: 20px;">
+          <el-option v-for="patient in patientSearchOptions" :key="patient.encounterId"
+            :label="`${patient.patientName} (${patient.idCard || '无身份证号'})`" :value="patient.encounterId">
+            <div style="display: flex; justify-content: space-between;">
+              <span>{{ patient.patientName }}</span>
+              <span style="color: #8492a6; font-size: 14px;">{{ patient.idCard || '无身份证号' }}</span>
+            </div>
+          </el-option>
+        </el-select>
+        <div style="text-align: right;">
+          <el-button @click="recallDialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="confirmRecallPatient"
+            :disabled="!selectedPatientEncounterId">确定呼叫</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
+    <!-- 候诊患者列表标题 -->
+    <div class="wait-list-title">候诊患者列表</div>
+
+    <!-- 候诊患者表格 -->
+    <el-table :data="sortedWaitPatientList" border style="width: 100%" header-cell-class-name="table-header"
+      :row-class-name="() => 'table-row'">
+      <el-table-column label="序号" type="index" width="60" align="center" />
+      <el-table-column prop="patientName" label="患者" width="180">
+        <template #default="scope">{{ scope.row.patientName }}</template>
+      </el-table-column>
+      <el-table-column prop="typeCode_dictText" label="号别" width="120" />
+      <el-table-column prop="organizationName" label="诊室" width="120" />
+      <el-table-column label="医生" width="120">
+        <template #default="scope">{{ scope.row.jz_practitioner_name || '心内科医生' }}</template>
+      </el-table-column>
+      <el-table-column label="状态" width="120">
+        <template #default>等待中</template>
+      </el-table-column>
+      <el-table-column label="操作" width="100" align="center">
+        <template #default="scope">
+          <el-button size="small" class="btn-receive" @click="callThisPatient(scope.row)">
+            接诊
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 底部信息栏 -->
+    <div class="footer-info">
+      <div>当前时间：{{ formatDate(new Date(), 'YYYY-MM-DD HH:mm:ss') }}</div>
+      <div>当前号：{{ getPatientNo(currentCallPatient) || '暂无' }}</div>
+      <div>等待人数：{{ currentWaitPatientList.length }}</div>
+    </div>
+  </el-dialog>
+</template>
+
+<script setup>
+// ✅ 核心修复：h 从 vue 导入，而非 element-plus
+import { ref, watch, onMounted, h, computed } from 'vue';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { receiveEncounter, completeEncounter, leaveEncounter, rearrangeMissedNumber } from '../api.js';
+
+// ===== 1. Props/Emits 定义 =====
+const props = defineProps({
+  dialogVisible: Boolean,
+  currentPatient: { type: Object, default: () => ({}) },
+  currentPatientList: { type: Array, default: () => [] }, // 候诊列表
+  roomNo: { type: String, default: '4号' },
+  department: { type: String, default: '心内科' } // 科室名称，默认为心内科
+});
+
+const emit = defineEmits(['update:dialogVisible', 'callNext', 'reCall', 'finish', 'skip', 'requeue', 'markSeen', 'callThis']);
+
+// ===== 2. 响应式变量 =====
+const currentWaitPatientList = ref([]); // 候诊患者列表
+const currentCallPatient = ref({}); // 当前就诊患者
+const selectedId = ref(''); // 选呼患者ID
+
+// 选呼功能相关变量
+const selectedPatientEncounterId = ref('');
+const patientSearchOptions = ref([]);
+const patientSearchLoading = ref(false);
+const patientSearchQuery = ref('');
+const recallDialogVisible = ref(false); // 选呼对话框显示/隐藏
+
+// ===== 3. 计算属性 =====
+// 按创建时间(create_time)和过号时间(missed_time)排序后的候诊列表
+const sortedWaitPatientList = computed(() => {
+  // 空列表直接返回
+  if (!currentWaitPatientList.value.length) return [];
+
+  // 调试：打印当前时间和排序前的患者列表
+  const now = new Date();
+  console.log('当前时间:', now);
+  console.log('排序前的患者列表:');
+  currentWaitPatientList.value.forEach(item => {
+    console.log(`患者 ${item.patientName}:`, {
+      encounterId: item.encounterId,
+      missed_time: item.missed_time,
+      missedTime: item.missedTime,
+      create_time: item.create_time,
+      createTime: item.createTime,
+      statusEnum: item.statusEnum,
+      registerTime: item.registerTime,
+      parsed_missed_time: item.missed_time ? new Date(item.missed_time) : null,
+      parsed_create_time: item.create_time ? new Date(item.create_time) : null,
+      parsed_registerTime: item.registerTime ? new Date(item.registerTime) : null
+    });
+  });
+
+  // 判断患者是否为过号患者
+  const isMissedPatient = (patient) => {
+    // 检查missed_time或missedTime是否存在且不为null
+    return patient.missed_time != null || patient.missedTime != null;
+  };
+
+  // 获取患者有效时间的辅助函数
+  const getPatientTime = (patient) => {
+    // 调试：打印患者的完整时间信息
+    console.log(`患者 ${patient.patientName} 的时间信息:`, {
+      missed_time: patient.missed_time,
+      missedTime: patient.missedTime,
+      registerTime: patient.registerTime,
+      create_time: patient.create_time,
+      createTime: patient.createTime
+    });
+
+    // 1. 优先使用missed_time（过号时间），同时处理null和undefined
+    if (patient.missed_time != null) {
+      console.log(`患者 ${patient.patientName} 使用missed_time: ${patient.missed_time}`);
+      return patient.missed_time;
+    }
+    if (patient.missedTime != null) {
+      console.log(`患者 ${patient.patientName} 使用missedTime: ${patient.missedTime}`);
+      return patient.missedTime;
+    }
+    // 2. 其次使用registerTime（挂号时间）
+    if (patient.registerTime != null) {
+      console.log(`患者 ${patient.patientName} 使用registerTime: ${patient.registerTime}`);
+      return patient.registerTime;
+    }
+    // 3. 最后使用create_time或createTime（创建时间）
+    if (patient.create_time != null) {
+      console.log(`患者 ${patient.patientName} 使用create_time: ${patient.create_time}`);
+      return patient.create_time;
+    }
+    if (patient.createTime != null) {
+      console.log(`患者 ${patient.patientName} 使用createTime: ${patient.createTime}`);
+      return patient.createTime;
+    }
+    // 4. 兜底：使用当前时间减去1000年，确保排到最前面
+    console.warn(`患者 ${patient.patientName} 没有有效时间字段，使用默认时间`);
+    return new Date(0); // 1970-01-01
+  };
+
+  // 核心改进：明确区分过号患者和未过号患者
+  // 1. 未过号患者排在过号患者前面
+  // 2. 未过号患者按照registerTime升序排列
+  // 3. 过号患者按照missed_time升序排列
+  const sortedList = [...currentWaitPatientList.value].sort((a, b) => {
+    const aIsMissed = isMissedPatient(a);
+    const bIsMissed = isMissedPatient(b);
+
+    // 调试：打印排序比较
+    console.log(`排序比较: ${a.patientName}(过号:${aIsMissed}) vs ${b.patientName}(过号:${bIsMissed})`);
+
+    // 1. 未过号患者排在过号患者前面
+    if (aIsMissed !== bIsMissed) {
+      const result = aIsMissed ? 1 : -1;
+      console.log(`比较结果: ${result} (${aIsMissed ? 'a是过号患者，排后面' : 'b是过号患者，排后面'})`);
+      return result;
+    }
+
+    // 2. 获取a和b的有效时间
+    const aTime = getPatientTime(a);
+    const bTime = getPatientTime(b);
+
+    // 解析时间，确保正确处理UTC时间
+    const timeA = new Date(aTime);
+    const timeB = new Date(bTime);
+
+    // 确保时间有效
+    if (isNaN(timeA.getTime())) {
+      console.log(`患者 ${a.patientName} 时间无效，排后面`);
+      return 1; // 无效时间排后面
+    }
+    if (isNaN(timeB.getTime())) {
+      console.log(`患者 ${b.patientName} 时间无效，排后面`);
+      return -1; // 有效时间排前面
+    }
+
+    // 3. 同类型患者按照时间升序排列
+    const result = timeA - timeB;
+    console.log(`比较结果: ${result} (时间比较: ${timeA} vs ${timeB})`);
+    return result;
+  });
+
+  // 调试：打印排序后的患者列表
+  console.log('排序后的患者列表:');
+  sortedList.forEach((item, index) => {
+    const effectiveTime = getPatientTime(item);
+    const isMissed = isMissedPatient(item);
+    console.log(`${index + 1}. ${item.patientName}:`, {
+      is_missed: isMissed,
+      missed_time: item.missed_time,
+      registerTime: item.registerTime,
+      create_time: item.create_time || item.createTime,
+      effective_time: new Date(effectiveTime)
+    });
+  });
+
+  return sortedList;
+});
+
+// ===== 4. 临时 formatDate 函数（避免外部依赖报错）=====
+const formatDate = (date, format = 'YYYY-MM-DD') => {
+  const d = new Date(date);
+  const year = d.getFullYear();
+  const month = String(d.getMonth() + 1).padStart(2, '0');
+  const day = String(d.getDate()).padStart(2, '0');
+  const hour = String(d.getHours()).padStart(2, '0');
+  const minute = String(d.getMinutes()).padStart(2, '0');
+  const second = String(d.getSeconds()).padStart(2, '0');
+  if (format === 'YYYY-MM-DD HH:mm:ss') {
+    return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
+  }
+  return `${year}-${month}-${day}`;
+};
+
+// ===== 4. 监听 Props 同步数据 =====
+watch(() => props.currentPatientList, (newVal) => {
+  currentWaitPatientList.value = newVal || [];
+}, { immediate: true });
+
+watch(() => props.currentPatient, (newVal) => {
+  currentCallPatient.value = newVal || {};
+}, { immediate: true });
+
+// ===== 5. 排队号计算 =====
+const getPatientNo = (patient) => {
+  if (!patient || !patient.encounterId || sortedWaitPatientList.value.length === 0) return '';
+  const index = sortedWaitPatientList.value.findIndex(item => item.encounterId === patient.encounterId);
+  return index > -1 ? `${index + 1}号` : '';
+};
+
+// ===== 6. 按钮核心逻辑 =====
+// 6.1 下一患者
+const callNextPatient = async () => {
+  if (sortedWaitPatientList.value.length === 0) {
+    ElMessage.warning('暂无候诊患者');
+    return;
+  }
+  // 获取第一个患者
+  const nextPatient = sortedWaitPatientList.value[0];
+  try {
+    // 调用接诊API
+    await receiveEncounter(nextPatient.encounterId);
+    // 更新当前呼叫患者
+    currentCallPatient.value = nextPatient;
+    // 通知父组件
+    emit('callNext');
+    ElMessage.success(`已呼叫下一位患者：${nextPatient.patientName}`);
+  } catch (error) {
+    console.error('呼叫下一位患者失败:', error);
+    ElMessage.error(`呼叫下一位患者失败：${error.message || '系统错误'}`);
+  }
+};
+
+// 6.2 显示选呼对话框
+const showRecallDialog = () => {
+  // 清空之前的选择
+  selectedPatientEncounterId.value = '';
+  patientSearchOptions.value = [];
+  // 显示对话框
+  recallDialogVisible.value = true;
+};
+
+// 6.3 远程搜索患者
+const remoteSearchPatient = (query) => {
+  if (query === '') {
+    patientSearchOptions.value = [];
+    return;
+  }
+
+  patientSearchLoading.value = true;
+
+  // 模拟远程搜索，实际从候诊列表中查找
+  setTimeout(() => {
+    // 搜索匹配的患者 - 支持模糊搜索
+    patientSearchOptions.value = sortedWaitPatientList.value.filter(patient => {
+      // 患者姓名模糊匹配
+      const nameMatch = patient.patientName && patient.patientName.toLowerCase().includes(query.toLowerCase());
+      // 身份证号模糊匹配
+      const idCardMatch = patient.idCard && patient.idCard.includes(query);
+      // 就诊ID模糊匹配
+      const encounterIdMatch = patient.encounterId && patient.encounterId.toString().includes(query);
+      // 至少满足一个条件
+      return nameMatch || idCardMatch || encounterIdMatch;
+    });
+
+    patientSearchLoading.value = false;
+  }, 200);
+};
+
+// 6.4 确认呼叫患者
+const confirmRecallPatient = async () => {
+  if (!selectedPatientEncounterId.value) return;
+
+  try {
+    // 查找选中的患者
+    const selectedPatient = sortedWaitPatientList.value.find(patient => patient.encounterId === selectedPatientEncounterId.value);
+    if (!selectedPatient) {
+      ElMessage.warning('未找到选中的患者');
+      return;
+    }
+
+    // 调用接诊API
+    await receiveEncounter(selectedPatient.encounterId);
+    // 更新当前呼叫患者
+    currentCallPatient.value = selectedPatient;
+    // 通知父组件
+    emit('reCall');
+    // 关闭对话框
+    recallDialogVisible.value = false;
+    // 清空选择
+    selectedPatientEncounterId.value = '';
+    ElMessage.success(`已呼叫患者：${selectedPatient.patientName}`);
+  } catch (error) {
+    console.error('选呼患者失败:', error);
+    ElMessage.error(`选呼患者失败：${error.message || '系统错误'}`);
+  }
+};
+
+// 6.5 完成
+const finishCallPatient = async () => {
+  if (!currentCallPatient.value.encounterId) {
+    ElMessage.warning('当前没有就诊患者');
+    return;
+  }
+  try {
+    await completeEncounter(currentCallPatient.value.encounterId);
+    emit('finish');
+    emit('update:dialogVisible', false);
+    ElMessage.success('患者已完诊');
+  } catch (error) {
+    console.error('完诊失败:', error);
+    ElMessage.error(`完诊失败：${error.message || '系统错误'}`);
+  }
+};
+
+// 6.6 跳过
+const skipPatient = async () => {
+  if (sortedWaitPatientList.value.length === 0) {
+    ElMessage.warning('暂无候诊患者');
+    return;
+  }
+  // 获取第一个患者
+  const nextPatient = sortedWaitPatientList.value[0];
+  try {
+    // 调用接诊API
+    await receiveEncounter(nextPatient.encounterId);
+    // 更新当前呼叫患者
+    currentCallPatient.value = nextPatient;
+    // 通知父组件
+    emit('skip');
+    ElMessage.success(`已跳过当前患者，呼叫下一位患者：${nextPatient.patientName}`);
+  } catch (error) {
+    console.error('跳过患者失败:', error);
+    ElMessage.error(`跳过患者失败：${error.message || '系统错误'}`);
+  }
+};
+
+// 6.7 过号重排
+const requeuePatient = async () => {
+  // 1. 校验：当前必须有就诊患者才能重排
+  if (!currentCallPatient.value || !currentCallPatient.value.encounterId) {
+    ElMessage.warning('当前没有就诊患者，无法过号重排');
+    return;
+  }
+
+  try {
+    // 2. 显示确认对话框
+    await ElMessageBox.confirm(
+      `确定将患者 ${currentCallPatient.value.patientName} 进行过号重排吗？`,
+      '过号重排确认',
+      {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+        draggable: true
+      }
+    );
+
+    // 3. 调用过号重排接口
+    console.log('开始调用过号重排接口，患者ID:', currentCallPatient.value.encounterId);
+    const res = await rearrangeMissedNumber(currentCallPatient.value.encounterId);
+
+    // 4. 处理后端返回结果
+    console.log('过号重排接口返回结果:', res);
+    if (res.code === 200) {
+      // 5. 直接通知父组件刷新候诊列表，依赖父组件重新获取数据
+      emit('requeue');
+
+      // 6. 提示用户+清空当前就诊患者
+      ElMessage.success(res.msg || '过号重排成功，患者已排至队尾');
+      currentCallPatient.value = {};
+    } else {
+      // 7. 处理后端返回的错误信息
+      console.error('过号重排失败，后端返回错误:', res);
+      ElMessage.error(res.msg || '过号重排失败');
+    }
+  } catch (error) {
+    // 处理取消操作
+    if (error !== 'cancel') {
+      console.error('过号重排失败，捕获异常:', error);
+      ElMessage.error(`过号重排失败：${error.message || '系统错误'}`);
+    }
+  }
+};
+
+// 6.8 标记已就诊
+const markSeenPatient = async () => {
+  if (!currentCallPatient.value.encounterId) {
+    ElMessage.warning('当前没有就诊患者');
+    return;
+  }
+  try {
+    await leaveEncounter(currentCallPatient.value.encounterId);
+    emit('markSeen');
+    emit('update:dialogVisible', false);
+    ElMessage.success('患者已暂离');
+  } catch (error) {
+    console.error('暂离失败:', error);
+    ElMessage.error(`暂离失败：${error.message || '系统错误'}`);
+  }
+};
+
+// 6.9 接诊指定患者
+const callThisPatient = async (row) => {
+  try {
+    // 调用接诊API
+    await receiveEncounter(row.encounterId);
+    // 更新当前呼叫患者
+    currentCallPatient.value = row;
+    // 通知父组件
+    emit('callThis', row);
+    ElMessage.success(`已接诊患者：${row.patientName}`);
+  } catch (error) {
+    console.error('接诊患者失败:', error);
+    ElMessage.error(`接诊患者失败：${error.message || '系统错误'}`);
+  }
+};
+
+
+
+
+</script>
+
+<style scoped>
+.call-dialog-custom {
+  --el-dialog-body-padding: 0;
+}
+
+.dialog-header {
+  background-color: #0b8074;
+  color: #fff;
+  padding: 12px 20px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-top-left-radius: 8px;
+  border-top-right-radius: 8px;
+}
+
+.header-title {
+  font-size: 24px;
+  font-weight: bold;
+  color: #fff;
+}
+
+.header-time {
+  font-size: 16px;
+  font-weight: normal;
+  background-color: rgba(255, 255, 255, 0.2);
+  padding: 8px 16px;
+  border-radius: 20px;
+  color: #fff;
+}
+
+.current-patient {
+  background-color: #f8fafc;
+  padding: 20px 20px;
+  margin-bottom: 20px;
+  border-radius: 8px;
+}
+
+.current-label {
+  font-size: 20px;
+  font-weight: 700;
+  color: #1f7a7a;
+  margin-bottom: 12px;
+}
+
+.current-info {
+  display: flex;
+  gap: 60px;
+  font-size: 18px;
+}
+
+.info-value {
+  font-weight: 800 !important;
+  color: #1f7a7a !important;
+  font-size: 26px !important;
+  background-color: #e6f7ff;
+  padding: 8px 16px;
+  border-radius: 8px;
+  margin-left: 8px;
+  display: inline-block;
+  min-width: 200px;
+  text-align: center;
+}
+
+.call-buttons {
+  padding: 0 20px 20px;
+  display: flex;
+  gap: 15px;
+  flex-wrap: wrap;
+}
+
+.btn-next {
+  background-color: #10b981 !important;
+  border-color: #10b981 !important;
+  color: #fff !important;
+  font-size: 16px !important;
+  padding: 14px 24px !important;
+  font-weight: 600;
+  border-radius: 6px;
+}
+
+.btn-recall {
+  background-color: #f59e0b !important;
+  border-color: #f59e0b !important;
+  color: #fff !important;
+  font-size: 16px !important;
+  padding: 14px 24px !important;
+  font-weight: 600;
+  border-radius: 6px;
+}
+
+.btn-finish {
+  background-color: #3b82f6 !important;
+  border-color: #3b82f6 !important;
+  color: #fff !important;
+  font-size: 16px !important;
+  padding: 14px 24px !important;
+  font-weight: 600;
+  border-radius: 6px;
+}
+
+.btn-skip {
+  background-color: #f5c518 !important;
+  border-color: #f5c518 !important;
+  color: #fff !important;
+  font-size: 16px !important;
+  padding: 14px 24px !important;
+  font-weight: 600;
+  border-radius: 6px;
+}
+
+.btn-requeue {
+  background-color: #165dff !important;
+  border-color: #165dff !important;
+  color: #fff !important;
+  font-size: 16px !important;
+  padding: 14px 24px !important;
+  font-weight: 600;
+  border-radius: 6px;
+}
+
+.btn-seen {
+  background-color: #86909c !important;
+  border-color: #86909c !important;
+  color: #fff !important;
+  font-size: 16px !important;
+  padding: 14px 24px !important;
+  font-weight: 600;
+  border-radius: 6px;
+}
+
+.btn-receive {
+  background-color: #10b981 !important;
+  border-color: #10b981 !important;
+  color: #fff !important;
+  font-size: 14px !important;
+  padding: 8px 12px !important;
+  border-radius: 4px;
+}
+
+.wait-list-title {
+  padding: 0 20px 12px;
+  font-size: 20px;
+  font-weight: 700;
+  color: #1f7a7a;
+}
+
+:deep(.table-header) {
+  background-color: #1f7a7a !important;
+  color: #fff !important;
+  font-weight: 700 !important;
+  font-size: 18px !important;
+}
+
+:deep(.table-row) {
+  font-size: 18px !important;
+  font-weight: 500;
+}
+
+:deep(.el-table__cell) {
+  padding: 16px 0 !important;
+}
+
+:deep(.el-table--enable-row-hover .el-table__body tr:hover>td) {
+  background-color: #f0f9ff !important;
+}
+
+.footer-info {
+  background-color: #1f7a7a;
+  color: #fff;
+  padding: 14px 20px;
+  margin-top: 20px;
+  font-size: 18px;
+  font-weight: 500;
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  gap: 10px;
+}
+</style>

openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue

@@ -17,7 +17,7 @@
           </el-button>
         </div>
       </div>
-
+      <!--检验信息-->
       <el-table
         ref="inspectionTableRef"
         :data="inspectionList"
@@ -29,17 +29,17 @@
       >
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="申请ID" prop="applicationId" width="90" align="center" />
-        <el-table-column label="申请单号" prop="applicationNo" width="140" align="center" />
+        <el-table-column label="申请单号" prop="applyNo" width="140" align="center" />
         <el-table-column label="检验项目" prop="inspectionItem" width="150" align="center" />
-        <el-table-column label="申请医生" prop="doctorName" width="120" align="center" />
+        <el-table-column label="申请医生" prop="applyDocName" width="120" align="center" />
         <el-table-column label="急" width="60" align="center">
           <template #default="scope">
-            <el-checkbox :model-value="scope.row.isUrgent" disabled />
+            <el-checkbox :model-value="scope.row.priorityCode" disabled />
           </template>
         </el-table-column>
         <el-table-column label="收费" width="80" align="center">
           <template #default="scope">
-            <el-checkbox :model-value="scope.row.needCharge" disabled />
+            <el-checkbox :model-value="scope.row.applyStatus" disabled />
           </template>
         </el-table-column>
         <el-table-column label="退费" width="80" align="center">
@@ -79,7 +79,7 @@
       </div>
     </div>
 
-    <!-- 下方：申请单和检验项目选择器 -->
+      <!-- 下方：申请单和检验项目选择器 -->
     <div style="display: flex; gap: 20px">
       <!-- 左侧：申请单和检验信息 -->
       <div style="width: 55%">
@@ -88,22 +88,22 @@
             <div class="application-form" style="padding: 20px; height: 700px; overflow-y: auto; border: 1px solid #e4e7ed; border-radius: 4px; margin: 10px;">
               <div style="margin-bottom: 20px">
                 <label style="display: block; margin-bottom: 5px; font-weight: bold">申请单号</label>
-                <el-input v-model="formData.applicationNo" disabled size="small" />
+                <el-input v-model="formData.applyNo" readonly size="small" />
               </div>
 
               <!-- 患者信息行 -->
               <div style="display: grid; grid-template-columns: 1fr 1fr 1fr; gap: 15px; margin-bottom: 20px">
                 <div>
-                  <label style="display: block; margin-bottom: 5px; font-weight: bold">姓名</label>
-                  <el-input v-model="formData.patientName" disabled size="small" />
+                  <label style="display: block; margin-bottom: 5px; font-weight: bold">姓名<span style="color: #f56c6c">*</span></label>
+                  <el-input v-model="formData.patientName" readonly size="small" />
                 </div>
                 <div>
-                  <label style="display: block; margin-bottom: 5px; font-weight: bold">就诊卡号</label>
-                  <el-input v-model="formData.cardNo" disabled size="small" />
+                  <label style="display: block; margin-bottom: 5px; font-weight: bold">就诊卡号<span style="color: #f56c6c">*</span></label>
+                  <el-input v-model="formData.medicalrecordNumber" readonly size="small" />
                 </div>
                 <div>
-                  <label style="display: block; margin-bottom: 5px; font-weight: bold">费用性质</label>
-                  <el-select v-model="formData.feeType" placeholder="请选择费用性质" size="small" style="width: 100%">
+                  <label style="display: block; margin-bottom: 5px; font-weight: bold">费用性质<span style="color: #f56c6c">*</span></label>
+                  <el-select v-model="formData.natureofCost" placeholder="请选择费用性质" size="small" style="width: 100%">
                     <el-option label="自费医疗" value="self" />
                     <el-option label="医保" value="medical" />
                     <el-option label="公费医疗" value="public" />
@@ -115,10 +115,11 @@
 
               <!-- 申请信息行 -->
               <div style="display: grid; grid-template-columns: 1fr 1fr 1fr; gap: 15px; margin-bottom: 20px">
+                <!--申请日期-->
                 <div>
-                  <label style="display: block; margin-bottom: 5px; font-weight: bold">申请日期</label>
+                  <label style="display: block; margin-bottom: 5px; font-weight: bold">申请日期<span style="color: #f56c6c">*</span></label>
                   <el-date-picker
-                    v-model="formData.applicationDate"
+                    v-model="formData.applyTime"
                     type="datetime"
                     placeholder="选择日期时间"
                     size="small"
@@ -127,21 +128,16 @@
                     style="width: 100%"
                   />
                 </div>
+                <!--申请科室-->
                 <div>
-                  <label style="display: block; margin-bottom: 5px; font-weight: bold">申请科室</label>
-                  <el-select v-model="formData.departmentName" placeholder="请选择申请科室" size="small" style="width: 100%" disabled>
-                    <el-option label="内科" value="internal" />
-                    <el-option label="外科" value="surgery" />
-                    <el-option label="儿科" value="pediatrics" />
-                  </el-select>
+                  <label style="display: block; margin-bottom: 5px; font-weight: bold">申请科室<span style="color: #f56c6c">*</span></label>
+                  <el-input v-model="formData.applyDepartment" readonly size="small" />
                 </div>
+
+                <!--申请医生-->
                 <div>
-                  <label style="display: block; margin-bottom: 5px; font-weight: bold">申请医生</label>
-                  <el-select v-model="formData.doctorName" placeholder="请选择申请医生" size="small" style="width: 100%" disabled>
-                    <el-option label="张医生" value="doctor_zhang" />
-                    <el-option label="李医生" value="doctor_li" />
-                    <el-option label="王医生" value="doctor_wang" />
-                  </el-select>
+                  <label style="display: block; margin-bottom: 5px; font-weight: bold">申请医生<span style="color: #f56c6c">*</span></label>
+                  <el-input v-model="formData.applyDocName" readonly size="small" />
                 </div>
               </div>
 
@@ -164,29 +160,29 @@
                 <div v-if="validationErrors.executeDepartment" class="error-message">请选择执行科室</div>
               </div>
 
-              <!-- 诊断相关字段 -->
+              <!-- 诊断描述 -->
               <div style="display: grid; grid-template-columns: 1fr 1fr; gap: 15px; margin-bottom: 20px">
-                <div :class="{ 'form-item-error': validationErrors.diagnosisDesc }">
+                <div :class="{ 'form-item-error': validationErrors.clinicDesc }">
                   <label style="display: block; margin-bottom: 5px; font-weight: bold">诊断描述 <span style="color: #f56c6c">*</span></label>
                   <el-input
-                    v-model="formData.diagnosisDesc"
+                    v-model="formData.clinicDesc"
                     type="textarea"
                     :rows="2"
                     size="small"
-                    :class="{ 'is-error': validationErrors.diagnosisDesc }"
+                    :class="{ 'is-error': validationErrors.clinicDesc }"
                   />
-                  <div v-if="validationErrors.diagnosisDesc" class="error-message">请输入诊断描述</div>
+                  <div v-if="validationErrors.clinicDesc" class="error-message">请输入诊断描述</div>
                 </div>
-                <div :class="{ 'form-item-error': validationErrors.clinicalDiagnosis }">
+                <div :class="{ 'form-item-error': validationErrors.clinicDiag }">
                   <label style="display: block; margin-bottom: 5px; font-weight: bold">临床诊断 <span style="color: #f56c6c">*</span></label>
                   <el-input
-                    v-model="formData.clinicalDiagnosis"
+                    v-model="formData.clinicDiag"
                     type="textarea"
                     :rows="2"
                     size="small"
-                    :class="{ 'is-error': validationErrors.clinicalDiagnosis }"
+                    :class="{ 'is-error': validationErrors.clinicDiag }"
                   />
-                  <div v-if="validationErrors.clinicalDiagnosis" class="error-message">请输入临床诊断</div>
+                  <div v-if="validationErrors.clinicDiag" class="error-message">请输入临床诊断</div>
                 </div>
               </div>
 
@@ -194,29 +190,29 @@
               <div style="display: grid; grid-template-columns: 1fr 1fr; gap: 15px; margin-bottom: 20px">
                 <div>
                   <label style="display: block; margin-bottom: 5px; font-weight: bold">禁忌症</label>
-                  <el-input v-model="formData.contraindications" type="textarea" :rows="2" size="small" />
+                  <el-input v-model="formData.contraindication" type="textarea" :rows="2" size="small" />
                 </div>
-                <div :class="{ 'form-item-error': validationErrors.medicalHistory }">
+                <div :class="{ 'form-item-error': validationErrors.medicalHistorySummary }">
                   <label style="display: block; margin-bottom: 5px; font-weight: bold">病史摘要 <span style="color: #f56c6c">*</span></label>
                   <el-input
-                    v-model="formData.medicalHistory"
+                    v-model="formData.medicalHistorySummary"
                     type="textarea"
                     :rows="2"
                     size="small"
-                    :class="{ 'is-error': validationErrors.medicalHistory }"
+                    :class="{ 'is-error': validationErrors.medicalHistorySummary }"
                   />
-                  <div v-if="validationErrors.medicalHistory" class="error-message">请输入病史摘要</div>
+                  <div v-if="validationErrors.medicalHistorySummary" class="error-message">请输入病史摘要</div>
                 </div>
-                <div :class="{ 'form-item-error': validationErrors.inspectionPurpose }">
+                <div :class="{ 'form-item-error': validationErrors.purposeofInspection }">
                   <label style="display: block; margin-bottom: 5px; font-weight: bold">检验目的 <span style="color: #f56c6c">*</span></label>
                   <el-input
-                    v-model="formData.inspectionPurpose"
+                    v-model="formData.purposeofInspection"
                     type="textarea"
                     :rows="2"
                     size="small"
-                    :class="{ 'is-error': validationErrors.inspectionPurpose }"
+                    :class="{ 'is-error': validationErrors.purposeofInspection }"
                   />
-                  <div v-if="validationErrors.inspectionPurpose" class="error-message">请输入检验目的</div>
+                  <div v-if="validationErrors.purposeofInspection" class="error-message">请输入检验目的</div>
                 </div>
                 <div>
                   <label style="display: block; margin-bottom: 5px; font-weight: bold">体格检查</label>
@@ -232,7 +228,7 @@
                 </div>
                 <div>
                   <label style="display: block; margin-bottom: 5px; font-weight: bold">备注</label>
-                  <el-input v-model="formData.remark" type="textarea" :rows="2" size="small" />
+                  <el-input v-model="formData.applyRemark" type="textarea" :rows="2" size="small" />
                 </div>
               </div>
 
@@ -240,15 +236,14 @@
               <div style="margin-bottom: 20px; padding: 15px; background: #f8f9fa; border-radius: 4px; border: 1px solid #e9ecef">
                 <label style="display: block; margin-bottom: 10px; font-weight: bold; color: #1a2b6d">状态设置</label>
                 <div style="display: flex; gap: 30px; flex-wrap: wrap">
-                  <el-checkbox v-model="formData.isUrgent">急</el-checkbox>
-                  <el-checkbox v-model="formData.needCharge" checked>收费</el-checkbox>
+                  <el-checkbox v-model="formData.priorityCode" :true-value="1" :false-value="0">急</el-checkbox>
+                  <el-checkbox v-model="formData.applyStatus" :true-value="1" :false-value="0">收费</el-checkbox>
                   <el-checkbox v-model="formData.needRefund">退费</el-checkbox>
                   <el-checkbox v-model="formData.needExecute">执行</el-checkbox>
                 </div>
               </div>
             </div>
           </el-tab-pane>
-
           <el-tab-pane label="检验信息" name="inspectionInfo">
             <div style="padding: 20px; height: 700px; overflow-y: auto; border: 1px solid #e4e7ed; border-radius: 4px; margin: 10px;">
               <div style="display: grid; grid-template-columns: 1fr 1fr; gap: 15px; margin-bottom: 20px">
@@ -290,22 +285,22 @@
               <div style="margin-top: 20px">
                 <h4 style="margin-bottom: 10px; font-weight: bold">检验信息详情</h4>
                 <el-table :data="selectedInspectionItems" border size="small" style="width: 100%" max-height="300">
-                  <el-table-column label="检验信息" prop="name" width="200" />
+                  <el-table-column label="项目名称" prop="itemName" width="200" />
                   <el-table-column label="样本类型" prop="sampleType" width="80" align="center" />
                   <el-table-column label="单位" prop="unit" width="60" align="center" />
-                  <el-table-column label="总量" width="60" align="center">
+                  <el-table-column label="总量" prop="itemQty" width="60" align="center">
                     <template #default="scope">
-                      <span>{{ scope.row.quantity || 1 }}</span>
+                      <span>{{ scope.row.itemQty || 1 }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column label="单价" width="70" align="right">
+                  <el-table-column label="单价" prop="itemPrice" width="70" align="right">
                     <template #default="scope">
-                      ¥{{ scope.row.price }}
+                      ¥{{ scope.row.itemPrice }}
                     </template>
                   </el-table-column>
-                  <el-table-column label="金额" width="70" align="right">
+                  <el-table-column label="金额" prop="itemAmount" width="70" align="right">
                     <template #default="scope">
-                      ¥{{ (scope.row.quantity || 1) * scope.row.price }}
+                      ¥{{ scope.row.itemAmount }}
                     </template>
                   </el-table-column>
                   <el-table-column label="服务费" width="70" align="right">
@@ -371,8 +366,8 @@
                     @change="toggleInspectionItem(item)"
                     @click.stop
                   />
-                  <span class="item-name">{{ item.name }}</span>
-                  <span class="item-price">¥{{ item.price }}</span>
+                  <span class="item-itemName">{{ item.itemName }}</span>
+                  <span class="item-price">¥{{ item.itemPrice }}</span>
                 </div>
               </div>
             </div>
@@ -395,8 +390,8 @@
               class="selected-tree-item"
             >
               <div class="selected-item-content">
-                <span class="item-name">{{ item.name }}</span>
-                <span class="item-price">¥{{ item.price }}</span>
+                <span class="item-itemName">{{ item.itemName }}</span>
+                <span class="item-price">¥{{ item.itemPrice }}</span>
                 <el-button
                   type="text"
                   size="small"
@@ -422,6 +417,13 @@
 import {onMounted, reactive, ref, watch} from 'vue'
 import {ElMessage, ElMessageBox} from 'element-plus'
 import {deleteInspectionApplication, getInspectionApplicationList, saveInspectionApplication} from '../api'
+import useUserStore from '@/store/modules/user.js'
+import {storeToRefs} from 'pinia'
+
+// 在 onMounted 中调用初始化函数
+onMounted(async () => {
+  await initData();
+})
 
 // Props
 const props = defineProps({
@@ -443,6 +445,32 @@ const loading = ref(false)
 const total = ref(0)
 const leftActiveTab = ref('application')
 
+// 用户信息store
+const userStore = useUserStore()
+const { id: userId, name: userName, nickName: userNickName } = storeToRefs(userStore)
+
+// 修改 initData 函数
+async function initData() {
+  // 然后执行原有的初始化逻辑
+  if (props.patientInfo) {
+    queryParams.encounterId = props.patientInfo.encounterId
+    formData.visitNo = props.patientInfo.busNo || ''
+    formData.patientId = props.patientInfo.patientId || ''
+    formData.patientName = props.patientInfo.patientName || ''
+    formData.medicalrecordNumber = props.patientInfo.identifierNo || ''
+    formData.applyDepartment = props.patientInfo.organizationName || ''
+    formData.operatorId = userId.value || ''
+    formData.applyDocName = userNickName.value || userName.value || ''
+    formData.applyDocCode = userId.value || ''
+    formData.specimenName = '血液'
+  }
+
+  // 只有在存在 encounterId 时才调用接口
+  if (queryParams.encounterId) {
+    getInspectionList()
+  }
+}
+
 // 查询参数
 const queryParams = reactive({
   pageNo: 1,
@@ -456,43 +484,49 @@ const inspectionList = ref([])
 // 表单数据
 const formData = reactive({
   applicationId: null,
-  applicationNo: '202511210001',
+  applyNo: '202511210001',
+  patientId:'',
   patientName: '',
-  cardNo: '',
-  feeType: 'self',
-  applicationDate: new Date(),
-  departmentName: '',
-  doctorName: '',
+  medicalrecordNumber: '',
+  natureofCost: 'self',
+  applyTime: new Date(),
+  applyDepartment: '',
+  applyDocName: '',
   executeDepartment: 'medical_lab',
-  diagnosisDesc: '',
-  contraindications: '',
-  clinicalDiagnosis: '',
-  medicalHistory: '',
-  inspectionPurpose: '',
+  clinicDesc: '',
+  contraindication: '',
+  clinicDiag: '',
+  medicalHistorySummary: '',
+  purposeofInspection: '',
   physicalExam: '',
-  inspectionItems: [],
+  labApplyItemList: [],
   inspectionItemsText: '',
-  remark: '',
-  isUrgent: false,
-  needCharge: true,
+  applyRemark: '',
+  priorityCode: 0,
+  applyStatus: 1,
   needRefund: false,
   needExecute: false,
   inspectionDoctor: '',
   inspectionTime: null,
   auditDoctor: '',
-  auditTime: null
+  auditTime: null,
+  visitNo: '',
+  applyDocCode:'',
+  applyDeptCode: '',
+  operatorId: '',
+  specimenName: '血液',
 })
 
 // 表单验证规则
 const formRules = {
-  feeType: [{ required: true, message: '请选择费用性质', trigger: 'change' }],
-  applicationDate: [{ required: true, message: '请选择申请日期', trigger: 'change' }],
+  natureofCost: [{ required: true, message: '请选择费用性质', trigger: 'change' }],
+  applyTime: [{ required: true, message: '请选择申请日期', trigger: 'change' }],
   executeDepartment: [{ required: true, message: '请选择执行科室', trigger: 'change' }],
-  diagnosisDesc: [{ required: true, message: '请输入诊断描述', trigger: 'blur' }],
-  clinicalDiagnosis: [{ required: true, message: '请输入临床诊断', trigger: 'blur' }],
-  medicalHistory: [{ required: true, message: '请输入病史摘要', trigger: 'blur' }],
-  inspectionPurpose: [{ required: true, message: '请输入检验目的', trigger: 'blur' }],
-  inspectionItems: [{ required: true, message: '请至少选择一个检验项目', trigger: 'change' }]
+  clinicDesc: [{ required: true, message: '请输入诊断描述', trigger: 'blur' }],
+  clinicDiag: [{ required: true, message: '请输入临床诊断', trigger: 'blur' }],
+  medicalHistorySummary: [{ required: true, message: '请输入病史摘要', trigger: 'blur' }],
+  purposeofInspection: [{ required: true, message: '请输入检验目的', trigger: 'blur' }],
+  labApplyItemList: [{ required: true, message: '请至少选择一个检验项目', trigger: 'change' }]
 }
 
 // 表单引用
@@ -504,11 +538,11 @@ const inspectionTableRef = ref()
 // 验证错误状态
 const validationErrors = reactive({
   executeDepartment: false,
-  diagnosisDesc: false,
-  clinicalDiagnosis: false,
-  medicalHistory: false,
-  inspectionPurpose: false,
-  inspectionItems: false
+  clinicDesc: false,
+  clinicDiag: false,
+  medicalHistorySummary: false,
+  purposeofInspection: false,
+  labApplyItemList: false
 })
 
 // 已选择的表格行
@@ -524,15 +558,15 @@ const searchKeyword = ref('')
 const activeCategory = ref('biochemical')
 
 // 检验项目分类（树形结构）
-const inspectionCategories = ref([
+let inspectionCategories = ref([
   {
     key: 'biochemical',
     label: '生化',
     expanded: true,
     items: [
-      { id: 1, name: '肝功能', price: 31, sampleType: '血清', unit: 'U/L', quantity: 1, serviceFee: 0, type: '生化', isSelfPay: false },
-      { id: 2, name: '肾功能', price: 28, sampleType: '血清', unit: 'U/L', quantity: 1, serviceFee: 0, type: '生化', isSelfPay: false },
-      { id: 3, name: '血糖', price: 15, sampleType: '血清', unit: 'mmol/L', quantity: 1, serviceFee: 0, type: '生化', isSelfPay: false }
+      { id: 1, itemName: '肝功能', itemPrice: 31, itemAmount: 31, sampleType: '血清', unit: 'U/L', itemQty: 1, serviceFee: 0, type: '生化', isSelfPay: false },
+      { id: 2, itemName: '肾功能', itemPrice: 28, itemAmount: 28, sampleType: '血清', unit: 'U/L', itemQty: 1, serviceFee: 0, type: '生化', isSelfPay: false },
+      { id: 3, itemName: '血糖', itemPrice: 15, itemAmount: 15, sampleType: '血清', unit: 'mmol/L', itemQty: 1, serviceFee: 0, type: '生化', isSelfPay: false }
     ]
   },
   {
@@ -540,8 +574,8 @@ const inspectionCategories = ref([
     label: '临检',
     expanded: false,
     items: [
-      { id: 4, name: '血常规+crp', price: 50, sampleType: '全血', unit: '×10^9/L', quantity: 1, serviceFee: 0, type: '血液', isSelfPay: false },
-      { id: 5, name: '血常规（五分类）', price: 15, sampleType: '全血', unit: '×10^9/L', quantity: 1, serviceFee: 0, type: '血液', isSelfPay: false }
+      { id: 4, itemName: '血常规+crp', itemPrice: 50, itemAmount: 50, sampleType: '全血', unit: '×10^9/L', itemQty: 1, serviceFee: 0, type: '血液', isSelfPay: false },
+      { id: 5, itemName: '血常规（五分类）', itemPrice: 15, itemAmount: 15, sampleType: '全血', unit: '×10^9/L', itemQty: 1, serviceFee: 0, type: '血液', isSelfPay: false }
     ]
   },
   {
@@ -549,7 +583,7 @@ const inspectionCategories = ref([
     label: '尿液',
     expanded: false,
     items: [
-      { id: 6, name: '尿常规', price: 20, sampleType: '尿液', unit: '细胞/μl', quantity: 1, serviceFee: 0, type: '尿液', isSelfPay: false }
+      { id: 6, itemName: '尿常规', itemPrice: 20, itemAmount: 20, sampleType: '尿液', unit: '细胞/μl', itemQty: 1, serviceFee: 0, type: '尿液', isSelfPay: false }
     ]
   },
   {
@@ -557,8 +591,8 @@ const inspectionCategories = ref([
     label: '免疫',
     expanded: false,
     items: [
-      { id: 7, name: '总IgE测定', price: 30, sampleType: '血清', unit: 'IU/ml', quantity: 1, serviceFee: 0, type: '免疫', isSelfPay: false },
-      { id: 8, name: '风湿', price: 119, sampleType: '血清', unit: 'U/ml', quantity: 1, serviceFee: 0, type: '免疫', isSelfPay: false }
+      { id: 7, itemName: '总IgE测定', itemPrice: 30, itemAmount: 30, sampleType: '血清', unit: 'IU/ml', itemQty: 1, serviceFee: 0, type: '免疫', isSelfPay: false },
+      { id: 8, itemName: '风湿', itemPrice: 119, itemAmount: 119, sampleType: '血清', unit: 'U/ml', itemQty: 1, serviceFee: 0, type: '免疫', isSelfPay: false }
     ]
   }
 ])
@@ -573,70 +607,39 @@ const getFilteredItems = (categoryKey) => {
   }
 
   return category.items.filter(item =>
-    item.name.toLowerCase().includes(searchKeyword.value.toLowerCase())
+    item.itemName.toLowerCase().includes(searchKeyword.value.toLowerCase())
   )
 }
 
-// 初始化数据
-function initData() {
-  console.log('检验组件初始化，patientInfo:', props.patientInfo)
-  if (props.patientInfo) {
-    // 确保 encounterId 存在且有效，优先使用 encounterId，其次尝试 id，最后尝试 patientId
-    queryParams.encounterId = props.patientInfo.encounterId || props.patientInfo.id || props.patientInfo.patientId
-    formData.patientName = props.patientInfo.patientName || ''
-    formData.cardNo = props.patientInfo.cardNo || ''
-    formData.departmentName = props.patientInfo.departmentName || ''
-    formData.doctorName = props.patientInfo.doctorName || ''
-  }
 
-  // 只有在存在有效的 encounterId 时才调用接口
-  if (queryParams.encounterId && queryParams.encounterId !== 'undefined' && queryParams.encounterId !== 'null' && queryParams.encounterId !== '') {
-    getInspectionList()
-  } else {
-    console.warn('缺少有效的就诊ID，无法获取检验申请单列表')
-    inspectionList.value = []
-    total.value = 0
-  }
-}
 
 // 获取检验申请单列表
 function getInspectionList() {
-  // 先检查是否有有效的encounterId
-  if (!queryParams.encounterId || queryParams.encounterId === 'undefined' || queryParams.encounterId === 'null') {
-    console.warn('缺少有效的就诊ID，无法获取检验申请单列表')
-    inspectionList.value = []
-    total.value = 0
-    loading.value = false
+  // 如果没有encounterId,不调用接口
+  if (!queryParams.encounterId) {
+    // console.warn('【检验】encounterId为空,不调用接口')
     return
   }
-
+  
   loading.value = true
 
   // 调用真实的API，只传递 encounterId 参数
+  // console.log('【检验】调用API,encounterId:', queryParams.encounterId)
   getInspectionApplicationList({ encounterId: queryParams.encounterId }).then((res) => {
     if (res.code === 200) {
       inspectionList.value = res.data || []
       total.value = res.data?.length || 0
+      // console.log('【检验】获取数据成功,数量:', inspectionList.value.length)
     } else {
       inspectionList.value = []
       total.value = 0
-      console.error('获取检验申请单列表失败:', res.message || res.msg)
-      ElMessage.error(res.message || res.msg || '获取检验申请单列表失败')
+      ElMessage.error('获取检验申请单列表失败')
     }
   }).catch((error) => {
-    console.error('获取检验申请单列表异常:', error)
+    // console.error('获取检验申请单列表异常:', error)
     inspectionList.value = []
     total.value = 0
-    // 提供更友好的错误信息
-    let errorMessage = '获取检验申请单列表异常'
-    if (error.response) {
-      errorMessage += ` (${error.response.status}): ${error.response.data.message || error.response.statusText}`
-    } else if (error.request) {
-      errorMessage += ': 网络请求失败，请检查网络连接'
-    } else {
-      errorMessage += `: ${error.message}`
-    }
-    ElMessage.error(errorMessage)
+    ElMessage.error('获取检验申请单列表异常')
   }).finally(() => {
     loading.value = false
   })
@@ -644,10 +647,12 @@ function getInspectionList() {
 
 // 新增申请单
 function handleNewApplication() {
-  console.log('点击新增按钮')
+  // console.log('点击新增按钮')
   resetForm()
   // 生成申请单号
-  formData.applicationNo = generateApplicationNo()
+  formData.applyNo = generateApplicationNo()
+  // 确保申请医生是当前登录医生
+  formData.applyDocName = userNickName.value || userName.value || ''
   leftActiveTab.value = 'application'
 }
 
@@ -661,30 +666,37 @@ function generateApplicationNo() {
   return `${year}${month}${day}${String(timestamp).slice(-3)}`
 }
 
+
 // 重置表单
-function resetForm() {
+async function resetForm() {
   Object.assign(formData, {
     applicationId: null,
-    applicationNo: '',
+    apply: '',
     patientName: props.patientInfo.patientName || '',
-    cardNo: props.patientInfo.cardNo || '',
-    feeType: 'self',
-    applicationDate: new Date(),
-    departmentName: props.patientInfo.departmentName || '',
-    doctorName: props.patientInfo.doctorName || '',
+    medicalrecordNumber: props.patientInfo.identifierNo || '',
+    natureofCost: 'self',
+    applyTime: new Date(),
+    applyDepartment: props.patientInfo.organizationName || '',
+    applyDeptCode: '',
+    applyDocCode: userId.value || '',
+    applyDocName: userNickName.value || userName.value || '',
+    operatorId: userId.value || '',
     executeDepartment: 'medical_lab',
-    diagnosisDesc: '',
-    contraindications: '',
-    clinicalDiagnosis: '',
-    medicalHistory: '',
-    inspectionPurpose: '',
+    clinicDesc: '',
+    contraindication: '',
+    clinicDiag: '',
+    medicalHistorySummary: '',
+    purposeofInspection: '',
     physicalExam: '',
-    inspectionItems: [],
-    remark: '',
-    isUrgent: false,
-    needCharge: true,
+    labApplyItemList: [],
+    applyRemark: '',
+    priorityCode: 0,
+    applyStatus: 1,
     needRefund: false,
-    needExecute: false
+    needExecute: false,
+    patientId: props.patientInfo.patientId || '',
+    visitNo: '',
+    specimenName: '血液',
   })
   selectedInspectionItems.value = []
 
@@ -712,32 +724,43 @@ function handleSave() {
   let hasErrors = false
 
   // 检查必填字段
+  // 检查必填字段，执行科室
   if (!formData.executeDepartment) {
     validationErrors.executeDepartment = true
     hasErrors = true
   }
-  if (!formData.diagnosisDesc.trim()) {
-    validationErrors.diagnosisDesc = true
+  // 检查必填字段，诊断描述
+  if (!formData.clinicDesc.trim()) {
+    validationErrors.clinicDesc = true
     hasErrors = true
   }
-  if (!formData.clinicalDiagnosis.trim()) {
-    validationErrors.clinicalDiagnosis = true
+  // 检查必填字段，临床诊断
+  if (!formData.clinicDiag.trim()) {
+    validationErrors.clinicDiag = true
     hasErrors = true
   }
-  if (!formData.medicalHistory.trim()) {
-    validationErrors.medicalHistory = true
+  // 检查必填字段，病史摘要
+  if (!formData.medicalHistorySummary.trim()) {
+    validationErrors.medicalHistorySummary = true
     hasErrors = true
   }
-  if (!formData.inspectionPurpose.trim()) {
-    validationErrors.inspectionPurpose = true
+  // 检查必填字段，检验目的
+  if (!formData.purposeofInspection.trim()) {
+    validationErrors.purposeofInspection = true
     hasErrors = true
   }
+  // 检查必填字段，检验项目
   if (selectedInspectionItems.value.length === 0) {
-    validationErrors.inspectionItems = true
+    validationErrors.labApplyItemList = true
     hasErrors = true
     ElMessage.error('请至少选择一项检验项目')
     return
   }
+  // 检查必填字段，申请日期
+  if(!formData.applyTime || (typeof formData.applyTime === 'string' && !formData.applyTime.trim())) {
+    validationErrors.applyTime = true
+    hasErrors = true
+  }
 
   if (hasErrors) {
     ElMessage.error('请填写所有必填字段')
@@ -747,11 +770,11 @@ function handleSave() {
   // 准备保存数据
   const saveData = {
     ...formData,
-    inspectionItems: selectedInspectionItems.value,
-    inspectionItemsText: selectedInspectionItems.value.map(item => item.name).join('、'),
-    amount: selectedInspectionItems.value.reduce((sum, item) => sum + item.price, 0),
+    labApplyItemList: selectedInspectionItems.value,
+    inspectionItemsText: selectedInspectionItems.value.map(item => item.itemName).join('、'),
+    amount: selectedInspectionItems.value.reduce((sum, item) => sum + item.itemAmount, 0),
     serviceFee: selectedInspectionItems.value.reduce((sum, item) => sum + (item.serviceFee || 0), 0),
-    totalAmount: selectedInspectionItems.value.reduce((sum, item) => sum + item.price + (item.serviceFee || 0), 0)
+    totalAmount: selectedInspectionItems.value.reduce((sum, item) => sum + item.itemAmount + (item.serviceFee || 0), 0)
   }
 
   console.log('保存检验申请单数据:', saveData)
@@ -768,7 +791,7 @@ function handleSave() {
       ElMessage.error(res.message || '保存失败')
     }
   }).catch((error) => {
-    console.error('保存检验申请单异常:', error)
+    // console.error('保存检验申请单异常:', error)
     ElMessage.error('保存异常')
   })
 }
@@ -777,8 +800,8 @@ function handleSave() {
 function handleFormSave() {
   formRef.value?.validate((valid) => {
     if (valid) {
-      formData.inspectionItems = selectedInspectionItems.value.map(item => item.id)
-      console.log('保存检验申请单表单数据:', formData)
+      formData.labApplyItemList = selectedInspectionItems.value.map(item => item.id)
+      // console.log('保存检验申请单表单数据:', formData)
       ElMessage.success('保存成功')
       showForm.value = false
       getInspectionList()
@@ -788,7 +811,7 @@ function handleFormSave() {
 
 // 查看详情
 function handleView(row) {
-  console.log('点击查看按钮，数据:', row)
+  // console.log('点击查看按钮，数据:', row)
   // 加载表单数据
   Object.assign(formData, row)
 
@@ -828,7 +851,7 @@ function switchCategory(category) {
 // 处理搜索
 function handleSearch() {
   // 搜索逻辑已在getFilteredItems中实现，这里可以添加额外的搜索逻辑
-  console.log('搜索关键词:', searchKeyword.value)
+  // console.log('搜索关键词:', searchKeyword.value)
 }
 
 // 处理项目项点击（排除勾选框点击）
@@ -847,7 +870,12 @@ function toggleInspectionItem(item) {
   if (index > -1) {
     selectedInspectionItems.value.splice(index, 1)
   } else {
-    selectedInspectionItems.value.push({ ...item })
+    // 创建新对象，包含 itemName 属性（等于 name 属性）
+    const newItem = {
+      ...item,
+      itemName: item.itemName
+    };
+    selectedInspectionItems.value.push(newItem);
   }
 }
 
@@ -883,7 +911,7 @@ function handleSelectionChange(selection) {
 
 // 打印申请单
 function handlePrint(row) {
-  console.log('打印申请单:', row)
+  // console.log('打印申请单:', row)
 
   // 切换到申请单TAB
   leftActiveTab.value = 'application'
@@ -957,7 +985,7 @@ function handlePrint(row) {
 // 删除申请单
 function handleDelete(row) {
   ElMessageBox.confirm(
-    `确定要删除申请单 "${row.applicationNo}" 吗？此操作不可撤销。`,
+    `确定要删除申请单 "${row.applyNo}" 吗？此操作不可撤销。`,
     '删除确认',
     {
       confirmButtonText: '确定删除',
@@ -966,7 +994,7 @@ function handleDelete(row) {
       confirmButtonClass: 'el-button--danger'
     }
   ).then(() => {
-    console.log('删除申请单:', row)
+    // console.log('删除申请单:', row)
     // 调用真实的API删除
     deleteInspectionApplication(row.applicationId).then((res) => {
       if (res.code === 200) {
@@ -977,7 +1005,7 @@ function handleDelete(row) {
         ElMessage.error(res.message || '删除失败')
       }
     }).catch((error) => {
-      console.error('删除检验申请单异常:', error)
+      // console.error('删除检验申请单异常:', error)
       ElMessage.error('删除异常')
     })
   }).catch(() => {
@@ -991,9 +1019,9 @@ function handleCellClick(row, column) {
 }
 
 // 监听activeTab变化
-watch(() => props.activeTab, (newVal) => {
+watch(() => props.activeTab, async (newVal) => {
   if (newVal === 'inspection') {
-    initData()
+    await initData()
     // 默认展开生化分类
     activeCategory.value = 'biochemical'
     inspectionCategories.value.forEach(cat => {
@@ -1002,33 +1030,32 @@ watch(() => props.activeTab, (newVal) => {
   }
 })
 
-// 监听patientInfo变化，确保在患者信息更新时也更新检验申请单列表
-watch(() => props.patientInfo, (newPatientInfo) => {
-  if (newPatientInfo && Object.keys(newPatientInfo).length > 0) {
-    // 更新encounterId
-    queryParams.encounterId = newPatientInfo.encounterId || newPatientInfo.id || newPatientInfo.patientId
-    // 如果有有效的encounterId，则获取检验申请单列表
-    if (queryParams.encounterId && queryParams.encounterId !== 'undefined' && queryParams.encounterId !== 'null' && queryParams.encounterId !== '') {
-      getInspectionList()
-    }
+// 监听patientInfo变化,确保encounterId及时更新
+watch(() => props.patientInfo, async (newVal) => {
+  // console.log('【检验】patientInfo变化:', newVal)
+  console.log('【检验】接收到的完整patientInfo:', JSON.stringify(newVal, null, 2))
+  if (newVal && newVal.encounterId) {
+    queryParams.encounterId = newVal.encounterId
+    // console.log('【检验】更新encounterId:', queryParams.encounterId)
+    
+    // 更新科室编码
+    // const currentDeptCode = await getCurrentDeptCode();
+    // formData.applyDeptCode = currentDeptCode || '';
   }
-}, { deep: true })
+}, { deep: true, immediate: true })
 
 // 初始化
-onMounted(() => {
-  initData()
+onMounted(async () => {
+  await initData()
 })
 
 // 暴露方法
 defineExpose({
-  getList() {
-    // 在调用getList时，先检查是否有有效的patientInfo，如果有则更新encounterId
-    if (props.patientInfo && Object.keys(props.patientInfo).length > 0) {
-      queryParams.encounterId = props.patientInfo.encounterId || props.patientInfo.id || props.patientInfo.patientId;
-    }
-    getInspectionList();
-  }
+  getList: getInspectionList
 })
+
+
+
 </script>
 
 <style lang="scss" scoped>
@@ -1207,7 +1234,7 @@ defineExpose({
   background-color: #ecf5ff;
 }
 
-.item-name {
+.item-itemName {
   font-weight: 500;
 }
 
@@ -1392,7 +1419,7 @@ defineExpose({
   border-left: 3px solid #409eff;
 }
 
-.inspection-tree-item .item-name {
+.inspection-tree-item .item-itemName {
   flex: 1;
   margin-left: 10px;
   font-weight: 500;
@@ -1436,7 +1463,7 @@ defineExpose({
   margin: 2px 0;
 }
 
-.selected-item-content .item-name {
+.selected-item-content .item-itemName {
   flex: 1;
   font-weight: 500;
 }

openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue

@@ -741,7 +741,7 @@
                         check-strictly
                         default-expand-all
                         :ref="(el) => (inputRefs.orgId = el)"
-                        @change="(value) => handleOrgChange(value, scope.$index)"
+                        @change="(value) => handleOrgChange(value, scope.$index, scope.row)"
                         placeholder="请选择执行科室"
                       />
                     </el-form-item>
@@ -1104,6 +1104,10 @@ const isAdding = ref(false);
 const isSaving = ref(false);
 const prescriptionRef = ref();
 const expandOrder = ref([]); //目前的展开行
+// 更新展开行的函数
+const updateExpandOrder = (keys) => {
+  expandOrder.value = keys;
+};
 const stockList = ref([]);
 const contractList = ref([]);
 const conditionId = ref('');
@@ -2261,7 +2265,7 @@ function handleSaveSign(row, index, prescriptionId) {
     return;
   }
 
-  const formRefName = 'formRef_' + targetPrescriptionId + '_' + actualIndex;
+  const formRefName = 'formRef' + actualIndex;
   let formRef = proxy.$refs[formRefName];
 
   console.log('handleSaveSign - 查找表单引用:', formRefName, '是否找到:', !!formRef, '类型:', typeof formRef, 'formRef:', formRef);
@@ -2663,7 +2667,7 @@ const handleEnter = (currentProp, row, rowIndex, prescriptionId) => {
     return;
   }
 
-  const formRefName = 'formRef_' + targetPrescriptionId + '_' + actualIndex;
+  const formRefName = 'formRef' + actualIndex;
   let formRef = proxy.$refs[formRefName];
 
   // 如果 formRef 是数组，取第一个元素

openhis-ui-vue3/src/views/doctorstation/index.vue

@@ -1,11 +1,16 @@
 <template>
   <div style="display: flex; justify-content: space-between; height: 90vh">
     <div style="width: 15%; height: 100%; border: 1px solid #eee; border-right: 0">
-      <div style="padding: 10px; border: 1px solid #eee; height: 50px; border-right: 0">
-        <span>现诊患者</span>
-        <el-badge :value="waitCount > 0 ? waitCount : ''" :max="10"
-          style="float: right; color: #409eff; cursor: pointer; margin-right: 10px">
-          <span @click="openDrawer"> 患者队列 </span>
+      <div
+        style="padding: 10px; border: 1px solid #eee; height: 50px; border-right: 0; display: flex; align-items: center; justify-content: space-between">
+        <div style="display: flex; align-items: center;">
+          <span style="margin-right: 20px; font-weight: 600;">现诊患者</span>
+          <el-button type="primary" size="small" @click.stop="handleOpenCallDialog" title="点击打开叫号界面">
+            <i class="el-icon-bell"></i> 呼叫
+          </el-button>
+        </div>
+        <el-badge :value="waitCount > 0 ? waitCount : ''" :max="10" style="color: #409eff; cursor: pointer;">
+          <span @click="openDrawer" style="font-weight: 600;"> 患者队列 </span>
         </el-badge>
       </div>
       <div style="width: 100%; padding: 10px">
@@ -15,16 +20,9 @@
             <el-button icon="Search" @click="getPatientList" />
           </template>
         </el-input>
-        <el-date-picker
-          v-model="registerTime"
-          @change="handleTimeChange"
-          type="date"
-          style="width: 100%; margin-bottom: 10px"
-          :clearable="false"
-          placeholder="挂号时间"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-        />
+        <el-date-picker v-model="registerTime" @change="handleTimeChange" type="date"
+          style="width: 100%; margin-bottom: 10px" :clearable="false" placeholder="挂号时间" format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD" />
         <el-scrollbar height="700px">
           <div v-for="(item, index) in patientList" :class="item.active ? 'patient-card actived' : 'patient-card'"
             :key="item.id" @click="handleCardClick(item, index)">
@@ -86,11 +84,11 @@
                 ' / ' +
                 patientInfo.genderEnum_enumText +
                 ' / ' +
-                  (patientInfo?.contractName ? patientInfo.contractName : '') +
-                  '/' +
-                  patientInfo.phone +
-                  '/' +
-                  patientInfo.busNo
+                (patientInfo?.contractName ? patientInfo.contractName : '') +
+                '/' +
+                patientInfo.phone +
+                '/' +
+                patientInfo.busNo
                 : '-'
             }}
           </el-descriptions-item>
@@ -110,27 +108,22 @@
             <el-button type="primary" plain @click.stop="handleRefund(patientInfo.encounterId)">
               退费
             </el-button>
-            <el-button type="primary" plain class="top-layer-btn" @click.stop="getEnPrescription(patientInfo.encounterId)">
+            <el-button type="primary" plain class="top-layer-btn"
+              @click.stop="getEnPrescription(patientInfo.encounterId)">
               处方单
             </el-button>
-            <el-button type="primary" plain class="top-layer-btn" :disabled="isHospitalizationButtonDisabled" @click.stop="handleHospitalizationClick()" @mouseenter="console.log('办理住院按钮状态：', { patientInfo: patientInfo?.value, hasEncounterId: patientInfo?.value?.encounterId, isDisabled: isHospitalizationButtonDisabled })"> 办理住院 </el-button>
+            <el-button type="primary" plain class="top-layer-btn" :disabled="isHospitalizationButtonDisabled"
+              @click.stop="handleHospitalizationClick()"
+              @mouseenter="console.log('办理住院按钮状态：', { patientInfo: patientInfo?.value, hasEncounterId: patientInfo?.value?.encounterId, isDisabled: isHospitalizationButtonDisabled })">
+              办理住院 </el-button>
           </el-descriptions-item>
         </el-descriptions>
       </div>
       <div style="padding: 10px; position: relative">
-        <el-tabs
-          type="card"
-          style="width: 100%; height: 100%"
-          v-loading="loading"
-          v-model="activeTab"
-          @tab-change="handleClick(activeTab)"
-        >
+        <el-tabs type="card" style="width: 100%; height: 100%" v-loading="loading" v-model="activeTab"
+          @tab-change="handleClick(activeTab)">
           <el-tab-pane label="门诊病历" name="hospitalizationEmr">
-            <hospitalizationEmr
-              :patientInfo="patientInfo"
-              :activeTab="activeTab"
-              @emrSaved="handleEmrSaved"
-            />
+            <hospitalizationEmr :patientInfo="patientInfo" :activeTab="activeTab" @emrSaved="handleEmrSaved" />
           </el-tab-pane>
           <!-- <el-tab-pane label="病历" name="emr">
             <Emr
@@ -151,12 +144,8 @@
             " />
           </el-tab-pane>
           <el-tab-pane label="医嘱" name="prescription">
-            <prescriptionlist
-              :patientInfo="patientInfo"
-              ref="prescriptionRef"
-              :activeTab="activeTab"
-              :outpatientEmrSaved="outpatientEmrSaved"
-            />
+            <prescriptionlist :patientInfo="patientInfo" ref="prescriptionRef" :activeTab="activeTab"
+              :outpatientEmrSaved="outpatientEmrSaved" />
           </el-tab-pane>
           <el-tab-pane label="中医" name="tcm">
             <tcmAdvice :patientInfo="patientInfo" ref="tcmRef" />
@@ -180,24 +169,17 @@
     <el-drawer v-model="drawer" title="患者队列" direction="ltr" @open="handleOpen">
       <PatientList ref="patientDrawerRef" @toCurrent="handleReceive" />
     </el-drawer>
-    <RefundListDialog
-      :open="openRefundListDialog"
-      :encounterId="currentEncounterId"
-      @close="openRefundListDialog = false"
-      @refresh="() => prescriptionRef.getListInfo()"
-    />
-    <HospitalizationDialog
-      :open="openDialog"
-      :patientInfo="patientInfo"
-      :encounterId="currentEncounterId"
-      :mainDiagnosis="mainDiagnosis"
-      @close="openDialog = false"
-    />
-    <PrescriptionInfo
-      :open="openPrescriptionDialog"
-      :precriptionInfo="prescriptionInfo"
-      @close="openPrescriptionDialog = false"
-    />
+    <RefundListDialog :open="openRefundListDialog" :encounterId="currentEncounterId"
+      @close="openRefundListDialog = false" @refresh="() => prescriptionRef.getListInfo()" />
+    <HospitalizationDialog :open="openDialog" :patientInfo="patientInfo" :encounterId="currentEncounterId"
+      :mainDiagnosis="mainDiagnosis" @close="openDialog = false" />
+    <PrescriptionInfo :open="openPrescriptionDialog" :precriptionInfo="prescriptionInfo"
+      @close="openPrescriptionDialog = false" />
+    <!-- 新增叫号弹窗组件 -->
+    <DoctorCallDialog v-model:dialogVisible="dialogVisible" :current-patient="currentCallPatient"
+      :current-patient-list="currentWaitPatientList" :room-no="roomNo"
+      :department="userStore.orgName || patientInfo.organizationName || '心内科'" @callNext="callNext" @reCall="reCall"
+      @finish="finishCall" @skip="skip" @requeue="requeue" @markSeen="markSeen" @callThis="callThis" />
   </div>
 </template>
 <script setup>
@@ -221,11 +203,12 @@ import HospitalizationDialog from './components/hospitalizationDialog.vue';
 import tcmAdvice from './components/tcm/tcmAdvice.vue';
 import inspectionApplication from './components/inspection/inspectionApplication.vue';
 import surgeryApplication from './components/surgery/surgeryApplication.vue';
-import {formatDate, formatDateStr} from '@/utils/index';
+import DoctorCallDialog from './components/callQueue/DoctorCallDialog.vue';
+import { formatDate, formatDateStr } from '@/utils/index';
 import useUserStore from '@/store/modules/user';
-import {nextTick} from 'vue';
-import {updatePatientInfo} from './components/store/patient.js';
-import {ElMessage, ElMessageBox} from 'element-plus';
+import { nextTick } from 'vue';
+import { updatePatientInfo } from './components/store/patient.js';
+import { ElMessage, ElMessageBox } from 'element-plus';
 
 // // 监听路由离开事件
 // onBeforeRouteLeave((to, from, next) => {
@@ -253,6 +236,10 @@ const drawer = ref(false);
 const openRefundListDialog = ref(false);
 const openDialog = ref(false);
 const openPrescriptionDialog = ref(false);
+const dialogVisible = ref(false); // 叫号弹窗显示/隐藏
+const currentCallPatient = ref({}); // 传给弹窗的【当前就诊患者】
+const currentWaitPatientList = ref([]); // 传给弹窗的【候诊患者列表】
+const roomNo = ref('4号'); // 诊室号
 const saveStatus = ref(false);
 const outpatientEmrSaved = ref(false); // 门诊病历保存状态
 const currentEncounterId = ref('');
@@ -267,11 +254,11 @@ const visitTypeDisabled = ref(false);
 // 计算属性：确定办理住院按钮是否应被禁用
 const isHospitalizationButtonDisabled = computed(() => {
   return !patientInfo.value ||
-         typeof patientInfo.value !== 'object' ||
-         !patientInfo.value.encounterId ||
-         patientInfo.value.encounterId === '' ||
-         patientInfo.value.encounterId === null ||
-         patientInfo.value.encounterId === undefined;
+    typeof patientInfo.value !== 'object' ||
+    !patientInfo.value.encounterId ||
+    patientInfo.value.encounterId === '' ||
+    patientInfo.value.encounterId === null ||
+    patientInfo.value.encounterId === undefined;
 });
 
 const prescriptionInfo = ref([]);
@@ -327,8 +314,9 @@ const shortcuts = [
 const eprescriptionRef = ref();
 onMounted(() => {
   getWaitPatient();
+  getWaitPatientList();
+  getPatientList();
 });
-getPatientList();
 // 获取现诊患者列表
 function getPatientList() {
   queryParams.value.statusEnum = 2;
@@ -405,6 +393,33 @@ function getWaitPatient() {
     waitCount.value = res.data.total;
   });
 }
+// 新增：获取候诊患者完整列表
+function getWaitPatientList() {
+  queryParams.value.registerTimeSTime = formatDateStr(new Date(), 'YYYY-MM-DD') + ' 00:00:00';
+  queryParams.value.registerTimeETime = formatDateStr(new Date(), 'YYYY-MM-DD') + ' 23:59:59';
+  queryParams.value.statusEnum = 1; // 筛选【待诊】患者
+  getList(queryParams.value).then((res) => {
+    currentWaitPatientList.value = res.data.records;
+    waitCount.value = res.data.total;
+  });
+}
+
+// 新增：打开叫号弹窗方法
+function handleOpenCallDialog() {
+  // 刷新患者列表和候诊列表，确保数据是最新的
+  getPatientList();
+  getWaitPatientList();
+
+  // 检查当前选中的患者是否已经完诊，如果已经完诊，就不设置为当前呼叫患者
+  if (patientInfo.value && patientInfo.value.statusEnum !== 3) { // 3代表已完诊
+    currentCallPatient.value = patientInfo.value;
+  } else {
+    // 如果当前患者已经完诊，就清空当前呼叫患者
+    currentCallPatient.value = {};
+  }
+
+  dialogVisible.value = true;
+}
 
 function handleClick(tab) {
   switch (tab) {
@@ -456,10 +471,10 @@ function getEnPrescription(encounterId) {
         type: 'error',
         message: '暂无处方单',
       });
-    return;
-  }
+      return;
+    }
     prescriptionInfo.value = res.data.records;
-              openPrescriptionDialog.value = true;
+    openPrescriptionDialog.value = true;
   });
 }
 
@@ -716,6 +731,58 @@ const onHospitalization = async () => {
     });
   }
 };
+
+// ========== 叫号弹窗所有回调事件 ==========
+const callNext = () => {
+  // 直接刷新患者列表和候诊列表，API调用已经在子组件中完成
+  getPatientList();
+  getWaitPatientList();
+  // 子组件已处理提示，这里无需重复提示
+};
+const reCall = () => {
+  // 选呼功能已实现，无需提示
+};
+const finishCall = () => {
+  dialogVisible.value = false;
+  // 刷新患者列表和候诊列表
+  getPatientList();
+  getWaitPatientList();
+  // 清空当前呼叫患者
+  currentCallPatient.value = {};
+  // 子组件已处理提示，这里无需重复提示
+};
+const skip = () => {
+  // 直接刷新患者列表和候诊列表，API调用已经在子组件中完成
+  getPatientList();
+  getWaitPatientList();
+  // 子组件已处理提示，这里无需重复提示
+};
+const requeue = () => {
+  // 1. 重新获取候诊患者列表
+  getWaitPatientList();
+  // 2. 刷新现诊患者列表
+  getPatientList();
+  // 3. 刷新候诊人数统计
+  getWaitPatient();
+  // 4. 清空当前呼叫患者
+  currentCallPatient.value = {};
+  // 子组件已处理提示，这里无需重复提示
+};
+const markSeen = async () => {
+  // 直接刷新患者列表和候诊列表，API调用已经在子组件中完成
+  getPatientList();
+  getWaitPatientList();
+  // 清空当前呼叫患者
+  currentCallPatient.value = {};
+};
+const callThis = (row) => {
+  handleCardClick(row);
+  currentCallPatient.value = row;
+  dialogVisible.value = false;
+  // 刷新患者列表和候诊列表
+  getPatientList();
+  getWaitPatientList();
+};
 </script>
 
 <style lang="scss" scoped>
@@ -724,6 +791,7 @@ const onHospitalization = async () => {
   :deep(.el-descriptions__label) {
     font-size: 16px !important;
   }
+
   :deep(.el-descriptions__content) {
     font-size: 16px !important;
   }
@@ -906,15 +974,18 @@ const onHospitalization = async () => {
   left: 0;
   width: 100%;
   height: calc(100% - 50px);
-  z-index: 998;  /* 降低z-index，避免覆盖按钮 */
+  z-index: 998;
+  /* 降低z-index，避免覆盖按钮 */
   /* 确保覆盖在内容上方，但不覆盖顶部按钮区域 */
   cursor: not-allowed;
   background-color: rgba(255, 255, 255, 0.01);
-  pointer-events: none;  /* 默认不捕获鼠标事件，只在真正需要禁用时才启用 */
+  pointer-events: none;
+  /* 默认不捕获鼠标事件，只在真正需要禁用时才启用 */
 }
 
 .disabled-wrapper .overlay.overlay-disabled {
-  pointer-events: auto;  /* 当需要真正禁用时启用指针事件 */
+  pointer-events: auto;
+  /* 当需要真正禁用时启用指针事件 */
 }
 
 /* 顶层按钮样式，确保按钮始终在最上层 */

openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue

@@ -88,6 +88,7 @@
                 v-for="(item, index) in tableData" 
                 :key="index"
                 :class="{ 'editing-row': item.editing, 'child-row': item.row.includes('.') }"
+                @click="handleRowClick(index)"
               >
                 <td>{{ item.row }}</td>
                 <td>
@@ -967,6 +968,14 @@ async function loadMenuData(menu) {
   }
 }
 
+// 处理行点击进入编辑状态
+function handleRowClick(index) {
+  const item = tableData.value[index];
+  if (!item.editing) {
+    item.editing = true;
+  }
+}
+
 // 处理编辑按钮点击
 function handleEdit(index) {
   const item = tableData.value[index];
@@ -982,6 +991,25 @@ function handleCancelEdit(index) {
 // 处理确认按钮点击
 async function handleConfirm(index) {
   const item = tableData.value[index];
+  
+  // 必填字段验证
+  if (!item.code || item.code.trim() === '') {
+    ElMessage.error('编码不能为空');
+    return;
+  }
+  if (!item.name || item.name.trim() === '') {
+    ElMessage.error('名称不能为空');
+    return;
+  }
+  if (!item.type || item.type.trim() === '') {
+    ElMessage.error('检查类型不能为空');
+    return;
+  }
+  if (!item.department || item.department.trim() === '') {
+    ElMessage.error('执行科室不能为空');
+    return;
+  }
+  
   try {
     // 根据当前激活的菜单调用不同的API
     if (activeMenu.value === '检查方法') {
@@ -1212,9 +1240,24 @@ function handleAddNewRow() {
 function handleAdd(index) {
   const parentRow = tableData.value[index];
   
+  // 查找该父行的所有现有子行，确定下一个子行号
+  const parentRowPrefix = parentRow.row + '.';
+  let maxChildNum = 0;
+  
+  tableData.value.forEach((item, idx) => {
+    if (item.row.startsWith(parentRowPrefix) && idx > index) {
+      const childNum = parseInt(item.row.split('.').pop());
+      if (childNum > maxChildNum) {
+        maxChildNum = childNum;
+      }
+    }
+  });
+  
+  const nextChildNum = maxChildNum + 1;
+  
   // 创建子行数据，继承父行的编码
   const childRow = {
-    row: parentRow.row + '.1', // 子行编号
+    row: parentRow.row + '.' + nextChildNum, // 子行编号
     code: parentRow.code, // 继承父行编码
     name: '',
     type: '',

排查指南-字段查询问题.md

@@ -282,3 +282,13 @@ public Long saveEncounterByRegister(Encounter encounter) {
 **记住**：查询条件使用的字段，必须在数据插入/更新时被设置！
 
 
+
+
+
+
+
+
+
+
+
+