新增门诊退费相关代码

openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java

@@ -41,7 +41,7 @@ public class PaymentReconciliation extends HisBaseEntity {
     private Integer paymentEnum;
 
     /** 付款实体ID */
-    private Long paypmentReconciliationId;
+    private Long paymentReconciliationId;
 
     /** 发起支付的工作流程类别 */
     private Integer kindEnum;
@@ -83,7 +83,7 @@ public class PaymentReconciliation extends HisBaseEntity {
     private String contractNo;
 
     /** 处方号集合 */
-    private String chargeItemJson;
+    private String chargeItemIds;
 
     /** 就诊ID */
     private Long encounterId;

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

@@ -106,5 +106,12 @@ public class MedicationDispense extends HisBaseEntity {
     /** 单次最大剂量 */
     private BigDecimal maxUnit;
 
+    /** 发放数量 */
+    private Integer quantity;
 
+    /** 发放单位 */
+    private String unitCode;
+
+    /** 产品批号 */
+    private String lotNumber;
 }

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

@@ -46,6 +46,9 @@ public class MedicationRequest extends HisBaseEntity {
     /** 请求单位编码 */
     private String unitCode;
 
+    /** 产品批号 */
+    private String lotNumber;
+
     /** 请求合计（元） */
     private BigDecimal displayAmount;
 

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

@@ -43,6 +43,15 @@ public class DeviceDispense extends HisBaseEntity {
     /** 发药类型 */
     private Integer dispenseCategoryEnum;
 
+    /** 发放数量 */
+    private Integer quantity;
+
+    /** 发放单位 */
+    private String unitCode;
+
+    /** 产品批号 */
+    private String lotNumber;
+
     /** 器材编码 */
     private Long deviceDefId;
 

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

@@ -6,8 +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 lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -61,6 +61,9 @@ public class DeviceRequest extends HisBaseEntity {
     /** 请求单位编码 */
     private String unitCode;
 
+    /** 产品批号 */
+    private String lotNumber;
+
     /** 器材编码 */
     private Long deviceDefId;
 
@@ -130,5 +133,4 @@ public class DeviceRequest extends HisBaseEntity {
     /** 发放编号 */
     private Long dispenseId;
 
-
 }