后端最新版本同步

openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/ActivityDevice.java

@@ -10,6 +10,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
+
 @Data
 @TableName("tmp_activity_device")
 @Accessors(chain = true)
@@ -38,11 +40,16 @@ public class ActivityDevice extends HisBaseEntity {
     private String devActTable;
 
     /** 耗材数量 */
-    private Integer quantity;
+    private BigDecimal quantity;
 
     /** 状态 */
     private Integer statusEnum;
 
+    /**
+     * 单位
+     */
+    private String unitCode;
+
     public ActivityDevice() {
         this.statusEnum = PublicationStatus.ACTIVE.getValue();
     }

openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrdersGroupPackage.java

@@ -0,0 +1,42 @@
+package com.openhis.template.domain;
+
+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;
+
+@Data
+@TableName("tmp_orders_group_package")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class OrdersGroupPackage extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 组套包类型
+     */
+    private Integer packageTypeEnum;
+
+    /**
+     * 科室id
+     */
+    private Long organizationId;
+
+    /**
+     * 参与者id
+     */
+    private Long practitionerId;
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/OrdersGroupPackageDetail.java

@@ -0,0 +1,49 @@
+package com.openhis.template.domain;
+
+import java.math.BigDecimal;
+
+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;
+
+@Data
+@TableName("tmp_orders_group_package_detail")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class OrdersGroupPackageDetail extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 组合套餐id
+     */
+    private Long groupPackageId;
+
+    /**
+     * 医嘱定义id
+     */
+    private Long orderDefinitionId;
+
+    /**
+     * 医嘱定义表名
+     */
+    private String orderDefinitionTable;
+
+    /**
+     * 数量
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 单位
+     */
+    private String unitCode;
+
+}