Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/dwr/table/UseRecordTableManager.java
===================================================================
diff -u -r20284 -r25325
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/dwr/table/UseRecordTableManager.java	(.../UseRecordTableManager.java)	(revision 20284)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/dwr/table/UseRecordTableManager.java	(.../UseRecordTableManager.java)	(revision 25325)
@@ -14,6 +14,7 @@
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.directory.vo.LoginUserData;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
+import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
 import com.forgon.disinfectsystem.entity.useRecord.UseRecord;
 import com.forgon.disinfectsystem.useRecord.service.UseRecordManager;
@@ -68,8 +69,18 @@
 		}else{
 			boolean seeAll = operationManager.isCurrentUserHaveAnyOperation("SSTS_UseRecord_SeeAll");
 			if (!seeAll) {
-				sql += " and po.operator = '" + loginUser.getUserFullName() + "'";
+				sql += " and (po.operator = '" + loginUser.getUserFullName() + "'";
+			}else{
+				sql += " and (po.departCoding = '" + loginUser.getCurrentOrgUnitCode() + "'";
 			}
+			//如果是高值耗材处理科室的用户,则可以查看所有有录入高值耗材(新)的使用记录
+			SupplyRoomConfig expensiveGoodsHandleSupplyRoomConfig = 
+					supplyRoomConfigManager.getExpensiveGoodsHandleDepartment();
+			if(expensiveGoodsHandleSupplyRoomConfig != null
+					&& StringUtils.equals(loginUser.getCurrentOrgUnitCode(), expensiveGoodsHandleSupplyRoomConfig.getOrgUnitCoding())){
+				sql += " or id in (select useRecord.id from "+ ExpensiveGoodsInstance.class.getSimpleName() +" where useRecord is not null)";
+			}
+			sql += ")";
 		}
 		
 		//按科室过滤
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp
===================================================================
diff -u -r25085 -r25325
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp	(.../useRecordView.jsp)	(revision 25085)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp	(.../useRecordView.jsp)	(revision 25325)
@@ -28,7 +28,8 @@
     //判断当前科室是否为一级供应室,如果是则parm_s_departCoding的隐藏域不传值
     SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
     String firstRoomOrgCode = supplyRoomConfigManager.getFirstSupplyRoomConfig().getOrgUnitCoding();
-    String parm_s_departCoding = currentOrgUnitCode;
+    //String parm_s_departCoding = currentOrgUnitCode;
+    String parm_s_departCoding = "";
     if(currentOrgUnitCode.equals(firstRoomOrgCode)){
     	parm_s_departCoding = "";
     }