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

Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis

Browse Source
This commit is contained in:
liuhongrui
2025-02-21 09:38:47 +08:00
parent 336cec11d7 0cef025527
commit db6c53e542
10 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java
View File

@@ -35,7 +35,7 @@ public class Account extends HisBaseEntity {
private Integer billingStatusEnum; private Integer billingStatusEnum;
/** 账户类型编码 */ /** 账户类型编码 */
private Integer typeCode; private String typeCode;
/** 名称 */ /** 名称 */
private String name; private String name;

2
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java
View File

@@ -29,7 +29,7 @@ public class Device extends HisBaseEntity {
private Long id; private Long id;
/** 器材编码 */ /** 器材编码 */
private Long deviceCode; private String deviceCode;
/** 器材定义编号 */ /** 器材定义编号 */
private Long defId; private Long defId;

2
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java
View File

@@ -38,7 +38,7 @@ public class Encounter extends HisBaseEntity {
private String code; private String code;
/** 状态编码 */ /** 状态编码 */
private Integer statusCode; private String statusCode;
/** 类别编码 */ /** 类别编码 */
private Integer classEnum; private Integer classEnum;

2
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java
View File

@@ -32,7 +32,7 @@ public class EncounterParticipant extends HisBaseEntity {
private Long encounterId; private Long encounterId;
/** 参与者类型 */ /** 参与者类型 */
private Integer typeCode; private String typeCode;
/** 开始时间 */ /** 开始时间 */
private Date startTiem; private Date startTiem;

2
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java
View File

@@ -32,7 +32,7 @@ public class EncounterReason extends HisBaseEntity {
private Long encounterId; private Long encounterId;
/** 原因编码 */ /** 原因编码 */
private Integer useCode; private String useCode;
/** 具体原因类型 */ /** 具体原因类型 */
private String valueTable; private String valueTable;

2
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java
View File

@@ -35,7 +35,7 @@ public class HealthcareService extends HisBaseEntity {
private Long offeredOrgId; private Long offeredOrgId;
/** 服务分类 */ /** 服务分类 */
private Integer categoryCode; private String categoryCode;
/** 服务类型 */ /** 服务类型 */
private String typeCode; private String typeCode;

2
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java
View File

@@ -53,7 +53,7 @@ public class Invoice extends HisBaseEntity {
private String paymentTerms; private String paymentTerms;
/** 账单批次号 */ /** 账单批次号 */
private BigDecimal batchCode; private String batchCode;
/** 结算批次号 */ /** 结算批次号 */
private String qrCode; private String qrCode;

2
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java
View File

@@ -29,7 +29,7 @@ public class PatientIdentifier extends HisBaseEntity {
private Long id; private Long id;
/** 标识类型编码 */ /** 标识类型编码 */
private Integer typeCode; private String typeCode;
/** 标识号 */ /** 标识号 */
private String identifierNo; private String identifierNo;

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

@@ -41,7 +41,7 @@ public class PaymentNotice extends HisBaseEntity {
private Long payee; private Long payee;
/** 通知方式 */ /** 通知方式 */
private Integer wayCode; private String wayCode;
/** 通知内容 */ /** 通知内容 */
private String content; private String content;

2
openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java
View File

@@ -50,7 +50,7 @@ public class MedicationDefinition extends HisBaseEntity {
private String wbCode; private String wbCode;
/** 药品分类 */ /** 药品分类 */
private Integer categoryCode; private String categoryCode;
/** 商品名称 */ /** 商品名称 */
private String merchandiseName; private String merchandiseName;