Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
===================================================================
diff -u -r18377 -r18379
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 18377)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 18379)
@@ -456,6 +456,7 @@
 			}
 			jsonArray.addAll(notTimeoutArray);
 			json.put("rows", jsonArray);
+			json.put("totalResults", jsonArray.size());
 		}
 		return json.toString();
 	}
Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.7.5_4.7.6_oracle.sql
===================================================================
diff -u -r17519 -r18379
--- ssts-web/src/main/webapp/dataUpdater/sqls/4.7.5_4.7.6_oracle.sql	(.../4.7.5_4.7.6_oracle.sql)	(revision 17519)
+++ ssts-web/src/main/webapp/dataUpdater/sqls/4.7.5_4.7.6_oracle.sql	(.../4.7.5_4.7.6_oracle.sql)	(revision 18379)
@@ -3,7 +3,7 @@
 from TousseItem i where i.recyclingRecord_id is not null;
 insert into MaterialErrorDamageDetail(id,additionalAmount,additionalPerson,additionalTime,amount,amountPerTousse,damageErrorDepartType,damageErrorMaterialType,departCodeForId,errorType,idCardInstanceId,linkType,lostIDCardInstanceBarcode,materialCost,materialDefinitionId,materialName,packingTaskId,settlementPrice,tousseDefinitionId,recyclingItemId,tousseName,type,classifyBasket_id,depart,departCode,handleDepartCode,handleDepartName,operationTime,operator,warehouseId,warehouseName) 
  (
- select r.id,r.additionalAmount,'',r.additionalTime,r.amount,0,r.damageErrorDepartType,r.damageErrorMaterialType,r.departCodeForId,r.errorType,r.idCardInstanceID,'',r.lostIDCardInstanceBarcode,r.materialCost,r.materialDefinitionId,r.materialName,r.packingTask_ID,r.settlementPrice,r.tousseDefinitionId,r.tousseItem_ID,r.tousseName,'回收误差',r.classifyBasket_id,r.depart,r.departCode,r.handleDepartCode,r.handleDepartName,r.missTime,'',r.warehouseId,r.warehouseName from RecyclingError r 
+ select r.id,r.additionalAmount,'',r.additionalTime,r.amount,0,r.damageErrorDepartType,r.damageErrorMaterialType,r.departCodeForId,r.errorType,r.idCardInstanceID,'',r.lostIDCardInstanceBarcode,r.materialCost,r.materialDefinitionId,r.materialName,r.packingTask_ID,r.settlementPrice,r.tousseDefinitionId,r.tousseItem_ID,r.tousseName,'回收误差',r.classifyBasket_id,r.depart,r.departCode,r.handleDepartCode,r.handleDepartName,r.missTime,'',r.warehouseId,r.warehouseName from RecyclingError r where type='回收记录' 
  union all 
  select i.id,i.additionalAmount,i.additionalPerson,i.additionalTime,i.amount,0,i.damageErrorDepartType,i.damageErrorMaterialType,'','',null,i.linkType,'',i.materialCost,i.materialDefinitionId,i.materialName,i.packingTask_ID,i.settlementPrice,i.tousseDefinitionId,i.tousseItem_ID,i.tousseName,'器械报损',i.classifyBasket_id,i.depart,i.departCoding,i.handleDepartCode,i.handleDepartName,i.time,i.damageOfPeople,i.warehouseId,i.warehouseName from RecyclingDamageItem i 
  );
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/StockTakeRecord.java
===================================================================
diff -u -r13248 -r18379
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/StockTakeRecord.java	(.../StockTakeRecord.java)	(revision 13248)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/StockTakeRecord.java	(.../StockTakeRecord.java)	(revision 18379)
@@ -48,6 +48,9 @@
 	
 	private String orgUnitCoding;//科室编码
 	
+	/**
+	 * 盘点记录id
+	 */
 	private Long inventoryRecordId;
 
 	// 结算一次性物品明细
Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.3.5_4.3.6_oracle.sql
===================================================================
diff -u -r14927 -r18379
--- ssts-web/src/main/webapp/dataUpdater/sqls/4.3.5_4.3.6_oracle.sql	(.../4.3.5_4.3.6_oracle.sql)	(revision 14927)
+++ ssts-web/src/main/webapp/dataUpdater/sqls/4.3.5_4.3.6_oracle.sql	(.../4.3.5_4.3.6_oracle.sql)	(revision 18379)
@@ -2,10 +2,4 @@
 execute immediate 'update foreignTousseapplication set patientAge1 = to_char(patientAge)';
 execute immediate 'commit';
 execute immediate 'alter table foreignTousseapplication drop column patientAge';
-execute immediate 'alter table foreignTousseapplication rename column patientAge1 to patientAge';
-
-execute immediate 'alter table SatisfactionSurveyTemplate add readers1 CLOB';
-execute immediate 'update SatisfactionSurveyTemplate set readers1 = TO_CLOB(readers)';
-execute immediate 'commit';
-execute immediate 'alter table SatisfactionSurveyTemplate drop column readers';
-execute immediate 'alter table SatisfactionSurveyTemplate rename column readers1 to readers';
\ No newline at end of file
+execute immediate 'alter table foreignTousseapplication rename column patientAge1 to patientAge';
\ No newline at end of file
Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.1.5_4.1.6_oracle.sql
===================================================================
diff -u -r13493 -r18379
--- ssts-web/src/main/webapp/dataUpdater/sqls/4.1.5_4.1.6_oracle.sql	(.../4.1.5_4.1.6_oracle.sql)	(revision 13493)
+++ ssts-web/src/main/webapp/dataUpdater/sqls/4.1.5_4.1.6_oracle.sql	(.../4.1.5_4.1.6_oracle.sql)	(revision 18379)
@@ -3,4 +3,7 @@
 where (case when m.specification is null then m.name else (m.name||'['||m.specification||']') END) = recyclingError.materialName);
 update recyclingDamageItem set materialDefinitionId = (select m.id from MaterialDefinition m 
 where (case when m.specification is null then m.name else (m.name||'['||m.specification||']') END) = recyclingDamageItem.materialName);
-update RecyclingError set additionalAmount = amount,additionalTime = missTime where type = '回收记录';
\ No newline at end of file
+update RecyclingError set additionalAmount = amount,additionalTime = missTime
+,handleDepartCode=(select orgUnitCoding from SupplyRoomConfig where supplyRoomType=1)
+,handleDepartName=(select orgUnitName from SupplyRoomConfig where supplyRoomType=1)
+where type = '回收记录';
\ No newline at end of file
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java
===================================================================
diff -u -r18372 -r18379
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java	(.../MaintainAction.java)	(revision 18372)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java	(.../MaintainAction.java)	(revision 18379)
@@ -387,7 +387,20 @@
 	}
 	
 	public void updateForeignTousseInfo(){
-		maintainManager.updateForeignTousseInfo();
+		String responsePrintMsg = "更新完成！";
+		try {
+			try {
+				maintainManager.updateForeignTousseInfo();
+			} catch (Exception e) {
+				responsePrintMsg = e.getMessage();
+			}
+			HttpServletResponse response = StrutsParamUtils.getResponse();
+			response.setContentType("text/html;charset=UTF-8");
+			response.getWriter().print(responsePrintMsg);
+			response.getWriter().close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
 	}
 	
 	/**
Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.4.1_4.4.2_oracle.sql
===================================================================
diff -u -r15644 -r18379
--- ssts-web/src/main/webapp/dataUpdater/sqls/4.4.1_4.4.2_oracle.sql	(.../4.4.1_4.4.2_oracle.sql)	(revision 15644)
+++ ssts-web/src/main/webapp/dataUpdater/sqls/4.4.1_4.4.2_oracle.sql	(.../4.4.1_4.4.2_oracle.sql)	(revision 18379)
@@ -13,5 +13,4 @@
 
 execute immediate 'alter table satisfactionsurveytable modify depart varchar2(4000)';
 execute immediate 'alter table satisfactionsurveytable modify departcoding varchar2(4000)';
-execute immediate 'alter table satisfactionsurveytemplate modify readers varchar2(4000)';
 execute immediate 'alter table satisfactionsurveytemplate modify summary varchar2(2000)';
\ No newline at end of file
Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.4.1_4.4.2_sqlserver.sql
===================================================================
diff -u -r15644 -r18379
--- ssts-web/src/main/webapp/dataUpdater/sqls/4.4.1_4.4.2_sqlserver.sql	(.../4.4.1_4.4.2_sqlserver.sql)	(revision 15644)
+++ ssts-web/src/main/webapp/dataUpdater/sqls/4.4.1_4.4.2_sqlserver.sql	(.../4.4.1_4.4.2_sqlserver.sql)	(revision 18379)
@@ -3,5 +3,4 @@
 
 alter table satisfactionsurveytable ALTER COLUMN depart nvarchar(4000);
 alter table satisfactionsurveytable ALTER COLUMN departcoding nvarchar(4000);
-alter table satisfactionsurveytemplate ALTER COLUMN readers nvarchar(4000);
 alter table satisfactionsurveytemplate ALTER COLUMN summary nvarchar(2000);
\ No newline at end of file
Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.3.5_4.3.6_sqlserver.sql
===================================================================
diff -u -r14927 -r18379
--- ssts-web/src/main/webapp/dataUpdater/sqls/4.3.5_4.3.6_sqlserver.sql	(.../4.3.5_4.3.6_sqlserver.sql)	(revision 14927)
+++ ssts-web/src/main/webapp/dataUpdater/sqls/4.3.5_4.3.6_sqlserver.sql	(.../4.3.5_4.3.6_sqlserver.sql)	(revision 18379)
@@ -1,3 +1 @@
-ALTER TABLE ForeignTousseApplication ALTER COLUMN patientAge varchar(10);
-
-ALTER TABLE SatisfactionSurveyTemplate ALTER COLUMN readers text;
\ No newline at end of file
+ALTER TABLE ForeignTousseApplication ALTER COLUMN patientAge varchar(10);
\ No newline at end of file