Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/ComboTousseComposite.java
===================================================================
diff -u
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/ComboTousseComposite.java	(revision 0)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/ComboTousseComposite.java	(revision 16806)
@@ -0,0 +1,69 @@
+/**
+ * 
+ */
+package com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Index;
+import javax.persistence.Table;
+
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
+/**
+ * 聚合包及所包含的包内普通器械包定义
+ * @author shuyongfu
+ * @since date:2017-01-16
+ */
+@Entity
+@Table(name = "ComboTousseComposite",indexes = {@Index(columnList = "comboTousseDefinitionId", name = "comboTousseDefinitionId_index")
+,@Index(columnList = "tousseDefinitionId", name = "tousseDefinitionId_index")
+})
+@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
+public class ComboTousseComposite {
+	
+	/**
+	 * id,主键/自增长
+	 */
+	private Long id;
+	
+	/**
+	 * 聚合包的包定义id
+	 */
+	private Long comboTousseDefinitionId;
+	
+	/**
+	 * 聚合包内的普通器械包包定义id
+	 */
+	private Long tousseDefinitionId;
+
+	@Id
+	@GeneratedValue(strategy=GenerationType.AUTO)
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getComboTousseDefinitionId() {
+		return comboTousseDefinitionId;
+	}
+
+	public void setComboTousseDefinitionId(Long comboTousseDefinitionId) {
+		this.comboTousseDefinitionId = comboTousseDefinitionId;
+	}
+
+	public Long getTousseDefinitionId() {
+		return tousseDefinitionId;
+	}
+
+	public void setTousseDefinitionId(Long tousseDefinitionId) {
+		this.tousseDefinitionId = tousseDefinitionId;
+	}
+	
+}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java
===================================================================
diff -u -r16714 -r16806
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java	(.../InvoiceItem.java)	(revision 16714)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java	(.../InvoiceItem.java)	(revision 16806)
@@ -102,6 +102,16 @@
 
 	private Integer transferScale;  //中包装单位装换单位系数
 	
+	/**
+	 * 聚合包实例id
+	 */
+	private Long comboTousseInstanceId;
+	
+	/**
+	 * 聚合包名称
+	 */
+	private String comboTousseName;
+	
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	public Long getId() {
@@ -358,6 +368,22 @@
 	public void setTransferScale(Integer transferScale) {
 		this.transferScale = transferScale;
 	}
+	public Long getComboTousseInstanceId() {
+		return comboTousseInstanceId;
+	}
+
+	public void setComboTousseInstanceId(Long comboTousseInstanceId) {
+		this.comboTousseInstanceId = comboTousseInstanceId;
+	}
+
+	public String getComboTousseName() {
+		return comboTousseName;
+	}
+
+	public void setComboTousseName(String comboTousseName) {
+		this.comboTousseName = comboTousseName;
+	}
+
 	/**
 	 * 判断是否是一次性物品,是一次性物品返回true,否则 返回false
 	 * @return
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
===================================================================
diff -u -r16796 -r16806
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java	(.../TousseDefinition.java)	(revision 16796)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java	(.../TousseDefinition.java)	(revision 16806)
@@ -119,6 +119,8 @@
 	public static final String PACKAGE_TYPE_CUSTOM = "自定义器械包";
 	public static final String PACKAGE_TYPE_DISINFECTION = "消毒物品";
 	
+	public static final String PACKAGE_TYPE_COMBO = "聚合包";
+	
 	// terry kwan, 2015-01-08 灭菌物品类型可以删除，实际上消毒物品是一定不需要灭菌的
 	// 而器械包是一定灭菌的
 	public static final String PACKAGE_TYPE_STERILIZATION = "灭菌物品";
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
===================================================================
diff -u -r16740 -r16806
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 16740)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 16806)
@@ -45,6 +45,7 @@
 ,@Index(columnList = "foreignTousseApp_id", name = "foreignTousseApp_id_index"),@Index(columnList = "proxyDisinfection_id", name = "proxyDisinfection_id_index")
 ,@Index(columnList = "idCardInstanceID", name = "idCardInstanceID_index"),@Index(columnList = "operationTime", name = "operationTime_index")
 ,@Index(columnList = "unTraceableTousse", name = "unTraceableTousse_index"),@Index(columnList = "tousseFixedBarcode", name = "tousseFixedBarcode_index")
+,@Index(columnList = "comboTousseInstanceId", name = "comboTousseInstanceId_index"),@Index(columnList = "comboTousseDefinitionId", name = "comboTousseDefinitionId_index")
 })
 @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
 @JsonFilter("fieldFilter")
@@ -290,7 +291,16 @@
 	public static final String ROUTINE_NO = "否";
 	private String isRoutine;  //是否常规发货,默认是常规发货（这里的不常规指的是：正在做"生物监测"时就把这个器械包发货了）
 	
+	/**
+	 * 关联的聚合包实例id
+	 */
+	private Long comboTousseInstanceId;
 	
+	/**
+	 * 关联的聚合包定义id
+	 */
+	private Long comboTousseDefinitionId;
+	
 	public static final String[] filterProperties = { "handler",
 			"hibernateLazyInitializer", "fieldHandler", "materialInstances",
 			"sterilizationRecords", "isUploadImage", "isUploadVideo", "images",
@@ -1161,6 +1171,22 @@
 		this.proxyDisinfectionSent = proxyDisinfectionSent;
 	}
 
+	public Long getComboTousseInstanceId() {
+		return comboTousseInstanceId;
+	}
+
+	public void setComboTousseInstanceId(Long comboTousseInstanceId) {
+		this.comboTousseInstanceId = comboTousseInstanceId;
+	}
+
+	public Long getComboTousseDefinitionId() {
+		return comboTousseDefinitionId;
+	}
+
+	public void setComboTousseDefinitionId(Long comboTousseDefinitionId) {
+		this.comboTousseDefinitionId = comboTousseDefinitionId;
+	}
+
 	@Transient
 	public boolean proxyDisinfectionSent(){
 		return StringTools.equals(Constants.STR_YES, proxyDisinfectionSent);