Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAReturnGoodReInvoiceManager.java
===================================================================
diff -u -r17817 -r18168
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAReturnGoodReInvoiceManager.java	(.../TestPDAReturnGoodReInvoiceManager.java)	(revision 17817)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAReturnGoodReInvoiceManager.java	(.../TestPDAReturnGoodReInvoiceManager.java)	(revision 18168)
@@ -51,30 +51,18 @@
 	 * 外六科护士站18B 吴启华 申请3个Test缝合包
 	 */
 	private void createTousseApplication(){
-		Map<String, Integer> appMap = new HashMap<String, Integer>();
-		appMap.put("Test开胸包", 3);
-		TousseDefinition tousseDefinition_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包");
-//		createSimpleTousseOrDiposableGoodsApplicationByParam("2014102100001", InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM, "外六科护士站18B", "3266", new Date(), appMap);
-		RecyclingApplication application1 = new RecyclingApplication();
-		application1.setSerialNumber("2014102100001");
-		application1.setApplicant("吴启华");
-		application1.setDepartCoding("3266");
-		application1.setDepart("外六科护士站18B");
-		application1.setHandleDepart(Constants.ORG_UNIT_NAME_CSSD);
-		application1.setHandleDepartCoding(Constants.ORG_UNIT_CODE_CSSD);
-		application1.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER);
-		application1.setType(InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM);
-		List<TousseItem> list = new ArrayList<TousseItem>();
-		TousseItem item1 = new TousseItem();
-		item1.setTousseName(tousseDefinition_Test开胸包.getName());
-		item1.setTousseDefinitionId(tousseDefinition_Test开胸包.getId());
-		item1.setAmount(3);
-		item1.setDiposable("否");
-		item1.setInvoicePlan(application1);
-		list.add(item1);
-		tousseItemManager.saveOrUpdate(item1);
-		application1.setApplicationItems(list);
-		objectDao.saveOrUpdate(application1);
+		
+		JSONObject appConfig = new JSONObject();
+		JSONArray itemsConfigs = new JSONArray();
+		appConfig.put("serialNumber", "2014102100001");
+		appConfig.put("type", InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM);
+		appConfig.put("depart", "外六科护士站18B");
+		appConfig.put("departCoding", "3266");
+		JSONObject tousseItem = new JSONObject();
+		tousseItem.put("tousseName", "Test开胸包");
+		tousseItem.put("amount", 3);
+		itemsConfigs.add(tousseItem);
+		createApplication(appConfig, itemsConfigs);
 	}
 	
 	/**
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDADuplicateInvoice.java
===================================================================
diff -u -r16683 -r18168
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDADuplicateInvoice.java	(.../PDADuplicateInvoice.java)	(revision 16683)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDADuplicateInvoice.java	(.../PDADuplicateInvoice.java)	(revision 18168)
@@ -20,6 +20,7 @@
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
+import com.forgon.tools.json.JSONUtil;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
@@ -81,14 +82,21 @@
 	private void createSimpleTousseApplication() {
 		Calendar today = Calendar.getInstance();
 		Date earler = today.getTime();
-		today.add(Calendar.HOUR_OF_DAY, 3);
-		Date later = today.getTime();
-
-		Map<String, Integer> applicationItemsMap = new HashMap<String, Integer>();
-		applicationItemsMap.put("Test开胸包", 2);
-		createSimpleTousseOrDiposableGoodsApplicationByParam("201410261707001",
-				InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM, "口腔科", "3266",
-				earler, applicationItemsMap);
+		
+		JSONObject appConfig = new JSONObject();
+		JSONArray itemsConfigs = new JSONArray();
+		
+		appConfig.put("serialNumber", "201410261707001");
+		appConfig.put("type", InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM);
+		appConfig.put("depart", "口腔科");
+		appConfig.put("departCoding", "3266");
+		appConfig.put("appTime", com.forgon.Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS.format(earler));
+		
+		JSONObject tousseItem = new JSONObject();
+		tousseItem.put("tousseName", "Test开胸包");
+		tousseItem.put("amount", 2);
+		itemsConfigs.add(tousseItem);
+		createApplication(appConfig, itemsConfigs);
 	}
 
 	private void createTousseInstance() {
Index: ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
===================================================================
diff -u -r18155 -r18168
--- ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 18155)
+++ ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 18168)
@@ -721,6 +721,64 @@
 		return application.getId();
 	}
 	
+	protected Long createApplication(JSONObject appConfig, JSONArray itemsConfigs){
+		Date nowDate = new Date();
+		String serialNumber = JSONUtil.optString(appConfig, "serialNumber", "");
+		String type = JSONUtil.optString(appConfig, "type", InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM);
+		String depart = JSONUtil.optString(appConfig, "depart", "");
+		String departCoding = JSONUtil.optString(appConfig, "departCoding", "");
+		Date appTime = JSONUtil.optDate(appConfig, "appTime",com.forgon.Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, nowDate);
+		
+		
+		RecyclingApplication application = new RecyclingApplication();
+		application.setSerialNumber(serialNumber);
+		application.setApplicant("吴启华");
+		application.setDepartCoding(departCoding);
+		application.setDepart(depart);
+		application.setSettleAccountsDepartCoding(departCoding);
+		application.setSettleAccountsDepart(depart);
+		application.setHandleDepart(Constants.ORG_UNIT_NAME_CSSD);
+		application.setHandleDepartCoding(Constants.ORG_UNIT_CODE_CSSD);
+		application.setApplicationTime(appTime);
+		application.setCommittedStatus(true);
+		application.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER);
+		application.setType(type);
+		List<TousseItem> items = new ArrayList<TousseItem>();
+		{
+			for(int i=0;i<itemsConfigs.size();++i){
+				JSONObject tousseConfig = itemsConfigs.getJSONObject(i);
+				TousseItem item = new TousseItem();
+				String tousseName = JSONUtil.optString(tousseConfig, "tousseName", "");
+				Integer amount = JSONUtil.optInteger(tousseConfig, "amount", 0);
+				String tousseType = JSONUtil.optString(tousseConfig, "tousseType", TousseDefinition.PACKAGE_TYPE_INSIDE);
+				item.setTousseType(tousseType);
+				if(StringUtils.equals(TousseItem.TYPE_DIPOSABLE_GOODS, tousseType)){
+					item.setDiposable("是");
+				}else{
+					item.setDiposable("否");
+					TousseDefinition tousseDefinition = tousseDefinitionManager.getTousseDefinitionByName(tousseName);
+					if(tousseDefinition != null){
+						item.setTousseType(tousseDefinition.getTousseType());
+						item.setTousseDefinitionId(tousseDefinition.getId());
+					}
+				}
+				
+				item.setTousseName(tousseName);
+				item.setAmount(amount);
+		
+				item.setInvoicePlan(application);
+				items.add(item);
+				tousseItemManager.saveOrUpdate(item);
+			}
+		}
+		if(type.equals(InvoicePlan.TYPE_BORROWINGSINGLE)){
+			application.setReturnStatus(InvoicePlan.RETURN_STATUS_UNRETURNED);
+		}
+		application.setApplicationItems(items);
+		objectDao.saveOrUpdate(application);
+		return application.getId();
+	}
+	
 	/**
 	 * 根据JSON参数创建物品的申请单
 	 * @param serialNum     流水号
Index: forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
===================================================================
diff -u -r17981 -r18168
--- forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java	(.../JSONUtil.java)	(revision 17981)
+++ forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java	(.../JSONUtil.java)	(revision 18168)
@@ -488,6 +488,15 @@
 		return DateTools.parseDateIfNotEmpty(v, sdf, defaultDate);
 	}
 	
+//	public static Date optDateObj(JSONObject obj, String key, Date defaultDate) {
+//		Object v = obj.opt(key);
+//		if (v == null || JSONNull.getInstance().equals(v)) {
+//			return defaultDate;
+//		}
+//		
+//		return (Date)v;
+//	}
+	
 	public static JsonObject fromObjecttoJsonObject(Object obj) {
 		return new Gson().toJsonTree(obj).getAsJsonObject();
 	}