diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java index 07846964..0dd059cb 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java @@ -21,7 +21,6 @@ import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.patientmanage.appservice.IOutpatientRecordService; import com.openhis.web.patientmanage.dto.OutpatientRecordDto; import com.openhis.web.patientmanage.dto.OutpatientRecordSearchParam; - import com.openhis.web.patientmanage.mapper.PatientManageMapper; /** @@ -74,6 +73,7 @@ public class OutpatientRecordServiceImpl implements IOutpatientRecordService { * * @return 医生名字列表 */ + @Override public R getDoctorNames() { return R.ok(patientManageMapper.getDoctorNames()); } diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IInvoiceService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IInvoiceService.java index bb05a9d7..b0b7d941 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IInvoiceService.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IInvoiceService.java @@ -29,14 +29,4 @@ public interface IInvoiceService extends IService { * @return */ Invoice getByPaymentId(Long id); - - /** - * 分页查询发票列表(带用户角色权限过滤) - * - * @param page 分页参数 - * @param isAdmin 是否为管理员 - * @param userId 用户ID - * @return 分页结果 - */ - IPage selectInvoicePage(Page page, boolean isAdmin, Long userId); } diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceServiceImpl.java index 0c2fd27c..ce8463e1 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceServiceImpl.java @@ -1,17 +1,18 @@ package com.openhis.administration.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +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.exception.ServiceException; +import com.core.common.utils.SecurityUtils; import com.openhis.administration.domain.Invoice; +import com.openhis.administration.domain.Supplier; import com.openhis.administration.mapper.InvoiceMapper; import com.openhis.administration.service.IInvoiceService; +import com.openhis.common.enums.SupplyStatus; +import com.openhis.workflow.domain.SupplyRequest; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.Date; import java.util.List; @@ -28,22 +29,20 @@ public class InvoiceServiceImpl extends ServiceImpl impl * 新增发票 * * @param invoice 发票实体 - * @return 发票ID - * @throws ServiceException 当发票已存在或插入失败时抛出异常 + * @return */ @Override - @Transactional(rollbackFor = Exception.class) public Long addInvoice(Invoice invoice) { - // 根据编码判断发票是否存在 - 使用count查询优化性能 - long count = baseMapper.selectCount(new LambdaQueryWrapper().eq(Invoice::getBusNo, invoice.getBusNo())); - if (count > 0) { - throw new ServiceException("发票编码已存在: " + invoice.getBusNo()); + // 根据编码判断发票是否存在 + List invoices + = baseMapper.selectList(new LambdaQueryWrapper().eq(Invoice::getBusNo, invoice.getBusNo())); + if (invoices.size() > 0) { + return null; } - // 新增发票 int insert = baseMapper.insert(invoice); if (insert != 1) { - throw new ServiceException("发票新增失败,请检查输入数据"); + return null; } return invoice.getId(); @@ -55,16 +54,14 @@ public class InvoiceServiceImpl extends ServiceImpl impl .eq(Invoice::getDeleteFlag, DelFlag.NO.getCode())); } + /** + * 分页查询发票列表 + */ @Override - public IPage selectInvoicePage(Page page, boolean isAdmin, Long userId) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(Invoice::getDeleteFlag, DelFlag.NO.getCode()); - - // 非管理员用户只能查看自己创建的发票 - if (!isAdmin) { - queryWrapper.eq(Invoice::getInvoicingStaffId, userId); - } - + public Page selectInvoicePage(Page page, boolean isAdmin, Long userId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + // 可以根据需要添加查询条件,目前按创建时间倒序排列 + queryWrapper.orderByDesc(Invoice::getCreateDate); return baseMapper.selectPage(page, queryWrapper); } }