提交merge1.3

2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IActivityDefinitionService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IActivityDefinitionService.java
@@ -43,18 +43,51 @@ public interface IActivityDefinitionService extends IService<ActivityDefinition>

    /**
     * Desc: 根据 项目id数组 加载 诊疗数据集合
+<<<<<<< HEAD
+=======
+     * 
+>>>>>>> v1.3
     * @param itemIds
     * @Author raymond
     * @Date 12:20 2025/10/18
     * @return java.util.List<com.openhis.workflow.domain.ActivityDefinition>
     **/
    List<ActivityDto> searchActivityDefinitionByIds(@Param("itemIds") List<Long> itemIds);
+<<<<<<< HEAD
    /**
     * Desc: 根据关键字查询 如果关键字为空，查询10条，否则返回查询到的所有
+=======
+
+    /**
+     * Desc: 根据关键字查询 如果关键字为空，查询10条，否则返回查询到的所有
+     * 
+>>>>>>> v1.3
     * @param keyWord
     * @Author raymond
     * @Date 07:53 2025/10/22
     * @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
     **/
    List<AdjustPriceMedListDto> searchActivityListByKeyWord(String keyWord);
+<<<<<<< HEAD
+=======
+
+    /**
+     * 查询某一类的服务
+     * 
+     * @param productIdList id集合
+     * @param activityDefCategory 类型
+     * @return 查询结果
+     */
+    List<ActivityDefinition> getListByIds(List<Long> productIdList, Integer activityDefCategory);
+
+    /**
+     * 查询某一类的服务
+     *
+     * @param productIdList id集合
+     * @param typeEnum 类型
+     * @return 查询结果
+     */
+    List<ActivityDefinition> getListByTypeEnum(List<Long> productIdList, Integer typeEnum);
+
+>>>>>>> v1.3
 }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceDispenseService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceDispenseService.java
@@ -38,6 +38,21 @@ public interface IDeviceDispenseService extends IService<DeviceDispense> {
     */
    Long generateDeviceDispense(DeviceRequest deviceRequest, Long procedureId, Long locationId,
        Date plannedDispenseTime);
+<<<<<<< HEAD
+=======
+
+    /**
+     * 医嘱执行生成耗材发放,状态为已发放
+     *
+     * @param deviceRequest 耗材医嘱请求
+     * @param procedureId 执行记录id
+     * @param locationId 发放器材房
+     * @param plannedDispenseTime 预定发药时间
+     * @return 发放id
+     */
+    Long generateIssuedDeviceDispense(DeviceRequest deviceRequest, Long procedureId, Long locationId,
+        Date plannedDispenseTime);
+>>>>>>> v1.3

    /**
     * 删除器材发放信息
@@ -128,4 +143,15 @@ public interface IDeviceDispenseService extends IService<DeviceDispense> {
     * @param medDispenseId 发放id列表
     */
    void updateDispenseStatusSummarized(List<Long> medDispenseId, String busNo);
+<<<<<<< HEAD
+=======
+
+    /**
+     * 通过请求id获取耗材发放信息
+     *
+     * @param requestIdList 请求id
+     * @return 发放信息
+     */
+    List<DeviceDispense> selectByRequestIdList(List<Long> requestIdList);
+>>>>>>> v1.3
 }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java
@@ -118,4 +118,15 @@ public interface IServiceRequestService extends IService<ServiceRequest> {
     * @return 请求信息列表
     */
    List<ServiceRequest> getServiceRequestByActivityId(Long activityId);
+<<<<<<< HEAD
+=======
+
+    /**
+     * 查询诊疗对应的服务申请
+     *
+     * @param encounterId 就诊id
+     * @return 请求信息列表
+     */
+    List<ServiceRequest> getServiceRequestListByEncounterId(Long encounterId);
+>>>>>>> v1.3
 }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestService.java
@@ -25,6 +25,14 @@ public interface ISupplyRequestService extends IService<SupplyRequest> {
     */
    List<SupplyRequest> getSupplyByBusNo(String busNo);

+    /**
+     * 通过单据号批量查询单据信息
+     *
+     * @param busNoList 单据号
+     * @return 单据信息
+     */
+    List<SupplyRequest> getSupplyByBusNoBatch(List<String> busNoList);
+
    /**
     * 通过原始单据号查询单据信息
     *
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ActivityDefinitionServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ActivityDefinitionServiceImpl.java
@@ -2,15 +2,21 @@ package com.openhis.workflow.service.impl;

 import java.util.List;

+<<<<<<< HEAD
 import com.openhis.medication.dto.AdjustPriceMedListDto;
 import com.openhis.workflow.dto.ActivityDto;
+=======
+import com.core.common.enums.DelFlag;
+>>>>>>> v1.3
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.openhis.common.enums.PublicationStatus;
+import com.openhis.medication.dto.AdjustPriceMedListDto;
 import com.openhis.workflow.domain.ActivityDefinition;
+import com.openhis.workflow.dto.ActivityDto;
 import com.openhis.workflow.mapper.ActivityDefinitionMapper;
 import com.openhis.workflow.service.IActivityDefinitionService;

@@ -80,4 +86,28 @@ public class ActivityDefinitionServiceImpl extends ServiceImpl<ActivityDefinitio
        return this.activityDefinitionMapper.searchActivityListByKeyWord(keyWord);
    }

+<<<<<<< HEAD
+=======
+    @Override
+    public List<ActivityDefinition> getListByIds(List<Long> productIdList, Integer activityDefCategory) {
+        LambdaQueryWrapper<ActivityDefinition> queryWrapper = new LambdaQueryWrapper<>();
+        if (activityDefCategory != null) {
+            queryWrapper.eq(ActivityDefinition::getCategoryCode, activityDefCategory);
+        }
+        queryWrapper.in(ActivityDefinition::getId, productIdList).eq(ActivityDefinition::getDeleteFlag,
+            DelFlag.NO.getCode());
+        return baseMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public List<ActivityDefinition> getListByTypeEnum(List<Long> productIdList, Integer typeEnum) {
+        LambdaQueryWrapper<ActivityDefinition> queryWrapper = new LambdaQueryWrapper<>();
+        if (typeEnum != null) {
+            queryWrapper.eq(ActivityDefinition::getTypeEnum, typeEnum);
+        }
+        queryWrapper.in(ActivityDefinition::getId, productIdList).eq(ActivityDefinition::getDeleteFlag,
+                DelFlag.NO.getCode());
+        return baseMapper.selectList(queryWrapper);
+    }
+>>>>>>> v1.3
 }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceDispenseServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceDispenseServiceImpl.java
@@ -1,5 +1,7 @@
 package com.openhis.workflow.service.impl;

+import static com.core.common.utils.SecurityUtils.getLoginUser;
+
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -13,11 +15,11 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.core.common.core.domain.model.LoginUser;
+import com.core.common.enums.DelFlag;
 import com.core.common.utils.AssignSeqUtil;
 import com.openhis.administration.domain.Practitioner;
 import com.openhis.common.enums.AssignSeqEnum;
-import com.openhis.common.enums.DbOpType;
-import com.openhis.common.enums.DelFlag;
 import com.openhis.common.enums.DispenseStatus;
 import com.openhis.workflow.domain.DeviceDispense;
 import com.openhis.workflow.domain.DeviceRequest;
@@ -87,12 +89,23 @@ public class DeviceDispenseServiceImpl extends ServiceImpl<DeviceDispenseMapper,
        // 设置限制发药时间
        deviceDispense.setLimitTime(limitTime);

+<<<<<<< HEAD
        if (DbOpType.INSERT.getCode().equals(dbOpType)) {
            baseMapper.insert(deviceDispense);
        } else if (DbOpType.UPDATE.getCode().equals(dbOpType)) {
            baseMapper.update(deviceDispense,
                new LambdaUpdateWrapper<DeviceDispense>().eq(DeviceDispense::getDeviceReqId, deviceRequest.getId()));
        }
+=======
+        baseMapper.insert(deviceDispense);
+
+        // if (DbOpType.INSERT.getCode().equals(dbOpType)) {
+        // baseMapper.insert(deviceDispense);
+        // } else if (DbOpType.UPDATE.getCode().equals(dbOpType)) {
+        // baseMapper.update(deviceDispense,
+        // new LambdaUpdateWrapper<DeviceDispense>().eq(DeviceDispense::getDeviceReqId, deviceRequest.getId()));
+        // }
+>>>>>>> v1.3

        return deviceDispense.getId();
    }
@@ -335,4 +348,84 @@ public class DeviceDispenseServiceImpl extends ServiceImpl<DeviceDispenseMapper,
                // .set(DeviceDispense::getSummaryNo, busNo)
                .in(DeviceDispense::getId, medDispenseId).eq(DeviceDispense::getDeleteFlag, DelFlag.NO.getCode()));
    }
+<<<<<<< HEAD
+=======
+
+    /**
+     * 通过请求id获取耗材发放信息
+     *
+     * @param requestIdList 请求id
+     * @return 发放信息
+     */
+    @Override
+    public List<DeviceDispense> selectByRequestIdList(List<Long> requestIdList) {
+        return baseMapper.selectList(new LambdaQueryWrapper<DeviceDispense>()
+            .in(DeviceDispense::getDeviceReqId, requestIdList).eq(DeviceDispense::getDeleteFlag, DelFlag.NO.getCode()));
+    }
+
+    /**
+     * 医嘱执行生成耗材发放,状态为已完成
+     *
+     * @param deviceRequest 耗材医嘱请求
+     * @param procedureId 执行记录id
+     * @param locationId 发放器材房
+     * @param plannedDispenseTime 预定发药时间
+     * @return 发放id
+     */
+    @Override
+    public Long generateIssuedDeviceDispense(DeviceRequest deviceRequest, Long procedureId, Long locationId,
+        Date plannedDispenseTime) {
+        DeviceDispense deviceDispense = new DeviceDispense();
+        // 执行id
+        deviceDispense.setProcedureId(procedureId);
+        // 预定发药时间
+        deviceDispense.setPlannedDispenseTime(plannedDispenseTime);
+        // 设置发放时间
+        deviceDispense.setDispenseTime(plannedDispenseTime);
+        // 器材发放id
+        deviceDispense.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_DIS_NO.getPrefix(), 4));
+        // 器材请求id
+        deviceDispense.setDeviceReqId(deviceRequest.getId());
+        // 器材发放状态
+        deviceDispense.setStatusEnum(DispenseStatus.COMPLETED.getValue());
+        // 发药类型
+        deviceDispense.setDispenseCategoryEnum(deviceRequest.getCategoryEnum());
+        // 器材编码
+        deviceDispense.setDeviceDefId(deviceRequest.getDeviceDefId());
+        // 领药患者
+        deviceDispense.setPatientId(deviceRequest.getPatientId());
+        // 相关诊疗
+        deviceDispense.setEncounterId(deviceRequest.getEncounterId());
+        // 发放数量
+        deviceDispense.setQuantity(deviceRequest.getQuantity());
+        // 发放单位
+        deviceDispense.setUnitCode(deviceRequest.getUnitCode());
+        // 产品批号
+        deviceDispense.setLotNumber(deviceRequest.getLotNumber());
+        // 发药人
+        // todo 存疑,是否用请求人作为发药人
+        LoginUser loginUser = getLoginUser();
+        deviceDispense.setPerformerId(loginUser.getPractitionerId());
+        // 发放器材房
+        deviceDispense.setLocationId(locationId);
+        // 支持用药信息
+        deviceDispense.setSupportInfo(deviceRequest.getSupportInfo());
+        // 已发药数量
+        deviceDispense.setDispenseQuantity(deviceRequest.getQuantity());
+        // 发药频次
+        deviceDispense.setDispenseFrequencyCode(deviceRequest.getRateCode());
+
+        // 获取当前时间
+        LocalDateTime now = LocalDateTime.now();
+        // 增加12小时
+        LocalDateTime newTime = now.plusHours(12);
+        // 转换为Date对象（如果需要保持使用Date类型）
+        Date limitTime = Date.from(newTime.atZone(ZoneId.systemDefault()).toInstant());
+        // 设置限制发药时间
+        deviceDispense.setLimitTime(limitTime);
+        baseMapper.insert(deviceDispense);
+
+        return deviceDispense.getId();
+    }
+>>>>>>> v1.3
 }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceRequestServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceRequestServiceImpl.java
@@ -8,7 +8,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.openhis.administration.domain.Practitioner;
+<<<<<<< HEAD
 import com.openhis.common.enums.DelFlag;
+=======
+import com.core.common.enums.DelFlag;
+>>>>>>> v1.3
 import com.openhis.common.enums.RequestStatus;
 import com.openhis.workflow.domain.DeviceRequest;
 import com.openhis.workflow.mapper.DeviceRequestMapper;
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/InventoryItemServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/InventoryItemServiceImpl.java
@@ -12,9 +12,10 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.common.enums.DelFlag;
+import com.core.common.enums.DelFlag;
 import com.openhis.common.enums.PublicationStatus;
 import com.openhis.workflow.domain.InventoryItem;
+import com.openhis.workflow.dto.AdjustPriceDto;
 import com.openhis.workflow.mapper.InventoryItemMapper;
 import com.openhis.workflow.service.IInventoryItemService;

@@ -70,7 +71,7 @@ public class InventoryItemServiceImpl extends ServiceImpl<InventoryItemMapper, I
        Integer tenantId) {
        LambdaQueryWrapper<InventoryItem> queryWrapper = new LambdaQueryWrapper<InventoryItem>()
            .eq(InventoryItem::getItemId, itemId).eq(InventoryItem::getLotNumber, lotNumber)
-            .eq(InventoryItem::getTenantId, tenantId).eq(InventoryItem::getDeleteFlag, DelFlag.NO.getValue())
+            .eq(InventoryItem::getTenantId, tenantId).eq(InventoryItem::getDeleteFlag, DelFlag.NO.getCode())
            .eq(InventoryItem::getInventoryStatusEnum, PublicationStatus.ACTIVE.getValue());
        if (locationId != null) {
            queryWrapper.eq(InventoryItem::getLocationId, locationId);
@@ -90,7 +91,11 @@ public class InventoryItemServiceImpl extends ServiceImpl<InventoryItemMapper, I
    public List<InventoryItem> selectInventoryByItemIdList(List<Long> itemIdList, Integer tenantId) {
        LambdaQueryWrapper<InventoryItem> queryWrapper =
            new LambdaQueryWrapper<InventoryItem>().in(InventoryItem::getItemId, itemIdList)
+<<<<<<< HEAD
                .eq(InventoryItem::getTenantId, tenantId).eq(InventoryItem::getDeleteFlag, DelFlag.NO.getValue())
+=======
+                .eq(InventoryItem::getTenantId, tenantId).eq(InventoryItem::getDeleteFlag, DelFlag.NO.getCode())
+>>>>>>> v1.3
                .eq(InventoryItem::getInventoryStatusEnum, PublicationStatus.ACTIVE.getValue());
        // 查询取库房信息
        return baseMapper.selectList(queryWrapper);
@@ -104,7 +109,11 @@ public class InventoryItemServiceImpl extends ServiceImpl<InventoryItemMapper, I
    @Override
    public List<InventoryItem> selectAllInventory() {
        LambdaQueryWrapper<InventoryItem> queryWrapper =
+<<<<<<< HEAD
            new LambdaQueryWrapper<InventoryItem>().eq(InventoryItem::getDeleteFlag, DelFlag.NO.getValue());
+=======
+            new LambdaQueryWrapper<InventoryItem>().eq(InventoryItem::getDeleteFlag, DelFlag.NO.getCode());
+>>>>>>> v1.3
        // 查询取库房信息
        return baseMapper.selectList(queryWrapper);
    }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java
@@ -13,7 +13,7 @@ import com.core.common.utils.DateUtils;
 import com.core.common.utils.SecurityUtils;
 import com.openhis.administration.domain.Practitioner;
 import com.openhis.common.constant.CommonConstants;
-import com.openhis.common.enums.DelFlag;
+import com.core.common.enums.DelFlag;
 import com.openhis.common.enums.RequestStatus;
 import com.openhis.workflow.domain.ServiceRequest;
 import com.openhis.workflow.mapper.ServiceRequestMapper;
@@ -225,4 +225,18 @@ public class ServiceRequestServiceImpl extends ServiceImpl<ServiceRequestMapper,
        return baseMapper.selectList(new LambdaQueryWrapper<ServiceRequest>()
            .eq(ServiceRequest::getActivityId, activityId).eq(ServiceRequest::getDeleteFlag, DelFlag.NO.getCode()));
    }
+<<<<<<< HEAD
+=======
+
+    /**
+     * 获取执行过的诊疗数据
+     *
+     * @param encounterId ID
+     */
+    @Override
+    public List<ServiceRequest> getServiceRequestListByEncounterId(Long encounterId) {
+        return baseMapper.selectList(new LambdaQueryWrapper<ServiceRequest>()
+                .eq(ServiceRequest::getEncounterId, encounterId).eq(ServiceRequest::getDeleteFlag, DelFlag.NO.getCode()));
+    }
+>>>>>>> v1.3
 }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyDeliveryServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyDeliveryServiceImpl.java
@@ -13,7 +13,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.SecurityUtils;
 import com.openhis.common.constant.CommonConstants;
+<<<<<<< HEAD
 import com.openhis.common.enums.DelFlag;
+=======
+import com.core.common.enums.DelFlag;
+>>>>>>> v1.3
 import com.openhis.common.enums.DispenseStatus;
 import com.openhis.common.enums.SupplyType;
 import com.openhis.workflow.domain.SupplyDelivery;
@@ -159,7 +163,11 @@ public class SupplyDeliveryServiceImpl extends ServiceImpl<SupplyDeliveryMapper,
            .setItemTable(CommonConstants.TableName.MED_MEDICATION_DEFINITION).setLotNumber(lotNumber)
            .setPatientId(patientId).setQuantity(minQuantity).setUnitCode(minUnitCode)
            .setTypeEnum(SupplyType.SUMMARY_DISPENSE.getValue()).setRequestId(supplyRequestId)
+<<<<<<< HEAD
            .setStatusEnum(DispenseStatus.IN_PROGRESS.getValue()).setReceiverId(receiverId));
+=======
+            .setStatusEnum(DispenseStatus.PREPARATION.getValue()).setReceiverId(receiverId));
+>>>>>>> v1.3
    }

    /**
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestAutoServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestAutoServiceImpl.java
@@ -1,24 +1,11 @@
 package com.openhis.workflow.service.impl;

-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
 import com.openhis.workflow.domain.SupplyRequestAuto;
 import com.openhis.workflow.mapper.SupplyRequestAutoMapper;
 import com.openhis.workflow.service.ISupplyRequestAutoService;
 import org.springframework.stereotype.Service;

-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.core.common.utils.DateUtils;
-import com.core.common.utils.SecurityUtils;
-import com.openhis.common.enums.DelFlag;
-import com.openhis.common.enums.SupplyStatus;
-import com.openhis.workflow.domain.SupplyRequest;
-import com.openhis.workflow.mapper.SupplyRequestMapper;
-import com.openhis.workflow.service.ISupplyRequestService;

 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestServiceImpl.java
@@ -12,10 +12,14 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.core.common.enums.DelFlag;
 import com.core.common.utils.DateUtils;
 import com.core.common.utils.SecurityUtils;
 import com.openhis.common.constant.CommonConstants;
+<<<<<<< HEAD
 import com.openhis.common.enums.DelFlag;
+=======
+>>>>>>> v1.3
 import com.openhis.common.enums.SupplyCategory;
 import com.openhis.common.enums.SupplyStatus;
 import com.openhis.common.enums.SupplyType;
@@ -51,6 +55,20 @@ public class SupplyRequestServiceImpl extends ServiceImpl<SupplyRequestMapper, S
    @Override
    public List<SupplyRequest> getSupplyByBusNo(String busNo) {
        return baseMapper.selectList(new LambdaQueryWrapper<SupplyRequest>().eq(SupplyRequest::getBusNo, busNo));
+<<<<<<< HEAD
+=======
+    }
+
+    /**
+     * 通过单据号批量查询单据信息
+     *
+     * @param busNoList 单据号
+     * @return 单据信息
+     */
+    @Override
+    public List<SupplyRequest> getSupplyByBusNoBatch(List<String> busNoList) {
+        return baseMapper.selectList(new LambdaQueryWrapper<SupplyRequest>().in(SupplyRequest::getBusNo, busNoList));
+>>>>>>> v1.3
    }

    /**