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,112 @@
|
||||
package com.openhis.administration.dto;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import com.core.common.annotation.Excel;
|
||||
import liquibase.pro.packaged.E;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
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.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* 门诊就诊记录Dto
|
||||
*
|
||||
* @author swb
|
||||
* @date 2026/2/27
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
public class OutpatientManageDto {
|
||||
/**
|
||||
* 患者姓名
|
||||
*/
|
||||
@Excel(name = "患者姓名",sort = 1, width = 20)
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 患者身份证号
|
||||
*/
|
||||
@Excel(name = "患者身份证号",sort = 2, width = 20)
|
||||
private String idCard;
|
||||
|
||||
/**
|
||||
* 疾病(主诊断)
|
||||
*/
|
||||
@Excel(name = "疾病(主诊断)",sort = 3, width = 20)
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* 患者ID
|
||||
*/
|
||||
@Excel(name = "患者ID",sort = 4, width = 20)
|
||||
private String patientBusNo;
|
||||
|
||||
/**
|
||||
* 门诊号
|
||||
*/
|
||||
@Excel(name = "门诊号",sort = 5, width = 20)
|
||||
private String encounterBusNo;
|
||||
|
||||
/**
|
||||
* 性别枚举
|
||||
*/
|
||||
private Integer genderEnum;
|
||||
@Excel(name = "性别",sort = 6, width = 20)
|
||||
private String genderEnum_enumText;
|
||||
|
||||
/**
|
||||
* 出生日期
|
||||
*/
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date birthDate;
|
||||
|
||||
/**
|
||||
* 年龄
|
||||
*/
|
||||
private String age;
|
||||
|
||||
/**
|
||||
* 患者手机号
|
||||
*/
|
||||
@Excel(name = "患者手机号",sort = 7, width = 20)
|
||||
private String phone;
|
||||
|
||||
/**
|
||||
* 就诊时间
|
||||
*/
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "就诊时间",sort = 8, width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date encounterTime;
|
||||
|
||||
/**
|
||||
* 就诊状态
|
||||
*/
|
||||
private Integer subjectStatusEnum;
|
||||
@Excel(name = "就诊状态",sort = 9, width = 20)
|
||||
private String subjectStatusEnum_enumText;
|
||||
|
||||
/**
|
||||
* 医院名称
|
||||
*/
|
||||
@Excel(name = "医院名称",sort = 10, width = 20)
|
||||
private String organizationName;
|
||||
|
||||
/**
|
||||
* 接诊医生姓名
|
||||
*/
|
||||
@Excel(name = "接诊医生姓名",sort = 11, width = 20)
|
||||
private String doctorName;
|
||||
|
||||
/**
|
||||
* 医生ID
|
||||
*/
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private String doctorId;
|
||||
}
|
||||
Reference in New Issue
Block a user