挂号补单功能的完善

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

@@ -29,6 +29,8 @@ 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.TriageCandidateExclusion;
+import com.openhis.triageandqueuemanage.service.TriageCandidateExclusionService;
 import com.openhis.web.paymentmanage.appservice.IPaymentRecService;
 import com.openhis.web.paymentmanage.dto.CancelPaymentDto;
 import com.openhis.web.paymentmanage.dto.CancelRegPaymentDto;
@@ -38,12 +40,15 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * 门诊挂号 应用实现类
  */
+@Slf4j
 @Service
 public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistrationAppService {
 
@@ -76,6 +81,9 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
 
     @Resource
     IPatientIdentifierService patientIdentifierService;
+    
+    @Resource
+    TriageCandidateExclusionService triageCandidateExclusionService;
 
     /**
      * 门诊挂号 - 查询患者信息
@@ -308,6 +316,47 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
             new Page<>(pageNo, pageSize), EncounterClass.AMB.getValue(), EncounterStatus.IN_PROGRESS.getValue(),
             ParticipantType.ADMITTER.getCode(), ParticipantType.REGISTRATION_DOCTOR.getCode(), queryWrapper,
             ChargeItemContext.REGISTER.getValue(), PaymentStatus.SUCCESS.getValue());
+        
+        // 过滤候选池排除列表（如果是从智能候选池查询，排除已加入队列的患者）
+        // 检查请求参数 excludeFromCandidatePool，如果为 true 或未设置，则过滤排除列表
+        String excludeParam = request.getParameter("excludeFromCandidatePool");
+        boolean shouldExclude = excludeParam == null || "true".equalsIgnoreCase(excludeParam);
+        if (shouldExclude && currentDayEncounter != null && !currentDayEncounter.getRecords().isEmpty()) {
+            try {
+                // 获取当前租户和日期
+                Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+                LocalDate today = LocalDate.now();
+                
+                // 查询排除列表
+                List<TriageCandidateExclusion> exclusions = triageCandidateExclusionService.list(
+                    new LambdaQueryWrapper<TriageCandidateExclusion>()
+                        .eq(TriageCandidateExclusion::getTenantId, tenantId)
+                        .eq(TriageCandidateExclusion::getExclusionDate, today)
+                        .eq(TriageCandidateExclusion::getDeleteFlag, "0")
+                );
+                
+                if (exclusions != null && !exclusions.isEmpty()) {
+                    // 构建排除的 encounterId 集合
+                    Set<Long> excludedEncounterIds = exclusions.stream()
+                        .map(TriageCandidateExclusion::getEncounterId)
+                        .filter(Objects::nonNull)
+                        .collect(Collectors.toSet());
+                    
+                    // 过滤结果
+                    List<CurrentDayEncounterDto> filteredRecords = currentDayEncounter.getRecords().stream()
+                        .filter(e -> e.getEncounterId() == null || !excludedEncounterIds.contains(e.getEncounterId()))
+                        .collect(Collectors.toList());
+                    
+                    // 更新分页结果
+                    currentDayEncounter.setRecords(filteredRecords);
+                    currentDayEncounter.setTotal(filteredRecords.size());
+                }
+            } catch (Exception e) {
+                // 如果过滤失败，记录日志但不影响正常查询
+                log.warn("过滤候选池排除列表失败", e);
+            }
+        }
+        
         currentDayEncounter.getRecords().forEach(e -> {
             // 性别
             e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));