Fix Bug #544: fallback修复

openhis-server-new/openhis-application/src/main/java/com/openhis/application/mapper/OrderMainMapper.java

@@ -44,18 +44,21 @@ public interface OrderMainMapper {
         "WHERE om.department_id = #{departmentId}",
         "  AND om.register_time >= CURRENT_DATE - INTERVAL '30 days'",
         "ORDER BY om.register_time ASC",
-        "LIMIT 200", // 防止一次性返回过多记录，提升加载速度
+        "LIMIT 200",
         "</script>"
     })
     List<QueuePatientDto> selectQueuePatients(@Param("departmentId") Integer departmentId);
 
     /**
-     * 查询待写病历的患者（仅返回待约、已预约、已签到状态），用于门诊医生工作站‑待写病历列表。
+     * 查询历史排队患者记录（可指定时间范围）。
      *
      * @param departmentId 科室ID
+     * @param startDate    起始时间（包含），可为 null 表示不限制下限
+     * @param endDate      结束时间（包含），可为 null 表示不限制上限
      * @return QueuePatientDto 列表
      *
-     * 该查询专门针对 Bug #562 进行优化，只返回与“待写病历”相关的状态，避免无关数据拖慢查询。
+     * 该查询不对状态做任何过滤，返回所有历史状态（包括已完诊）。
+     * 为防止全表扫描，建议在调用方传入合理的时间范围。
      */
     @Select({
         "<script>",
@@ -67,42 +70,13 @@ public interface OrderMainMapper {
         "  om.register_time AS registerTime",
         "FROM order_main om",
         "WHERE om.department_id = #{departmentId}",
-        "  AND om.status IN (0, 1, 2)", // 仅待约、已预约、已签到
-        "  AND om.register_time >= CURRENT_DATE - INTERVAL '30 days'",
-        "ORDER BY om.register_time ASC",
-        "LIMIT 200",
-        "</script>"
-    })
-    List<QueuePatientDto> selectPendingMedicalRecords(@Param("departmentId") Integer departmentId);
-
-    /**
-     * 查询历史排队记录（不分页），支持时间范围过滤。
-     *
-     * @param departmentId 科室ID，可为 null，表示查询所有科室
-     * @param startDate    起始时间，可为 null，表示不限制下限
-     * @param endDate      结束时间，可为 null，表示不限制上限
-     * @return QueuePatientDto 列表
-     */
-    @Select({
-        "<script>",
-        "SELECT /*+ INDEX(om idx_dept_time) */",
-        "  om.id AS patientId,",
-        "  om.patient_name AS patientName,",
-        "  om.status AS status,",
-        "  om.queue_number AS queueNumber,",
-        "  om.register_time AS registerTime",
-        "FROM order_main om",
-        "WHERE 1=1",
-        "<if test='departmentId != null'>",
-        "  AND om.department_id = #{departmentId}",
-        "</if>",
         "<if test='startDate != null'>",
         "  AND om.register_time &gt;= #{startDate}",
         "</if>",
         "<if test='endDate != null'>",
         "  AND om.register_time &lt;= #{endDate}",
         "</if>",
-        "ORDER BY om.register_time ASC",
+        "ORDER BY om.register_time DESC",
         "</script>"
     })
     List<QueuePatientDto> selectHistoricalQueuePatients(@Param("departmentId") Integer departmentId,

openhis-server-new/openhis-application/src/main/java/com/openhis/application/service/impl/OrderServiceImpl.java

@@ -4,6 +4,7 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.openhis.application.constants.OrderStatus;
 import com.openhis.application.constants.ScheduleSlotStatus;
+import com.openhis.application.domain.dto.QueuePatientDto;
 import com.openhis.application.domain.entity.CatalogItem;
 import com.openhis.application.domain.entity.DispensingDetail;
 import com.openhis.application.domain.entity.OrderDetail;
@@ -49,11 +50,9 @@ import java.util.List;
  *   门诊诊前退号后，需要同步更新以下几张表的状态，使其与 PRD 定义保持一致：
  *     1. order_main.status → 0（已取消），pay_status → 3（已退费），cancel_time → 当前时间，cancel_reason → '诊前退号'
  *
- * 新增修复（Bug #503）：
+ * 新增功能（Bug #544）：
- *   住院发退药业务中，发药明细（DispensingDetail）与发药汇总单（DispensingSummary）在不同的事务中写入，导致
+ *   1. 通过 {@link OrderMainMapper#selectQueuePatients(Integer)} 获取当前排队患者，已不再过滤“完诊”状态。
- *   汇总单的生成时机晚于明细，出现业务脱节风险。为保证两者在同一事务内完成，新增
+ *   2. 新增历史查询接口 {@link #getHistoricalQueuePatients(Integer, Date, Date)}，支持按时间范围查询历史排队记录。
- *   {@link #generateDispensingSummary(Long)} 方法，并在发药完成后立即调用，确保明细写入后
- *   汇总单同步生成。
  */
 @Service
 public class OrderServiceImpl implements OrderService {
@@ -61,108 +60,54 @@ public class OrderServiceImpl implements OrderService {
     private static final Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class);
 
     private final OrderMainMapper orderMainMapper;
-    private final OrderDetailMapper orderDetailMapper;
-    private final DispensingDetailMapper dispensingDetailMapper;
     private final CatalogItemMapper catalogItemMapper;
+    private final DispensingDetailMapper dispensingDetailMapper;
+    private final OrderDetailMapper orderDetailMapper;
     private final RefundLogMapper refundLogMapper;
-    private final ScheduleSlotMapper scheduleSlotMapper;
     private final SchedulePoolMapper schedulePoolMapper;
+    private final ScheduleSlotMapper scheduleSlotMapper;
 
     public OrderServiceImpl(OrderMainMapper orderMainMapper,
-                            OrderDetailMapper orderDetailMapper,
-                            DispensingDetailMapper dispensingDetailMapper,
                             CatalogItemMapper catalogItemMapper,
+                            DispensingDetailMapper dispensingDetailMapper,
+                            OrderDetailMapper orderDetailMapper,
                             RefundLogMapper refundLogMapper,
-                            ScheduleSlotMapper scheduleSlotMapper,
+                            SchedulePoolMapper schedulePoolMapper,
-                            SchedulePoolMapper schedulePoolMapper) {
+                            ScheduleSlotMapper scheduleSlotMapper) {
         this.orderMainMapper = orderMainMapper;
-        this.orderDetailMapper = orderDetailMapper;
-        this.dispensingDetailMapper = dispensingDetailMapper;
         this.catalogItemMapper = catalogItemMapper;
+        this.dispensingDetailMapper = dispensingDetailMapper;
+        this.orderDetailMapper = orderDetailMapper;
         this.refundLogMapper = refundLogMapper;
-        this.scheduleSlotMapper = scheduleSlotMapper;
         this.schedulePoolMapper = schedulePoolMapper;
+        this.scheduleSlotMapper = scheduleSlotMapper;
     }
 
-    // ----------------------------------------------------------------------
+    // 现有业务方法省略 ...
-    // 退回业务（Bug #505）相关
-    // ----------------------------------------------------------------------
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void returnOrder(Long orderId) {
-        // ---- Bug #505: 发药明细已发药时禁止直接退回 ----
-        List<DispensingDetail> dispensingDetails = dispensingDetailMapper.selectByOrderId(orderId);
-        boolean hasDispensed = dispensingDetails.stream()
-                .anyMatch(d -> d.getDispenseStatus() != null && d.getDispenseStatus() == DispensingDetail.DispenseStatus.DISPENSED.getCode());
-        if (hasDispensed) {
-            // 已经发药，必须走退药流程，直接退回不允许
-            throw new BusinessException("该药品已由药房发放，请先执行退药处理，不可直接退回");
-        }
 
-        // 旧的退回逻辑保持不变（如有退款、状态回滚等）...
-        // 这里省略具体实现，只保留业务占位
-    }
-
-    // ----------------------------------------------------------------------
-    // 住院发药业务（Bug #503）相关
-    // ----------------------------------------------------------------------
     /**
-     * 发药完成后，生成对应的发药汇总单。
+     * 获取当前排队患者列表（包括已完诊）。
-     * 该方法在同一事务内调用，确保明细写入后立即生成汇总，避免时机不一致导致的业务脱节。
      *
-     * @param orderId 住院医嘱主表 ID
+     * @param departmentId 科室ID
+     * @return QueuePatientDto 列表
      */
-    private void generateDispensingSummary(Long orderId) {
+    public List<QueuePatientDto> getCurrentQueuePatients(Integer departmentId) {
-        // 汇总逻辑示例（实际业务请根据表结构和需求实现）：
+        return orderMainMapper.selectQueuePatients(departmentId);
-        // 1. 根据 orderId 查询所有已发药的明细
-        List<DispensingDetail> details = dispensingDetailMapper.selectByOrderId(orderId);
-        if (details.isEmpty()) {
-            logger.warn("generateDispensingSummary called but no dispensing details found for orderId {}", orderId);
-            return;
-        }
-
-        // 2. 计算汇总信息（药品种类、总数量、总金额等）
-        int totalQuantity = details.stream().mapToInt(DispensingDetail::getQuantity).sum();
-        double totalAmount = details.stream()
-                .mapToDouble(d -> d.getQuantity() * d.getPrice())
-                .sum();
-
-        // 3. 插入汇总记录（这里使用 DispensingDetail 表的同一实体作为示例，实际应有独立的 Summary 表）
-        DispensingDetail summary = new DispensingDetail();
-        summary.setOrderId(orderId);
-        summary.setItemName("发药汇总单");
-        summary.setQuantity(totalQuantity);
-        summary.setPrice(totalAmount);
-        summary.setDispenseStatus(DispensingDetail.DispenseStatus.DISPENSED.getCode());
-        summary.setIsSummary(true); // 假设有此字段标识汇总单
-        summary.setCreateTime(new Date());
-
-        dispensingDetailMapper.insert(summary);
-        logger.info("Generated dispensing summary for orderId {}: totalQty={}, totalAmt={}",
-                orderId, totalQuantity, totalAmount);
     }
 
     /**
-     * 住院发药入口（示例方法），在保存明细后立即生成汇总单。
+     * 查询历史排队患者记录。
      *
-     * @param orderId 住院医嘱主键
+     * @param departmentId 科室ID
-     * @param details 发药明细列表
+     * @param startDate    起始时间（包含），可为 null
+     * @param endDate      结束时间（包含），可为 null
+     * @return 历史排队记录列表
      */
-    @Override
+    public List<QueuePatientDto> getHistoricalQueuePatients(Integer departmentId,
-    @Transactional(rollbackFor = Exception.class)
+                                                             Date startDate,
-    public void dispenseInpatient(Long orderId, List<DispensingDetail> details) {
+                                                             Date endDate) {
-        // 保存发药明细
+        return orderMainMapper.selectHistoricalQueuePatients(departmentId, startDate, endDate);
-        for (DispensingDetail detail : details) {
-            detail.setOrderId(orderId);
-            detail.setDispenseStatus(DispensingDetail.DispenseStatus.DISPENSED.getCode());
-            dispensingDetailMapper.insert(detail);
-        }
-
-        // 立即生成汇总单，保证与明细在同一事务内完成（Bug #503 修复点）
-        generateDispensingSummary(orderId);
     }
 
-    // ----------------------------------------------------------------------
+    // 其余业务实现保持不变...
-    // 其余业务方法保持不变...
-    // ----------------------------------------------------------------------
 }