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

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

@@ -50,10 +50,10 @@ public class Account extends HisBaseEntity {
private BigDecimal balanceAmount;
/** 医保区域编码 */
private String ybAreaCode;
private String ybAreaNo;
/** 合同编码 */
private String contractCode;
private String contractNo;
/** 欠费限制额度 */
private BigDecimal limitAccount;

8
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java
View File

@@ -32,13 +32,13 @@ public class ChargeItem extends HisBaseEntity {
private Integer statusEnum;
/** 层级 */
private String code;
private String busNo;
/** 患者ID */
private Long patientId;
/** 类别 */
private Integer context;
private Integer contextEnum;
/** 就诊ID */
private Long encounterId;
@@ -47,7 +47,7 @@ public class ChargeItem extends HisBaseEntity {
private Date occurrenceTime;
/** 执行人Id */
private Long performer;
private Long performerId;
/** 执行科室 */
private Long performingOrgId;
@@ -110,7 +110,7 @@ public class ChargeItem extends HisBaseEntity {
private Long accountId;
/** 机构 */
private String orgCode;
private Integer orgId;
}

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

@@ -29,16 +29,16 @@ public class Device extends HisBaseEntity {
private Long id;
/** 器材编码 */
private String deviceCode;
private String busNo;
/** 器材定义编号 */
private Long defId;
private Long deviceDefId;
/** 器材状态 */
private Integer statusEnum;
/** 器材可用状态 */
private Integer availabilityStatus;
private Integer availabilityEnum;
/** 厂家 */
private String manufacturer;

14
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java
View File

@@ -29,19 +29,19 @@ public class DeviceDefinition extends HisBaseEntity {
private Long id;
/** 编码 */
private String code;
private String busNo;
/** 器材名称 */
private String name;
/** 器材名称拼音 */
private String pyCode;
private String pyStr;
/** 器材五笔拼音 */
private String wbCode;
private String wbStr;
/** 器材分类 */
private String deviceClass;
private String deviceCode;
/** 器材种类 */
private String deviceTypeCode;
@@ -74,13 +74,13 @@ public class DeviceDefinition extends HisBaseEntity {
private Integer ybFlag;
/** 医保编码 */
private String ybCode;
private String ybNo;
/** 医保对码标记 */
private Integer ybMatchFlag;
/** 状态 */
private Integer status;
private Integer statusEnum;
/** 生产厂家 */
private Long manufacturerId;
@@ -92,7 +92,7 @@ public class DeviceDefinition extends HisBaseEntity {
private String description;
/** 适用范围 */
private Long jurisdiction;
private String jurisdiction;
/** 执行科室 */
private Long ruleId;

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

@@ -35,7 +35,7 @@ public class Encounter extends HisBaseEntity {
private Long groupId;
/** 就诊编码 */
private String code;
private String busNo;
/** 状态编码 */
private String statusCode;

3
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java
View File

@@ -34,9 +34,6 @@ public class EncounterDiagnosis extends HisBaseEntity {
/** 诊断_id */
private Long conditionId;
/** 诊断编码 */
private String code;
/** 住院患者疾病诊 */
private Integer iptDiseCrsp;

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

@@ -29,7 +29,7 @@ public class HealthcareService extends HisBaseEntity {
private Long id;
/** 活动标记 */
private Integer active;
private Integer activeFlag;
/** 提供部门ID */
private Long offeredOrgId;

6
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java
View File

@@ -29,7 +29,7 @@ public class Location extends HisBaseEntity {
private Long id;
/** 编码 */
private String code;
private String busNo;
/** 名称 */
private String name;
@@ -47,10 +47,10 @@ public class Location extends HisBaseEntity {
private String typeJson;
/** 拼音码 */
private String spellCode;
private String pyStr;
/** 五笔码 */
private String wbCode;
private String wbStr;
/** 物理形式枚举 */
private String formEnum;

8
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java
View File

@@ -29,7 +29,7 @@ public class Organization extends HisBaseEntity {
private Long id;
/** 编码 */
private String code;
private String bus_no;
/** 名称 */
private String name;
@@ -44,13 +44,13 @@ public class Organization extends HisBaseEntity {
private Integer classEnum;
/** 拼音码 */
private String spellCode;
private String pyStr;
/** 五笔码 */
private String wbCode;
private String wbStr;
/** 医保码 */
private String ybCode;
private String ybNo;
/** 医保名称 */
private String ybName;

8
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java
View File

@@ -41,7 +41,7 @@ public class Patient extends HisBaseEntity {
private String nameJson;
/** 患者院内编码/病历号 */
private String code;
private String busNo;
/** 性别编码 */
private Integer genderEnum;
@@ -80,16 +80,16 @@ public class Patient extends HisBaseEntity {
private String addressJson;
/** 民族 */
private String nationality;
private String nationalityCode;
/** 身份证号 */
private String idCard;
/** 拼音码 */
private String spellCode;
private String pyStr;
/** 五笔码 */
private String wbCode;
private String wbStr;
/** 血型ABO */
private String bloodAbo;

8
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java
View File

@@ -68,16 +68,16 @@ public class Practitioner extends HisBaseEntity {
private String addressJson;
/** 拼音码 */
private String spellCode;
private String pyStr;
/** 五笔码 */
private String wbCode;
private String wbStr;
/** 患者院内编码/病历号 */
private String code;
private String busNo;
/** 医保码 */
private String ybCode;
private String ybNo;
/** 系统用户id */
private Long userId;

4
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java
View File

@@ -31,8 +31,8 @@ public class PractitionerRole extends HisBaseEntity {
/** 名称 */
private String name;
/** 编码 */
private String code;
/** 角色编码 */
private String role_code;
/** 活动标识 */
private Integer activeFlag;

6
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java
View File

@@ -29,7 +29,7 @@ public class Supplier extends HisBaseEntity {
private Long id;
/** 编号 */
private String code;
private String busNo;
/** 名称 */
private String name;
@@ -41,10 +41,10 @@ public class Supplier extends HisBaseEntity {
private String address;
/** 拼音码 */
private String pyCode;
private String pyStr;
/** 五笔码 */
private String wbCode;
private String wbStr;
/** 联系人电话 */
private String phone;