feat: 合并 upstream/v1.3 新增功能模块(安全合并策略)
新增功能模块:
- 药房管理:住院退药、处方审核功能
- 报表管理:门诊管理报表、药房结算报表、医嘱统计报表
- 支付管理:三方对账功能
- 新增枚举类:电子处方类型、频次类型、病历状态等10个
- 新增实体类:处方审核记录、第三方支付请求、中医结算目录
- 工具类增强:年龄计算、Excel工具
合并策略:仅合并低风险新增文件,保留现有业务功能
上游版本:v1.3 (2025-03-06发版)
合并分支:merge-upstream-v1.3-0310
🤖 Auto-generated by Claude Code
This commit is contained in:
@@ -0,0 +1,72 @@
|
||||
package com.openhis.financial.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.core.common.core.domain.HisBaseEntity;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 第三方支付请求实体
|
||||
*/
|
||||
@Data
|
||||
@TableName("fin_three_part_pay_request")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
public class ThreePartPayRequest extends HisBaseEntity {
|
||||
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private BigDecimal id;
|
||||
|
||||
/**
|
||||
* payment表主键Id
|
||||
*/
|
||||
private Long paymentId;
|
||||
|
||||
/**
|
||||
* 请求金额
|
||||
*/
|
||||
private BigDecimal amount;
|
||||
|
||||
/**
|
||||
* 扫码信息
|
||||
*/
|
||||
private String scanKey;
|
||||
|
||||
/**
|
||||
* 请求时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date requestDate;
|
||||
|
||||
/**
|
||||
* 请求费用类型(1.挂号;2.门诊;3,住院;4.预交金;5,其他)暂时用不上这个字段
|
||||
*/
|
||||
private String payType;
|
||||
|
||||
/**
|
||||
* 请求类型,暂时用PaymentType枚举
|
||||
*/
|
||||
private String requestType;
|
||||
|
||||
/**
|
||||
* 请求人ID
|
||||
*/
|
||||
private Long requestPersonId;
|
||||
|
||||
/**
|
||||
* pos机号码
|
||||
*/
|
||||
private String posNo;
|
||||
}
|
||||
Reference in New Issue
Block a user