Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.js =================================================================== diff -u -r17174 -r17250 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.js (.../comboTousse.js) (revision 17174) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.js (.../comboTousse.js) (revision 17250) @@ -156,7 +156,6 @@ Ext.onReady(function () { Ext.QuickTips.init(); // 记录cookie（3步） - $Id('parm_s_onlyShowDisable').value = onlyShowDisable; var columns = [ {header: "器械包名称", width: 180, dataIndex: 'name', renderer: modifyRecord}, {header: "器械包类型", width: 90, dataIndex: 'tousseType'}, Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.jsp =================================================================== diff -u -r17174 -r17250 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.jsp (.../comboTousse.jsp) (revision 17174) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.jsp (.../comboTousse.jsp) (revision 17250) @@ -18,7 +18,6 @@ request.setAttribute("userName", userName); request.setAttribute("imageType", ImageFile.IMAGE_TYPE_TOUSSE); request.setAttribute("videoType", VideoFile.VIDEO_TYPE_TOUSSE); - request.setAttribute("onlyShowDisable", request.getParameter("onlyShowDisable")); if (currentOrgUnitCode != null) { request.setAttribute("currentOrgUnitCode", currentOrgUnitCode); request.setAttribute("departCode", departCode); @@ -33,7 +32,7 @@ - 器械包 + 聚合包定义管理 @@ -77,7 +76,6 @@ var enableSaveAndNewBtn = false; var imageType = '${imageType}'; var videoType = '${videoType}'; - var onlyShowDisable = '${onlyShowDisable}'; //是否只加载已经停用的器械包 enableEditBtn = true; @@ -119,8 +117,7 @@
- - +
\ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp =================================================================== diff -u -r17150 -r17250 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp (.../tousseView.jsp) (revision 17150) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp (.../tousseView.jsp) (revision 17250) @@ -32,7 +32,7 @@ -器械包 +器械包定义管理 @@ -109,13 +109,13 @@ + + - - @@ -127,7 +127,6 @@
-
\ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js =================================================================== diff -u -r16232 -r17250 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js (.../tousseView.js) (revision 16232) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js (.../tousseView.js) (revision 17250) @@ -116,14 +116,7 @@ return false; } id = records[0].data['id']; - var type = records[0].data['tousseType']; - if(type == PACKAGE_TYPE_FOREIGN){ - addAndEditForeignTousseDefinition(id); - }else if(type == PACKAGE_TYPE_CUSTOM){ - addAndEditCustomTousse(null,id,"00",refresh); - }else{ - addAndEditTousse(id,records[0].data['isUploadVideo']); - } + addAndEditTousse(id,records[0].data['isUploadVideo']); }; @@ -229,14 +222,7 @@ handler : function() { addAndEditTousse(0,'否'); } - }, '-', { - text : '添加外来器械包', - hidden : true, - iconCls : 'btn_ext_add_foreignTousse', - handler : function() { - addAndEditForeignTousseDefinition(0); - } - }, '-',{ + },{ text : '修改', hidden : SSTS_Tousse_Update, iconCls : 'btn_ext_application_edit', Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java =================================================================== diff -u -r17198 -r17250 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java (.../TousseDefinitionTableManager.java) (revision 17198) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java (.../TousseDefinitionTableManager.java) (revision 17250) @@ -2,13 +2,16 @@ import java.io.UnsupportedEncodingException; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import com.forgon.Constants; import com.forgon.disinfectsystem.tousse.comboTousse.service.ComboTousseManager; import com.forgon.disinfectsystem.tousse.comboTousse.service.ComboTousseOrgUnitHandler; + import net.sf.json.JSONArray; import net.sf.json.JSONObject; import net.sf.json.JsonConfig; @@ -31,6 +34,7 @@ import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.json.JSONUtil; import com.forgon.tools.string.StringTools; +import com.forgon.tools.util.SqlUtils; /** * @author WangYi 2012-2-14 下午04:55:28 @@ -68,63 +72,53 @@ this.comboTousseManagerImpl = comboTousseManagerImpl; } + /** + * 加载“器械包定义管理”和“聚合包定义管理”两个视图列表的数据 + * 备注：聚合包定义管理只查聚合包一种类型，器械包定义管理查（器械包、敷料包、消毒物品、外部代理灭菌）四种类型 + * @param parameterMap + * @return + */ public String findTousseDefinitionTableList( Map> parameterMap) { - - // 关键字查询-》把小写字母转换成大写字母 - if (!parameterMap.get("grid_search_query").isEmpty()) { + if (!parameterMap.get("grid_search_query").isEmpty()) { //关键字查询-》把小写字母转换成大写字母 List keyList = parameterMap.get("grid_search_query"); List queryKey = new ArrayList(keyList.size()); for (int i = 0; i < keyList.size(); i++) { queryKey.add(((String) keyList.get(i)).toUpperCase()); } parameterMap.put("grid_search_query", queryKey); } - SupplyRoomConfig firstSupplyRoom = supplyRoomConfigManager - .getFirstSupplyRoomConfig(); - String departCode = firstSupplyRoom.getOrgUnitCoding();// 一级供应商的部门代码 - LoginUserData userData = AcegiHelper.getLoginUser();// 当前登录用户 - String currentOrgUnitCode = userData - .getCurrentOrgUnitCode();// 当前登录用户的部门代码 - - String sql = "where po.tousseType != '" - + TousseDefinition.PACKAGE_TYPE_SPLIT - + "' and po.tousseType != '" - + TousseDefinition.PACKAGE_TYPE_CUSTOM - + "' and po.tousseType != '" - + TousseDefinition.PACKAGE_TYPE_FOREIGN + "'"; + + String sql = ""; Map sqlWhereParamMap = gridManager.getParamFromView(parameterMap); - String isShowComboTousse = sqlWhereParamMap.get("isShowComboTousse"); - if (StringUtils.isNotBlank(isShowComboTousse)){ - sql += " and po.tousseType "; - // 聚合包定义页面要查出聚合包,器械包定义页面则不查出聚合包 - sql += String.format("true".equals(isShowComboTousse) ? "= '%s'" : "!= '%s'", TousseDefinition.PACKAGE_TYPE_COMBO); - } - - //现在器械包定义的handlerDepartCode这个字段已经不用了,所以去掉条件过滤,防止二级供应室用户看不到该字段值不为该用户所在科室的器械包 - /*if (currentOrgUnitCode == null - || (currentOrgUnitCode != null && currentOrgUnitCode.equals(departCode))) {// 当前登录用户是一级供应室的人，可查全部 - } else {// 二级供应室 - sql += " and po.handlerDepartCode='" + currentOrgUnitCode + "' "; - }*/ - List parameterList = parameterMap.get("parm_s_onlyShowDisable"); - if (!parameterList.isEmpty() - && parameterList.size() > 0 - && "yes".equals(parameterList.get(0))) { //只显示停用的器械包 - sql += " and po.isDisable = '是' "; + String isComboTousseView = sqlWhereParamMap.get("isComboTousseView"); + if ("true".equals(isComboTousseView)){ //聚合包定义页面只查聚合包一种类型，器械包定义页面查（器械包、敷料包、消毒物品、外部代理灭菌） + sql += String.format("where po.tousseType='%s' ", TousseDefinition.PACKAGE_TYPE_COMBO); } else { - sql += " and po.isDisable != '是' "; + Collection tousseTypes = new ArrayList(); + tousseTypes.add(TousseDefinition.PACKAGE_TYPE_INSIDE); + tousseTypes.add(TousseDefinition.PACKAGE_TYPE_DRESSING); + tousseTypes.add(TousseDefinition.PACKAGE_TYPE_DISINFECTION); + tousseTypes.add(TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY); + sql += String.format("where %s ",SqlUtils.getStringFieldInCollectionsPredicate("po.tousseType", tousseTypes)); + + String onlyShowDisable = sqlWhereParamMap.get("onlyShowDisable"); //是否只显示停用的器械包（现在器械包定义那一块把“停用的器械包”和“非停用器械包”分开显示了） + if ("yes".equals(onlyShowDisable)) { + sql += String.format(" and po.isDisable='%s' ", Constants.STR_YES); + } else { + sql += String.format(" and (po.isDisable<>'%s' or po.isDisable is null) ", Constants.STR_YES); + } } - - sql += " and (po.forDisplay = 1 or po.forDisplay is null)"; + + sql += " and (po.forDisplay = 1 or po.forDisplay is null)"; //forDisplay为0的不显示 String result = gridManager.renderGrid(parameterMap, TousseDefinition.class.getName(), sql, new String[]{ "fieldHandler", "materialInstances", "tousseDefinitionMaterials", "idCardDefinitions", "diposableGoodsItems", "image", "images", "videos", "toussePackingTeachingImage", "tousseInstances"}); //如果是聚合包,要处理一下所属部门，因为所属部门在另外一张表 - if (ObjectUtils.equals("true", isShowComboTousse)){ + if (ObjectUtils.equals("true", isComboTousseView)){ ComboTousseOrgUnitHandler comboTousseOrgUnitHandler = ComboTousseOrgUnitHandler.getInstance(); comboTousseOrgUnitHandler.setComboTousseManagerImpl(comboTousseManagerImpl); result = comboTousseOrgUnitHandler.handleResult(result);