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 BigDecimal balanceAmount;
/** 医保区域编码 */ /** 医保区域编码 */
private String ybAreaCode; private String ybAreaNo;
/** 合同编码 */ /** 合同编码 */
private String contractCode; private String contractNo;
/** 欠费限制额度 */ /** 欠费限制额度 */
private BigDecimal limitAccount; 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 Integer statusEnum;
/** 层级 */ /** 层级 */
private String code; private String busNo;
/** 患者ID */ /** 患者ID */
private Long patientId; private Long patientId;
/** 类别 */ /** 类别 */
private Integer context; private Integer contextEnum;
/** 就诊ID */ /** 就诊ID */
private Long encounterId; private Long encounterId;
@@ -47,7 +47,7 @@ public class ChargeItem extends HisBaseEntity {
private Date occurrenceTime; private Date occurrenceTime;
/** 执行人Id */ /** 执行人Id */
private Long performer; private Long performerId;
/** 执行科室 */ /** 执行科室 */
private Long performingOrgId; private Long performingOrgId;
@@ -110,7 +110,7 @@ public class ChargeItem extends HisBaseEntity {
private Long accountId; 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 Long id;
/** 器材编码 */ /** 器材编码 */
private String deviceCode; private String busNo;
/** 器材定义编号 */ /** 器材定义编号 */
private Long defId; private Long deviceDefId;
/** 器材状态 */ /** 器材状态 */
private Integer statusEnum; private Integer statusEnum;
/** 器材可用状态 */ /** 器材可用状态 */
private Integer availabilityStatus; private Integer availabilityEnum;
/** 厂家 */ /** 厂家 */
private String manufacturer; 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 Long id;
/** 编码 */ /** 编码 */
private String code; private String busNo;
/** 器材名称 */ /** 器材名称 */
private String name; private String name;
/** 器材名称拼音 */ /** 器材名称拼音 */
private String pyCode; private String pyStr;
/** 器材五笔拼音 */ /** 器材五笔拼音 */
private String wbCode; private String wbStr;
/** 器材分类 */ /** 器材分类 */
private String deviceClass; private String deviceCode;
/** 器材种类 */ /** 器材种类 */
private String deviceTypeCode; private String deviceTypeCode;
@@ -74,13 +74,13 @@ public class DeviceDefinition extends HisBaseEntity {
private Integer ybFlag; private Integer ybFlag;
/** 医保编码 */ /** 医保编码 */
private String ybCode; private String ybNo;
/** 医保对码标记 */ /** 医保对码标记 */
private Integer ybMatchFlag; private Integer ybMatchFlag;
/** 状态 */ /** 状态 */
private Integer status; private Integer statusEnum;
/** 生产厂家 */ /** 生产厂家 */
private Long manufacturerId; private Long manufacturerId;
@@ -92,7 +92,7 @@ public class DeviceDefinition extends HisBaseEntity {
private String description; private String description;
/** 适用范围 */ /** 适用范围 */
private Long jurisdiction; private String jurisdiction;
/** 执行科室 */ /** 执行科室 */
private Long ruleId; 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 Long groupId;
/** 就诊编码 */ /** 就诊编码 */
private String code; private String busNo;
/** 状态编码 */ /** 状态编码 */
private String statusCode; 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 */ /** 诊断_id */
private Long conditionId; private Long conditionId;
/** 诊断编码 */
private String code;
/** 住院患者疾病诊 */ /** 住院患者疾病诊 */
private Integer iptDiseCrsp; 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 Long id;
/** 活动标记 */ /** 活动标记 */
private Integer active; private Integer activeFlag;
/** 提供部门ID */ /** 提供部门ID */
private Long offeredOrgId; 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 Long id;
/** 编码 */ /** 编码 */
private String code; private String busNo;
/** 名称 */ /** 名称 */
private String name; private String name;
@@ -47,10 +47,10 @@ public class Location extends HisBaseEntity {
private String typeJson; private String typeJson;
/** 拼音码 */ /** 拼音码 */
private String spellCode; private String pyStr;
/** 五笔码 */ /** 五笔码 */
private String wbCode; private String wbStr;
/** 物理形式枚举 */ /** 物理形式枚举 */
private String formEnum; 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 Long id;
/** 编码 */ /** 编码 */
private String code; private String bus_no;
/** 名称 */ /** 名称 */
private String name; private String name;
@@ -44,13 +44,13 @@ public class Organization extends HisBaseEntity {
private Integer classEnum; private Integer classEnum;
/** 拼音码 */ /** 拼音码 */
private String spellCode; private String pyStr;
/** 五笔码 */ /** 五笔码 */
private String wbCode; private String wbStr;
/** 医保码 */ /** 医保码 */
private String ybCode; private String ybNo;
/** 医保名称 */ /** 医保名称 */
private String ybName; 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 nameJson;
/** 患者院内编码/病历号 */ /** 患者院内编码/病历号 */
private String code; private String busNo;
/** 性别编码 */ /** 性别编码 */
private Integer genderEnum; private Integer genderEnum;
@@ -80,16 +80,16 @@ public class Patient extends HisBaseEntity {
private String addressJson; private String addressJson;
/** 民族 */ /** 民族 */
private String nationality; private String nationalityCode;
/** 身份证号 */ /** 身份证号 */
private String idCard; private String idCard;
/** 拼音码 */ /** 拼音码 */
private String spellCode; private String pyStr;
/** 五笔码 */ /** 五笔码 */
private String wbCode; private String wbStr;
/** 血型ABO */ /** 血型ABO */
private String bloodAbo; 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 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 */ /** 系统用户id */
private Long userId; 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 name;
/** 编码 */ /** 角色编码 */
private String code; private String role_code;
/** 活动标识 */ /** 活动标识 */
private Integer activeFlag; 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 Long id;
/** 编号 */ /** 编号 */
private String code; private String busNo;
/** 名称 */ /** 名称 */
private String name; private String name;
@@ -41,10 +41,10 @@ public class Supplier extends HisBaseEntity {
private String address; private String address;
/** 拼音码 */ /** 拼音码 */
private String pyCode; private String pyStr;
/** 五笔码 */ /** 五笔码 */
private String wbCode; private String wbStr;
/** 联系人电话 */ /** 联系人电话 */
private String phone; private String phone;

6
openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java
View File

@@ -41,7 +41,7 @@ public class Condition extends HisBaseEntity {
private Integer severityEnum; private Integer severityEnum;
/** 疾病或诊断编码 */ /** 疾病或诊断编码 */
private String code; private String busNo;
/** 身体部位 */ /** 身体部位 */
private String bodySiteJson; private String bodySiteJson;
@@ -77,7 +77,7 @@ public class Condition extends HisBaseEntity {
private Date recordedDatetime; private Date recordedDatetime;
/** 记录人 */ /** 记录人 */
private Long recorder; private Long recorderId;
/** 阶段总结 */ /** 阶段总结 */
private String stageSummaryText; private String stageSummaryText;
@@ -86,7 +86,7 @@ public class Condition extends HisBaseEntity {
private String evidence; private String evidence;
/** 医保编码 */ /** 医保编码 */
private String ybCode; private String ybNo;
} }

8
openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java
View File

@@ -32,16 +32,16 @@ public class ConditionDefinition extends HisBaseEntity {
private Integer sourceEnum; private Integer sourceEnum;
/** 编码 */ /** 编码 */
private String code; private String condition_code;
/** 诊断名称 */ /** 诊断名称 */
private String name; private String name;
/** 诊断名称拼音 */ /** 诊断名称拼音 */
private String pyCode; private String pyStr;
/** 诊断名称五笔拼音 */ /** 诊断名称五笔拼音 */
private String wbCode; private String wbStr;
/** 类型 */ /** 类型 */
private String typeCode; private String typeCode;
@@ -53,7 +53,7 @@ public class ConditionDefinition extends HisBaseEntity {
private Integer ybFlag; private Integer ybFlag;
/** 医保编码 */ /** 医保编码 */
private String ybCode; private String ybNo;
/** 医保对码标记 */ /** 医保对码标记 */
private Integer ybMatchFlag; private Integer ybMatchFlag;

6
openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java
View File

@@ -43,8 +43,8 @@ public class Procedure extends HisBaseEntity {
/** 分类 */ /** 分类 */
private Integer categoryEnum; private Integer categoryEnum;
/** 编码 */ /** 手术编码 */
private String code; private String procedureCode;
/** 患者Id */ /** 患者Id */
private Long patientId; private Long patientId;
@@ -65,7 +65,7 @@ public class Procedure extends HisBaseEntity {
private Date recordedTime; private Date recordedTime;
/** 记录人 */ /** 记录人 */
private Long recorder; private Long recorderId;
/** 是否有报告 */ /** 是否有报告 */
private Integer reportFlag; private Integer reportFlag;

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 useEnum;
/** 索赔指向 */ /** 索赔指向 */
private Integer insurer; private Integer insurerEnum;
/** condition_dis */ /** condition_dis */
private String conditionDis; 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 Integer categoryEnum;
/** 合同编码 */ /** 合同编码 */
private String code; private String busNo;
/** 机构 */ /** 机构 */
private Long orgId; 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 paypmentReconciliationId;
/** 被支付方 */ /** 被支付方 */
private Long payee; private Long payeeId;
/** 通知方式 */ /** 通知方式 */
private String wayCode; private String wayCode;
/** 通知内容 */ /** 通知内容 */
private String content; private String contentText;
/** 被通知方 */ /** 被通知方 */
private String recipient; private String recipient;
@@ -56,7 +56,7 @@ public class PaymentNotice extends HisBaseEntity {
private Integer payStatus; 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) @TableId(type = IdType.ASSIGN_ID)
private Long id; private Long id;
/** recId */ /** 先前支付明细id */
private Long predecessor; private Long predecessorId;
/** 付款类型 */ /** 付款类型 */
private Integer targetEnum; private Integer targetEnum;
@@ -38,13 +38,13 @@ public class PaymentRecDetail extends HisBaseEntity {
private Long accountId; private Long accountId;
/** 账户类型 */ /** 账户类型 */
private Integer accountType; private Integer accountEnum;
/** 支付类型 */ /** 支付类型 */
private Integer payType; private Integer payEnum;
/** 支付类型等级 */ /** 支付类型等级 */
private Integer payTypeClass; private Integer payLevelEnum;
/** 金额 */ /** 金额 */
private BigDecimal amount; private BigDecimal amount;
@@ -56,7 +56,7 @@ public class PaymentRecDetail extends HisBaseEntity {
private BigDecimal chargeAmount; private BigDecimal chargeAmount;
/** 支付平台返回交易号 */ /** 支付平台返回交易号 */
private String payTransId; private String payTransNo;
/** 支付平台返回交易信息 */ /** 支付平台返回交易信息 */
private String payTransText; 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 Long relationId;
/** 支付的业务标识符 */ /** 支付的业务标识符 */
private String paymentIdentifier; private String paymentNo;
/** 付款类别 */ /** 付款类别 */
private Integer type; private Integer paymentEnum;
/** 付款实体ID */ /** 付款实体ID */
private Long paypmentReconciliationId; private Long paypmentReconciliationId;
@@ -47,10 +47,10 @@ public class PaymentReconciliation extends HisBaseEntity {
private Integer kindEnum; private Integer kindEnum;
/** 收款员 */ /** 收款员 */
private Long enterer; private Long entererId;
/** 支付发起人类型 */ /** 支付发起人类型 */
private Integer issuerType; private Integer issuerEnum;
/** 支付的患者ID */ /** 支付的患者ID */
private Long patientId; private Long patientId;
@@ -80,13 +80,13 @@ public class PaymentReconciliation extends HisBaseEntity {
private Integer printCount; private Integer printCount;
/** 合同编码 */ /** 合同编码 */
private String contractCode; private String contractNo;
/** 处方号集合 */ /** 处方号集合 */
private String chargeItemJson; private String chargeItemJson;
/** 就诊ID */ /** 就诊ID */
private Long encoutnerId; private Long encounterId;
} }

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 id;
/** 药品编码 */ /** 药品编码 */
private Long medicationProductId; private Long medicationDefId;
/** 药品状态 */ /** 药品状态 */
private Integer statusEnum; 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 id;
/** 药品编号 */ /** 药品编号 */
private Long code; private String busNo;
/** 药品名称 */ /** 药品名称 */
private String name; private String name;
@@ -44,10 +44,10 @@ public class MedicationDefinition extends HisBaseEntity {
private String nameEn; private String nameEn;
/** 药品名称拼音码 */ /** 药品名称拼音码 */
private String pyCode; private String pyStr;
/** 药品五笔码 */ /** 药品五笔码 */
private String wbCode; private String wbStr;
/** 药品分类 */ /** 药品分类 */
private String categoryCode; private String categoryCode;
@@ -56,10 +56,10 @@ public class MedicationDefinition extends HisBaseEntity {
private String merchandiseName; private String merchandiseName;
/** 商品名称拼音码 */ /** 商品名称拼音码 */
private String merchandisePyCode; private String merchandisePyStr;
/** 商品五笔码 */ /** 商品五笔码 */
private String merchandiseWbCode; private String merchandiseWbStr;
/** 药品单位 */ /** 药品单位 */
private String unitCode; private String unitCode;
@@ -86,7 +86,7 @@ public class MedicationDefinition extends HisBaseEntity {
private Integer ybMatchFlag; private Integer ybMatchFlag;
/** 医保编码 */ /** 医保编码 */
private String ybCode; private String ybNo;
/** 药理作用分类 */ /** 药理作用分类 */
private String pharmacologyCategoryCode; 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; private Long id;
/** 药品发放id */ /** 药品发放id */
private String code; private String busNo;
/** 药品发放状态 */ /** 药品发放状态 */
private Integer statusEnum; private Integer statusEnum;
@@ -41,7 +41,7 @@ public class MedicationDispense extends HisBaseEntity {
private Date statusChangedTime; private Date statusChangedTime;
/** 发药类型 */ /** 发药类型 */
private Integer dispenseCategory; private Integer dispenseEnum;
/** 药品编码 */ /** 药品编码 */
private Long medicationId; 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 Long id;
/** 药品请求编码 */ /** 药品请求编码 */
private String code; private String bus_no;
/** 处方号 */ /** 处方号 */
private String prescriptionCode; private String prescriptionNo;
/** 分组id */ /** 分组id */
private Long groupId; private Long groupId;
@@ -116,7 +116,7 @@ public class MedicationRequest extends HisBaseEntity {
private String reasonJson; private String reasonJson;
/** 治疗类型 */ /** 治疗类型 */
private Integer therapyType; private Integer therapyEnum;
/** 服药时间(开始) */ /** 服药时间(开始) */
private Date effectiveDoseStart; private Date effectiveDoseStart;
@@ -128,7 +128,7 @@ public class MedicationRequest extends HisBaseEntity {
private Integer skinTestFlag; private Integer skinTestFlag;
/** 合同Id */ /** 合同Id */
private String contractCode; private String contractNo;
/** 输液标志 */ /** 输液标志 */
private Integer infusionFlag; private Integer infusionFlag;
@@ -167,7 +167,7 @@ public class MedicationRequest extends HisBaseEntity {
private Integer dispensePerDuration; private Integer dispensePerDuration;
/** 发药人 */ /** 发药人 */
private Long dispenser; private Long dispenserId;
} }

14
openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java
View File

@@ -32,34 +32,34 @@ public class ActivityDefinition extends HisBaseEntity {
private Integer categoryEnum; private Integer categoryEnum;
/** 编码 */ /** 编码 */
private String code; private String busNo;
/** 项目名称 */ /** 项目名称 */
private String name; private String name;
/** 项目名称拼音 */ /** 项目名称拼音 */
private String pyCode; private String pyStr;
/** 五笔拼音 */ /** 五笔拼音 */
private String wbCode; private String wbStr;
/** 类型 */ /** 类型 */
private Integer typeEnum; private Integer typeEnum;
/** 使用单位 */ /** 使用单位 */
private String permittedUnit; private String permittedUnitCode;
/** 医保标记 */ /** 医保标记 */
private Integer ybFlag; private Integer ybFlag;
/** 医保编码 */ /** 医保编码 */
private String ybCode; private String ybNo;
/** 医保对码标记 */ /** 医保对码标记 */
private Integer ybMatchFlag; private Integer ybMatchFlag;
/** 状态 */ /** 状态 */
private String statusCode; private Integer statusEnum;
/** 身体部位 */ /** 身体部位 */
private String bodySiteCode; private String bodySiteCode;
@@ -71,7 +71,7 @@ public class ActivityDefinition extends HisBaseEntity {
private String description; private String description;
/** 规则id */ /** 规则id */
private String ruleId; private Integer ruleId;
} }

2
openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java
View File

@@ -29,7 +29,7 @@ public class DeviceDispense extends HisBaseEntity {
private Long id; private Long id;
/** 器材发放id */ /** 器材发放id */
private String code; private String busNo;
/** 器材请求id */ /** 器材请求id */
private String deviceReqId; private String deviceReqId;

6
openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java
View File

@@ -29,13 +29,13 @@ public class DeviceRequest extends HisBaseEntity {
private Long id; private Long id;
/** 器材请求编码 */ /** 器材请求编码 */
private String code; private String busNo;
/** 处方号 */ /** 处方号 */
private String prescriptionCode; private String prescriptionNo;
/** 相关诊疗项目 */ /** 相关诊疗项目 */
private String activityId; private Integer activityId;
/** 组套id */ /** 组套id */
private Long packageId; private Long packageId;

10
openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/InventoryItem.java
View File

@@ -32,19 +32,19 @@ public class InventoryItem extends HisBaseEntity {
private Integer categoryEnum; private Integer categoryEnum;
/** 编码 */ /** 编码 */
private String code; private String busNo;
/** 名称 */ /** 名称 */
private String name; private String name;
/** 拼音码 */ /** 拼音码 */
private String pyCode; private String pyStr;
/** 五笔码 */ /** 五笔码 */
private String wbCode; private String wbStr;
/** 库存状态 */ /** 库存状态 */
private Integer inventoryStatus; private Integer inventoryStatusEnum;
/** 供应商id */ /** 供应商id */
private Long supplierId; private Long supplierId;
@@ -92,7 +92,7 @@ public class InventoryItem extends HisBaseEntity {
private Long locationId; private Long locationId;
/** 追溯码 */ /** 追溯码 */
private String traceCode; private String traceNo;
/** 追溯码包装层级 */ /** 追溯码包装层级 */
private Integer packagingLevels; private Integer packagingLevels;

8
openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java
View File

@@ -29,7 +29,7 @@ public class ServiceRequest extends HisBaseEntity {
private Long id; private Long id;
/** 处方号 */ /** 处方号 */
private String prescriptionCode; private String prescriptionNo;
/** 请求基于什么 */ /** 请求基于什么 */
private String basedOnTable; private String basedOnTable;
@@ -56,7 +56,7 @@ public class ServiceRequest extends HisBaseEntity {
private Integer performFlag; private Integer performFlag;
/** 请求code */ /** 请求code */
private Long code; private Long activityId;
/** 数量 */ /** 数量 */
private BigDecimal quantity; private BigDecimal quantity;
@@ -77,7 +77,7 @@ public class ServiceRequest extends HisBaseEntity {
private Long requesterId; private Long requesterId;
/** 执行者类型 */ /** 执行者类型 */
private String performerType; private String performerTypeCode;
/** 执行人 */ /** 执行人 */
private Long performerId; private Long performerId;
@@ -98,7 +98,7 @@ public class ServiceRequest extends HisBaseEntity {
private Date occurrenceEndTime; private Date occurrenceEndTime;
/** 历史请求 */ /** 历史请求 */
private Long relevantHistory; private Long relevantHistoryId;
} }

24
openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java
View File

@@ -35,13 +35,13 @@ public class SupplyDelivery extends HisBaseEntity {
private Long summaryId; private Long summaryId;
/** 状态 */ /** 状态 */
private Integer status; private Integer statusEnum;
/** 患者id */ /** 患者id */
private Long patientId; private Long patientId;
/** 类型 */ /** 类型 */
private Integer type; private Integer typeEnum;
/** 发放项目所属表 */ /** 发放项目所属表 */
private String itemTable; private String itemTable;
@@ -62,7 +62,7 @@ public class SupplyDelivery extends HisBaseEntity {
private String lotNumber; private String lotNumber;
/** 追溯码 */ /** 追溯码 */
private String traceCode; private String traceNo;
/** 供应商 */ /** 供应商 */
private Long supplierId; private Long supplierId;
@@ -82,24 +82,6 @@ public class SupplyDelivery extends HisBaseEntity {
/** 发放周期时间 */ /** 发放周期时间 */
private String occurrenceTiming; private String occurrenceTiming;
/** 源仓库类型 */
private Integer sourceType;
/** 源仓库 */
private Long sourceLocationId;
/** 源仓位 */
private Long sourceLocationStoreId;
/** 目的仓库类型 */
private Integer purposeType;
/** 目的仓库 */
private Long purposeLocationId;
/** 目的仓位 */
private Long purposeLocationStoreId;
/** 接收人 */ /** 接收人 */
private Long receiverId; private Long receiverId;

6
openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java
View File

@@ -65,7 +65,7 @@ public class SupplyRequest extends HisBaseEntity {
private Integer itemQuantity; private Integer itemQuantity;
/** 物品编码 */ /** 物品编码 */
private Long code; private Long itemId;
/** 物品计量单位 */ /** 物品计量单位 */
private String unitIdCode; private String unitIdCode;
@@ -89,7 +89,7 @@ public class SupplyRequest extends HisBaseEntity {
private String reason; private String reason;
/** 源仓库类型 */ /** 源仓库类型 */
private Integer sourceType; private Integer sourceTypeEnum;
/** 源仓库 */ /** 源仓库 */
private Long sourceLocationId; private Long sourceLocationId;
@@ -98,7 +98,7 @@ public class SupplyRequest extends HisBaseEntity {
private Long sourceLocationStoreId; private Long sourceLocationStoreId;
/** 目的类型 */ /** 目的类型 */
private Integer purposeType; private Integer purposeTypeEnum;
/** 目的仓库 */ /** 目的仓库 */
private Long purposeLocationId; private Long purposeLocationId;