层级优化，方法内容优化，字段修改

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

@@ -6,9 +6,8 @@ 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.ChargeItemStatus;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -75,7 +74,7 @@ public class ChargeItem extends HisBaseEntity {
     private Long definitionId;
 
     /** 定价子表主键 */
-    private Long applicabilityId;
+    private Long defDetailId;
 
     /** 原价 */
     private BigDecimal baseAmount;
@@ -122,5 +121,4 @@ public class ChargeItem extends HisBaseEntity {
     /** 机构 */
     private Integer orgId;
 
-
 }

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

@@ -19,10 +19,10 @@ import lombok.experimental.Accessors;
  * @date 2025-02-20
  */
 @Data
-@TableName("adm_charge_item_def_app")
+@TableName("adm_charge_item_def_detail")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-public class ChargeItemDefApp extends HisBaseEntity {
+public class ChargeItemDefDetail extends HisBaseEntity {
 
     /** ID */
     @TableId(type = IdType.ASSIGN_ID)
@@ -34,28 +34,19 @@ public class ChargeItemDefApp extends HisBaseEntity {
     /** 条件规则 */
     private Long conditionRuleId;
 
-    /** 批次号 */
-    private String conditionLotnumber;
-
-    /** 医保相关价格 */
-    private String conditionYbCode;
-
-    /** 采购售卖条件 */
-    private String conditionInoutCode;
-
-    /** 条件类型 */
-    private String conditionUnitCode;
-
     /** 条件 */
     private String conditionCode;
 
+    /** 命中值 */
+    private String conditionValue;
+
     /** 优先级 */
     private Integer priority;
 
     /** 价格 */
     private BigDecimal amount;
 
-    public ChargeItemDefApp() {
+    public ChargeItemDefDetail() {
         // 默认优先级：常规
         this.priority = ActPriority.ROUTINE.getValue();
     }