wangjunping/his
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

实体与db字段规范性修改

Browse Source
This commit is contained in:
Zhang.WH
2025-02-22 17:07:09 +08:00
parent 91e3433ca7
commit 2b6720d75b
32 changed files with 105 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java
View File

@@ -44,7 +44,7 @@ public class Claim extends HisBaseEntity {
private Integer useEnum;
/** 索赔指向 */
private Integer insurer;
private Integer insurerEnum;
/** condition_dis */
private String conditionDis;

2
openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Contract.java
View File

@@ -38,7 +38,7 @@ public class Contract extends HisBaseEntity {
private Integer categoryEnum;
/** 合同编码 */
private String code;
private String busNo;
/** 机构 */
private Long orgId;

6
openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java
View File

@@ -38,13 +38,13 @@ public class PaymentNotice extends HisBaseEntity {
private Long paypmentReconciliationId;
/** 被支付方 */
private Long payee;
private Long payeeId;
/** 通知方式 */
private String wayCode;
/** 通知内容 */
private String content;
private String contentText;
/** 被通知方 */
private String recipient;
@@ -56,7 +56,7 @@ public class PaymentNotice extends HisBaseEntity {
private Integer payStatus;
/** 机构 */
private String orgCode;
private Integer orgId;
}

12
openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecDetail.java
View File

@@ -28,8 +28,8 @@ public class PaymentRecDetail extends HisBaseEntity {
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/** recId */
private Long predecessor;
/** 先前支付明细id */
private Long predecessorId;
/** 付款类型 */
private Integer targetEnum;
@@ -38,13 +38,13 @@ public class PaymentRecDetail extends HisBaseEntity {
private Long accountId;
/** 账户类型 */
private Integer accountType;
private Integer accountEnum;
/** 支付类型 */
private Integer payType;
private Integer payEnum;
/** 支付类型等级 */
private Integer payTypeClass;
private Integer payLevelEnum;
/** 金额 */
private BigDecimal amount;
@@ -56,7 +56,7 @@ public class PaymentRecDetail extends HisBaseEntity {
private BigDecimal chargeAmount;
/** 支付平台返回交易号 */
private String payTransId;
private String payTransNo;
/** 支付平台返回交易信息 */
private String payTransText;

12
openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java
View File

@@ -35,10 +35,10 @@ public class PaymentReconciliation extends HisBaseEntity {
private Long relationId;
/** 支付的业务标识符 */
private String paymentIdentifier;
private String paymentNo;
/** 付款类别 */
private Integer type;
private Integer paymentEnum;
/** 付款实体ID */
private Long paypmentReconciliationId;
@@ -47,10 +47,10 @@ public class PaymentReconciliation extends HisBaseEntity {
private Integer kindEnum;
/** 收款员 */
private Long enterer;
private Long entererId;
/** 支付发起人类型 */
private Integer issuerType;
private Integer issuerEnum;
/** 支付的患者ID */
private Long patientId;
@@ -80,13 +80,13 @@ public class PaymentReconciliation extends HisBaseEntity {
private Integer printCount;
/** 合同编码 */
private String contractCode;
private String contractNo;
/** 处方号集合 */
private String chargeItemJson;
/** 就诊ID */
private Long encoutnerId;
private Long encounterId;
}