Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
===================================================================
diff -u -r13845 -r13890
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 13845)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 13890)
@@ -1041,12 +1041,10 @@
 					
 					obj.put("materials",materialsString);
 					obj.put("children",materialsString);
+					obj.put("isApplyEntireTousse", td.getIsApplyEntireTousse());
 					
-					String isApplyEntireTousse = td.getIsApplyEntireTousse();
-					obj.put("isApplyEntireTousse", isApplyEntireTousse);
-					
 					// 对于非整包清洗的消毒物品，不显示包数量
-					if (!"是".equals(isApplyEntireTousse)){
+					if (!td.applyEntireTousse()){
 						amountStr = "";
 					}
 				}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
===================================================================
diff -u -r13017 -r13890
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java	(.../DepartmentAppTemplateManagerImpl.java)	(revision 13017)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java	(.../DepartmentAppTemplateManagerImpl.java)	(revision 13890)
@@ -255,8 +255,8 @@
 		String totalPriceStr = "";
 		Double price = 0d;
 		
-		String isApplyEntireTousse = "否";
 		
+		
 		boolean isLeaf = true;
 		
 		JSONArray materialsJsonArray = new JSONArray();
@@ -281,8 +281,6 @@
 			
 			tousseType = tdOfTousseItem.getTousseType();
 			
-			isApplyEntireTousse = tdOfTousseItem.getIsApplyEntireTousse();
-			
 			if (tousseItem == null){
 			
 				price = tdOfTousseItem.getPrice();
@@ -298,7 +296,7 @@
 				
 				// 如果是新申请单，并且该消毒物品是整包清洗，则计算整包的单价，否则不需要
 				if (tousseItem == null){
-					if ("是".equals(isApplyEntireTousse)){
+					if (tdOfTousseItem.applyEntireTousse()){
 						price = 0d;
 						for (int i = 0; i < materialsJsonArray.size(); i++) {
 							JSONObject obj = (JSONObject) materialsJsonArray.get(i);
@@ -323,7 +321,7 @@
 			json.put("id", itemId);
 			json.put("tousseDefinitionID", tdOfTousseItem.getId());
 			json.put("tousseType", tousseType);
-			json.put("isApplyEntireTousse", isApplyEntireTousse);
+			json.put("isApplyEntireTousse", tdOfTousseItem.getIsApplyEntireTousse());
 			json.put("name", tousseName);
 			json.put("unit", unit);
 			json.put("count", amountStr);
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r13840 -r13890
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 13840)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 13890)
@@ -2023,10 +2023,8 @@
 	
 	private void reSetDisinfectGoodPrintItem(String tousseType,TousseDefinition td,PrintRowVo vo){
 		if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseType) && td != null){
-			
-			String isApplyEntireTousse = td.getIsApplyEntireTousse();
 			// 非整包申请，按材料数量打印
-			if ("否".equals(isApplyEntireTousse)){
+			if (!td.applyEntireTousse()){
 			
 				int miAmount = 0;
 				List<MaterialInstance> miList = td.getMaterialInstances();
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r13855 -r13890
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 13855)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 13890)
@@ -82,6 +82,7 @@
 import com.forgon.tools.MapTools;
 import com.forgon.tools.MathTools;
 import com.forgon.tools.StrutsParamUtils;
+import com.forgon.tools.StrutsResponseUtils;
 import com.forgon.tools.hibernate.ObjectDao;
 import com.forgon.tools.json.DateJsonValueProcessor;
 import com.forgon.tools.json.JsonPropertyFilter;
@@ -1262,9 +1263,10 @@
 			map.put("diposableGoods", diposableGoodsList);
 			JSONObject jsonObject = JSONObject.fromObject(map);
 
-			StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8");
-			StrutsParamUtils.getResponse().getWriter()
-					.println(jsonObject.toString());
+			StrutsResponseUtils.output(jsonObject);
+//			StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8");
+//			StrutsParamUtils.getResponse().getWriter()
+//					.println(jsonObject.toString());
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r13879 -r13890
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 13879)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 13890)
@@ -1223,7 +1223,7 @@
 			if (barcodeDevice instanceof TousseInstance) {
 				TousseInstance tousseInstance = ((TousseInstance) barcodeDevice);
 				TousseDefinition td = tousseInstance.getTousseDefinition();
-				if(td.isDisinfection() && "否".equals(td.getIsApplyEntireTousse())){
+				if(td.isDisinfection() && !td.applyEntireTousse()){
 					if(StringUtils.isBlank(submitInvoiceItem.getTousseType())){
 						amount = 1;// 若是消毒物品，并且是拆包申请，那么amount是材料总数，应重设为1（包数）。
 					}
@@ -2530,7 +2530,7 @@
 		}
 		result.addProperty("isCleanedEntirely", td.getIsApplyEntireTousse());
 		if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(td.getTousseType())
-				&& "否".endsWith(td.getIsApplyEntireTousse())){
+				&& !td.applyEntireTousse()){
 			// 非整包清洗的消毒物品，显示材料数量
 			result.addProperty("materialAmount", CssdUtils.getMaterialTotalAmount(td,false));
 		}
@@ -2596,7 +2596,7 @@
 		
 		TousseDefinition td = tousseInstance.getTousseDefinition();
 		if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(td.getTousseType())
-				&& "否".endsWith(td.getIsApplyEntireTousse())){
+				&& !td.applyEntireTousse()){
 			// 非整包申请的消毒物品，显示材料数量
 			result.addProperty("materialAmount", CssdUtils.getMaterialTotalAmount(td,false));
 		}
@@ -3450,7 +3450,7 @@
 				
 				if(applicationItem.isDisinfection()){
 					// 非整包申请的消毒物品，显示材料数量,并且将材料明细设置到tousseVO里面
-					if(tousseDefinition != null && StringUtils.equals("否", tousseDefinition.getIsApplyEntireTousse())){
+					if(tousseDefinition != null && !tousseDefinition.applyEntireTousse()){
 						int materialTotalAmount = vo.getMaterialAmount();
 						materialTotalAmount += CssdUtils.getMaterialTotalAmount(tousseDefinition,false);
 						vo.setMaterialAmount(materialTotalAmount);
@@ -4734,13 +4734,12 @@
 				if(!tousseDefinition.isDisinfection()){
 					continue;
 				}
-				String operationTime = new SimpleDateFormat("yyyy-MM-dd")
+				String operationTime = Constants.SIMPLEDATEFORMAT_YYYYMMDD
 						.format(tousseInstance.getOperationTime());// 消毒日期
 				String expireDateStr = "";
 				Date expireDate = tousseInstance.getValidUntil();
 				if (expireDate != null){
-					SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-					expireDateStr = sdf.format(expireDate);
+					expireDateStr = Constants.SIMPLEDATEFORMAT_YYYYMMDD.format(expireDate);
 				}
 
 				List<MaterialInstance> materialList = tousseDefinition.getMaterialInstances();