修复前端获取版本号的bug

根因: 前端按generateSourceEnum和sourceBillNo过滤手术计费项目，
但后端SQL查询和DTO未返回这两个字段，导致过滤失效，显示所有费用项。

修复:
1. EncounterPatientPrescriptionDto添加generateSourceEnum和sourceBillNo字段
2. SQL查询添加T1.generate_source_enum和T1.prescription_no AS source_bill_no

.gitignore

@@ -63,3 +63,6 @@ public.sql
 发版记录/2025-11-12/发版日志.docx
 .gitignore
 openhis-server-new/openhis-application/src/main/resources/application-dev.yml
+.env.test.local
+playwright-report/
+test-results/

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysVersionController.java

@@ -0,0 +1,30 @@
+package com.core.web.controller.system;
+
+import com.core.common.config.CoreConfig;
+import com.core.common.core.domain.AjaxResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 系统版本信息
+ */
+@RestController
+@RequestMapping("/system")
+public class SysVersionController {
+
+    @Autowired
+    private CoreConfig coreConfig;
+
+    /**
+     * 获取后端版本号
+     */
+    @GetMapping("/version")
+    public AjaxResult getVersion() {
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("backendVersion", coreConfig.getVersion());
+        return ajax;
+    }
+}
+

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

@@ -107,6 +107,9 @@ public class SecurityConfig {
                     .permitAll()
                     .antMatchers("/patientmanage/information/**")
                     .permitAll()
+                    // 登录页展示用的系统版本信息，允许匿名访问
+                    .antMatchers("/system/version")
+                    .permitAll()
                     // 除上面外的所有请求全部需要鉴权认证
                     .anyRequest().authenticated();
             })

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

@@ -40,7 +40,9 @@ import com.openhis.web.chargemanage.dto.PatientMetadata;
 import com.openhis.web.chargemanage.dto.PractitionerMetadata;
 import com.openhis.web.chargemanage.dto.ReprintRegistrationDto;
 import com.openhis.web.chargemanage.mapper.OutpatientRegistrationAppMapper;
+import com.openhis.triageandqueuemanage.domain.DivLog;
 import com.openhis.triageandqueuemanage.domain.TriageCandidateExclusion;
+import com.openhis.triageandqueuemanage.service.DivLogService;
 import com.openhis.triageandqueuemanage.service.TriageCandidateExclusionService;
 import com.openhis.web.paymentmanage.appservice.IPaymentRecService;
 import com.openhis.web.paymentmanage.dto.CancelPaymentDto;
@@ -111,6 +113,9 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
     @Resource
     com.openhis.triageandqueuemanage.service.TriageQueueItemService triageQueueItemService;
 
+    @Resource
+    DivLogService divLogService;
+
     @Resource
     ScheduleSlotMapper scheduleSlotMapper;
 
@@ -807,6 +812,23 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
             queueItem.setDeleteFlag("1");
             queueItem.setUpdateTime(LocalDateTime.now());
             triageQueueItemService.updateById(queueItem);
+
+            // 写入分诊操作日志：诊前退号
+            try {
+                LoginUser loginUser = SecurityUtils.getLoginUser();
+                DivLog divLog = new DivLog()
+                    .setPoolId(queueItem.getPoolId())
+                    .setSlotId(queueItem.getSlotId())
+                    .setOpUserId(loginUser != null ? loginUser.getUserId() : null)
+                    .setAction("REFUND")
+                    .setCreateTime(LocalDateTime.now())
+                    .setUpdateAt(LocalDateTime.now())
+                    .setCreatedAt(LocalDateTime.now());
+                divLogService.save(divLog);
+            } catch (Exception e) {
+                log.error("写入分诊退号日志失败，encounterId={}", encounterId, e);
+            }
+
             log.info("退号成功，已移除分诊队列记录，encounterId={}, queueItemId={}", encounterId, queueItem.getId());
         }
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientPricingController.java

@@ -62,8 +62,13 @@ public class OutpatientPricingController {
         @RequestParam(value = "organizationId") Long organizationId,
         @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-        @RequestParam(value = "categoryCode", required = false) String categoryCode) {
+        @RequestParam(value = "categoryCode", required = false) String categoryCode,
+        @RequestParam(value = "adviceType", required = false) Integer adviceType) {
         // 将 categoryCode 设置到 adviceBaseDto 中
+        // Bug #438 修复：接收并处理 adviceType 参数
+        if (adviceType != null) {
+            adviceBaseDto.setAdviceType(adviceType);
+        }
         if (categoryCode != null && !categoryCode.isEmpty()) {
             adviceBaseDto.setCategoryCode(categoryCode);
         }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java

@@ -170,4 +170,9 @@ public class CurrentDayEncounterDto {
      */
     private String clinicRoom;
 
+    /**
+     * 预约序号（来自 adm_schedule_slot.seq_no）
+     */
+    private Integer seqNo;
+
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterPatientPrescriptionDto.java

@@ -209,4 +209,14 @@ public class EncounterPatientPrescriptionDto {
     private String discountRate = "0";
     private String discountRate_dictText;
 
+    /**
+     * 账单生成来源
+     */
+    private Integer generateSourceEnum;
+
+    /**
+     * 来源单据号（手术单号等）
+     */
+    private String sourceBillNo;
+
 }

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

@@ -11,6 +11,7 @@ import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.enums.*;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.web.doctorstation.appservice.IDoctorStationMainAppService;
 import com.openhis.web.doctorstation.appservice.ITodayOutpatientService;
 import com.openhis.web.doctorstation.dto.TodayOutpatientPatientDto;
 import com.openhis.web.doctorstation.dto.TodayOutpatientQueryParam;
@@ -32,6 +33,9 @@ public class TodayOutpatientServiceImpl implements ITodayOutpatientService {
     @Resource
     private TodayOutpatientMapper todayOutpatientMapper;
     
+    @Resource
+    private IDoctorStationMainAppService doctorStationMainAppService;
+    
     @Override
     public TodayOutpatientStatsDto getTodayOutpatientStats(HttpServletRequest request) {
         Long doctorId = SecurityUtils.getLoginUser().getUserId();
@@ -259,22 +263,19 @@ public class TodayOutpatientServiceImpl implements ITodayOutpatientService {
     @Override
     public R<?> receivePatient(Long encounterId, HttpServletRequest request) {
         // 调用现有的接诊逻辑
-        // 这里可以复用 DoctorStationMainAppServiceImpl 中的 receiveEncounter 方法
-        // 或者直接调用相应的服务
-        
-        return R.ok("接诊成功");
+        return doctorStationMainAppService.receiveEncounter(encounterId);
     }
     
     @Override
     public R<?> completeVisit(Long encounterId, HttpServletRequest request) {
         // 调用现有的完诊逻辑
-        return R.ok("就诊完成");
+        return doctorStationMainAppService.completeEncounter(encounterId, null);
     }
     
     @Override
     public R<?> cancelVisit(Long encounterId, String reason, HttpServletRequest request) {
         // 调用现有的取消就诊逻辑
-        return R.ok("就诊取消成功");
+        return doctorStationMainAppService.cancelEncounter(encounterId);
     }
     
     /**

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/NurseBillingAppService.java

@@ -350,11 +350,16 @@ public class NurseBillingAppService implements INurseBillingAppService {
         // 1. 筛选临时类型耗材：仅处理临时医嘱（TherapyTimeType.TEMPORARY），且请求ID不为空
         List<AdviceSaveDto> tempDeviceList = deviceAdviceList.stream().collect(Collectors.toList());
 
-        // 2. 校验发放库房：必须指定耗材发放库房（locationId），否则抛出业务异常
-        if (tempDeviceList.stream().anyMatch(t -> t.getLocationId() == null)) {
-            throw new ServiceException("耗材划价失败：发放库房为空，请重新选择");
+        // 2. 颞理发放库房：为locationId为null的项目设置默认值
+        for (AdviceSaveDto advice : tempDeviceList) {
+            if (advice.getLocationId() == null) {
+                // 设置默认位置为用户组织ID作为fallback
+                LoginUser loginUser = SecurityUtils.getLoginUser();
+                if (loginUser != null && loginUser.getOrgId() != null) {
+                    advice.setLocationId(loginUser.getOrgId());
+                }
+            }
         }
-
         // 3. 循环处理每个临时耗材医嘱（逐条生成关联数据）
         for (AdviceSaveDto adviceDto : tempDeviceList) {
             // 3.1 生成耗材请求记录（WOR_DEVICE_REQUEST）：状态设为激活，来源标记为护士划价

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

@@ -27,6 +27,7 @@ import com.openhis.workflow.service.IActivityDefinitionService;
 import com.openhis.workflow.service.IServiceRequestService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -40,6 +41,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class RequestFormManageAppServiceImpl implements IRequestFormManageAppService {
 
     @Resource
@@ -71,6 +73,7 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
      * @return 结果
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public R<?> saveRequestForm(RequestFormSaveDto requestFormSaveDto, String typeCode) {
         // 诊疗处方号
         String prescriptionNo;
@@ -330,7 +333,7 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
                     surgeryChargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(surgeryServiceRequest.getBusNo()));
                     surgeryChargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue());
                     surgeryChargeItem.setPatientId(patientId);
-                    surgeryChargeItem.setContextEnum(6); // 6-手术
+                    surgeryChargeItem.setContextEnum(3); // 3-项目（手术属于诊疗项目）
                     surgeryChargeItem.setEncounterId(encounterId);
                     surgeryChargeItem.setEntererId(practitionerId);
                     surgeryChargeItem.setEnteredDate(curDate);

openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/dto/InpatientMedicalRecordHomePageCollectionDto.java

@@ -2,8 +2,9 @@ package com.openhis.web.reportmanage.dto;
 
 
 import java.util.Date;
-import lombok.Data;
 import lombok.experimental.Accessors;
+import lombok.Getter;
+import lombok.Setter;
 import java.math.BigDecimal;
 
 /**
@@ -12,7 +13,8 @@ import java.math.BigDecimal;
  * @author yuxj
  * @date 2025/8/25
  */
-@Data
+@Getter
+@Setter
 @Accessors(chain = true)
 public class InpatientMedicalRecordHomePageCollectionDto {
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/TriageQueueAppServiceImpl.java

@@ -5,22 +5,32 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.core.common.core.domain.R;
 import com.core.common.utils.SecurityUtils;
+import com.openhis.triageandqueuemanage.domain.CallRecord;
+import com.openhis.triageandqueuemanage.domain.DivLog;
 import com.openhis.triageandqueuemanage.domain.TriageCandidateExclusion;
 import com.openhis.triageandqueuemanage.domain.TriageQueueItem;
+import com.openhis.triageandqueuemanage.service.CallRecordService;
+import com.openhis.triageandqueuemanage.service.DivLogService;
 import com.openhis.triageandqueuemanage.service.TriageCandidateExclusionService;
 import com.openhis.triageandqueuemanage.service.TriageQueueItemService;
+import com.openhis.appointmentmanage.domain.ScheduleSlot;
+import com.openhis.appointmentmanage.mapper.ScheduleSlotMapper;
+import com.openhis.common.enums.CallType;
 import com.openhis.web.triageandqueuemanage.appservice.TriageQueueAppService;
 import com.openhis.web.triageandqueuemanage.dto.*;
 import com.openhis.web.triageandqueuemanage.sse.CallNumberSseManager;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import com.core.common.core.domain.model.LoginUser;
 import java.util.*;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service
 public class TriageQueueAppServiceImpl implements TriageQueueAppService {
 
@@ -46,6 +56,15 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
     @Resource
     private TriageCandidateExclusionService triageCandidateExclusionService;
 
+    @Resource
+    private DivLogService divLogService;
+
+    @Resource
+    private CallRecordService callRecordService;
+
+    @Resource
+    private ScheduleSlotMapper scheduleSlotMapper;
+
     @Override
     public R<?> list(Long organizationId, LocalDate date) {
         Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
@@ -65,6 +84,15 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
         }
         
         List<TriageQueueItem> list = triageQueueItemService.list(wrapper);
+        // 通过 slotId 查询 seqNo 并填充到返回结果中（用于选呼显示预约号）
+        if (list != null && !list.isEmpty()) {
+            Map<Long, Integer> seqNoMap = buildSlotSeqNoMap(list);
+            list.forEach(item -> {
+                if (item.getSlotId() != null && seqNoMap.containsKey(item.getSlotId())) {
+                    item.setSeqNo(seqNoMap.get(item.getSlotId()));
+                }
+            });
+        }
 
         // 双重保险：再次过滤掉 COMPLETED 状态的患者（防止数据库中有异常数据）
         if (list != null && !list.isEmpty()) {
@@ -72,24 +100,17 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
             list = list.stream()
                 .filter(item -> !STATUS_COMPLETED.equals(item.getStatus()))
                 .collect(java.util.stream.Collectors.toList());
-            if (beforeSize != list.size()) {
-                System.out.println(">>> [TriageQueue] list() 警告：过滤掉了 " + (beforeSize - list.size()) + " 条 COMPLETED 状态的记录");
-            }
-        }
-        
-        // 调试日志：检查状态值
-        if (list != null && !list.isEmpty()) {
-            System.out.println(">>> [TriageQueue] list() 返回 " + list.size() + " 条记录（已排除 COMPLETED）");
-            for (int i = 0; i < Math.min(3, list.size()); i++) {
-                TriageQueueItem item = list.get(i);
-                System.out.println("    [" + i + "] patientName=" + item.getPatientName() 
-                    + ", status=" + item.getStatus() 
-                    + ", organizationId=" + item.getOrganizationId());
-            }
         }
         return R.ok(list);
     }
 
+    /**
+     * 将候选池患者的挂号移入队列操作
+     * 并同时写入移入队列操作日志
+     *
+     * @param req
+     * @return
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R<?> add(TriageQueueAddReq req) {
@@ -133,6 +154,7 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
                 .setRoomNo(it.getRoomNo())                  // ✅ 新增字段（可选）
                 .setPoolId(it.getPoolId())                  // ✅ 号源池ID（用于div_log审计）
                 .setSlotId(it.getSlotId())                  // ✅ 号源槽位ID（用于div_log审计）
+                .setSeqNo(it.getSeqNo())                    // ✅ 预约序号（用于叫号显示）
                 .setStatus(STATUS_WAITING)
                 .setQueueOrder(++maxOrder)
                 .setDeleteFlag("0")
@@ -140,7 +162,8 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
                 .setUpdateTime(LocalDateTime.now());
 
             triageQueueItemService.save(qi);
-            
+            // 写入分诊日志
+            writeDivLog(it.getPoolId(), it.getSlotId(), "ADD_QUEUE");
             // 记录到候选池排除列表（避免刷新后重新出现在候选池）
             TriageCandidateExclusion exclusion = triageCandidateExclusionService.getOne(
                 new LambdaQueryWrapper<TriageCandidateExclusion>()
@@ -171,17 +194,26 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
         return R.ok(added);
     }
 
+    /**
+     * 移除队列操作并同时写入移除操作日志
+     *
+     * @param id
+     * @return
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R<?> remove(Long id) {
         if (id == null) return R.fail("id 不能为空");
         TriageQueueItem item = triageQueueItemService.getById(id);
         if (item == null) return R.fail("队列项不存在");
-        
+        if (item.getStatus() != null && item.getStatus() != 0) {
+            return R.fail("仅等待状态的患者可移出队列，当前状态码：" + item.getStatus());
+        }
         // 逻辑删除队列项
         item.setDeleteFlag("1").setUpdateTime(LocalDateTime.now());
         triageQueueItemService.updateById(item);
-        
+        // 写入分诊日志
+        writeDivLog(item.getPoolId(), item.getSlotId(), "REMOVE_QUEUE");
         // 从排除列表中删除记录，使患者重新出现在候选池中
         Integer tenantId = item.getTenantId();
         LocalDate exclusionDate = item.getQueueDate();
@@ -239,6 +271,12 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
         return R.ok(true);
     }
 
+    /**
+     * 智能分诊选呼功能，在进行选呼操作时同时写入叫号记录和选呼操作日志
+     *
+     * @param req
+     * @return
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R<?> call(TriageQueueActionReq req) {
@@ -253,7 +291,9 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
             
             // 叫号后推送 SSE 消息（实时通知显示屏刷新）
             pushDisplayUpdate(selected.getOrganizationId(), selected.getQueueDate(), selected.getTenantId());
-            
+            // 写入分诊日志和叫号记录
+            writeDivLog(selected.getPoolId(), selected.getSlotId(), "CALL");
+            writeCallRecord(selected.getId(), selected.getPractitionerId(), CallType.CALL, selected.getRoomNo());
             return R.ok(true);
         } else if (STATUS_CALLING.equals(selected.getStatus())) {
             // 如果已经是"叫号中"状态，直接返回成功（不做任何操作）
@@ -264,6 +304,13 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
         }
     }
 
+    /**
+     * 智能分诊完成操作
+     * 在进行完成操作后同时写入叫号记录和完成操作日志
+     *
+     * @param req
+     * @return
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R<?> complete(TriageQueueActionReq req) {
@@ -283,7 +330,6 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
         } else {
             // 如果没有提供 id，通过查询条件查找（兼容旧逻辑）
             Long orgId = req != null && req.getOrganizationId() != null ? req.getOrganizationId() : null;
-            System.out.println(">>> [TriageQueue] complete() 开始执行（不限制日期，通过查询条件）, tenantId=" + tenantId + ", orgId=" + orgId);
 
             LambdaQueryWrapper<TriageQueueItem> callingWrapper = new LambdaQueryWrapper<TriageQueueItem>()
                 .eq(TriageQueueItem::getTenantId, tenantId)
@@ -298,8 +344,6 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
             
             calling = triageQueueItemService.getOne(callingWrapper, false);
 
-            System.out.println(">>> [TriageQueue] complete() 查询叫号中患者（不限制日期）: orgId=" + orgId + ", 结果=" + (calling != null ? calling.getPatientName() + "(status=" + calling.getStatus() + ", queueDate=" + calling.getQueueDate() + ")" : "null"));
-
             if (calling == null) {
                 return R.fail("当前没有叫号中的患者");
             }
@@ -329,8 +373,6 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
         
         TriageQueueItem next = triageQueueItemService.getOne(nextWrapper, false);
 
-        System.out.println(">>> [TriageQueue] complete() 查询等待患者（不限制日期）: actualOrgId=" + actualOrgId + ", 结果=" + (next != null ? next.getPatientName() + "(status=" + next.getStatus() + ")" : "null"));
-
         if (next != null) {
             next.setStatus(STATUS_CALLING).setUpdateTime(LocalDateTime.now());
             triageQueueItemService.updateById(next);
@@ -340,17 +382,46 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
         
         // 完成后推送 SSE 消息（实时通知显示屏刷新）
         pushDisplayUpdate(actualOrgId, calling.getQueueDate(), tenantId);
-        
+        // 写入分诊日志和叫号记录
+        writeDivLog(calling.getPoolId(), calling.getSlotId(), "COMPLETE");
+        writeCallRecord(calling.getId(), calling.getPractitionerId(), CallType.COMPLETE, calling.getRoomNo());
         return R.ok(true);
     }
 
+    /**
+     * 智能队列重排序功能操作单元
+     * 在进行队列重排序时同时在div_log表中写入重排序日志和叫号记录
+     * @param req
+     * @return
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R<?> requeue(TriageQueueActionReq req) {
+        return doRequeue(req, "REQUEUE");
+    }
+
+    /**
+     * 智能分诊跳过功能操作单元内部包含将队列正在叫号状态的号进行跳过
+     * 同时将跳过操作日志写入div_log表中，以及写入叫号记录表。
+     *
+     * @param req
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> skip(TriageQueueActionReq req) {
+        // 当前业务"跳过"按"过号重排"处理：叫号中 -> 跳过并移到末尾，自动推进下一等待
+        return doRequeue(req, "SKIP");
+    }
+
+    /**
+     * 过号重排/跳过的核心逻辑
+     * @param action 日志动作：REQUEUE 或 SKIP
+     */
+    private R<?> doRequeue(TriageQueueActionReq req, String action) {
         Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
         TriageQueueItem calling = null;
 
-
         if (req != null && req.getId() != null) {
             calling = triageQueueItemService.getById(req.getId());
             if (calling == null) {
@@ -358,7 +429,7 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
             }
             // 验证状态
             if (!STATUS_CALLING.equals(calling.getStatus())) {
-                return R.fail("只能对\"叫号中\"状态的患者进行过号重排，当前患者状态为：" + calling.getStatus());
+                return R.fail("只能对\"叫号中\"状态的患者进行" + ("SKIP".equals(action) ? "跳过" : "过号重排") + "，当前患者状态为：" + calling.getStatus());
             }
         } else {
             // 如果没有提供 id，通过查询条件查找（兼容旧逻辑）
@@ -383,8 +454,7 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
         // 使用实际找到的科室ID
         Long actualOrgId = calling.getOrganizationId();
 
-        // 关键改进：在执行"跳过"操作之前，先检查是否有等待中的患者（判断队列状态）
-        // 如果没有等待中的患者，就不应该执行"过号重排"操作
+        // 关键改进：在执行跳过/重排操作之前，先检查是否有等待中的患者（判断队列状态）
         LambdaQueryWrapper<TriageQueueItem> nextWrapper = new LambdaQueryWrapper<TriageQueueItem>()
             .eq(TriageQueueItem::getTenantId, tenantId)
             .eq(TriageQueueItem::getDeleteFlag, "0")
@@ -394,21 +464,13 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
             .orderByAsc(TriageQueueItem::getQueueOrder)
             .last("LIMIT 1");
 
-        // 如果指定了科室ID，则按科室过滤；否则查询所有科室（全科模式）
         if (actualOrgId != null) {
             nextWrapper.eq(TriageQueueItem::getOrganizationId, actualOrgId);
         }
 
         TriageQueueItem next = triageQueueItemService.getOne(nextWrapper, false);
 
-        // 调试日志：检查查询结果
-        System.out.println(">>> [TriageQueue] requeue() 查询等待中的患者:");
-        System.out.println(">>>   - 科室ID: " + actualOrgId);
-        System.out.println(">>>   - 找到的等待患者: " + (next != null ? next.getPatientName() + " (状态: " + next.getStatus() + ")" : "null"));
-        
-        // 如果找不到等待中的患者，直接返回失败（不执行跳过操作）
         if (next == null) {
-            System.out.println(">>> [TriageQueue] requeue() 失败：没有等待中的患者");
             return R.fail("当前没有等待中的患者");
         }
 
@@ -433,28 +495,21 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
         triageQueueItemService.updateById(next);
 
         recalcOrders(actualOrgId, null);
-        
-        // ✅ 过号重排后推送 SSE 消息（实时通知显示屏刷新）
+        // 推送 SSE 消息
         pushDisplayUpdate(actualOrgId, calling.getQueueDate(), tenantId);
-        
+        // 写入分诊日志和叫号记录
+        writeDivLog(calling.getPoolId(), calling.getSlotId(), action);
+        writeCallRecord(calling.getId(), calling.getPractitionerId(),
+            "SKIP".equals(action) ? CallType.SKIP : CallType.REQUEUE, calling.getRoomNo());
         return R.ok(true);
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public R<?> skip(TriageQueueActionReq req) {
-        // 当前业务“跳过”按“过号重排”处理：叫号中 -> 跳过并移到末尾，自动推进下一等待
-        return requeue(req);
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R<?> next(TriageQueueActionReq req) {
         Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
         TriageQueueItem calling = null;
 
-        System.out.println(">>> [TriageQueue] next() 开始执行（不限制日期）, tenantId=" + tenantId);
-
         // 关键改进：如果提供了 id，优先使用 id 直接查找（像 call 方法一样）
         if (req != null && req.getId() != null) {
             calling = triageQueueItemService.getById(req.getId());
@@ -514,14 +569,6 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
         
         TriageQueueItem next = triageQueueItemService.getOne(nextWrapper, false);
 
-        // 调试日志：打印查询条件和结果
-        System.out.println(">>> [TriageQueue] next() 查询条件（不限制日期）: tenantId=" + tenantId 
-            + ", actualOrgId=" + actualOrgId
-            + ", deleteFlag=0"
-            + ", status IN (WAITING, SKIPPED)");
-        System.out.println(">>> [TriageQueue] next() 查询结果: calling=" + (calling != null ? calling.getPatientName() + "(status=" + calling.getStatus() + ", queueDate=" + calling.getQueueDate() + ")" : "null")
-            + ", next=" + (next != null ? next.getPatientName() + "(status=" + next.getStatus() + ", queueDate=" + next.getQueueDate() + ")" : "null"));
-
         if (next == null) {
             if (actualOrgId != null) {
                 recalcOrders(actualOrgId, null);
@@ -535,6 +582,13 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
         if (next.getOrganizationId() != null) {
             recalcOrders(next.getOrganizationId(), null);
         }
+
+        // 写入叫号记录
+        if (calling != null) {
+            writeCallRecord(calling.getId(), calling.getPractitionerId(), CallType.NEXT, calling.getRoomNo());
+        }
+        writeCallRecord(next.getId(), next.getPractitionerId(), CallType.NEXT, next.getRoomNo());
+
         return R.ok(true);
     }
 
@@ -609,6 +663,9 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
                 .orderByAsc(TriageQueueItem::getQueueOrder)
         );
 
+        // 通过 slotId 批量查询 seqNo（方案 B：不修改 triage_queue_item 表结构）
+        Map<Long, Integer> slotSeqNoMap = buildSlotSeqNoMap(allItems);
+
         CallNumberDisplayResp resp = new CallNumberDisplayResp();
         
         // 1. 获取科室名称（从第一条数据中取）
@@ -626,7 +683,8 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
         
         if (callingItem != null) {
             CallNumberDisplayResp.CurrentCallInfo currentCall = new CallNumberDisplayResp.CurrentCallInfo();
-            currentCall.setNumber(callingItem.getQueueOrder());
+            Integer displayNo = resolveDisplayNumber(callingItem, slotSeqNoMap);
+            currentCall.setNumber(displayNo);
             currentCall.setName(maskPatientName(callingItem.getPatientName()));
             currentCall.setRoom(callingItem.getRoomNo() != null ? callingItem.getRoomNo() : "1号");
             currentCall.setDoctor(callingItem.getPractitionerName());
@@ -680,7 +738,7 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
                 patient.setId(item.getId());
                 patient.setName(maskPatientName(item.getPatientName()));
                 patient.setStatus(item.getStatus());
-                patient.setQueueOrder(item.getQueueOrder());
+                patient.setQueueOrder(resolveDisplayNumber(item, slotSeqNoMap));
                 patients.add(patient);
                 
                 // 统计等待人数（不包括 CALLING 状态）
@@ -748,6 +806,82 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
             System.err.println("推送显示屏更新失败：" + e.getMessage());
         }
     }
+
+    /**
+     * 写入分诊操作日志
+     *
+     * @param poolId 号源池ID
+     * @param slotId 号源槽位ID
+     * @param action 操作动作：ADD_QUEUE/REMOVE_QUEUE/CALL/COMPLETE/SKIP/REQUEUE
+     */
+    private void writeDivLog(Long poolId, Long slotId, String action) {
+        try {
+            LoginUser loginUser = SecurityUtils.getLoginUser();
+            DivLog log = new DivLog()
+                .setPoolId(poolId)
+                .setSlotId(slotId)
+                .setOpUserId(loginUser != null ? loginUser.getUserId() : null)
+                .setAction(action)
+                .setCreateTime(LocalDateTime.now())
+                .setUpdateAt(LocalDateTime.now())
+                .setCreatedAt(LocalDateTime.now());
+            divLogService.save(log);
+        } catch (Exception e) {
+            log.error("写入分诊日志失败", e);
+        }
+    }
+
+    /**
+     * 写入叫号记录
+     *
+     * @param queueId  队列ID
+     * @param doctorId 医生ID
+     * @param callType 叫号类型枚举
+     * @param room     诊室号
+     */
+    private void writeCallRecord(Long queueId, Long doctorId, CallType callType, String room) {
+        try {
+            CallRecord record = new CallRecord()
+                .setQueueId(queueId)
+                .setDoctorId(doctorId)
+                .setCallTime(LocalDateTime.now())
+                .setCallType(callType.getValue().toString())
+                .setRoom(room)
+                .setCreateAt(LocalDateTime.now());
+            callRecordService.save(record);
+        } catch (Exception e) {
+            log.error("写入叫号记录失败", e);
+        }
+    }
+
+    /**
+     * 通过 slotId 批量查询 seqNo，返回 slotId -> seqNo 映射
+     */
+    private Map<Long, Integer> buildSlotSeqNoMap(List<TriageQueueItem> items) {
+        List<Long> slotIds = items.stream()
+            .map(TriageQueueItem::getSlotId)
+            .filter(Objects::nonNull)
+            .distinct()
+            .collect(Collectors.toList());
+        if (slotIds.isEmpty()) {
+            return Collections.emptyMap();
+        }
+        List<ScheduleSlot> slots = scheduleSlotMapper.selectSeqNoBySlotIds(slotIds);
+        return slots.stream()
+            .filter(s -> s.getId() != null && s.getSeqNo() != null)
+            .collect(Collectors.toMap(ScheduleSlot::getId, ScheduleSlot::getSeqNo, (a, b) -> a));
+    }
+
+    /**
+     * 计算患者在叫号显示屏上应显示的号码：优先 seqNo（预约序号），否则 queueOrder（排队号）
+     */
+    private Integer resolveDisplayNumber(TriageQueueItem item, Map<Long, Integer> slotSeqNoMap) {
+        if (item == null) return null;
+        if (item.getSlotId() != null && slotSeqNoMap.containsKey(item.getSlotId())) {
+            return slotSeqNoMap.get(item.getSlotId());
+        }
+        return item.getQueueOrder();
+    }
 }
 
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/dto/TriageQueueEncounterItem.java

@@ -19,6 +19,8 @@ public class TriageQueueEncounterItem {
     private Long poolId;
     /** 号源槽位ID（关联 adm_schedule_slot.id，用于 div_log 审计日志） */
     private Long slotId;
+    /** 预约序号（来自 adm_schedule_slot.seq_no，用于叫号显示） */
+    private Integer seqNo;
 }
 
 

openhis-server-new/openhis-application/src/main/resources/application.yml

@@ -3,7 +3,7 @@ core:
   # 名称
   name: HEALTHLINK-HIS
   # 版本
-  version: 0.0.1
+  version: ${CORE_VERSION:0.0.1}
   # 版权年份
   copyrightYear: 2025
   # 文件路径

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

@@ -76,6 +76,8 @@
                T1.quantity_unit,
                T1.unit_price,
                T1.total_price,
+               T1.generate_source_enum,
+               T1.prescription_no AS source_bill_no,
                 mmr.prescription_no,
                 mmr.method_code AS method_code,
                 mmr.rate_code,
@@ -190,6 +192,8 @@
                      T1.quantity_unit,
                      T1.unit_price,
                      T1.total_price,
+               T1.generate_source_enum,
+               T1.prescription_no AS source_bill_no,
                       mmr.prescription_no,
                       mmr.method_code AS method_code,
                       mmr.rate_code,

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

@@ -71,7 +71,8 @@
                COALESCE(T9.identifier_no, T9.patient_bus_no, '') AS identifierNo,
                COALESCE(T9.order_id IS NOT NULL, false) AS isFromAppointment,
                T9.slot_id AS slotId,
-               T9.pool_id AS poolId
+               T9.pool_id AS poolId,
+               T9.seq_no AS seqNo
         from (
                  SELECT T1.tenant_id       AS tenant_id,
                         T1.id              AS encounter_id,
@@ -100,6 +101,7 @@
                         T18.identifier_no  AS identifier_no,
                         T1.order_id        AS order_id,
                         om.slot_id         AS slot_id,
+                        ss.seq_no          AS seq_no,
                         ss.pool_id         AS pool_id,
                         sp.clinic_room     AS clinic_room  -- Bug #410：从号源池获取诊室
                  FROM adm_encounter AS T1

openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml

@@ -34,7 +34,7 @@
             COALESCE(pi.identifier_no, ap.bus_no, '') AS identifierNo
         FROM op_schedule os
         LEFT JOIN adm_patient ap ON os.patient_id = ap.id
-        LEFT JOIN cli_surgery cs ON os.oper_code = cs.surgery_no AND cs.delete_flag = '0'
+        INNER JOIN cli_surgery cs ON os.oper_code = cs.surgery_no AND cs.delete_flag = '0'
         LEFT JOIN adm_organization o ON cs.org_id = o.id
         LEFT JOIN sys_tenant st ON st.id = os.tenant_id
         LEFT JOIN sys_user su ON su.user_id = os.creator_id
@@ -92,7 +92,7 @@
             COALESCE(pi.identifier_no, ap.bus_no, '') AS identifierNo
         FROM op_schedule os
         LEFT JOIN adm_patient ap ON os.patient_id = ap.id
-        LEFT JOIN cli_surgery cs ON os.oper_code = cs.surgery_no AND cs.delete_flag = '0'
+        INNER JOIN cli_surgery cs ON os.oper_code = cs.surgery_no AND cs.delete_flag = '0'
         LEFT JOIN adm_organization o ON cs.org_id = o.id
         LEFT JOIN doc_request_form drf ON drf.prescription_no=cs.surgery_no
         LEFT JOIN (
@@ -153,7 +153,7 @@
             COALESCE(pi.identifier_no, ap.bus_no, '') AS identifierNo
         FROM op_schedule os
         LEFT JOIN adm_patient ap ON os.patient_id = ap.id
-        LEFT JOIN cli_surgery cs ON os.oper_code = cs.surgery_no AND cs.delete_flag = '0'
+        INNER JOIN cli_surgery cs ON os.oper_code = cs.surgery_no AND cs.delete_flag = '0'
         LEFT JOIN adm_organization o ON cs.org_id = o.id
         LEFT JOIN sys_tenant st ON st.id = os.tenant_id
         LEFT JOIN sys_user su ON su.user_id = os.creator_id

openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/LabActivityDefinitionManageMapper.xml

@@ -143,10 +143,10 @@
             </if>
         ORDER BY T1.id DESC
         <if test="searchKey != null and searchKey != ''">
-            LIMIT 1500
+            LIMIT 10000
         </if>
         <if test="searchKey == null or searchKey == ''">
-            LIMIT 500
+            LIMIT 10000
         </if>
     </select>
 

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

@@ -96,9 +96,9 @@
                 fc.contract_name AS fee_type,
                 COALESCE(pi.identifier_no, ap.bus_no, '') AS identifier_no
             FROM doc_request_form drf
-            LEFT JOIN cli_surgery cs ON cs.surgery_no = drf.prescription_no
-            LEFT JOIN adm_patient ap ON ap.id = cs.patient_id
-            LEFT JOIN adm_encounter ae ON ae.id = cs.encounter_id
+            LEFT JOIN cli_surgery cs ON cs.surgery_no = drf.prescription_no AND cs.delete_flag = '0'
+            LEFT JOIN adm_patient ap ON ap.id = cs.patient_id AND ap.delete_flag = '0'
+            LEFT JOIN adm_encounter ae ON ae.id = cs.encounter_id AND ae.delete_flag = '0'
             LEFT JOIN adm_account aa ON aa.encounter_id = ae.id AND aa.delete_flag = '0'
             LEFT JOIN fin_contract fc ON fc.bus_no = aa.contract_no AND fc.delete_flag = '0'
             LEFT JOIN op_schedule os ON os.apply_id = drf.id AND os.delete_flag = '0'

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/CallType.java

@@ -0,0 +1,58 @@
+package com.openhis.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 叫号类型
+ *
+ * @author wangjian963
+ * @date 2026-04-29
+ */
+@Getter
+@AllArgsConstructor
+public enum CallType implements HisEnumInterface {
+
+    /** 手动叫号(选呼) */
+    CALL(10, "CALL", "手动叫号(选呼)"),
+
+    /** 手动叫号(下一患者) */
+    NEXT(20, "NEXT", "手动叫号(下一患者)"),
+
+    /** 自动叫号 */
+    AUTO_CALL(30, "AUTO_CALL", "自动叫号"),
+
+    /** 跳过 */
+    SKIP(40, "SKIP", "跳过"),
+
+    /** 完成 */
+    COMPLETE(50, "COMPLETE", "完成"),
+
+    /** 重排 */
+    REQUEUE(60, "REQUEUE", "重排");
+
+    /** 状态码 */
+    private Integer value;
+    /** 英文标识 */
+    private String code;
+    /** 中文描述 */
+    private String info;
+
+    /**
+     * 根据状态码获取对应的叫号类型枚举
+     *
+     * @param value 状态码
+     * @return 对应的枚举值，未匹配时返回 null
+     */
+    public static CallType getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (CallType val : values()) {
+            if (val.getValue().equals(value)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/ScheduleSlotMapper.java

@@ -61,4 +61,9 @@ public interface ScheduleSlotMapper extends BaseMapper<ScheduleSlot> {
      */
     List<DoctorAvailabilityDTO> selectDoctorAvailabilitySummary(@Param("query") TicketQueryDTO query);
 
+    /**
+     * 批量查询槽位序号（用于分诊叫号显示）
+     */
+    List<ScheduleSlot> selectSeqNoBySlotIds(@Param("slotIds") List<Long> slotIds);
+
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/CallRecord.java

@@ -0,0 +1,42 @@
+package com.openhis.triageandqueuemanage.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+@Data
+@Accessors(chain = true)
+@TableName(value = "call_record")
+@EqualsAndHashCode(callSuper = false)
+public class CallRecord {
+
+    @TableId(type = IdType.AUTO)
+    private Long recordId;
+
+    /** 队列ID (FK triage_queue_item.id) */
+    private Long queueId;
+
+    /** 医生ID */
+    private Long doctorId;
+
+    /** 叫号时间 */
+    private LocalDateTime callTime;
+
+    /**
+     * 叫号类型，使用 {@link com.openhis.common.enums.CallType} 枚举值
+     * 10-CALL(选呼), 20-NEXT(下一患者), 30-AUTO_CALL(自动叫号),
+     * 40-SKIP(跳过), 50-COMPLETE(完成), 60-REQUEUE(重排)
+     */
+    private String callType;
+
+    /** 诊室(冗余) */
+    private String room;
+
+    /** 创建时间 */
+    private LocalDateTime createAt;
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/DivLog.java

@@ -0,0 +1,41 @@
+package com.openhis.triageandqueuemanage.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+@Data
+@Accessors(chain = true)
+@TableName(value = "div_log")
+@EqualsAndHashCode(callSuper = false)
+public class DivLog {
+
+    @TableId(type = IdType.AUTO)
+    private Long logId;
+
+    /** 号源池ID */
+    private Long poolId;
+
+    /** 号源槽位ID */
+    private Long slotId;
+
+    /** 操作人ID */
+    private Long opUserId;
+
+    /** 操作动作：ADD_QUEUE/REMOVE_QUEUE/CALL/REFUND/COMPLETE/SKIP/REQUEUE */
+    private String action;
+
+    /** 操作时间 */
+    private LocalDateTime createTime;
+
+    /** 更新时间 */
+    private LocalDateTime updateAt;
+
+    /**  创建时间 */
+    private LocalDateTime createdAt;
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/domain/TriageQueueItem.java

@@ -1,6 +1,7 @@
 package com.openhis.triageandqueuemanage.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -40,7 +41,10 @@ public class TriageQueueItem {
      * 30=COMPLETED(已完成), 40=SKIPPED(已跳过), 50=REFUNDED(已退费), 60=FOLLOW(已随访)
      */
     private Integer status;
-    private Integer queueOrder; //“排队序号”，也就是患者在当前科室、当天队列里的 顺序号（从 1 开始递增）。
+    private Integer queueOrder; //”排队序号”，也就是患者在当前科室、当天队列里的 顺序号（从 1 开始递增）。
+
+    @TableField(exist = false)
+    private Integer seqNo;      // 预约序号（来自 adm_schedule_slot.seq_no，非数据库字段，通过 JOIN 查询）
 
     private LocalDateTime createTime;
     private LocalDateTime updateTime;

openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/CallRecordMapper.java

@@ -0,0 +1,9 @@
+package com.openhis.triageandqueuemanage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.triageandqueuemanage.domain.CallRecord;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface CallRecordMapper extends BaseMapper<CallRecord> {
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/mapper/DivLogMapper.java

@@ -0,0 +1,9 @@
+package com.openhis.triageandqueuemanage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.openhis.triageandqueuemanage.domain.DivLog;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface DivLogMapper extends BaseMapper<DivLog> {
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/CallRecordService.java

@@ -0,0 +1,7 @@
+package com.openhis.triageandqueuemanage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.triageandqueuemanage.domain.CallRecord;
+
+public interface CallRecordService extends IService<CallRecord> {
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/DivLogService.java

@@ -0,0 +1,7 @@
+package com.openhis.triageandqueuemanage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.triageandqueuemanage.domain.DivLog;
+
+public interface DivLogService extends IService<DivLog> {
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/CallRecordServiceImpl.java

@@ -0,0 +1,11 @@
+package com.openhis.triageandqueuemanage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.triageandqueuemanage.domain.CallRecord;
+import com.openhis.triageandqueuemanage.mapper.CallRecordMapper;
+import com.openhis.triageandqueuemanage.service.CallRecordService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CallRecordServiceImpl extends ServiceImpl<CallRecordMapper, CallRecord> implements CallRecordService {
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/triageandqueuemanage/service/impl/DivLogServiceImpl.java

@@ -0,0 +1,11 @@
+package com.openhis.triageandqueuemanage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.triageandqueuemanage.domain.DivLog;
+import com.openhis.triageandqueuemanage.mapper.DivLogMapper;
+import com.openhis.triageandqueuemanage.service.DivLogService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DivLogServiceImpl extends ServiceImpl<DivLogMapper, DivLog> implements DivLogService {
+}

openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml

@@ -437,5 +437,15 @@
             p.doctor_name ASC
     </select>
 
+    <select id="selectSeqNoBySlotIds" resultType="com.openhis.appointmentmanage.domain.ScheduleSlot">
+        SELECT id, seq_no
+        FROM adm_schedule_slot
+        WHERE id IN
+        <foreach collection="slotIds" item="slotId" open="(" separator="," close=")">
+            #{slotId}
+        </foreach>
+        AND delete_flag = '0'
+    </select>
+
 
 </mapper>

openhis-ui-vue3/.env.test

@@ -1,12 +1,5 @@
-# 页面标题
-VITE_APP_TITLE = 医院信息管理系统
-
-# 测试环境配置
-VITE_APP_ENV = 'test'
-
-# OpenHIS管理系统/测试环境
-
-VITE_APP_BASE_API = '/test-api'
-
-# 租户ID配置
-VITE_APP_TENANT_ID = '1'
+# Playwright E2E 测试环境变量
+# 注意：此文件仅用于本地开发，生产环境使用CI Secret管理
+TEST_BASE_URL=http://localhost:80
+TEST_USERNAME=admin
+TEST_PASSWORD=changeme_in_local_env

openhis-ui-vue3/.gitignore

@@ -21,3 +21,8 @@ selenium-debug.log
 
 package-lock.json
 yarn.lock
+
+# Playwright test results
+test-results/
+tests/e2e/report/
+tests/tests/

openhis-ui-vue3/package.json

@@ -17,7 +17,10 @@
     "test:run": "vitest run",
     "test:coverage": "vitest run --coverage",
     "test:ui": "vitest --ui",
-    "lint": "eslint . --ext .js,.vue src/"
+    "lint": "eslint . --ext .js,.vue src/",
+    "test:e2e": "playwright test",
+    "test:e2e:ui": "playwright test --ui",
+    "test:e2e:report": "playwright show-report"
   },
   "repository": {
     "type": "git",

openhis-ui-vue3/playwright.config.ts

@@ -0,0 +1,28 @@
+import { defineConfig, devices } from '@playwright/test';
+
+export default defineConfig({
+  testDir: './tests/e2e/specs',
+  fullyParallel: true,
+  timeout: 60_000,
+  expect: { timeout: 10_000 },
+  retries: process.env.CI ? 2 : 1,
+  workers: process.env.CI ? 2 : undefined,
+  reporter: [
+    ['html', { outputFolder: 'tests/e2e/report', open: 'never' }],
+    ['list'],
+  ],
+  use: {
+    baseURL: process.env.TEST_BASE_URL || 'http://localhost:81',
+    screenshot: 'only-on-failure',
+    video: 'retain-on-failure',
+    trace: 'retain-on-failure',
+    viewport: { width: 1920, height: 1080 },
+    locale: 'zh-CN',
+    timezoneId: 'Asia/Shanghai',
+    actionTimeout: 15_000,
+    navigationTimeout: 30_000,
+  },
+  projects: [
+    { name: 'chromium', use: { ...devices['Desktop Chrome'] } },
+  ],
+});

openhis-ui-vue3/src/api/system/info.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+export function getSystemVersion(options = {}) {
+  return request({
+    url: '/system/version',
+    method: 'get',
+    ...options
+  })
+}
+

openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue

@@ -378,6 +378,7 @@ import {getCurrentInstance, nextTick, watch} from 'vue';
 const { proxy } = getCurrentInstance();
 const { unit_code, med_chrgitm_type, fin_type_code, activity_category_code, chrgitm_lv } =
   proxy.useDict(
+    'specimen_code',
     'unit_code',
     'med_chrgitm_type',
     'fin_type_code',

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

@@ -562,7 +562,7 @@
                   prescriptionList[scope.$index].minUnitQuantity = prescriptionList[scope.$index].quantity || 1;
                   prescriptionList[scope.$index].minUnitCode = prescriptionList[scope.$index].unitCode;
                   prescriptionList[scope.$index].minUnitCode_dictText = prescriptionList[scope.$index].unitCode_dictText;
-                  adviceQueryParams.adviceTypes = value; // 🎯 修复：改为 adviceTypes（复数）
+                  adviceQueryParams.adviceTypes = [value]; // 🎯 修复：改为 adviceTypes（复数）
 
                   // 根据选择的类型设置categoryCode，用于药品分类筛选
                   if (value == 1) { // 西药

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

@@ -116,7 +116,7 @@ const getList = () => {
     pageNum: 1,
     categoryCode: '24',
     organizationId: patientInfo.value.inHospitalOrgId,
-    adviceTypes: '3', //1 药品 2耗材 3诊疗
+    adviceTypes: [3], //1 药品 2耗材 3诊疗
   })
     .then((res) => {
       if (res.code === 200) {

openhis-ui-vue3/src/views/login.vue

@@ -100,7 +100,11 @@
         </div>
       </el-form-item>
       <div class="footer">
-            © 2025 {{ currentTenantName || settings.systemName }}信息管理系统 | 版本 v2.5.1
+        © 2025 {{ currentTenantName || settings.systemName }}信息管理系统
+        | 前端版本 {{ formattedFrontendVersion }}
+        <span v-if="backendVersion">
+          | 后端版本 {{ formattedBackendVersion }}
+        </span>
         <!-- 公司版权信息（新增） -->
         <div class="company-copyright">
           技术支持：上海经创贺联信息技术有限公司
@@ -126,7 +130,7 @@
 </template>
 
 <script setup>
-import {getCurrentInstance, onMounted, ref, watch, nextTick} from 'vue';
+import {computed, getCurrentInstance, onMounted, ref, watch, nextTick} from 'vue';
 import settings from '@/settings';
 import {getCodeImg, getUserBindTenantList, sign} from '@/api/login';
 import {invokeYbPlugin5001} from '@/api/public';
@@ -134,6 +138,7 @@ import Cookies from 'js-cookie';
 import {decrypt, encrypt} from '@/utils/jsencrypt';
 import useUserStore from '@/store/modules/user';
 import {ElMessage} from 'element-plus';
+import {getSystemVersion} from '@/api/system/info';
 import logoNew from '@/assets/logo/LOGO.jpg';
 
 const userStore = useUserStore();
@@ -141,6 +146,31 @@ const route = useRoute();
 const router = useRouter();
 const { proxy } = getCurrentInstance();
 const env = import.meta.env.MODE;
+const loginVersion = import.meta.env.VITE_APP_BUILD_VERSION;
+const backendVersion = ref('');
+
+const formattedFrontendVersion = computed(() => {
+  if (!loginVersion) return '';
+  // 期望格式：YYYYMMDDHHmmss -> 显示 YYYY-MM-DD
+  if (loginVersion.length >= 8) {
+    const y = loginVersion.substring(0, 4);
+    const m = loginVersion.substring(4, 6);
+    const d = loginVersion.substring(6, 8);
+    return `${y}-${m}-${d}`;
+  }
+  return loginVersion;
+});
+
+const formattedBackendVersion = computed(() => {
+  if (!backendVersion.value) return '';
+  if (backendVersion.value.length >= 8) {
+    const y = backendVersion.value.substring(0, 4);
+    const m = backendVersion.value.substring(4, 6);
+    const d = backendVersion.value.substring(6, 8);
+    return `${y}-${m}-${d}`;
+  }
+  return backendVersion.value;
+});
 
 const loginForm = ref({
   username: '',
@@ -236,6 +266,15 @@ onMounted(() => {
       }
     });
   }
+
+  // 获取后端版本号
+  getSystemVersion().then((res) => {
+    if (res && res.backendVersion) {
+      backendVersion.value = res.backendVersion;
+    }
+  }).catch(() => {
+    backendVersion.value = '';
+  });
 });
 
 function handleLogin() {

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

@@ -1941,6 +1941,7 @@ function submitForm() {
         // 新增手术安排
         addSurgerySchedule(submitData).then((res) => {
           proxy.$modal.msgSuccess('新增成功')
+          queryParams.pageNo = 1
           open.value = false
           getPageList()
         }).catch(() => {

openhis-ui-vue3/src/views/triageandqueuemanage/api.js

@@ -37,7 +37,7 @@ export function getCandidatePool(params) {
       pageNo: params?.pageNo || 1,
       pageSize: params?.pageSize || 10000,
       searchKey: params?.searchKey || '',
-      statusEnum: params?.statusEnum || -1 // -1表示排除退号记录（正常挂号）
+      statusEnum: params?.statusEnum ?? 1 // 1=PLANNED(待诊)，已挂号未接诊的患者；不传或传-1会返回已接诊的患者
     },
     skipErrorMsg: true // 跳过错误提示，由组件处理
   })

openhis-ui-vue3/src/views/triageandqueuemanage/cardiology/index.vue

@@ -6,12 +6,19 @@
         <span class="title">智能分诊排队管理 - {{ currentDeptName }}</span>
       </div>
       <div class="header-right">
-        <el-button type="primary" @click="handleRefresh">
+        <el-button
+          type="primary"
+          @click="handleRefresh"
+        >
           <el-icon><Refresh /></el-icon>
           刷新
         </el-button>
-        <el-button @click="handleExit">退出</el-button>
-        <el-button @click="handleConfig">后台配置</el-button>
+        <el-button @click="handleExit">
+          退出
+        </el-button>
+        <el-button @click="handleConfig">
+          后台配置
+        </el-button>
       </div>
     </div>
 
@@ -31,28 +38,67 @@
             style="width: 100%"
             @selection-change="handleCandidateSelectionChange"
           >
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column prop="sequenceNo" label="序号" width="80" align="center" />
-            <el-table-column prop="patientName" label="患者" width="100" align="center" />
-            <el-table-column prop="age" label="年龄" width="80" align="center" />
-            <el-table-column prop="appointmentType" label="号别" width="100" align="center" />
-            <el-table-column prop="room" label="诊室" width="120" align="center" />
-            <el-table-column prop="doctor" label="医生" width="120" align="center" />
-            <el-table-column prop="matchingRule" label="命中规则" min-width="150" align="center" />
+            <el-table-column
+              type="selection"
+              width="55"
+              align="center"
+            />
+            <el-table-column
+              prop="sequenceNo"
+              label="序号"
+              width="80"
+              align="center"
+            />
+            <el-table-column
+              prop="patientName"
+              label="患者"
+              width="100"
+              align="center"
+            />
+            <el-table-column
+              prop="age"
+              label="年龄"
+              width="80"
+              align="center"
+            />
+            <el-table-column
+              prop="appointmentType"
+              label="号别"
+              width="100"
+              align="center"
+            />
+            <el-table-column
+              prop="room"
+              label="诊室"
+              width="120"
+              align="center"
+            />
+            <el-table-column
+              prop="doctor"
+              label="医生"
+              width="120"
+              align="center"
+            />
+            <el-table-column
+              prop="matchingRule"
+              label="命中规则"
+              min-width="150"
+              align="center"
+            />
           </el-table>
         </div>
         <div class="candidate-actions">
           <el-button 
             type="primary" 
-            @click="handleAddToQueue"
             :disabled="selectedCandidates.length === 0"
+            @click="handleAddToQueue"
           >
             加入队列 >>
           </el-button>
           <el-button 
             type="primary" 
-            @click="handleAddAllToQueue"
             :disabled="filteredCandidatePoolList.length === 0"
+            @click="handleAddAllToQueue"
           >
             一键加入队列
           </el-button>
@@ -75,13 +121,48 @@
             highlight-current-row
             @row-click="handleQueueRowClick"
           >
-            <el-table-column prop="queueOrder" label="队序" width="80" align="center" />
-            <el-table-column prop="patientName" label="患者" width="100" align="center" />
-            <el-table-column prop="appointmentType" label="号别" width="100" align="center" />
-            <el-table-column prop="room" label="诊室" width="120" align="center" />
-            <el-table-column prop="doctor" label="医生" width="120" align="center" />
-            <el-table-column prop="waitingTime" label="等待" width="100" align="center" />
-            <el-table-column prop="status" label="状态" width="100" align="center">
+            <el-table-column
+              prop="queueOrder"
+              label="队序"
+              width="80"
+              align="center"
+            />
+            <el-table-column
+              prop="patientName"
+              label="患者"
+              width="100"
+              align="center"
+            />
+            <el-table-column
+              prop="appointmentType"
+              label="号别"
+              width="100"
+              align="center"
+            />
+            <el-table-column
+              prop="room"
+              label="诊室"
+              width="120"
+              align="center"
+            />
+            <el-table-column
+              prop="doctor"
+              label="医生"
+              width="120"
+              align="center"
+            />
+            <el-table-column
+              prop="waitingTime"
+              label="等待"
+              width="100"
+              align="center"
+            />
+            <el-table-column
+              prop="status"
+              label="状态"
+              width="100"
+              align="center"
+            >
               <template #default="scope">
                 <el-tag :type="getStatusTagType(scope.row.status)">
                   {{ scope.row.status }}
@@ -94,25 +175,25 @@
           <div class="queue-actions-left">
             <el-button 
               type="danger" 
-              @click="handleRemoveFromQueue"
               :disabled="!selectedQueueRow"
               size="small"
+              @click="handleRemoveFromQueue"
             >
-              << 移出队列
+              &lt;&lt; 移出队列
             </el-button>
             <el-button 
               type="info" 
-              @click="handleMoveUp"
               :disabled="!selectedQueueRow || !canMoveUp"
               size="small"
+              @click="handleMoveUp"
             >
               ↑
             </el-button>
             <el-button 
               type="info" 
-              @click="handleMoveDown"
               :disabled="!selectedQueueRow || !canMoveDown"
               size="small"
+              @click="handleMoveDown"
             >
               ↓
             </el-button>
@@ -120,15 +201,15 @@
           <div class="queue-actions-right">
             <el-button 
               :type="showOnlyWaiting ? 'primary' : ''" 
-              @click="showOnlyWaiting = true"
               size="small"
+              @click="showOnlyWaiting = true"
             >
               只显示等待
             </el-button>
             <el-button 
               :type="!showOnlyWaiting ? 'primary' : ''" 
-              @click="showOnlyWaiting = false"
               size="small"
+              @click="showOnlyWaiting = false"
             >
               显示全部状态
             </el-button>
@@ -141,7 +222,9 @@
     <div class="footer-section">
       <!-- 就诊科室快速过滤栏 -->
       <div class="filter-section">
-        <div class="filter-label">③ 就诊科室快速过滤栏</div>
+        <div class="filter-label">
+          ③ 就诊科室快速过滤栏
+        </div>
         <div class="filter-select-wrapper">
           <el-select
             v-model="selectedDept"
@@ -167,24 +250,53 @@
 
       <!-- 叫号控制板 -->
       <div class="call-control-section">
-        <div class="call-control-label">④ 叫号控制板</div>
+        <div class="call-control-label">
+          ④ 叫号控制板
+        </div>
         <div class="call-control-content">
           <div class="current-call-display">
             当前呼叫: {{ currentCall.number }} {{ currentCall.name }} 诊室: {{ currentCall.room }}
           </div>
           <div class="control-buttons">
-            <el-button type="primary" @click="handleSelectCall">选呼</el-button>
-            <el-button type="success" @click="handleNextPatient">下一患者</el-button>
-            <el-button type="warning" @click="handleSkip">跳过</el-button>
-            <el-button type="primary" @click="handleComplete">完成</el-button>
-            <el-button type="info" @click="handleRequeue">过号重排</el-button>
+            <el-button
+              type="primary"
+              @click="handleSelectCall"
+            >
+              选呼
+            </el-button>
+            <el-button
+              type="success"
+              @click="handleNextPatient"
+            >
+              下一患者
+            </el-button>
+            <el-button
+              type="warning"
+              @click="handleSkip"
+            >
+              跳过
+            </el-button>
+            <el-button
+              type="primary"
+              @click="handleComplete"
+            >
+              完成
+            </el-button>
+            <el-button
+              type="info"
+              @click="handleRequeue"
+            >
+              过号重排
+            </el-button>
           </div>
         </div>
       </div>
 
       <!-- LED显示 -->
       <div class="led-section">
-        <div class="led-label">⑤ LED:</div>
+        <div class="led-label">
+          ⑤ LED:
+        </div>
         <div class="led-display">
           [{{ currentCall.number }}]{{ currentCall.name }}请到{{ currentCall.room }}({{ callType }})
         </div>
@@ -205,11 +317,25 @@
     >
       <template #header>
         <div class="config-dialog-header">
-        <div class="config-dialog-title">智能分诊规则引擎配置 - 心内科</div>
+          <div class="config-dialog-title">
+            智能分诊规则引擎配置 - 心内科
+          </div>
           <div class="config-topbar-actions">
-          <el-button type="primary" @click="handleAddRule">新增规则</el-button>
-          <el-button type="primary" @click="handleSaveAllRules">保存全部</el-button>
-          <el-button @click="handleTestRule">测试规则</el-button>
+            <el-button
+              type="primary"
+              @click="handleAddRule"
+            >
+              新增规则
+            </el-button>
+            <el-button
+              type="primary"
+              @click="handleSaveAllRules"
+            >
+              保存全部
+            </el-button>
+            <el-button @click="handleTestRule">
+              测试规则
+            </el-button>
           </div>
         </div>
       </template>
@@ -224,42 +350,96 @@
               :class="{ active: idx === editingIndex }"
               @click="handleSelectRule(idx)"
             >
-            <div class="rule-title">规则{{ idx + 1 }}</div>
-            <div class="rule-sub">prio={{ item.priority }}</div>
-            <div class="rule-sub">{{ item.name }}</div>
+              <div class="rule-title">
+                规则{{ idx + 1 }}
+              </div>
+              <div class="rule-sub">
+                prio={{ item.priority }}
+              </div>
+              <div class="rule-sub">
+                {{ item.name }}
+              </div>
               <div class="rule-actions">
-              <el-button size="small" @click.stop="handleSelectRule(idx)">编辑</el-button>
-              <el-button size="small" @click.stop="handleDeleteRule(idx)">删除</el-button>
-              <el-button size="small" @click.stop="handleRuleMoveUp(idx)" :disabled="idx === 0">↑</el-button>
-              <el-button size="small" @click.stop="handleRuleMoveDown(idx)" :disabled="idx === rules.length - 1">↓</el-button>
+                <el-button
+                  size="small"
+                  @click.stop="handleSelectRule(idx)"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  @click.stop="handleDeleteRule(idx)"
+                >
+                  删除
+                </el-button>
+                <el-button
+                  size="small"
+                  :disabled="idx === 0"
+                  @click.stop="handleRuleMoveUp(idx)"
+                >
+                  ↑
+                </el-button>
+                <el-button
+                  size="small"
+                  :disabled="idx === rules.length - 1"
+                  @click.stop="handleRuleMoveDown(idx)"
+                >
+                  ↓
+                </el-button>
               </div>
             </div>
           </el-scrollbar>
         </div>
 
         <div class="config-right">
-        <el-form label-width="110px" class="config-form">
-          <el-form-item label="规则名称:" required>
-            <el-input v-model="ruleForm.name" placeholder="请输入规则名称" />
+          <el-form
+            label-width="110px"
+            class="config-form"
+          >
+            <el-form-item
+              label="规则名称:"
+              required
+            >
+              <el-input
+                v-model="ruleForm.name"
+                placeholder="请输入规则名称"
+              />
             </el-form-item>
 
             <el-form-item label="科室:">
-            <el-select v-model="ruleForm.dept" class="config-fullwidth" disabled>
-              <el-option label="心内科" value="心内科" />
+              <el-select
+                v-model="ruleForm.dept"
+                class="config-fullwidth"
+                disabled
+              >
+                <el-option
+                  label="心内科"
+                  value="心内科"
+                />
               </el-select>
             </el-form-item>
 
             <el-form-item label="规则描述:">
-            <el-input v-model="ruleForm.desc" placeholder="请输入规则描述" />
+              <el-input
+                v-model="ruleForm.desc"
+                placeholder="请输入规则描述"
+              />
             </el-form-item>
 
-          <el-form-item label="优先级:" required>
+            <el-form-item
+              label="优先级:"
+              required
+            >
               <el-input v-model="ruleForm.priority" />
             </el-form-item>
 
             <el-form-item label="周几生效:">
               <el-checkbox-group v-model="ruleForm.weeks">
-              <el-checkbox v-for="w in weekOptions" :key="w.value" :label="w.value">
+                <el-checkbox
+                  v-for="w in weekOptions"
+                  :key="w.value"
+                  :label="w.value"
+                >
                   {{ w.label }}
                 </el-checkbox>
               </el-checkbox-group>
@@ -270,13 +450,17 @@
                 v-model="ruleForm.expr"
                 type="textarea"
                 :rows="8"
-              placeholder='{"age":">=60","regType":"专家"}'
+                placeholder="{&quot;age&quot;:&quot;>=60&quot;,&quot;regType&quot;:&quot;专家&quot;}"
               />
             </el-form-item>
 
             <div class="config-inline-actions">
-            <el-button @click="handleQuickGenerate">快速生成器</el-button>
-            <el-button @click="handleValidateRule">语法检查</el-button>
+              <el-button @click="handleQuickGenerate">
+                快速生成器
+              </el-button>
+              <el-button @click="handleValidateRule">
+                语法检查
+              </el-button>
             </div>
           </el-form>
         </div>
@@ -284,8 +468,15 @@
 
       <template #footer>
         <div class="config-footer">
-        <el-button type="primary" @click="handleSaveCurrentRule">保存</el-button>
-        <el-button @click="configDialogVisible = false">取消</el-button>
+          <el-button
+            type="primary"
+            @click="handleSaveCurrentRule"
+          >
+            保存
+          </el-button>
+          <el-button @click="configDialogVisible = false">
+            取消
+          </el-button>
         </div>
       </template>
     </el-dialog>
@@ -297,15 +488,36 @@
       width="600px"
       :close-on-click-modal="false"
     >
-    <el-form :model="quickGeneratorForm" label-width="120px">
+      <el-form
+        :model="quickGeneratorForm"
+        label-width="120px"
+      >
         <el-form-item label="年龄条件:">
           <div style="display: flex; align-items: center; gap: 10px;">
-          <el-select v-model="quickGeneratorForm.ageOperator" style="width: 100px;">
-            <el-option label=">=" value=">=" />
-            <el-option label="<=" value="<=" />
-            <el-option label="=" value="=" />
-            <el-option label=">" value=">" />
-            <el-option label="<" value="<" />
+            <el-select
+              v-model="quickGeneratorForm.ageOperator"
+              style="width: 100px;"
+            >
+              <el-option
+                label=">="
+                value=">="
+              />
+              <el-option
+                label="<="
+                value="<="
+              />
+              <el-option
+                label="="
+                value="="
+              />
+              <el-option
+                label=">"
+                value=">"
+              />
+              <el-option
+                label="<"
+                value="<"
+              />
             </el-select>
             <el-input-number
               v-model="quickGeneratorForm.ageValue"
@@ -331,10 +543,22 @@
             clearable
             style="width: 100%"
           >
-          <el-option label="专家" value="专家" />
-          <el-option label="普通" value="普通" />
-          <el-option label="特需" value="特需" />
-          <el-option label="急诊" value="急诊" />
+            <el-option
+              label="专家"
+              value="专家"
+            />
+            <el-option
+              label="普通"
+              value="普通"
+            />
+            <el-option
+              label="特需"
+              value="特需"
+            />
+            <el-option
+              label="急诊"
+              value="急诊"
+            />
           </el-select>
         </el-form-item>
 
@@ -345,9 +569,18 @@
             clearable
             style="width: 100%"
           >
-          <el-option label="心内科" value="心内科" />
-          <el-option label="心外科" value="心外科" />
-          <el-option label="神经内科" value="神经内科" />
+            <el-option
+              label="心内科"
+              value="心内科"
+            />
+            <el-option
+              label="心外科"
+              value="心外科"
+            />
+            <el-option
+              label="神经内科"
+              value="神经内科"
+            />
           </el-select>
         </el-form-item>
 
@@ -391,8 +624,15 @@
 
       <template #footer>
         <div style="text-align: right;">
-        <el-button @click="quickGeneratorDialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="handleApplyQuickGenerate">应用</el-button>
+          <el-button @click="quickGeneratorDialogVisible = false">
+            取消
+          </el-button>
+          <el-button
+            type="primary"
+            @click="handleApplyQuickGenerate"
+          >
+            应用
+          </el-button>
         </div>
       </template>
     </el-dialog>
@@ -627,29 +867,40 @@ const parseAge = (ageStr) => {
 }
 
 // 后端队列状态 -> 前端展示状态
+// 后端状态码：0=WAITING, 10=CALLING, 20=IN_CLINIC, 30=COMPLETED, 40=SKIPPED, 50=REFUNDED, 60=FOLLOW
 const mapBackendStatusToFrontend = (status) => {
-  if (!status) {
+  if (status === null || status === undefined) {
     console.warn('【心内科】状态映射：收到空状态值')
     return '等待'
   }
-  // 转换为大写并去除空格，确保匹配
-  const normalizedStatus = String(status).trim().toUpperCase()
-  if (normalizedStatus === 'CALLING') return '叫号中'
-  if (normalizedStatus === 'WAITING') return '等待'
-  if (normalizedStatus === 'SKIPPED') return '跳过'
-  if (normalizedStatus === 'COMPLETED') return '已完成'
+  const numStatus = Number(status)
+  switch (numStatus) {
+    case 0:  return '等待'
+    case 10: return '叫号中'
+    case 20: return '诊中'
+    case 30: return '已完成'
+    case 40: return '跳过'
+    case 50: return '已退费'
+    case 60: return '已随访'
+    default:
       console.warn('【心内科】状态映射：未知状态值', status, '-> 默认返回"等待"')
       return '等待'
   }
+}
 
-// 前端状态 -> 后端状态（目前仅展示用）
+// 前端状态 -> 后端状态码
 const mapFrontendStatusToBackend = (status) => {
-  if (!status) return 'WAITING'
-  if (status === '叫号中') return 'CALLING'
-  if (status === '等待') return 'WAITING'
-  if (status === '跳过') return 'SKIPPED'
-  if (status === '已完成') return 'COMPLETED'
-  return 'WAITING'
+  if (!status) return 0
+  switch (status) {
+    case '叫号中': return 10
+    case '等待':   return 0
+    case '诊中':   return 20
+    case '已完成': return 30
+    case '跳过':   return 40
+    case '已退费': return 50
+    case '已随访': return 60
+    default:       return 0
+  }
 }
 
 // 从数据库加载队列

openhis-ui-vue3/tests/e2e/fixtures/auth.ts

@@ -0,0 +1,17 @@
+import { test as base } from '@playwright/test';
+import { TEST_USERS } from '../utils/test-data';
+
+export const test = base.extend({
+  async authenticatedPage({ page }, use) {
+    // 登录
+    await page.goto('/');
+    await page.fill('input[placeholder="请输入用户名"]', TEST_USERS.admin.username);
+    await page.fill('input[placeholder="请输入密码"]', TEST_USERS.admin.password);
+    await page.click('button:has-text("登录")');
+    await page.waitForURL(/.*(dashboard|home).*/);
+    
+    await use(page);
+  },
+});
+
+export { expect } from '@playwright/test';

openhis-ui-vue3/tests/e2e/pages/DoctorStationPage.ts

@@ -0,0 +1,26 @@
+import { Page, expect } from '@playwright/test';
+
+export class DoctorStationPage {
+  readonly page: Page;
+
+  constructor(page: Page) {
+    this.page = page;
+  }
+
+  async goto() {
+    await this.page.goto('/doctorstation');
+    await this.page.waitForLoadState('networkidle');
+  }
+
+  async expandCategory(index: number = 0) {
+    const item = this.page.locator('.el-collapse-item, .category-item').nth(index);
+    await item.click();
+    await this.page.waitForTimeout(500);
+  }
+
+  async searchPatient(name: string) {
+    await this.page.fill('input[placeholder*="患者"], input[placeholder*="姓名"]', name);
+    await this.page.click('button:has-text("搜索"), button:has-text("查询")');
+    await this.page.waitForLoadState('networkidle');
+  }
+}

openhis-ui-vue3/tests/e2e/pages/LoginPage.ts

@@ -0,0 +1,46 @@
+import { Page, expect } from '@playwright/test';
+
+export class LoginPage {
+  readonly page: Page;
+
+  constructor(page: Page) {
+    this.page = page;
+  }
+
+  async goto() {
+    await this.page.goto('/');
+    await this.page.waitForLoadState('domcontentloaded');
+  }
+
+  async login(username: string, password: string) {
+    // Actual placeholders from login.vue: "账号" and "密码"
+    await this.page.fill('input[placeholder="账号"]', username);
+    await this.page.fill('input[placeholder="密码"]', password);
+    // Check for tenant selection if exists
+    const tenantSelect = this.page.locator('.el-select__wrapper, input[placeholder="请选择医疗机构"]').first();
+    if (await tenantSelect.isVisible().catch(() => false)) {
+      await tenantSelect.click();
+      await this.page.waitForTimeout(500);
+      // Select first option
+      const firstOption = this.page.locator('.el-select-dropdown__item, .el-option').first();
+      if (await firstOption.isVisible().catch(() => false)) {
+        await firstOption.click();
+        await this.page.waitForTimeout(500);
+      }
+    }
+    await this.page.click('button:has-text("登 录")');
+    await this.page.waitForLoadState('networkidle');
+  }
+
+  async expectLoginSuccess() {
+    await expect(this.page).toHaveURL(/.*(dashboard|home|index).*/, { timeout: 15000 });
+  }
+
+  async expectLoginFailed() {
+    await expect(this.page.locator('.el-message--error')).toBeVisible({ timeout: 5000 });
+  }
+
+  async expectOnLoginPage() {
+    await expect(this.page.locator('input[placeholder="账号"]')).toBeVisible();
+  }
+}

openhis-ui-vue3/tests/e2e/pages/SurgeryBillingPage.ts

@@ -0,0 +1,34 @@
+import { Page, expect } from '@playwright/test';
+
+export class SurgeryBillingPage {
+  readonly page: Page;
+
+  constructor(page: Page) {
+    this.page = page;
+  }
+
+  async goto() {
+    await this.page.goto('/operatingroom');
+    await this.page.waitForLoadState('networkidle');
+  }
+
+  async rapidClickGenerate(times: number = 5) {
+    const btn = this.page.locator('button:has-text("生成"), button:has-text("新增")');
+    for (let i = 0; i < times; i++) {
+      await btn.click().catch(() => {});
+    }
+    await this.page.waitForLoadState('networkidle');
+  }
+
+  async getDialogCount(): Promise<number> {
+    return await this.page.locator('.el-dialog, .el-message-box').count();
+  }
+
+  async expectNoLocationIdError() {
+    await expect(this.page.locator('text=发放库房为空')).toHaveCount(0, { timeout: 5000 });
+  }
+
+  async expectSaveSuccess() {
+    await expect(this.page.locator('.el-message--success')).toBeVisible({ timeout: 10000 });
+  }
+}

openhis-ui-vue3/tests/e2e/specs/bug-regression.spec.ts

@@ -0,0 +1,53 @@
+import { test, expect } from '@playwright/test';
+import { LoginPage } from '../pages/LoginPage';
+import { TEST_USERS, TEST_URLS } from '../utils/test-data';
+
+test.describe('🐛 Bug回归测试', () => {
+  let loginPage: LoginPage;
+
+  test.beforeEach(async ({ page }) => {
+    loginPage = new LoginPage(page);
+    await loginPage.goto();
+    await loginPage.login(TEST_USERS.admin.username, TEST_USERS.admin.password);
+    await loginPage.expectLoginSuccess();
+  });
+
+  test('#437 手术计费防重复提交 @bug437 @regression', async ({ page }) => {
+    await page.goto(TEST_URLS.surgeryBilling);
+    await page.waitForLoadState('networkidle');
+    
+    const addBtn = page.locator('button:has-text("新增"), button:has-text("生成")');
+    if (await addBtn.isVisible()) {
+      await addBtn.click();
+      await addBtn.click();
+      await addBtn.click();
+      await page.waitForTimeout(2000);
+      
+      const dialogs = page.locator('.el-dialog, .el-message-box');
+      expect(await dialogs.count()).toBeLessThanOrEqual(1);
+    }
+  });
+
+  test('#443 手术计费签发耗材 @bug443 @regression', async ({ page }) => {
+    await page.goto(TEST_URLS.surgeryBilling);
+    await page.waitForLoadState('networkidle');
+    const signBtn = page.locator('button:has-text("签发"), button:has-text("提交")');
+    if (await signBtn.isVisible()) {
+      await signBtn.click();
+      await page.waitForTimeout(2000);
+      const errorMsg = page.locator('text=发放库房为空');
+      expect(await errorMsg.count()).toBe(0);
+    }
+  });
+
+  test('#427 检查项目分类手风琴展开 @regression', async ({ page }) => {
+    await page.goto(TEST_URLS.doctorStation);
+    await page.waitForLoadState('networkidle');
+    const categories = page.locator('.el-collapse-item, .category-item');
+    const count = await categories.count();
+    if (count > 0) {
+      await categories.first().click();
+      await page.waitForTimeout(500);
+    }
+  });
+});

openhis-ui-vue3/tests/e2e/specs/concurrency.spec.ts

@@ -0,0 +1,54 @@
+import { test, expect } from '@playwright/test';
+import { TEST_USERS, TEST_URLS } from '../utils/test-data';
+
+test.describe('🔄 并发操作测试', () => {
+  test('#437 多窗口同时操作手术计费 @bug437', async ({ browser }) => {
+    const context1 = await browser.newContext();
+    const context2 = await browser.newContext();
+    
+    const page1 = await context1.newPage();
+    const page2 = await context2.newPage();
+
+    // Login on both pages
+    for (const page of [page1, page2]) {
+      await page.goto(TEST_URLS.login);
+      await page.fill('input[placeholder="账号"]', TEST_USERS.admin.username);
+      await page.fill('input[placeholder="密码"]', TEST_USERS.admin.password);
+      await page.click('button:has-text("登 录")');
+      await page.waitForURL(/.*(dashboard|home|index).*/);
+    }
+
+    await Promise.all([
+      page1.goto(TEST_URLS.surgeryBilling),
+      page2.goto(TEST_URLS.surgeryBilling),
+    ]);
+
+    await Promise.all([
+      page1.waitForLoadState('networkidle'),
+      page2.waitForLoadState('networkidle'),
+    ]);
+
+    const genBtn1 = page1.locator('button:has-text("生成")');
+    const genBtn2 = page2.locator('button:has-text("生成")');
+    
+    if (await genBtn1.isVisible() && await genBtn2.isVisible()) {
+      await Promise.all([
+        genBtn1.click().catch(() => {}),
+        genBtn2.click().catch(() => {}),
+      ]);
+      
+      await page1.waitForTimeout(3000);
+      
+      const table1 = page1.locator('el-table__body tr, .el-table__row');
+      const table2 = page2.locator('el-table__body tr, .el-table__row');
+      
+      const count1 = await table1.count();
+      const count2 = await table2.count();
+      
+      expect(count1).toBe(count2);
+    }
+
+    await context1.close();
+    await context2.close();
+  });
+});

openhis-ui-vue3/tests/e2e/specs/doctor-station.spec.ts

@@ -0,0 +1,34 @@
+import { test, expect } from '@playwright/test';
+import { LoginPage } from '../pages/LoginPage';
+import { TEST_USERS, TEST_URLS } from '../utils/test-data';
+
+test.describe('🏥 门诊医生站', () => {
+  let loginPage: LoginPage;
+
+  test.beforeEach(async ({ page }) => {
+    loginPage = new LoginPage(page);
+    await loginPage.goto();
+    await loginPage.login(TEST_USERS.admin.username, TEST_USERS.admin.password);
+    await loginPage.expectLoginSuccess();
+  });
+
+  test('#427 分类手风琴展开/收起 @regression', async ({ page }) => {
+    await page.goto(TEST_URLS.doctorStation);
+    await page.waitForLoadState('networkidle');
+    
+    const items = page.locator('.el-collapse-item, .category-item');
+    const count = await items.count();
+    
+    if (count >= 2) {
+      await items.nth(0).click();
+      await page.waitForTimeout(500);
+      await items.nth(1).click();
+      await page.waitForTimeout(500);
+    }
+  });
+
+  test('TC-DOCTOR-001: 医生站页面加载 @smoke', async ({ page }) => {
+    await page.goto(TEST_URLS.doctorStation);
+    await expect(page).toHaveURL(/.*doctorstation.*/);
+  });
+});

openhis-ui-vue3/tests/e2e/specs/login.spec.ts

@@ -0,0 +1,38 @@
+import { test, expect } from '@playwright/test';
+import { LoginPage } from '../pages/LoginPage';
+import { TEST_USERS } from '../utils/test-data';
+
+test.describe('🔐 登录模块', () => {
+  let loginPage: LoginPage;
+
+  test.beforeEach(async ({ page }) => {
+    loginPage = new LoginPage(page);
+    await loginPage.goto();
+  });
+
+  test('TC-LOGIN-001: 管理员正常登录 @smoke', async ({ page }) => {
+    await loginPage.login(TEST_USERS.admin.username, TEST_USERS.admin.password);
+    await loginPage.expectLoginSuccess();
+  });
+
+  test('TC-LOGIN-002: 错误密码登录 @smoke', async ({ page }) => {
+    await loginPage.login(TEST_USERS.admin.username, 'wrong_password_123');
+    // Check for any error indication (message, toast, or stayed on login page)
+    const hasError = await page.locator('.el-message--error, .el-message-box, text=密码错误, text=用户名或密码错误').isVisible().catch(() => false);
+    const stillOnLogin = page.url().includes('login') || page.url() === 'http://localhost:81/' || page.url() === 'http://localhost:81/index';
+    expect(hasError || stillOnLogin).toBeTruthy();
+  });
+
+  test('TC-LOGIN-003: 空用户名登录', async ({ page }) => {
+    await loginPage.login('', TEST_USERS.admin.password);
+    // Should show validation error or stay on login page
+    const hasError = await page.locator('.el-form-item__error, .el-message--error').isVisible().catch(() => false);
+    const stillOnLogin = page.url().includes('login') || page.url() === 'http://localhost:81/';
+    expect(hasError || stillOnLogin).toBeTruthy();
+  });
+
+  test('TC-LOGIN-004: 密码输入框可见性切换', async ({ page }) => {
+    const passwordInput = page.locator('input[placeholder="密码"]');
+    await expect(passwordInput).toHaveAttribute('type', 'password');
+  });
+});

openhis-ui-vue3/tests/e2e/specs/surgery-billing.spec.ts

@@ -0,0 +1,42 @@
+import { test, expect } from '@playwright/test';
+import { LoginPage } from '../pages/LoginPage';
+import { TEST_USERS, TEST_URLS } from '../utils/test-data';
+
+test.describe('💊 手术计费模块', () => {
+  let loginPage: LoginPage;
+
+  test.beforeEach(async ({ page }) => {
+    loginPage = new LoginPage(page);
+    await loginPage.goto();
+    await loginPage.login(TEST_USERS.admin.username, TEST_USERS.admin.password);
+    await loginPage.expectLoginSuccess();
+  });
+
+  test('#437 快速连续点击防重复 @bug437 @smoke', async ({ page }) => {
+    await page.goto(TEST_URLS.surgeryBilling);
+    await page.waitForLoadState('networkidle');
+    
+    const genBtn = page.locator('button:has-text("生成"), button:has-text("新增")');
+    if (await genBtn.isVisible()) {
+      for (let i = 0; i < 5; i++) {
+        await genBtn.click().catch(() => {});
+      }
+      await page.waitForTimeout(3000);
+      
+      const count = await page.locator('.el-dialog, .el-message-box').count();
+      expect(count).toBeLessThanOrEqual(1);
+    }
+  });
+
+  test('#443 签发耗材不报库房错误 @bug443 @smoke', async ({ page }) => {
+    await page.goto(TEST_URLS.surgeryBilling);
+    await page.waitForLoadState('networkidle');
+    
+    const signBtn = page.locator('button:has-text("签发"), button:has-text("提交")');
+    if (await signBtn.isVisible()) {
+      await signBtn.click();
+      await page.waitForTimeout(2000);
+      await expect(page.locator('text=发放库房为空')).toHaveCount(0, { timeout: 5000 });
+    }
+  });
+});

openhis-ui-vue3/tests/e2e/utils/test-data.ts

@@ -1,13 +1,13 @@
 export const TEST_USERS = {
   admin: {
     username: process.env.TEST_USERNAME || 'admin',
-    password: process.env.TEST_PASSWORD || '123456',
+    password: process.env.TEST_PASSWORD || 'admin123',
   },
 };
 
 export const TEST_URLS = {
   login: '/',
-  dashboard: '/dashboard',
+  dashboard: '/index',
   doctorStation: '/doctorstation',
-  surgeryBilling: '/surgery-billing',
+  surgeryBilling: '/operatingroom',
 };

openhis-ui-vue3/tests/playwright.config.ts

@@ -1,19 +1,26 @@
 import { defineConfig, devices } from '@playwright/test';
 
 export default defineConfig({
-  testDir: './tests/e2e/specs',
-  timeout: 60 * 1000,
-  expect: { timeout: 10000 },
-  fullyParallel: false,
-  forbidOnly: !!process.env.CI,
-  retries: process.env.CI ? 2 : 0,
-  workers: 1,
-  reporter: [['html', { outputFolder: 'playwright-report' }], ['list']],
+  testDir: './e2e/specs',
+  fullyParallel: true,
+  timeout: 60_000,
+  expect: { timeout: 10_000 },
+  retries: process.env.CI ? 2 : 1,
+  workers: process.env.CI ? 2 : undefined,
+  reporter: [
+    ['html', { outputFolder: 'tests/e2e/report', open: 'never' }],
+    ['list'],
+  ],
   use: {
-    baseURL: process.env.TEST_BASE_URL || 'http://localhost:80',
-    trace: 'on-first-retry',
+    baseURL: process.env.TEST_BASE_URL || 'http://localhost:81',
     screenshot: 'only-on-failure',
     video: 'retain-on-failure',
+    trace: 'retain-on-failure',
+    viewport: { width: 1920, height: 1080 },
+    locale: 'zh-CN',
+    timezoneId: 'Asia/Shanghai',
+    actionTimeout: 15_000,
+    navigationTimeout: 30_000,
   },
   projects: [
     { name: 'chromium', use: { ...devices['Desktop Chrome'] } },

openhis-ui-vue3/vite.config.js

@@ -11,11 +11,11 @@ import createVitePlugins from './vite/plugins';
 export default defineConfig(({ mode, command }) => {
   const env = loadEnv(mode, process.cwd());
   const { VITE_APP_ENV } = env;
+  const buildVersion = process.env.VITE_APP_VERSION || env.VITE_APP_VERSION || Date.now().toString();
   return {
-    // define: {
-    //   // enable hydration mismatch details in production build
-    //   __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: 'true'
-    // },
+    define: {
+      'import.meta.env.VITE_APP_BUILD_VERSION': JSON.stringify(buildVersion),
+    },
     // 部署生产环境和开发环境下的URL。
     // 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上
     // 例如 https://www.openHIS.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.openhis.vip/admin/，则设置 baseUrl 为 /admin/。