diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationLabApplyServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationLabApplyServiceImpl.java index b66d60a9..ccaf38e6 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationLabApplyServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationLabApplyServiceImpl.java @@ -374,11 +374,11 @@ public class DoctorStationLabApplyServiceImpl implements IDoctorStationInspectio // 查询检验申请单列表 log.debug("查询申请单数据前"); - List list = doctorStationLabApplyMapper.getInspectionApplyListPage(encounterId); + List list = doctorStationLabApplyMapper.getInspectionApplyListPage(encounterId); log.debug("查询申请单数据后"); // 使用 PageInfo 包装查询结果 - PageInfo pageInfo = new PageInfo<>(list); + PageInfo pageInfo = new PageInfo<>(list); // 构建返回结果 Map result = new HashMap<>(); diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationLabApplyDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationLabApplyDto.java index fdcd81fb..fbbb0709 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationLabApplyDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DoctorStationLabApplyDto.java @@ -17,6 +17,10 @@ import java.util.List; @Data @Accessors(chain = true) public class DoctorStationLabApplyDto { + /** + * 申请单ID(数据库自增主键) + */ + private Long applicationId; /** * 申请单编号 */ diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationLabApplyMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationLabApplyMapper.java index 55020e48..32505f1f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationLabApplyMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationLabApplyMapper.java @@ -1,6 +1,6 @@ package com.openhis.web.doctorstation.mapper; -import com.openhis.lab.domain.InspectionLabApply; +import com.openhis.web.doctorstation.dto.DoctorStationLabApplyDto; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -23,5 +23,5 @@ public interface DoctorStationLabApplyMapper { * @param encounterId 就诊 ID * @return 检验申请单列表 */ - List getInspectionApplyListPage(@Param("encounterId") Long encounterId); + List getInspectionApplyListPage(@Param("encounterId") Long encounterId); } diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationLabApplyMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationLabApplyMapper.xml index f9464c2c..90fc30f7 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationLabApplyMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationLabApplyMapper.xml @@ -7,6 +7,7 @@ + 直接查询申请单表,不关联明细表,避免重复记录-->