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,64 @@
|
||||
package com.openhis.administration.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 lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* 处方点评记录实体类
|
||||
*
|
||||
* @author swb
|
||||
* @date 2026/1/29
|
||||
*/
|
||||
@Data
|
||||
@TableName("prescription_review_record")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
public class PrescriptionReviewRecord extends HisBaseEntity {
|
||||
/**
|
||||
* ID
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 处方号
|
||||
*/
|
||||
private String prescriptionNo;
|
||||
|
||||
/**
|
||||
* 就诊ID
|
||||
*/
|
||||
private Long encounterId;
|
||||
|
||||
/**
|
||||
* 药品请求ids
|
||||
*/
|
||||
private String medRequestIds;
|
||||
|
||||
/**
|
||||
* 是否合理标识(0:不合理,1:合理,2:待点评)
|
||||
*/
|
||||
private Integer reasonableFlag;
|
||||
|
||||
/**
|
||||
* 存在问题
|
||||
*/
|
||||
private String reasonEnum;
|
||||
|
||||
/**
|
||||
* 其他问题
|
||||
*/
|
||||
private String reasonText;
|
||||
|
||||
/**
|
||||
* 点评药师ID
|
||||
*/
|
||||
private Long practitionerId;
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user