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/medication/domain/Medication.java
View File

@@ -29,7 +29,7 @@ public class Medication extends HisBaseEntity {
private Long id;
/** 药品编码 */
private Long medicationProductId;
private Long medicationDefId;
/** 药品状态 */
private Integer statusEnum;

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

@@ -29,7 +29,7 @@ public class MedicationDefinition extends HisBaseEntity {
private Long id;
/** 药品编号 */
private Long code;
private String busNo;
/** 药品名称 */
private String name;
@@ -44,10 +44,10 @@ public class MedicationDefinition extends HisBaseEntity {
private String nameEn;
/** 药品名称拼音码 */
private String pyCode;
private String pyStr;
/** 药品五笔码 */
private String wbCode;
private String wbStr;
/** 药品分类 */
private String categoryCode;
@@ -56,10 +56,10 @@ public class MedicationDefinition extends HisBaseEntity {
private String merchandiseName;
/** 商品名称拼音码 */
private String merchandisePyCode;
private String merchandisePyStr;
/** 商品五笔码 */
private String merchandiseWbCode;
private String merchandiseWbStr;
/** 药品单位 */
private String unitCode;
@@ -86,7 +86,7 @@ public class MedicationDefinition extends HisBaseEntity {
private Integer ybMatchFlag;
/** 医保编码 */
private String ybCode;
private String ybNo;
/** 药理作用分类 */
private String pharmacologyCategoryCode;

4
openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java
View File

@@ -29,7 +29,7 @@ public class MedicationDispense extends HisBaseEntity {
private Long id;
/** 药品发放id */
private String code;
private String busNo;
/** 药品发放状态 */
private Integer statusEnum;
@@ -41,7 +41,7 @@ public class MedicationDispense extends HisBaseEntity {
private Date statusChangedTime;
/** 发药类型 */
private Integer dispenseCategory;
private Integer dispenseEnum;
/** 药品编码 */
private Long medicationId;

10
openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java
View File

@@ -29,10 +29,10 @@ public class MedicationRequest extends HisBaseEntity {
private Long id;
/** 药品请求编码 */
private String code;
private String bus_no;
/** 处方号 */
private String prescriptionCode;
private String prescriptionNo;
/** 分组id */
private Long groupId;
@@ -116,7 +116,7 @@ public class MedicationRequest extends HisBaseEntity {
private String reasonJson;
/** 治疗类型 */
private Integer therapyType;
private Integer therapyEnum;
/** 服药时间(开始) */
private Date effectiveDoseStart;
@@ -128,7 +128,7 @@ public class MedicationRequest extends HisBaseEntity {
private Integer skinTestFlag;
/** 合同Id */
private String contractCode;
private String contractNo;
/** 输液标志 */
private Integer infusionFlag;
@@ -167,7 +167,7 @@ public class MedicationRequest extends HisBaseEntity {
private Integer dispensePerDuration;
/** 发药人 */
private Long dispenser;
private Long dispenserId;
}