Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.jsp =================================================================== diff -u -r14876 -r15159 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.jsp (.../foreignProxyDisinfectionView.jsp) (revision 14876) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.jsp (.../foreignProxyDisinfectionView.jsp) (revision 15159) @@ -1,6 +1,7 @@ <%@page import="java.util.List"%> <%@page import="com.forgon.systemsetting.service.HttpOptionManager"%> <%@ page import="com.forgon.disinfectsystem.entity.basedatamanager.container.Container" %> +<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%> <%@ page contentType="text/html; charset=UTF-8"%> <%@ include file="/common/taglibs.jsp"%> <% @@ -18,13 +19,15 @@ tem += "]"; request.setAttribute("foreignProxyGroupList", tem); + SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager"); LoginUserData loginUser = AcegiHelper.getLoginUser(); request.setAttribute("hospitalName", loginUser.getHospitalName()); %> <% LoginUserData userData = AcegiHelper.getLoginUser(); request.setAttribute("userName",userData.getUserFullName()); request.setAttribute("currentOrgUnitName", userData.getCurrentOrgUnitName()); + request.setAttribute("isSupplyRoomUser",supplyRoomConfigManager.isSupplyRoomUser2(userData)); %> @@ -68,6 +71,8 @@ var hospitalName = '<%=request.getAttribute("hospitalName")%>'; var curUserName = '${userName}'; var currentOrgUnitName = '${currentOrgUnitName}'; +var isSupplyRoomUser = ${isSupplyRoomUser}; + var SSTS_ForeignProxyDisinfection_Create = true; SSTS_ForeignProxyDisinfection_Create = false; Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js =================================================================== diff -u -r15157 -r15159 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 15157) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js (.../foreignProxyDisinfectionView.js) (revision 15159) @@ -1729,7 +1729,11 @@ } if(!id){ - top.Ext.getCmp('applicant').setValue($Id('userName').value); + if(isSupplyRoomUser){ + top.Ext.getCmp('applicant').setValue($Id('userName').value); + }else{ + top.Ext.getCmp('maker').setValue($Id('userName').value); + } top.Ext.getCmp('applicationTimeStr').setValue(Ext.util.Format.date(new Date(), 'Y-m-d H:i')); top.Ext.getCmp('arrivedTimeStr').setValue(Ext.util.Format.date(new Date(), 'Y-m-d H:i')); } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java =================================================================== diff -u -r15035 -r15159 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java (.../SupplyRoomConfigManager.java) (revision 15035) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java (.../SupplyRoomConfigManager.java) (revision 15159) @@ -119,6 +119,12 @@ */ public boolean isSupplyRoomUser(LoginUserData user); /** + * 判断登录用户是否是供应室用户,包括一级供应室和二级供应室，优化速度，一条查询sql判断，不用查询几次 + * @param user 登录用户信息 + * @return + */ + public boolean isSupplyRoomUser2(LoginUserData user); + /** * 判断当前登录用户是否是供应室用户,包括一级供应室和二级供应室 * @return */ Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java =================================================================== diff -u -r15145 -r15159 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 15145) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 15159) @@ -494,6 +494,7 @@ return jsonArray; } + @Deprecated @Override public boolean isSupplyRoomUser(LoginUserData user) { if(user != null){ @@ -514,6 +515,22 @@ } return false; } + // 一条sql判断是否为供应室 + public boolean isSupplyRoomUser2(LoginUserData user) { + if(user == null){ + return false; + } + String currentOrgUnitCode = user.getCurrentOrgUnitCode(); + if(StringUtils.isBlank(currentOrgUnitCode)){ + return false; + } + String sql = String.format(" where po.supplyRoomType in(%s,%s) and po.orgUnitCoding='%s'",SupplyRoomConfig.SUPPLYROOM_TYPE_1,SupplyRoomConfig.SUPPLYROOM_TYPE_2, user.getCurrentOrgUnitCode()); + int c = objectDao.countObjectBySql(SupplyRoomConfig.class.getSimpleName(), sql); + if(c > 0){ + return true; + } + return false; + } @Override public boolean isSupplyRoomUser() {