Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
===================================================================
diff -u -r13588 -r13892
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java	(.../DiposableGoodsAction.java)	(revision 13588)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java	(.../DiposableGoodsAction.java)	(revision 13892)
@@ -133,19 +133,33 @@
 
 	// 保存一次性物品定义
 	public String saveDiposableGoods() {
-		if (diposableGoods != null) {
-			// 设置拼音码
-			diposableGoods.setSpelling(GB2Alpha.string2Alpha(diposableGoods
-					.getName()));
-			// 设置五笔码
-			diposableGoods.setWbCode(GB2WB.getWBCode(diposableGoods.getName()));
-			if(DatabaseUtil.isPoIdValid(diposableGoods.getId())){
-				diposableGoodsManager.updateDisposableGoods_TRANS_REQUIRED(diposableGoods);
-			}else{
-				diposableGoodsManager.saveOrUpdate(diposableGoods);
+		JSONObject obj = new JSONObject();
+		obj.put("success", true);
+		try {
+			if (diposableGoods != null) {
+				// 设置拼音码
+				diposableGoods.setSpelling(GB2Alpha.string2Alpha(diposableGoods
+						.getName()));
+				// 设置五笔码
+				diposableGoods.setWbCode(GB2WB.getWBCode(diposableGoods.getName()));
+				if(DatabaseUtil.isPoIdValid(diposableGoods.getId())){
+					diposableGoodsManager.updateDisposableGoods_TRANS_REQUIRED(diposableGoods);
+				}else{
+					diposableGoodsManager.saveOrUpdate(diposableGoods);
+				}
+				
 			}
-			
+		} catch (Exception e) {
+			e.printStackTrace();
+			obj.put("success", true);
+			obj.put("errorMessage", e.getMessage());
 		}
+		try {
+			StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8");
+			StrutsParamUtils.getResponse().getWriter().println(obj.toString());
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 		return null;
 	}
 
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r13860 -r13892
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 13860)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 13892)
@@ -548,10 +548,6 @@
 function addAndEditInvoicePlan(orgUnitCoding,depart) {
 	// 发货物品
 	sendOutGoodsStore = new Ext.data.Store({
-		proxy : new Ext.data.HttpProxy({
-			url : WWWROOT + '/disinfectSystem/invoiceAction!loadTousseInstaceByid.do',
-			method : 'POST'
-		}),
 		reader : new Ext.data.JsonReader({
 			fields : [
 			  	    {name : 'id'},
@@ -634,14 +630,14 @@
 		{header : '实发数量',id : 'tempAmount',dataIndex : 'tempAmount',width : 50,value : 0, menuDisabled: true,renderer:getDefaultAmount},
 		{header : '误差数量',id : 'errorAmount',dataIndex : 'errorAmount',width : 50,value : 0, menuDisabled: true,renderer:getDefaultAmount},
 		{id : 'diposable',header : "是否一次性材料",dataIndex : 'diposable',hidden :true},
-		{id :'applicationAmount',header : "最大发货数量",dataIndex : 'applicationAmount',hidden : true,width :150},
-		{id : 'deleteItem',header:'删除',hidden :true,width :40,menuDisabled: true,
-			renderer: function(v,p,record){
-				var str = "<img src=" + WWWROOT + '/images/web/stop.png'+" onclick=\"getCurrentTab().removeSendOutGoodsDetail() \">";
-				return str;
-			},
-			dataIndex:'button'
-		}
+		{id :'applicationAmount',header : "最大发货数量",dataIndex : 'applicationAmount',hidden : true,width :150}
+//		{id : 'deleteItem',header:'删除',hidden :true,width :40,menuDisabled: true,
+//			renderer: function(v,p,record){
+//				var str = "<img src=" + WWWROOT + '/images/web/stop.png'+" onclick=\"getCurrentTab().removeSendOutGoodsDetail() \">";
+//				return str;
+//			},
+//			dataIndex:'button'
+//		}
 	]);
 	
 	var recyclingErrorCm = new Ext.grid.ColumnModel([
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r13853 -r13892
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 13853)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 13892)
@@ -827,8 +827,10 @@
 			Collection<String> orgUnitCodings, String applyDate , String tousseType) {
 		String sql = 
 				buildSqlForGetInvoicePlanByOrgUnitCodingsAndTousseType(orgUnitCodings, applyDate, tousseType);
-		sql += " ORDER BY sequence, applicationTime";
-		return objectDao.findBySql(InvoicePlan.class.getSimpleName(), sql);
+//		sql += " ORDER BY sequence, applicationTime";
+//		return objectDao.findBySql(InvoicePlan.class.getSimpleName(), sql);
+		String hql = String.format("select distinct po from %s po inner join fetch po.applicationItems %s ORDER BY sequence, applicationTime", InvoicePlan.class.getSimpleName(),sql);
+		return objectDao.findByHql(hql);
 	}
 
 	/**
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
===================================================================
diff -u -r13588 -r13892
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js	(.../diposableGoodsView.js)	(revision 13588)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js	(.../diposableGoodsView.js)	(revision 13892)
@@ -561,12 +561,18 @@
 		waitMsg : '正在保存数据，请稍候',
 		waitTitle : '提交表单',
 		success : function(form, action) {
-			formWindow.close();
-			showResult('保存成功');
-			grid.dwrReload();
+			var result = Ext.decode(action.response.responseText);
+			if(isUndefinedOrNullOrEmpty(result.errorMessage)){
+				showResult('保存成功');
+				formWindow.close();
+				grid.dwrReload();
+			}else{
+				showResult('保存出错, ' + result.errorMessage);
+				top.Ext.getCmp('saveBtn').enable();
+			}
 		},
 		failure : function(form, action) {
-			showResult(action.result.message);
+			showResult('保存出错');
 			top.Ext.getCmp('saveBtn').enable();
 		}
 	});
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java
===================================================================
diff -u -r12331 -r13892
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java	(.../RecyclingApplication.java)	(revision 12331)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java	(.../RecyclingApplication.java)	(revision 13892)
@@ -227,7 +227,7 @@
 		this.patientName = patientName;
 	}
 	
-	@ManyToOne(cascade=CascadeType.REFRESH,fetch=FetchType.EAGER)
+	@ManyToOne(cascade=CascadeType.REFRESH,fetch=FetchType.LAZY)
 	@JoinColumn(name="userecord_id")
 	public UseRecord getUseRecord() {
 	    return useRecord;