Index: ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java
===================================================================
diff -u -r13904 -r13928
--- ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java	(.../BorrowRecordAction.java)	(revision 13904)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java	(.../BorrowRecordAction.java)	(revision 13928)
@@ -230,7 +230,7 @@
 						} else if (StringUtils.equals(borrowRecord.getStatus(),
 								BorrowRecord.STATUS_BORROWED)) {
 							type = "归还";
-							if (!StringUtils.equals(borrowRecord.getDepartCode(), invoice.getInvoicePlan().getDepartCoding())) {
+							if (StringUtils.equals(borrowRecord.getDepartCode(), expensiveDisposablegoods.getLocation())) {
 								for (TousseItem item : borrowRecord.getItems()) {
 									if (StringUtils.equals(item.getTousseName(),
 											goodsName)) {
@@ -244,7 +244,7 @@
 								}
 							} else {
 								message = "{success:false,msg:'该高值耗材不属于"
-										+ borrowRecord.getDepartName() + "及其物品共用配置的科室。'}";
+										+ borrowRecord.getDepartName() + "'}";
 							}
 						}
 					} else {
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/borrowrecord/BorrowRecord.java
===================================================================
diff -u -r13921 -r13928
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/borrowrecord/BorrowRecord.java	(.../BorrowRecord.java)	(revision 13921)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/borrowrecord/BorrowRecord.java	(.../BorrowRecord.java)	(revision 13928)
@@ -27,6 +27,9 @@
 
 	private Long id;
 
+	/**
+	 * 借用科室
+	 */
 	private String departCode;
 
 	private String departName;
@@ -40,6 +43,9 @@
 	public static final String STATUS_BORROWED = "已借出";
 	public static final String STATUS_RETURNED = "已归还";
 
+	/**
+	 * 借出科室
+	 */
 	private String rentalDepartCode;
 
 	private String rentalDepartName;
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java
===================================================================
diff -u -r13921 -r13928
--- ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java	(.../BorrowRecordManagerImpl.java)	(revision 13921)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java	(.../BorrowRecordManagerImpl.java)	(revision 13928)
@@ -191,6 +191,13 @@
 						instanceAmount++;
 					}
 				}
+				for (ExpensiveDisposablegoods e : borrowRecord
+						.getReturnedExpensiveGoodsItems()) {
+					if (StringUtils.equals(e.getName(),
+							tousseItem.getTousseName())) {
+						instanceAmount++;
+					}
+				}
 				if (!Integer.valueOf(instanceAmount).equals(tousseItem.getAmount())) {
 					throw new RecyclingRecordException(
 							tousseItem.getTousseName() + "没有达到所需归还的数量。");