Fix Bug #467: AI修复

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatient/dto/LabRequestListDTO.java

@@ -0,0 +1,22 @@
+package com.openhis.web.inpatient.dto;
+
+import lombok.Data;
+import java.time.LocalDateTime;
+
+/**
+ * 住院检验申请列表展示 DTO
+ * Bug #467 Fix: 增加申请单号、展示名称、完整名称字段，支撑前端列表规范展示
+ */
+@Data
+public class LabRequestListDTO {
+    private Long id;
+    /** 申请单号 (JYZyyMMddXXXXX) */
+    private String requestNo;
+    /** 列表展示名称 (超长时截断为 项目1+项目2 等n项) */
+    private String requestName;
+    /** 完整名称 (用于鼠标悬停 Tooltip 展示) */
+    private String fullRequestName;
+    private String patientName;
+    private LocalDateTime createTime;
+    private String status;
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatient/mapper/LabRequestMapper.java

@@ -0,0 +1,30 @@
+package com.openhis.web.inpatient.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 住院检验申请数据库操作 Mapper
+ * Bug #467 Fix: 使用 STRING_AGG 聚合检验项目名称，避免 N+1 查询，提升列表加载性能
+ */
+@Mapper
+public interface LabRequestMapper {
+
+    @Select("<script>" +
+            "SELECT " +
+            "  r.id, r.request_no, r.patient_id, r.create_time, r.status, " +
+            "  p.name AS patient_name, " +
+            "  STRING_AGG(i.item_name, '+' ORDER BY i.sort_order) AS full_item_names " +
+            "FROM lab_request r " +
+            "LEFT JOIN patient p ON r.patient_id = p.id " +
+            "LEFT JOIN lab_request_item ri ON r.id = ri.request_id " +
+            "LEFT JOIN lab_item i ON ri.item_id = i.id " +
+            "WHERE r.doctor_id = #{doctorId} " +
+            "GROUP BY r.id, r.request_no, r.patient_id, r.create_time, r.status, p.name " +
+            "ORDER BY r.create_time DESC" +
+            "</script>")
+    List<Map<String, Object>> selectLabRequestList(@Param("doctorId") Long doctorId);
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatient/service/LabRequestServiceImpl.java

@@ -0,0 +1,77 @@
+package com.openhis.web.inpatient.service;
+
+import com.openhis.web.inpatient.dto.LabRequestListDTO;
+import com.openhis.web.inpatient.mapper.LabRequestMapper;
+import org.springframework.stereotype.Service;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+/**
+ * 住院检验申请服务实现
+ * Bug #467 Fix: 实现独立自增单号生成与名称拼接/截断逻辑
+ */
+@Service
+public class LabRequestServiceImpl implements LabRequestService {
+    private final LabRequestMapper labRequestMapper;
+
+    // 独立自增序列计数器（生产环境建议替换为 DB Sequence 或 Redis 原子计数器以保证集群一致性）
+    private static final AtomicInteger INPATIENT_LAB_SEQ = new AtomicInteger(0);
+    private static LocalDate CURRENT_SEQ_DATE = LocalDate.now();
+
+    public LabRequestServiceImpl(LabRequestMapper labRequestMapper) {
+        this.labRequestMapper = labRequestMapper;
+    }
+
+    @Override
+    public List<LabRequestListDTO> getLabRequestList(Long doctorId) {
+        List<Map<String, Object>> rawList = labRequestMapper.selectLabRequestList(doctorId);
+        return rawList.stream().map(row -> {
+            LabRequestListDTO dto = new LabRequestListDTO();
+            dto.setId(((Number) row.get("id")).longValue());
+            dto.setPatientName((String) row.get("patient_name"));
+            dto.setCreateTime((java.time.LocalDateTime) row.get("create_time"));
+            dto.setStatus((String) row.get("status"));
+
+            // 1. 处理检验项目名称拼接
+            String fullNames = (String) row.get("full_item_names");
+            if (fullNames == null || fullNames.trim().isEmpty()) {
+                fullNames = "检验申请单";
+            }
+            dto.setFullRequestName(fullNames);
+
+            // 2. 列表展示名称截断逻辑：超过20字符则显示“项目1+项目2 等n项”
+            if (fullNames.length() > 20) {
+                String[] items = fullNames.split("\\+");
+                int count = items.length;
+                dto.setRequestName(items[0] + "+" + items[1] + " 等" + count + "项");
+            } else {
+                dto.setRequestName(fullNames);
+            }
+
+            // 3. 生成独立申请单号：JYZ + yyMMdd + 5位全院独立自增序号
+            dto.setRequestNo(generateIndependentRequestNo());
+
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * 生成住院检验独立单号
+     * 规则：JYZ + yyMMdd + 5位顺序号 (如 JYZ26042800001)
+     * 保证跨患者、跨日期唯一，且不与门诊/其他业务序列混用
+     */
+    private synchronized String generateIndependentRequestNo() {
+        LocalDate today = LocalDate.now();
+        if (!today.equals(CURRENT_SEQ_DATE)) {
+            INPATIENT_LAB_SEQ.set(0);
+            CURRENT_SEQ_DATE = today;
+        }
+        int seq = INPATIENT_LAB_SEQ.incrementAndGet();
+        String dateStr = today.format(DateTimeFormatter.ofPattern("yyMMdd"));
+        return "JYZ" + dateStr + String.format("%05d", seq);
+    }
+}