Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
===================================================================
diff -u -r13806 -r14012
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 13806)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 14012)
@@ -871,12 +871,15 @@
 				+ " AND po.isPrinted = false"
 				+ " AND po.invoicePlan.recyclingStatus = :recyclingStatus"
 				+ " AND po.invoicePlan.departCoding = :departCoding"
+				+ " AND po.invoicePlan.handleDepartCoding = :handleDepartCoding"
 				+ " AND (po.isTerminated is null or po.isTerminated <> true)"
 				+ " AND po.invoicePlan.type IN (:invoicePlanType) order by id asc";
 		Query query = objectDao.getHibernateSession().createQuery(sql);
 		query.setParameterList("tousseTypes", tousseTypes);
 		query.setParameter("recyclingStatus", InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE);
 		query.setParameter("departCoding", departCode);
+		//限制只查询当前用户所属科室(一般是供应室)处理的申请单内的物品
+		query.setParameter("handleDepartCoding", AcegiHelper.getCurrentOrgUnitCode());
 		query.setParameterList("invoicePlanType", Arrays.asList(
 				InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM,
 				InvoicePlan.TYPE_CUSTOM_TOUSSE_APPLIACTION_FORM));
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationForm.js
===================================================================
diff -u -r13943 -r14012
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationForm.js	(.../foreignTousseApplicationForm.js)	(revision 13943)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationForm.js	(.../foreignTousseApplicationForm.js)	(revision 14012)
@@ -1049,7 +1049,10 @@
     var clinicNumber =  top.Ext.getCmp('clinicNumber').getValue();
     var doctor =  top.Ext.getCmp('doctor').getValue();
     var surgery =  top.Ext.getCmp('surgery').getValue();
-    var operationTime = new Date(top.Ext.getCmp('operationTime').getValue()).Format("yyyy-MM-dd hh:mm");
+    var operationTime = "";
+    if(top.Ext.getCmp('operationTime').getValue() != ''){
+    	operationTime = new Date(top.Ext.getCmp('operationTime').getValue()).Format("yyyy-MM-dd hh:mm");
+    }
     
     var supplierName =  getSupplierName();
     var goodsDetail = getPrintGoodsInfo();
@@ -1094,6 +1097,10 @@
         	summary.supplierName = supplierName;
         	summary.goodsDetail = goodsDetail;
         	summary.tousses = tousses;
+        	
+        	if(!summary.operationTime){
+        		summary.operationTime = "";
+        	}
 //        	printApplicationGoods(printType, summary);
         	doPrintForeignTousseApplication(printType, summary);
         	
Index: forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
===================================================================
diff -u -r13624 -r14012
--- forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java	(.../OrgUnitManagerImpl.java)	(revision 13624)
+++ forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java	(.../OrgUnitManagerImpl.java)	(revision 14012)
@@ -428,6 +428,7 @@
 		String sql15 = "update RecyclingError set depart = '" + newOrgName + "' where departCode = '" + orgCoding + "'";
 		String sql16 = "update RecyclingDamageRecord set depart = '" + newOrgName + "' where departCoding = '" + orgCoding + "'";
 		String sql17 = "update QualityMonitoring set orgUnitName = '" + newOrgName + "' where orgUnitCoding = '" + orgCoding + "'";
+		
 		objectDao.excuteSQL(sql1);
 		objectDao.excuteSQL(sql2);
 		objectDao.excuteSQL(sql3);
@@ -445,6 +446,46 @@
 		objectDao.excuteSQL(sql15);
 		objectDao.excuteSQL(sql16);
 		objectDao.excuteSQL(sql17);
+		
+		//补充增加借物单的借出科室、借用科室、篮筐、供应室处理器械包配置的供应室、供应室服务临床配置的供应室名称及临床科室名称、科室库存、器械包材料库存、
+		//材料发货、装配任务、召回明细、供用室领用、材料退货、灭菌机、用户满意度调查表、员工档案表、任务组、仓库等表的科室名称处理
+		String sql18 = "update BorrowRecord set departName = '" + newOrgName + "' where departCode = '" + orgCoding + "'";
+		String sql19 = "update BorrowRecord set rentalDepartName = '" + newOrgName + "' where rentalDepartCode = '" + orgCoding + "'";
+		String sql20 = "update Container set departName = '" + newOrgName + "' where departCode = '" + orgCoding + "'";
+		String sql21 = "update CssdHandleTousses set orgUnitName = '" + newOrgName + "' where orgUnitCode = '" + orgCoding + "'";
+		String sql22 = "update CssdServiceDepts set cssdOrgUnitName = '" + newOrgName + "' where cssdOrgUnitCode = '" + orgCoding + "'";
+		String sql23 = "update CssdServiceDepts set clinicOrgUnitName = '" + newOrgName + "' where clinicOrgUnitCode = '" + orgCoding + "'";
+		String sql24 = "update DepartmentStock set departName = '" + newOrgName + "' where departCoding = '" + orgCoding + "'";
+		String sql25 = "update GoodsStock set orgUnitName = '"+newOrgName+"' where orgUnitCode = '" + orgCoding + "'";
+		String sql26 = "update MaterialInvoice set depart = '" + newOrgName + "' where departCoding = '" + orgCoding + "'";
+		String sql27 = "update MaterialInvoice set settleAccountsDepart = '" + newOrgName + "' where settleAccountsDepart = '" + oldOrgName + "'";
+		String sql28 = "update PackingTask set department = '" + newOrgName + "' where department = '" + oldOrgName + "'";
+		String sql29 = "update ReceiveRecord set depart = '" + newOrgName + "' where departCoding = '" + orgCoding + "'";
+		String sql30 = "update ReturnMaterialRecord set depart = '" + newOrgName + "' where departCoding = '" + orgCoding + "'";
+		String sql31 = "update Rinser set department = '" + newOrgName + "' where department = '" + oldOrgName + "'";
+		String sql32 = "update SatisfactionSurveyTable set depart = '" + newOrgName + "' where departCoding = '" + orgCoding + "'";
+		String sql33 = "update StaffArchive set orgUnitName = '" + newOrgName + "' where orgUnitName = '" + oldOrgName + "'";
+		String sql34 = "update TaskGroup set departName = '" + newOrgName + "' where departCode = '" + orgCoding + "'";
+		String sql35 = "update WareHouse set orgUnitName = '" + newOrgName + "' where orgUnitCode = '" + orgCoding + "'";
+		
+		objectDao.excuteSQL(sql18);
+		objectDao.excuteSQL(sql19);
+		objectDao.excuteSQL(sql20);
+		objectDao.excuteSQL(sql21);
+		objectDao.excuteSQL(sql22);
+		objectDao.excuteSQL(sql23);
+		objectDao.excuteSQL(sql24);
+		objectDao.excuteSQL(sql25);
+		objectDao.excuteSQL(sql26);
+		objectDao.excuteSQL(sql27);
+		objectDao.excuteSQL(sql28);
+		objectDao.excuteSQL(sql29);
+		objectDao.excuteSQL(sql30);
+		objectDao.excuteSQL(sql31);
+		objectDao.excuteSQL(sql32);
+		objectDao.excuteSQL(sql33);
+		objectDao.excuteSQL(sql34);
+		objectDao.excuteSQL(sql35);
 	}
 
 	// 设置部门管理者
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r13903 -r14012
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 13903)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 14012)
@@ -2355,8 +2355,9 @@
 		}
 		// 是外来器械
 		else if (TousseDefinition.PACKAGE_TYPE_FOREIGN.equals(tousseType)) {
-			td = tousseDefinitionManager
-					.getTousseDefinitionByName(name);
+			/*td = tousseDefinitionManager
+					.getTousseDefinitionByName(name);*/
+			td = tousseDefinitionManager.getTousseDefinitionById(tousseItem.getTousseDefinitionId());
 			
 			name = CssdUtils.filterDisinfectGoodsName(name);
 
@@ -2446,11 +2447,14 @@
 				+ " AND (po.invoicePlan.recyclingStatus != :recyclingStatus OR po.invoicePlan.recyclingStatus is null)"
 				+ " AND po.invoicePlan.deliverStatus IN (:deliverStatus)"
 				+ " AND po.invoicePlan.departCoding = :departCoding"
+				+ " AND po.invoicePlan.handleDepartCoding = :handleDepartCoding"
 				+ " AND po.invoicePlan.type IN (:invoicePlanType) order by id asc";
 		Query query = objectDao.getHibernateSession().createQuery(sql);
 		query.setParameterList("tousseTypes", tousseTypes);
 		query.setParameter("recyclingStatus", InvoicePlan.STATUS_END);
 		query.setParameter("departCoding", departCode);
+		//限制只查询当前用户所属科室(一般是供应室)处理的申请单内的物品
+		query.setParameter("handleDepartCoding", AcegiHelper.getCurrentOrgUnitCode());
 		query.setParameterList("deliverStatus", Arrays.asList(
 				InvoicePlan.DELIVERSTATUS_AWAITDELIVER,
 				InvoicePlan.DELIVERSTATUS_PARTDELIVERED));
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoringconfig/QualityMonitoringItem.java
===================================================================
diff -u -r12331 -r14012
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoringconfig/QualityMonitoringItem.java	(.../QualityMonitoringItem.java)	(revision 12331)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoringconfig/QualityMonitoringItem.java	(.../QualityMonitoringItem.java)	(revision 14012)
@@ -1,5 +1,6 @@
 package com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -69,6 +70,7 @@
 		this.requirement = requirement;
 	}
 
+	@Column(length=5000)
 	public String getOptions() {
 		return options;
 	}