Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
===================================================================
diff -u -r16973 -r17006
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java	(.../TousseDefinition.java)	(revision 16973)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java	(.../TousseDefinition.java)	(revision 17006)
@@ -73,6 +73,12 @@
 	private String wbCode;// 五笔
 
 	private Double price = 0.0; // 价格
+	
+	/**
+	 * 折扣价(德阳市人民医院提出的问题:DYSYY-15 折扣价问题的个性化需求改进)
+	 * 默认值为器械包价格
+	 */
+	private Double discountPrice = 0.0;
 
 	private Double borrowPrice = 0.0; // 借出价格(元/天)
 
@@ -160,12 +166,29 @@
 	private String limitInvoiceDepart = STR_NO; 
 	
 	private String isPrintOrg = STR_NO; //是否打印科室(默认不打印,省医提出问题)
+	
+	/**
+	 * 打印科室来源,默认为无
+	 * 有资产归属、回收科室、无三个选择可选,对应之前的是否打印科室字段是和否
+	 */
+	private String printOrgSource = PRINGORGSOURCE_NONE;
+	
+	public static String PRINGORGSOURCE_ASSERTBELONG = "资产归属";
+	public static String PRINGORGSOURCE_RECYCLINGDEPART = "回收科室";
+	public static String PRINGORGSOURCE_NONE = "无";
 
 	private String isTraceable = STR_YES; //是否追溯
 	
 	private String isReview = STR_YES; //是否审核
 	
 	private String isSterile; //是否灭菌
+	
+	/**
+	 * 是否发货(德阳市人民医院提出的问题:DYSYY-10 器械包定义增加【是否发货】字段)
+	 * 默认为是
+	 * 如果为否,则所该物品对的应的申请项不需要在发货计划的待发货物品中显示
+	 */
+	private String isInvoice = STR_YES;
 
 	private String isCustomPacking = STR_YES;// 是否允许自定义装配
 	
@@ -1210,5 +1233,29 @@
 	public void setIsForeignTousse(String isForeignTousse) {
 		this.isForeignTousse = isForeignTousse;
 	}
+
+	public Double getDiscountPrice() {
+		return discountPrice;
+	}
+
+	public void setDiscountPrice(Double discountPrice) {
+		this.discountPrice = discountPrice;
+	}
+
+	public String getIsInvoice() {
+		return isInvoice;
+	}
+
+	public void setIsInvoice(String isInvoice) {
+		this.isInvoice = isInvoice;
+	}
+
+	public String getPrintOrgSource() {
+		return printOrgSource;
+	}
+
+	public void setPrintOrgSource(String printOrgSource) {
+		this.printOrgSource = printOrgSource;
+	}
 	
 }
Index: forgon-core/src/main/java/com/forgon/Constants.java
===================================================================
diff -u -r16956 -r17006
--- forgon-core/src/main/java/com/forgon/Constants.java	(.../Constants.java)	(revision 16956)
+++ forgon-core/src/main/java/com/forgon/Constants.java	(.../Constants.java)	(revision 17006)
@@ -20,7 +20,7 @@
 			"4.0.5","4.0.6","4.0.44","4.0.45","4.1.0","4.1.1","4.1.2","4.1.3","4.1.4","4.1.5","4.1.6","4.1.7","4.1.8","4.1.9","4.2.0","4.2.1","4.2.2",
 			"4.2.3","4.2.4","4.2.5","4.2.6","4.2.7","4.2.8","4.2.9","4.3.0","4.3.1","4.3.2","4.3.3","4.3.4","4.3.5","4.3.6","4.3.7","4.3.8","4.3.9",
 			"4.4.0","4.4.1","4.4.2","4.4.3","4.4.4","4.4.5","4.4.6","4.4.7","4.4.8","4.4.9","4.5.0","4.5.1","4.5.2","4.5.3","4.5.4","4.5.5","4.5.6","4.5.7","4.5.8",
-			"4.5.9","4.6.0","4.6.1","4.6.2","4.6.3"};// 版本列表
+			"4.5.9","4.6.0","4.6.1","4.6.2","4.6.3","4.6.4"};// 版本列表
 	public final static List<String> SOFTWARE_VERSION_LIST = Arrays
 			.asList(SOFTWARE_VERSION_ARRAY);
 	public final static String SOFTWARE_VERSION = SOFTWARE_VERSION_ARRAY[SOFTWARE_VERSION_ARRAY.length - 1];// 软件最新版本
Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.6.3_4.6.4.sql
===================================================================
diff -u
--- ssts-web/src/main/webapp/dataUpdater/sqls/4.6.3_4.6.4.sql	(revision 0)
+++ ssts-web/src/main/webapp/dataUpdater/sqls/4.6.3_4.6.4.sql	(revision 17006)
@@ -0,0 +1,3 @@
+update TousseDefinition set discountPrice=price,isInvoice='是';
+update TousseDefinition set printOrgSource='回收科室' where isPrintOrg='是';
+update TousseDefinition set printOrgSource='无' where isPrintOrg='否';
\ No newline at end of file