开票记录

ruoyi-admin/src/main/java/org/dromara/web/controller/InvoiceRecordController.java

@@ -0,0 +1,105 @@
+package org.dromara.web.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.web.domain.vo.InvoiceRecordVo;
+import org.dromara.web.domain.bo.InvoiceRecordBo;
+import org.dromara.web.service.IInvoiceRecordService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 开票记录
+ *
+ * @author Huanyi
+ * @date 2025-08-15
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/invoice/record")
+public class InvoiceRecordController extends BaseController {
+
+    private final IInvoiceRecordService invoiceRecordService;
+
+    /**
+     * 查询开票记录列表
+     */
+    @SaCheckPermission("web:record:list")
+    @GetMapping("/list")
+    public TableDataInfo<InvoiceRecordVo> list(InvoiceRecordBo bo, PageQuery pageQuery) {
+        return invoiceRecordService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出开票记录列表
+     */
+    @SaCheckPermission("web:record:export")
+    @Log(title = "开票记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(InvoiceRecordBo bo, HttpServletResponse response) {
+        List<InvoiceRecordVo> list = invoiceRecordService.queryList(bo);
+        ExcelUtil.exportExcel(list, "开票记录", InvoiceRecordVo.class, response);
+    }
+
+    /**
+     * 获取开票记录详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("web:record:query")
+    @GetMapping("/{id}")
+    public R<InvoiceRecordVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(invoiceRecordService.queryById(id));
+    }
+
+    /**
+     * 新增开票记录
+     */
+    @SaCheckPermission("web:record:add")
+    @Log(title = "开票记录", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody InvoiceRecordBo bo) {
+        return toAjax(invoiceRecordService.insertByBo(bo));
+    }
+
+    /**
+     * 修改开票记录
+     */
+    @SaCheckPermission("web:record:edit")
+    @Log(title = "开票记录", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody InvoiceRecordBo bo) {
+        return toAjax(invoiceRecordService.updateByBo(bo));
+    }
+
+    /**
+     * 删除开票记录
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("web:record:remove")
+    @Log(title = "开票记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(invoiceRecordService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-admin/src/main/java/org/dromara/web/controller/HistoryPatientController.java → ruoyi-admin/src/main/java/org/dromara/web/controller/TotalPatientController.java

@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/total/patient")
-public class HistoryPatientController {
+public class TotalPatientController {
 
     private final TotalPatientService totalPatientService;
 

ruoyi-admin/src/main/java/org/dromara/web/domain/InvoiceRecord.java

@@ -0,0 +1,82 @@
+package org.dromara.web.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 开票记录对象 invoice_record
+ *
+ * @author Huanyi
+ * @date 2025-08-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("invoice_record")
+public class InvoiceRecord extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 发票号码
+     */
+    private String number;
+
+    /**
+     * 发票类型
+     */
+    private String type;
+
+    /**
+     * 发票抬头
+     */
+    private String header;
+
+    /**
+     * 抬头名称
+     */
+    private String headerName;
+
+    /**
+     * 患者名称
+     */
+    private String name;
+
+    /**
+     * 门诊/住院号
+     */
+    private String admissionId;
+
+    /**
+     * 开票金额
+     */
+    private Long amount;
+
+    /**
+     * 开票进度
+     */
+    private Long progress;
+
+    /**
+     * 失败原因
+     */
+    private String failReason;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

ruoyi-admin/src/main/java/org/dromara/web/domain/bo/InvoiceRecordBo.java

@@ -0,0 +1,75 @@
+package org.dromara.web.domain.bo;
+
+import org.dromara.web.domain.InvoiceRecord;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 开票记录业务对象 invoice_record
+ *
+ * @author Huanyi
+ * @date 2025-08-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = InvoiceRecord.class, reverseConvertGenerate = false)
+public class InvoiceRecordBo extends BaseEntity {
+
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 发票号码
+     */
+    private String number;
+
+    /**
+     * 发票类型
+     */
+    private String type;
+
+    /**
+     * 发票抬头
+     */
+    private String header;
+
+    /**
+     * 抬头名称
+     */
+    private String headerName;
+
+    /**
+     * 患者名称
+     */
+    private String name;
+
+    /**
+     * 门诊/住院号
+     */
+    private String admissionId;
+
+    /**
+     * 开票金额
+     */
+    private Long amount;
+
+    /**
+     * 开票进度
+     */
+    private Long progress;
+
+    /**
+     * 失败原因
+     */
+    private String failReason;
+
+
+}

ruoyi-admin/src/main/java/org/dromara/web/domain/vo/InvoiceRecordVo.java

@@ -0,0 +1,94 @@
+package org.dromara.web.domain.vo;
+
+import org.dromara.web.domain.InvoiceRecord;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 开票记录视图对象 invoice_record
+ *
+ * @author Huanyi
+ * @date 2025-08-15
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = InvoiceRecord.class)
+public class InvoiceRecordVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ExcelProperty(value = "id")
+    private Long id;
+
+    /**
+     * 发票号码
+     */
+    @ExcelProperty(value = "发票号码")
+    private String number;
+
+    /**
+     * 发票类型
+     */
+    @ExcelProperty(value = "发票类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "invoice_type")
+    private String type;
+
+    /**
+     * 发票抬头
+     */
+    @ExcelProperty(value = "发票抬头")
+    private String header;
+
+    /**
+     * 抬头名称
+     */
+    @ExcelProperty(value = "抬头名称")
+    private String headerName;
+
+    /**
+     * 患者名称
+     */
+    @ExcelProperty(value = "患者名称")
+    private String name;
+
+    /**
+     * 门诊/住院号
+     */
+    @ExcelProperty(value = "门诊/住院号")
+    private String admissionId;
+
+    /**
+     * 开票金额
+     */
+    @ExcelProperty(value = "开票金额")
+    private Long amount;
+
+    /**
+     * 开票进度
+     */
+    @ExcelProperty(value = "开票进度", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "invoice_progress")
+    private Long progress;
+
+    /**
+     * 失败原因
+     */
+    @ExcelProperty(value = "失败原因")
+    private String failReason;
+
+
+}

ruoyi-admin/src/main/java/org/dromara/web/mapper/InvoiceRecordMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.web.mapper;
+
+import org.dromara.web.domain.InvoiceRecord;
+import org.dromara.web.domain.vo.InvoiceRecordVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 开票记录Mapper接口
+ *
+ * @author Huanyi
+ * @date 2025-08-15
+ */
+public interface InvoiceRecordMapper extends BaseMapperPlus<InvoiceRecord, InvoiceRecordVo> {
+
+}

ruoyi-admin/src/main/java/org/dromara/web/service/IInvoiceRecordService.java

@@ -0,0 +1,68 @@
+package org.dromara.web.service;
+
+import org.dromara.web.domain.vo.InvoiceRecordVo;
+import org.dromara.web.domain.bo.InvoiceRecordBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 开票记录Service接口
+ *
+ * @author Huanyi
+ * @date 2025-08-15
+ */
+public interface IInvoiceRecordService {
+
+    /**
+     * 查询开票记录
+     *
+     * @param id 主键
+     * @return 开票记录
+     */
+    InvoiceRecordVo queryById(Long id);
+
+    /**
+     * 分页查询开票记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 开票记录分页列表
+     */
+    TableDataInfo<InvoiceRecordVo> queryPageList(InvoiceRecordBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的开票记录列表
+     *
+     * @param bo 查询条件
+     * @return 开票记录列表
+     */
+    List<InvoiceRecordVo> queryList(InvoiceRecordBo bo);
+
+    /**
+     * 新增开票记录
+     *
+     * @param bo 开票记录
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(InvoiceRecordBo bo);
+
+    /**
+     * 修改开票记录
+     *
+     * @param bo 开票记录
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(InvoiceRecordBo bo);
+
+    /**
+     * 校验并批量删除开票记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-admin/src/main/java/org/dromara/web/service/impl/InvoiceManagementServiceImpl.java

@@ -1,13 +1,17 @@
 package org.dromara.web.service.impl;
+import java.util.Date;
+import com.google.common.collect.Maps;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.domain.R;
 import org.dromara.web.domain.ChargeRecord;
+import org.dromara.web.domain.InvoiceRecord;
 import org.dromara.web.domain.bo.EmailSendBo;
 import org.dromara.web.domain.bo.InvoiceMakeOutBo;
 import org.dromara.web.mapper.ChargeRecordMapper;
+import org.dromara.web.mapper.InvoiceRecordMapper;
 import org.dromara.web.service.EmailService;
 import org.dromara.web.service.InvoiceManagementService;
 import org.springframework.stereotype.Service;
@@ -28,6 +32,7 @@ public class InvoiceManagementServiceImpl implements InvoiceManagementService {
     private final EmailService emailService;
 
     private final ChargeRecordMapper chargeRecordMapper;
+    private final InvoiceRecordMapper invoiceRecordMapper;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -35,15 +40,33 @@ public class InvoiceManagementServiceImpl implements InvoiceManagementService {
 
         EmailSendBo sendBo = new EmailSendBo();
         sendBo.setEmail(bo.getEmail());
-        sendBo.setMessage("");
+        sendBo.setMessage("test");
         sendBo.setFileBase64("");
         emailService.send(sendBo);
 
         LambdaUpdateWrapper<ChargeRecord> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(ChargeRecord::getId, bo.getId())
             .set(ChargeRecord::getWhetherInvoice, 1);
-        int flag = chargeRecordMapper.update(wrapper);
-        if (flag <= 0) {
+        int updateFlag = chargeRecordMapper.update(wrapper);
+        if (updateFlag <= 0) {
+            throw new RuntimeException("开票失败！");
+        }
+
+        ChargeRecord chargeRecord = chargeRecordMapper.selectById(bo.getId());
+
+        InvoiceRecord record = new InvoiceRecord();
+        record.setNumber("");
+        record.setType(bo.getType() == 0 ? "个人" : "企业");
+        record.setHeader("");
+        record.setHeaderName("");
+        record.setName(chargeRecord.getPatientName());
+        record.setAdmissionId(chargeRecord.getPatientNo());
+        record.setAmount(chargeRecord.getReceivableAmount());
+        record.setProgress(1L);
+        record.setFailReason("");
+
+        int insertFlag = invoiceRecordMapper.insert(record);
+        if (insertFlag <= 0) {
             throw new RuntimeException("开票失败！");
         }
 

ruoyi-admin/src/main/java/org/dromara/web/service/impl/InvoiceRecordServiceImpl.java

@@ -0,0 +1,136 @@
+package org.dromara.web.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.web.domain.bo.InvoiceRecordBo;
+import org.dromara.web.domain.vo.InvoiceRecordVo;
+import org.dromara.web.domain.InvoiceRecord;
+import org.dromara.web.mapper.InvoiceRecordMapper;
+import org.dromara.web.service.IInvoiceRecordService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 开票记录Service业务层处理
+ *
+ * @author Huanyi
+ * @date 2025-08-15
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class InvoiceRecordServiceImpl implements IInvoiceRecordService {
+
+    private final InvoiceRecordMapper baseMapper;
+
+    /**
+     * 查询开票记录
+     *
+     * @param id 主键
+     * @return 开票记录
+     */
+    @Override
+    public InvoiceRecordVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询开票记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 开票记录分页列表
+     */
+    @Override
+    public TableDataInfo<InvoiceRecordVo> queryPageList(InvoiceRecordBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<InvoiceRecord> lqw = buildQueryWrapper(bo);
+        Page<InvoiceRecordVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的开票记录列表
+     *
+     * @param bo 查询条件
+     * @return 开票记录列表
+     */
+    @Override
+    public List<InvoiceRecordVo> queryList(InvoiceRecordBo bo) {
+        LambdaQueryWrapper<InvoiceRecord> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<InvoiceRecord> buildQueryWrapper(InvoiceRecordBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<InvoiceRecord> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(InvoiceRecord::getId);
+        lqw.eq(StringUtils.isNotBlank(bo.getNumber()), InvoiceRecord::getNumber, bo.getNumber());
+        lqw.eq(StringUtils.isNotBlank(bo.getType()), InvoiceRecord::getType, bo.getType());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), InvoiceRecord::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getAdmissionId()), InvoiceRecord::getAdmissionId, bo.getAdmissionId());
+        lqw.eq(bo.getProgress() != null, InvoiceRecord::getProgress, bo.getProgress());
+        return lqw;
+    }
+
+    /**
+     * 新增开票记录
+     *
+     * @param bo 开票记录
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(InvoiceRecordBo bo) {
+        InvoiceRecord add = MapstructUtils.convert(bo, InvoiceRecord.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改开票记录
+     *
+     * @param bo 开票记录
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(InvoiceRecordBo bo) {
+        InvoiceRecord update = MapstructUtils.convert(bo, InvoiceRecord.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(InvoiceRecord entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除开票记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-admin/src/main/resources/mapper/InvoiceRecordMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.web.mapper.InvoiceRecordMapper">
+
+</mapper>

script/sql/biz/create.sql

@@ -501,3 +501,26 @@ CREATE TABLE `consult_patient`
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
   COLLATE = utf8mb4_unicode_ci COMMENT ='会诊患者';
+
+CREATE TABLE `invoice_record`
+(
+    `id`                     bigint PRIMARY KEY NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `tenant_id`              varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT '000000' COMMENT '租户编号',
+    `number`                 varchar(255) COMMENT '发票号码',
+    `type`                   varchar(255) COMMENT '发票类型',
+    `header`                 varchar(255) COMMENT '发票抬头',
+    `header_name`            varchar(255) COMMENT '抬头名称',
+    `name`                   varchar(255) COMMENT '患者名称',
+    `admission_id`           varchar(255) COMMENT '门诊/住院号',
+    `amount`                 decimal    COMMENT '开票金额',
+    `progress`               tinyint(1) COMMENT '开票进度',
+    `fail_reason`            varchar(255) COMMENT '失败原因',
+    `del_flag`               char(1) COLLATE utf8mb4_unicode_ci     DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
+    `create_dept`            bigint                                 DEFAULT NULL COMMENT '创建部门',
+    `create_by`              varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者',
+    `create_time`            datetime                               DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_by`              varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者',
+    `update_time`            datetime                               DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci COMMENT ='开票记录';