Index: ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/departmentapplicationtemplate/service/DepartmentAppTemplateManagerTests.java
===================================================================
diff -u -r13017 -r16792
--- ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/departmentapplicationtemplate/service/DepartmentAppTemplateManagerTests.java	(.../DepartmentAppTemplateManagerTests.java)	(revision 13017)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/departmentapplicationtemplate/service/DepartmentAppTemplateManagerTests.java	(.../DepartmentAppTemplateManagerTests.java)	(revision 16792)
@@ -339,7 +339,8 @@
 		assertEquals("注射器[5ML]",jsonArray.getJSONObject(0).optString("name"));
 		assertEquals(TousseItem.TYPE_DIPOSABLE_GOODS,jsonArray.getJSONObject(0).optString("tousseType"));
 		assertEquals("5ML",jsonArray.getJSONObject(0).optString("specification"));
-		assertEquals("1000",jsonArray.getJSONObject(0).optString("storage"));
+		//现在4.1的代码已将不再把库存记在一次性物品定义表里了,所以验证库存的断言去掉
+		//assertEquals("1000",jsonArray.getJSONObject(0).optString("storage"));
 		assertEquals("1.65",jsonArray.getJSONObject(0).optString("price"));
 		
 		assertEquals("纱块[6*8]",jsonArray.getJSONObject(1).optString("name"));
@@ -350,8 +351,10 @@
 		assertEquals("注射器[10ML]",jsonArray.getJSONObject(2).optString("name"));
 		assertEquals(TousseItem.TYPE_DIPOSABLE_GOODS,jsonArray.getJSONObject(2).optString("tousseType"));
 		assertEquals("10ML",jsonArray.getJSONObject(2).optString("specification"));
-		assertEquals("2000",jsonArray.getJSONObject(2).optString("storage"));
-		assertEquals("2.75",jsonArray.getJSONObject(2).optString("price"));
+		//现在4.1的代码已将不再把库存记在一次性物品定义表里了,所以验证库存的断言去掉
+		//assertEquals("2000",jsonArray.getJSONObject(2).optString("storage"));
+		//注射器[10ML]的参考价为1.4,浮动系统为1.1,所以最终算出的申领价格应该是1.4*1.1=1.54,而并不是2.75,所以此处代码要将2.75修改为1.54
+		assertEquals("1.54",jsonArray.getJSONObject(2).optString("price"));
 		
 	}