Index: ssts-web/src/main/webapp/WEB-INF/spring/security-standard/applicationContext-acegi-security.xml
===================================================================
diff -u -r41299 -r41658
--- ssts-web/src/main/webapp/WEB-INF/spring/security-standard/applicationContext-acegi-security.xml (.../applicationContext-acegi-security.xml) (revision 41299)
+++ ssts-web/src/main/webapp/WEB-INF/spring/security-standard/applicationContext-acegi-security.xml (.../applicationContext-acegi-security.xml) (revision 41658)
@@ -171,6 +171,7 @@
+
Index: ssts-web/src/main/webapp/js/initStoreUtils.js
===================================================================
diff -u -r41262 -r41658
--- ssts-web/src/main/webapp/js/initStoreUtils.js (.../initStoreUtils.js) (revision 41262)
+++ ssts-web/src/main/webapp/js/initStoreUtils.js (.../initStoreUtils.js) (revision 41658)
@@ -1,8 +1,8 @@
// 查找某科室的人员
-function loadUsersBySearchString() {
+function loadUsersBySearchString(orgUnitCoding) {
var store = new Ext.data.Store({
proxy: new Ext.data.HttpProxy({
- url: WWWROOT + '/systemmanage/user/userAction!loadUsersBySearchString.do',
+ url: WWWROOT + '/systemmanage/user/userAction!loadUsersBySearchString.do?orgUnitCoding='+orgUnitCoding,
method: 'POST'
}),
reader: new Ext.data.JsonReader({
Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r41425 -r41658
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 41425)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 41658)
@@ -6884,7 +6884,7 @@
*/
function initStore() {
// 查找某科室的人员
- departUsersStore = loadUsersBySearchString();
+ departUsersStore = loadUsersBySearchString(currentOrgUnitCoding);
// 获取器械包和一次性物品的数据
tousseDefinitionStore = getTousseAndDiposableGoodsData('器械包和外来器械包');
// 获取抽检器械数据
Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js
===================================================================
diff -u -r41518 -r41658
--- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js (.../routineMonitoringForm.js) (revision 41518)
+++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js (.../routineMonitoringForm.js) (revision 41658)
@@ -1787,7 +1787,7 @@
// store初始化
function initStore() {
// 查找某科室的人员
- departUsersStore = loadUsersBySearchString();
+ departUsersStore = loadUsersBySearchString(currentOrgUnitCoding);
// 炉次
frequencyStore = getFrequency();
// 获取器械包和一次性物品的数据
Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.jsp
===================================================================
diff -u -r41312 -r41658
--- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.jsp (.../routineMonitoringForm.jsp) (revision 41312)
+++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.jsp (.../routineMonitoringForm.jsp) (revision 41658)
@@ -37,6 +37,7 @@
var PACKAGE_TYPE_FOREIGN = '<%=TousseDefinition.PACKAGE_TYPE_FOREIGN%>';
var PACKAGE_TYPE_SPLIT = '<%=TousseDefinition.PACKAGE_TYPE_SPLIT%>';
var id = '${param.id}' || '';
+var currentOrgUnitCoding = '${param.orgUnitCoding}' || '';
//自定义表单类型:定期监测、质量监测
var formType_routineMonitoring = '<%=FormDefinition.FOMRTYPE_PERIODICMONITORING%>';
var formType_qualityMonitoring = '<%=FormDefinition.FOMRTYPE_QUALITYMONITORING%>';
Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.jsp
===================================================================
diff -u -r41315 -r41658
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.jsp (.../qualitymonitoringInstanceForm.jsp) (revision 41315)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.jsp (.../qualitymonitoringInstanceForm.jsp) (revision 41658)
@@ -72,7 +72,7 @@
var qualityMonitoringUpdateMode = '${qualityMonitoringUpdateMode}';
var imageType_qualitymonitoring = '<%=ImageFile.IMAGE_TYPE_QUALITYMONITORING%>';
//当前用户所在的当前科室
- var currentOrgUnitCoding = '<%=AcegiHelper.getCurrentOrgUnitCode()%>';
+ var currentOrgUnitCoding = '<%=StringUtils.defaultIfEmpty(AcegiHelper.getCurrentOrgUnitCode(), request.getParameter("orgUnitCoding"))%>';
var currentOrgUnitName = '<%=AcegiHelper.getCurrentOrgUnitName()%>';
/**
* 页面完成加载后,调用此函数