Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/userecordconvertconfig/dwr/table/UseRecordConvertConfigTableManager.java
===================================================================
diff -u -r20735 -r29892
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/userecordconvertconfig/dwr/table/UseRecordConvertConfigTableManager.java	(.../UseRecordConvertConfigTableManager.java)	(revision 20735)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/userecordconvertconfig/dwr/table/UseRecordConvertConfigTableManager.java	(.../UseRecordConvertConfigTableManager.java)	(revision 29892)
@@ -1,13 +1,16 @@
 package com.forgon.disinfectsystem.basedatamanager.userecordconvertconfig.dwr.table;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import com.forgon.component.grid.GridManager;
 import com.forgon.disinfectsystem.entity.useRecord.UseRecordConvertConfig;
 import com.forgon.disinfectsystem.entity.useRecord.UseRecordConvertDepartConfig;
+import com.forgon.tools.string.StringTools;
 
 
 public class UseRecordConvertConfigTableManager {
@@ -25,14 +28,36 @@
 	 */
 	public String findUseRecordConvertConfigTableList(Map<String, List<String>> parameterMap){
 		String returnJson = "";
-		Map<String, String> sqlWhereParamMap = gridManager
-				.getParamFromView(parameterMap);
 		
-		String condition = "where 1=1";
-		//按科室过滤
-		String departName = sqlWhereParamMap.get("departName");
-		if(StringUtils.isNotBlank(departName)){
-			condition += " and po in (select useRecordConvertConfig from  "+ UseRecordConvertDepartConfig.class.getSimpleName() +" where departName like '%" + departName + "%')";
+		List<String> grid_search_fields = parameterMap.get("grid_search_fields");
+		List<String> grid_search_query = parameterMap.get("grid_search_query");
+		parameterMap.put("grid_search_fields", new ArrayList<String>());
+		String condition = "";
+		if(CollectionUtils.isNotEmpty(grid_search_fields) && CollectionUtils.isNotEmpty(grid_search_query)){
+			String grid_search_fieldStr = grid_search_fields.get(0);
+			String query = grid_search_query.get(0);
+			if(StringUtils.isNotBlank(grid_search_fieldStr) && StringUtils.isNotBlank(query)){
+				List<String> conditionList = new ArrayList<String>();
+				String[] search_fields = grid_search_fieldStr.substring(1, grid_search_fieldStr.length()-1).split(",");
+				for(int i=0;i<search_fields.length;i++){
+					String field = search_fields[i].replace("\"", "");
+					//按科室过滤
+					if(field.equals("departNames")){
+						String departSql = " (po in (select useRecordConvertConfig from  "+ UseRecordConvertDepartConfig.class.getSimpleName() +" where departName like '%" + query + "%')) ";
+						conditionList.add(departSql);
+						continue;
+					}
+					String fieldSql = " (po." + field + " like '%" + query + "%') ";
+					conditionList.add(fieldSql);
+				}
+				
+				if(CollectionUtils.isNotEmpty(conditionList)){
+					for (String sql : conditionList) {
+						condition = StringTools.uniteTwoStringBySemicolon(condition, sql, " or ");
+					}
+				}
+				condition = " where 1=1 and (" + condition + ") ";
+			}
 		}
 		
 		returnJson = gridManager.renderGrid(parameterMap,