Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.6.3_4.6.4.sql
===================================================================
diff -u -r17006 -r17010
--- ssts-web/src/main/webapp/dataUpdater/sqls/4.6.3_4.6.4.sql	(.../4.6.3_4.6.4.sql)	(revision 17006)
+++ ssts-web/src/main/webapp/dataUpdater/sqls/4.6.3_4.6.4.sql	(.../4.6.3_4.6.4.sql)	(revision 17010)
@@ -1,3 +1,5 @@
 update TousseDefinition set discountPrice=price,isInvoice='是';
 update TousseDefinition set printOrgSource='回收科室' where isPrintOrg='是';
-update TousseDefinition set printOrgSource='无' where isPrintOrg='否';
\ No newline at end of file
+update TousseDefinition set printOrgSource='无' where isPrintOrg='否';
+update TousseInstance set discountPrice=fluctuationPrice;
+update InvoiceItem set settlementDiscountPrice=settlementPrice;
\ No newline at end of file
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
===================================================================
diff -u -r16972 -r17010
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 16972)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 17010)
@@ -118,6 +118,12 @@
 
 	private Double price; // 单价
 	
+	/**
+	 * 折扣价(德阳市人民医院提出的问题:DYSYY-15 折扣价问题的个性化需求改进)
+	 * 默认值为器械包价格
+	 */
+	private Double discountPrice = 0.0;
+	
 	private Double fluctuationPrice;//浮动价格
 	
 	private String sterilizationBasket;//灭菌篮筐
@@ -1305,6 +1311,14 @@
 		this.comboTousseDefinitionName = comboTousseDefinitionName;
 	}
 
+	public Double getDiscountPrice() {
+		return discountPrice;
+	}
+
+	public void setDiscountPrice(Double discountPrice) {
+		this.discountPrice = discountPrice;
+	}
+
 	@Transient
 	public boolean proxyDisinfectionSent(){
 		return StringTools.equals(Constants.STR_YES, proxyDisinfectionSent);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java
===================================================================
diff -u -r16936 -r17010
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java	(.../InvoiceItem.java)	(revision 16936)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java	(.../InvoiceItem.java)	(revision 17010)
@@ -59,6 +59,12 @@
 
 	private Double settlementPrice = 0d;// 发货物品小结价格
 	
+	/**
+	 * 结算的折扣价(德阳市人民医院提出的问题:DYSYY-15 折扣价问题的个性化需求改进)
+	 * 默认值为器械包价格
+	 */
+	private Double settlementDiscountPrice = 0.0;
+	
 	private String tousseType; //发货物品类型   器械包、一次性物品、消毒物品等等
 	
 	private Long invoiceID;// 发货单ID
@@ -384,6 +390,14 @@
 		this.comboTousseName = comboTousseName;
 	}
 
+	public Double getSettlementDiscountPrice() {
+		return settlementDiscountPrice;
+	}
+
+	public void setSettlementDiscountPrice(Double settlementDiscountPrice) {
+		this.settlementDiscountPrice = settlementDiscountPrice;
+	}
+
 	/**
 	 * 判断是否是一次性物品,是一次性物品返回true,否则 返回false
 	 * @return