Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java
===================================================================
diff -u -r30983 -r33937
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java	(.../BorrowRecordManagerImpl.java)	(revision 30983)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java	(.../BorrowRecordManagerImpl.java)	(revision 33937)
@@ -181,8 +181,8 @@
 		String loginUserDepartCode = AcegiHelper.getLoginUser()
 				.getCurrentOrgUnitCode();
 		if (borrowRecord.getId() != null
-				&& StringUtils.equals(borrowRecord.getStatus(),
-						BorrowRecord.STATUS_BORROWED)
+				&& (StringUtils.equals(borrowRecord.getStatus(), BorrowRecord.STATUS_BORROWED)
+						|| StringUtils.equals(borrowRecord.getStatus(), BorrowRecord.STATUS_PART_RETURNED))
 				&& StringUtils.equals(loginUserDepartCode,
 						borrowRecord.getRentalDepartCode())) {
 			borrowRecord.setStatus(BorrowRecord.STATUS_RETURNED);
@@ -207,8 +207,12 @@
 					}
 				}
 				if (!Integer.valueOf(instanceAmount).equals(tousseItem.getAmount())) {
-					throw new RecyclingRecordException(
-							tousseItem.getTousseName() + "没有达到所需归还的数量。");
+					if(instanceAmount < tousseItem.getAmount()){
+						borrowRecord.setStatus(BorrowRecord.STATUS_PART_RETURNED);
+					}else{
+						throw new RecyclingRecordException(
+								tousseItem.getTousseName() + "归还的数量大于借用数量。");
+					}
 				}
 			}
 		}
Index: ssts-web/src/main/webapp/disinfectsystem/borrowRecord/borrowRecordView.jsp
===================================================================
diff -u -r29513 -r33937
--- ssts-web/src/main/webapp/disinfectsystem/borrowRecord/borrowRecordView.jsp	(.../borrowRecordView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/borrowRecord/borrowRecordView.jsp	(.../borrowRecordView.jsp)	(revision 33937)
@@ -21,6 +21,7 @@
     var statusArr = new Array();
     statusArr.push('<%=BorrowRecord.STATUS_BORROWED%>');
     statusArr.push('<%=BorrowRecord.STATUS_RETURNED%>');
+    statusArr.push('<%=BorrowRecord.STATUS_PART_RETURNED%>');
 
 /**
  * 《科室互借查看》权限
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r33922 -r33937
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 33922)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 33937)
@@ -6660,8 +6660,8 @@
 					obj.put("name", tousseInstance.getTousseDefinitionName());
 					obj.put("barcode", tousseInstance.getBarcode());
 					obj.put("type", "借用");
-				} else if (StringUtils.equals(borrowRecord.getStatus(),
-						BorrowRecord.STATUS_BORROWED)) {
+				} else if (StringUtils.equals(borrowRecord.getStatus(), BorrowRecord.STATUS_BORROWED)
+						|| StringUtils.equals(borrowRecord.getStatus(),BorrowRecord.STATUS_PART_RETURNED)) {
 					if(!StringUtils.equals(borrowRecord.getDepartCode(),
 							tousseInstance.getLocation())){
 						throw new RuntimeException("该器械包不属于" + borrowRecord.getDepartName());
@@ -6699,8 +6699,8 @@
 						obj.put("name", goodsName);
 						obj.put("barcode", expensiveDisposablegoods.getBarcode());
 						obj.put("type", "借用");
-					} else if (StringUtils.equals(borrowRecord.getStatus(),
-							BorrowRecord.STATUS_BORROWED)) {
+					} else if (StringUtils.equals(borrowRecord.getStatus(), BorrowRecord.STATUS_BORROWED)
+							|| StringUtils.equals(borrowRecord.getStatus(),BorrowRecord.STATUS_PART_RETURNED)) {
 						if(!StringUtils.equals(borrowRecord.getDepartCode(), expensiveDisposablegoods.getLocation())){
 							throw new RuntimeException("该高值耗材不属于" + borrowRecord.getDepartName());
 						}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/borrowrecord/BorrowRecord.java
===================================================================
diff -u -r26602 -r33937
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/borrowrecord/BorrowRecord.java	(.../BorrowRecord.java)	(revision 26602)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/borrowrecord/BorrowRecord.java	(.../BorrowRecord.java)	(revision 33937)
@@ -60,6 +60,7 @@
 
 	public static final String STATUS_BORROWED = "已借出";
 	public static final String STATUS_RETURNED = "已归还";
+	public static final String STATUS_PART_RETURNED = "部分归还";
 
 	/**
 	 * 借出科室
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java
===================================================================
diff -u -r30971 -r33937
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java	(.../BorrowRecordAction.java)	(revision 30971)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java	(.../BorrowRecordAction.java)	(revision 33937)
@@ -162,7 +162,8 @@
 										+ type + "'}";
 							}
 						} else if (StringUtils.equals(borrowRecord.getStatus(),
-								BorrowRecord.STATUS_BORROWED)) {
+								BorrowRecord.STATUS_BORROWED) ||
+								StringUtils.equals(borrowRecord.getStatus(), BorrowRecord.STATUS_PART_RETURNED)) {
 							type = "归还";
 							if (StringUtils.equals(borrowRecord.getDepartCode(),
 									tousseInstance.getLocation())) {
@@ -220,7 +221,8 @@
 										+ type + "'}";
 							}
 						} else if (StringUtils.equals(borrowRecord.getStatus(),
-								BorrowRecord.STATUS_BORROWED)) {
+								BorrowRecord.STATUS_BORROWED) ||
+								StringUtils.equals(borrowRecord.getStatus(), BorrowRecord.STATUS_PART_RETURNED)) {
 							type = "归还";
 							if (StringUtils.equals(borrowRecord.getDepartCode(), expensiveDisposablegoods.getLocation())) {
 								boolean matched = false;