Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r23936 -r23942
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 23936)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 23942)
@@ -13644,8 +13644,12 @@
sql += " and m.depart = '" + department + "'";
}
- String handleDeptCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
- sql += " and m.handleDepartCode = '" + handleDeptCode + "'";
+ //1.如果当前登录为一级供应室用户(按处理科室进行过滤)
+ if(supplyRoomConfigManager.isFirstSupplyRoomOrgUnit(AcegiHelper.getCurrentOrgUnitCode())){
+ //2.如果当前登录用户为非供应室用户(如:临床科室用户)
+ String handleDeptCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
+ sql += " and m.handleDepartCode = '" + handleDeptCode + "'";
+ }
sql += " order by m.depart";
//sql += "group by m.departCoding";
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/returnGoodsDetailView.js
===================================================================
diff -u -r14049 -r23942
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/returnGoodsDetailView.js (.../returnGoodsDetailView.js) (revision 14049)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/returnGoodsDetailView.js (.../returnGoodsDetailView.js) (revision 23942)
@@ -45,7 +45,7 @@
}
Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function() {};
-
+ //远程数据源(查询所有科室)
var departJsonStore = new Ext.data.Store({
proxy : new Ext.data.HttpProxy({
url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getAllOrgUnitName.do',
@@ -59,6 +59,11 @@
]
)
});
+ //本地数据源,只有当前科室
+ var departOfUserOwnStore = new Ext.data.SimpleStore( {
+ fields : ['id','name'],
+ data : [ ['0',orgUnitName]]
+ });
var tousseTypeStore = new Ext.data.SimpleStore( {
fields : ['value'],
@@ -163,7 +168,8 @@
minChars : 0,
valueField : 'id',
displayField : 'name',
- store : departJsonStore,
+ store : isFirstSupplyRoom ? departJsonStore : departOfUserOwnStore,
+ mode : isFirstSupplyRoom ? 'remote':'local',
forceSelection : true,
lazyInit : true,
triggerAction : 'all',
@@ -241,7 +247,12 @@
}]
});
- Ext.getCmp('departSearch').setValue("全部");
+ //为一级供应室时,设置为全部,否则设置为当前科室
+ if(isFirstSupplyRoom){
+ Ext.getCmp('departSearch').setValue("全部");
+ }else{
+ Ext.getCmp('departSearch').setValue(orgUnitName);
+ }
var reportForm = new Ext.Panel({
frame:false,//渲染面板
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/returnGoodsDetailView.jsp
===================================================================
diff -u -r12331 -r23942
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/returnGoodsDetailView.jsp (.../returnGoodsDetailView.jsp) (revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/returnGoodsDetailView.jsp (.../returnGoodsDetailView.jsp) (revision 23942)
@@ -1,3 +1,4 @@
+<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
<%@ page contentType="text/html; charset=UTF-8"%>
<%@ include file="/common/taglibs.jsp"%>
@@ -13,7 +14,14 @@
-
+<%
+ SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
+ String orgUnitCoding = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
+ String orgUnitName = AcegiHelper.getLoginUser().getCurrentOrgUnitName();
+ int supplyRoomType = supplyRoomConfigManager.getSupplyRoomTypeByOrgUnitCoding(orgUnitCoding);
+ request.setAttribute("supplyRoomType", supplyRoomType);
+ request.setAttribute("orgUnitName", orgUnitName);
+%>
退库明细