采购入库代码补全

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
 
+import liquibase.pro.packaged.S;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -62,7 +63,7 @@ public class ChargeItem extends HisBaseEntity {
     private Long quantityValue;
 
     /** 单位 */
-    private Long quantityUnit;
+    private String quantityUnit;
 
     /** 单价 */
     private BigDecimal unitPrice;

openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java

@@ -21,8 +21,6 @@ import lombok.AllArgsConstructor;
 @AllArgsConstructor
 public class ChargeItemServiceImpl extends ServiceImpl<ChargeItemMapper, ChargeItem> implements IChargeItemService {
 
-    private final ChargeItemMapper chargeItemMapper;
-
     /**
      * 创建已计费的采购账单
      *
@@ -30,7 +28,12 @@ public class ChargeItemServiceImpl extends ServiceImpl<ChargeItemMapper, ChargeI
      */
     @Override
     public void createBilledPurchaseCharge(List<ChargeItem> chargeItemList) {
-
+        for (ChargeItem chargeItem : chargeItemList) {
+            // 此判断是为了避免插入时主键重复
+            if (chargeItem.getId() == null) {
+                baseMapper.insert(chargeItem);
+            }
+        }
     }
 
     /**