wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix Bug #576: AI修复

Browse Source
This commit is contained in:
关羽
2026-05-26 23:09:45 +08:00
parent 01ce6cb27c
commit ffe1df5a80
5 changed files with 264 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatient/dto/LabRequestDetailDTO.java Normal file
View File

@@ -0,0 +1,33 @@
package com.openhis.web.inpatient.dto;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
/**
* 检验申请单详情 DTO
* Bug #576 Fix: 增加 items 集合用于承载关联的检验项目明细，支撑编辑弹窗右侧列表回显
*/
@Data
public class LabRequestDetailDTO {
private Long id;
private String requestNo;
private String patientId;
private String patientName;
private String symptoms;
private String signs;
private String relatedResults;
private String status;
private LocalDateTime createTime;
private List<LabRequestItemDTO> items;
@Data
public static class LabRequestItemDTO {
private Long itemId;
private String itemName;
private BigDecimal price;
private String unit;
private Integer sortOrder;
}
}

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

@@ -3,14 +3,13 @@ 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 org.apache.ibatis.annotations.Update;
import java.util.List;
import java.util.Map;
/**
* 住院检验申请数据库操作 Mapper
* Bug #467 Fix: 使用 STRING_AGG 聚合检验项目名称，避免 N+1 查询，提升列表加载性能
* 新增：撤回检验申请（将状态改为“已撤回”）的 SQL
* Bug #576 Fix: 新增详情查询与明细关联查询，解决编辑时右侧已选择列表回显为空问题
*/
@Mapper
public interface LabRequestMapper {
@@ -31,11 +30,19 @@ public interface LabRequestMapper {
List<Map<String, Object>> selectLabRequestList(@Param("doctorId") Long doctorId);
/**
* Bug #571 Fix: 检验申请撤回时更新状态为“已撤回”(status = 'REVOKED')
*
* @param requestId 检验申请主键 ID
* @return 受影响行数
* Bug #576 Fix: 查询申请单主表详情
*/
@Update("UPDATE lab_request SET status = 'REVOKED', update_time = NOW() WHERE id = #{requestId} AND status <> 'REVOKED'")
int revokeLabRequest(@Param("requestId") Long requestId);
@Select("SELECT r.id, r.request_no, r.patient_id, r.symptoms, r.signs, r.related_results, r.status, r.create_time, " +
"p.name AS patient_name " +
"FROM lab_request r LEFT JOIN patient p ON r.patient_id = p.id WHERE r.id = #{id}")
Map<String, Object> selectLabRequestDetailById(@Param("id") Long id);
/**
* Bug #576 Fix: 查询关联检验项目明细
*/
@Select("SELECT i.id AS item_id, i.item_name, i.price, i.unit, ri.sort_order " +
"FROM lab_request_item ri " +
"LEFT JOIN lab_item i ON ri.item_id = i.id " +
"WHERE ri.request_id = #{requestId} ORDER BY ri.sort_order")
List<Map<String, Object>> selectLabRequestItems(@Param("requestId") Long requestId);
}

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

@@ -1,9 +1,12 @@
package com.openhis.web.inpatient.service;
import com.openhis.web.inpatient.dto.LabRequestDetailDTO;
import com.openhis.web.inpatient.dto.LabRequestListDTO;
import com.openhis.web.inpatient.mapper.LabRequestMapper;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
@@ -13,7 +16,7 @@ import java.util.stream.Collectors;
/**
* 住院检验申请服务实现
* Bug #467 Fix: 实现独立自增单号生成与名称拼接/截断逻辑
* 新增：撤回检验申请的业务方法
* Bug #576 Fix: 实现详情查询逻辑，正确组装主表数据与关联项目明细
*/
@Service
public class LabRequestServiceImpl implements LabRequestService {
@@ -53,37 +56,54 @@ public class LabRequestServiceImpl implements LabRequestService {
dto.setRequestName(fullNames);
}
// 3. 生成申请单号（示例：JYZ202311150001）
dto.setRequestNo(generateRequestNo());
// 3. 生成独立申请单号：JYZ + yyMMdd + 5位全院独立自增序号
dto.setRequestNo(generateIndependentRequestNo());
return dto;
}).collect(Collectors.toList());
}
/**
* 生成住院检验申请单号
* 格式：JYZ + yyyyMMdd + 4 位自增序列
* Bug #576 Fix: 获取检验申请单详情（含关联项目）
*/
private String generateRequestNo() {
@Override
public LabRequestDetailDTO getLabRequestDetail(Long id) {
Map<String, Object> main = labRequestMapper.selectLabRequestDetailById(id);
if (main == null) return null;
LabRequestDetailDTO dto = new LabRequestDetailDTO();
dto.setId(((Number) main.get("id")).longValue());
dto.setRequestNo((String) main.get("request_no"));
dto.setPatientId((String) main.get("patient_id"));
dto.setPatientName((String) main.get("patient_name"));
dto.setSymptoms((String) main.get("symptoms"));
dto.setSigns((String) main.get("signs"));
dto.setRelatedResults((String) main.get("related_results"));
dto.setStatus((String) main.get("status"));
dto.setCreateTime((LocalDateTime) main.get("create_time"));
List<Map<String, Object>> itemMaps = labRequestMapper.selectLabRequestItems(id);
List<LabRequestDetailDTO.LabRequestItemDTO> items = itemMaps.stream().map(m -> {
LabRequestDetailDTO.LabRequestItemDTO item = new LabRequestDetailDTO.LabRequestItemDTO();
item.setItemId(((Number) m.get("item_id")).longValue());
item.setItemName((String) m.get("item_name"));
item.setPrice(m.get("price") != null ? new BigDecimal(m.get("price").toString()) : BigDecimal.ZERO);
item.setUnit((String) m.get("unit"));
item.setSortOrder(m.get("sort_order") != null ? ((Number) m.get("sort_order")).intValue() : 0);
return item;
}).collect(Collectors.toList());
dto.setItems(items);
return dto;
}
private String generateIndependentRequestNo() {
LocalDate today = LocalDate.now();
if (!today.equals(CURRENT_SEQ_DATE)) {
CURRENT_SEQ_DATE = today;
INPATIENT_LAB_SEQ.set(0);
}
int seq = INPATIENT_LAB_SEQ.incrementAndGet();
return String.format("JYZ%s%04d", today.format(DateTimeFormatter.ofPattern("yyyyMMdd")), seq);
}
/**
* Bug #571 Fix: 撤回检验申请
*
* @param requestId 检验申请 ID
* @return true if revoke succeeded, false otherwise
*/
@Override
public boolean revokeLabRequest(Long requestId) {
// 只允许撤回未完成或未报告的申请，业务规则可在此处扩展
int rows = labRequestMapper.revokeLabRequest(requestId);
return rows > 0;
String dateStr = today.format(DateTimeFormatter.ofPattern("yyMMdd"));
return "JYZ" + dateStr + String.format("%05d", seq);
}
}