解决合并冲突

openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentedItemModel.java

@@ -1,8 +1,9 @@
 package com.openhis.financial.model;
-import com.openhis.administration.domain.ChargeItem;
-import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
+
+import lombok.Data;
 
 @Data
 public class PaymentedItemModel {
@@ -21,4 +22,37 @@ public class PaymentedItemModel {
     /** 总价 */
     private Long chargeItemId;
 
+    /** 医疗服务所在表 */
+    private String serviceTable;
+
+    /** 医疗服务ID */
+    private Long serviceId;
+
+    /** 产品所在表 */
+    private String productTable;
+
+    /** 产品ID */
+    private Long productId;
+
+    /** 开立人ID */
+    private Long entererId;
+
+    /** 开立科室 */
+    private Long requestingOrgId;
+
+    /** 开立时间 */
+    private Date enteredDate;
+
+    /** 数量 */
+    private BigDecimal quantityValue;
+
+    /** 单位 */
+    private String quantityUnit;
+
+    /** 单价 */
+    private BigDecimal unitPrice;
+
+    /** chargeItem定义id */
+    private Long definitionId;
+
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResult.java

@@ -1,12 +1,13 @@
 package com.openhis.financial.model;
 
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.openhis.yb.dto.Clinic2206FundPaymentResult;
-import lombok.Data;
-
 import java.math.BigDecimal;
 import java.util.List;
 
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.openhis.yb.dto.Clinic2206FundPaymentResult;
+
+import lombok.Data;
+
 @Data
 public class PrePaymentResult {
 
@@ -82,4 +83,6 @@ public class PrePaymentResult {
     private String busNo; // 挂号采访码
 
     private Long accountId; // 账号ID码
+
+    private BigDecimal gfRatio;// 学校垫付金额
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/StudentPaymentItemModel.java

@@ -0,0 +1,49 @@
+package com.openhis.financial.model;
+
+import java.math.BigDecimal;
+
+import lombok.Data;
+
+@Data
+public class StudentPaymentItemModel extends PaymentedItemModel {
+
+    /**
+     * 医保等级
+     */
+    private Integer chrgitmLv;
+
+    /**
+     * 医保分类
+     */
+    private String ybType;
+
+    /**
+     * 自付比例
+     */
+    private BigDecimal selfRatio;
+
+    /**
+     * 公费一次报销金额
+     */
+    private BigDecimal oncePrice;
+
+    /**
+     * 医保折扣部分金额
+     */
+    private BigDecimal ybRatio;
+
+    /**
+     * 学校垫付部分金额
+     */
+    private BigDecimal studentRatio;
+
+    /**
+     * 自付比例
+     */
+    private BigDecimal twiceRatio;
+
+    /**
+     * 公费二次报销金额
+     */
+    private BigDecimal twicePrice;
+}