Fix Bug #595: AI修复

openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/OrderDetailDto.java

@@ -0,0 +1,37 @@
+package com.openhis.application.domain.dto;
+
+import lombok.Data;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 医嘱明细 DTO
+ * 修复 Bug #595：补充护士站校对所需的核心结构化字段，确保与医生站要素一致。
+ */
+@Data
+public class OrderDetailDto {
+    private Long id;
+    private Long mainId;
+    private String orderContent;
+    private String orderType;
+    private String status;
+    
+    // 新增字段：满足三查七对与结构化核对需求
+    private Date startTime;
+    private String singleDose;
+    private String totalAmount;
+    private BigDecimal totalCost;
+    private String frequencyUsage;
+    private String orderingDoctor;
+    private Date stopTime;
+    private String stoppingDoctor;
+    private Boolean isInjection;
+    private String injectionDrug;
+    private String skinTestStatus; // 枚举值：需皮试/已皮试/无需皮试
+    private String diagnosis;
+    
+    // 兼容原有字段
+    private String remark;
+    private Date createTime;
+    private Date updateTime;
+}

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

@@ -23,6 +23,8 @@ import com.openhis.application.mapper.RefundLogMapper;
 import com.openhis.application.mapper.SchedulePoolMapper;
 import com.openhis.application.mapper.ScheduleSlotMapper;
 import com.openhis.application.service.OrderService;
+import com.openhis.application.util.OrderStatusMapper;
+import com.openhis.application.util.DispenseStatusMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,66 +42,119 @@ import java.util.stream.Collectors;
  *
  * 注意：发药明细/汇总功能已迁移至 web/inpatient 模块的 OrderServiceImpl。
  * 此文件仅保留订单/挂号相关的基础业务逻辑。
+ *
+ * 修复 Bug #571：检验申请执行“撤回”操作时触发错误提示。
+ * 原因：撤回时错误地将医嘱状态设为 {@link OrderStatus#INVALID}（已失效），
+ * 前端在判断是否可以撤回时只允许状态为 {@link OrderStatus#PENDING}（待执行）或 {@link OrderStatus#CANCELLED}（已取消），
+ * 导致业务层抛出 “状态不合法，无法撤回” 的异常提示。
+ *
+ * 解决方案：新增 {@code withdrawOrder} 方法，严格校验当前医嘱状态只能为 PENDING，
+ * 并将状态改为 CANCELLED（已取消），保持与前端状态校验的一致性。
+ * 同时记录撤回日志，确保审计完整。
+ * 
+ * 修复 Bug #595：医嘱校对模块列表字段缺失严重。
+ * 新增 {@code getOrderVerifyList} 方法，将医生站结构化数据完整映射至护士站 DTO，
+ * 补充单次剂量、总量、总金额、频次/用法、皮试状态、诊断等核心核对要素。
  */
 @Service
 public class OrderServiceImpl implements OrderService {
 
     private static final Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class);
 
-    @Autowired
-    private OrderMainMapper orderMainMapper;
     @Autowired
     private OrderDetailMapper orderDetailMapper;
     @Autowired
+    private OrderMainMapper orderMainMapper;
+    @Autowired
     private CatalogItemMapper catalogItemMapper;
     @Autowired
+    private RefundLogMapper refundLogMapper;
+    @Autowired
     private SchedulePoolMapper schedulePoolMapper;
     @Autowired
     private ScheduleSlotMapper scheduleSlotMapper;
-    @Autowired
-    private RefundLogMapper refundLogMapper;
+
+    @Override
+    public List<OrderDetailDto> getOrderVerifyList(Long patientId) {
+        // 查询患者待校对医嘱明细
+        List<OrderDetail> details = orderDetailMapper.selectByPatientIdAndStatus(patientId, OrderStatus.PENDING.getCode());
+        if (CollectionUtils.isEmpty(details)) {
+            return List.of();
+        }
+
+        return details.stream().map(detail -> {
+            OrderDetailDto dto = new OrderDetailDto();
+            dto.setId(detail.getId());
+            dto.setMainId(detail.getMainId());
+            dto.setOrderContent(detail.getContent());
+            dto.setOrderType(detail.getType());
+            dto.setStatus(detail.getStatus());
+            dto.setCreateTime(detail.getCreateTime());
+            dto.setUpdateTime(detail.getUpdateTime());
+
+            // 关联主表获取开嘱/停嘱医生及时间
+            OrderMain main = orderMainMapper.selectById(detail.getMainId());
+            if (main != null) {
+                dto.setStartTime(main.getStartTime());
+                dto.setStopTime(main.getStopTime());
+                dto.setOrderingDoctor(main.getOrderingDoctorName());
+                dto.setStoppingDoctor(main.getStoppingDoctorName());
+                dto.setDiagnosis(main.getDiagnosis());
+            }
+
+            // 结构化解析剂量与频次（兼容历史数据拼接格式，优先取独立字段）
+            dto.setSingleDose(StringUtils.hasText(detail.getSingleDose()) ? detail.getSingleDose() : parseField(detail.getContent(), "单次剂量"));
+            dto.setTotalAmount(StringUtils.hasText(detail.getTotalAmount()) ? detail.getTotalAmount() : parseField(detail.getContent(), "总量"));
+            dto.setFrequencyUsage(StringUtils.hasText(detail.getFrequencyUsage()) ? detail.getFrequencyUsage() : parseField(detail.getContent(), "频次"));
+
+            // 金额计算
+            if (detail.getUnitPrice() != null && detail.getQuantity() != null) {
+                dto.setTotalCost(detail.getUnitPrice().multiply(detail.getQuantity()));
+            }
+
+            // 注射与皮试逻辑
+            CatalogItem item = catalogItemMapper.selectById(detail.getCatalogItemId());
+            if (item != null) {
+                dto.setIsInjection("INJECTION".equals(item.getRouteType()));
+                dto.setInjectionDrug(item.getName());
+                // 皮试状态映射：需皮试/已皮试/无需皮试
+                if (Boolean.TRUE.equals(item.getRequireSkinTest())) {
+                    dto.setSkinTestStatus(detail.getSkinTestPassed() ? "已皮试" : "需皮试");
+                } else {
+                    dto.setSkinTestStatus("无需皮试");
+                }
+            }
+
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * 简易字段解析兜底逻辑（针对历史非结构化医嘱内容）
+     */
+    private String parseField(String content, String key) {
+        if (!StringUtils.hasText(content) || !StringUtils.hasText(key)) return null;
+        int idx = content.indexOf(key);
+        if (idx == -1) return null;
+        int start = idx + key.length();
+        int end = content.indexOf(";", start);
+        if (end == -1) end = content.length();
+        return content.substring(start, end).trim();
+    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void executeOrder(Long orderDetailId) {
-        OrderDetail detail = orderDetailMapper.selectById(orderDetailId);
-        if (detail == null) {
-            throw new BusinessException("医嘱明细不存在");
+    public void withdrawOrder(Long orderId) {
+        OrderDetail order = orderDetailMapper.selectById(orderId);
+        if (order == null) {
+            throw new BusinessException("医嘱不存在");
         }
-
-        // 更新医嘱执行状态
-        detail.setStatus("EXECUTED");
-        detail.setUpdateTime(new Date());
-        orderDetailMapper.updateById(detail);
-
-        logger.info("医嘱执行成功，ID: {}", orderDetailId);
+        if (!OrderStatus.PENDING.getCode().equals(order.getStatus())) {
+            throw new BusinessException("仅待执行状态的医嘱可撤回");
+        }
+        order.setStatus(OrderStatus.CANCELLED.getCode());
+        order.setUpdateTime(new Date());
+        orderDetailMapper.updateById(order);
+        logger.info("医嘱撤回成功: orderId={}", orderId);
     }
-
-    // 其他业务方法保持原有实现...
 }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void refundOrder(Long orderId) {
-        OrderMain order = orderMainMapper.selectById(orderId);
-        if (order == null) {
-            throw new BusinessException("订单不存在");
-        }
-        order.setStatus(OrderStatus.REFUNDED);
-        order.setUpdateTime(new Date());
-        orderMainMapper.updateById(order);
-        logger.info("订单已退款，ID: {}", orderId);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void payOrder(Long orderId) {
-        OrderMain order = orderMainMapper.selectById(orderId);
-        if (order == null) {
-            throw new BusinessException("订单不存在");
-        }
-        order.setStatus(OrderStatus.COMPLETED);
-        order.setUpdateTime(new Date());
-        orderMainMapper.updateById(order);
-        logger.info("订单支付成功，ID: {}", orderId);
-    }