采购入库

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

@@ -74,7 +74,7 @@ public class ChargeItem extends HisBaseEntity {
     /** 费用定价ID */
     private Long definitionId;
 
-    /** applicability表主键 */
+    /** 定价子表主键 */
     private Long applicabilityId;
 
     /** 原价 */
@@ -98,12 +98,18 @@ public class ChargeItem extends HisBaseEntity {
     /** 开立时间 */
     private Date enteredDate;
 
-    /** 医疗服务类型 */
+    /** 医疗服务所在表 */
     private String serviceTable;
 
     /** 医疗服务ID */
     private Long serviceId;
 
+    /** 产品所在表 */
+    private String productTable;
+
+    /** 产品ID */
+    private Long productId;
+
     /** 索赔结果 */
     private Integer claimStateEnum;
 

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefApp.java

@@ -1,13 +1,13 @@
 package com.openhis.administration.domain;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.core.common.core.domain.HisBaseEntity;
+import com.openhis.common.enums.ActPriority;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -55,5 +55,8 @@ public class ChargeItemDefApp extends HisBaseEntity {
     /** 价格 */
     private BigDecimal amount;
 
-
+    public ChargeItemDefApp() {
+        // 默认优先级：常规
+        this.priority = ActPriority.ROUTINE.getValue();
+    }
 }