Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.js
===================================================================
diff -u -r35352 -r35355
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.js	(.../idCardInstanceView.js)	(revision 35352)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.js	(.../idCardInstanceView.js)	(revision 35355)
@@ -72,9 +72,49 @@
 	DWREngine.setAsync(true);
 }
 
-Ext.onReady(function () {
-	var supplyRoomStore = getSupplyRoomStore('handlerDepartCode');
+function getCssdsByApplyDepartStore(domID, currentOrgUnitCoding) {
+	var cssdsByApplyDepartStore = new Ext.data.Store({
+		proxy: new Ext.data.HttpProxy({
+			url: WWWROOT + '/systemmanage/getCssdsByApplyDepartAndType.do',
+			method: 'POST'
+		}),
+		baseParams: { applyDepartCode: currentOrgUnitCoding },
+		reader: new Ext.data.JsonReader({
+			root: 'data'
+		}, [
+			{ name: 'departCode', mapping: 'cssdOrgUnitCode' },
+			{ name: 'name', mapping: 'cssdOrgUnitName' }
+		])
+	});
 
+	cssdsByApplyDepartStore.load()
+
+	return cssdsByApplyDepartStore;
+}
+
+Ext.onReady(function () {
+	var supplyRoomStore;
+	if (isSupplyRoomUser == true || isSupplyRoomUser == 'true') {
+		//一级二级供应室数据源
+		supplyRoomStore = getSupplyRoomStore('handlerDepartCode');
+		$Id('parm_s_handlerDepartCode').value = currentOrgUnitCoding;
+	} else {
+		//服务的供应室数据源
+		supplyRoomStore = getCssdsByApplyDepartStore('handlerDepartCode', currentOrgUnitCoding);
+		supplyRoomStore.on('load', function (store) {
+			if (store.getCount() == 1) {
+				Ext.getCmp('handlerDepartCode').setValue(store.getAt(0).data.departCode);
+				$Id('parm_s_handlerDepartCode').value = store.getAt(0).data.departCode;
+			} else if (store.getCount() > 1) {
+				var supplyRoomRecord = Ext.data.Record.create([
+					{ name: 'departCode', type: 'string' },
+					{ name: 'name', type: 'string' }
+				]);
+				supplyRoomStore.insert(0, new supplyRoomRecord({ 'departCode': ALL, 'name': ALL }));
+				$Id('parm_s_handlerDepartCode').value = ''
+			}
+		})
+	}
 	var assetsBelongStore = new Ext.data.Store({
 		proxy: new Ext.data.HttpProxy({
 			url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSettleAccountsDepartJson.do?showDisableOrgUnit=false',
@@ -373,7 +413,7 @@
 			}, {
 				columnWidth: .25,
 				layout: 'form',
-				labelWidth: labelWidth+30,
+				labelWidth: labelWidth + 30,
 				items: [{
 					xtype: 'combo',
 					id: 'isDisable',
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.jsp
===================================================================
diff -u -r35351 -r35355
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.jsp	(.../idCardInstanceView.jsp)	(revision 35351)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.jsp	(.../idCardInstanceView.jsp)	(revision 35355)
@@ -14,6 +14,16 @@
 
     request.setAttribute("hospitalName", loginUser.getHospitalName());
     request.setAttribute("foreignDefaultLabelpaper", syscfg.getBarcodePaperType());
+    String currentOrgUnitCode = loginUser.getCurrentOrgUnitCode();
+    if(currentOrgUnitCode!=null){
+        request.setAttribute("currentOrgUnitCode", currentOrgUnitCode);
+        //只要是供应室用户,不管是一级供应室还是二级供应室都能修改价格
+        if(supplyRoomConfigManager.isSupplyRoomUser(loginUser)){
+            request.setAttribute("isSupplyRoomUser", true);
+        }else{
+            request.setAttribute("isSupplyRoomUser", false);
+        }
+    }
 %>
 <script type="text/javascript">
 </script>
@@ -55,7 +65,9 @@
     var userName = '${loginUserData.userFullName}';
     var ALL = '全部';
     //当前用户所在的当前科室
-	var currentOrgUnitCoding = '<%=AcegiHelper.getCurrentOrgUnitCode()%>';
+	var currentOrgUnitCoding = '${currentOrgUnitCode}';
+    //是否供应室用户
+    var isSupplyRoomUser = '${isSupplyRoomUser}';
 	//查看所有供应室报表的权限
 	var SSTS_View_All_Supply_Room_Report = true;
 	<operation:authorize ifAnyGranted="SSTS_View_All_Supply_Room_Report">