Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java =================================================================== diff -u -r25288 -r25962 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java (.../TousseInstanceTableManager.java) (revision 25288) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java (.../TousseInstanceTableManager.java) (revision 25962) @@ -23,10 +23,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.Transformer; import org.apache.commons.lang3.StringUtils; -import org.apache.http.impl.cookie.DateParseException; -import org.apache.http.impl.cookie.DateUtils; import org.apache.log4j.Logger; -import org.apache.poi.util.StringUtil; import com.fasterxml.jackson.databind.ObjectMapper; import com.forgon.component.grid.GridManager; @@ -191,242 +188,280 @@ } } + /** + * 获取器械包列表信息 + * @param parameterMap + * @return + */ @SuppressWarnings("unchecked") - public String findTousseInstanceTableList( - Map> parameterMap) { - - Map sqlWhereParamMap = gridManager - .getParamFromView(parameterMap); + public String findTousseInstanceTableList(Map> parameterMap) { + Map sqlWhereParamMap = gridManager.getParamFromView(parameterMap); StringBuilder sqlBuilder = new StringBuilder(" WHERE 1=1 "); + + //过滤条件：标识牌编号 String idNumber = sqlWhereParamMap.get("idNumberSearch"); String idNumberSql = null; if(StringUtils.isNotBlank(idNumber)){ - idNumberSql = String.format(" and po.idCardInstanceID in(select idi.id from IDCardInstance idi , IDCardDefinition idd where idi.idCardDefinitionID=idd.id and idd.idNumber like '%%%s%%') ", idNumber); + idNumberSql = String.format(" and po.idCardInstanceID in" + + "(select idi.id from IDCardInstance idi , IDCardDefinition idd " + + "where idi.idCardDefinitionID=idd.id and idd.idNumber like '%%%s%%') " + , idNumber); } - - /*由于不追溯的器械包都会生成一个固定条码的包实例,这些包实例的operationTime都是null, - 器械包信息页面oracle数据库按operationTime降排时默认null都排到最前面了,所以增加此过滤条件*/ - sqlBuilder.append(" AND operationTime is not null "); if(idNumberSql != null){ sqlBuilder.append(idNumberSql); } - String barcodeSearch = sqlWhereParamMap.get("barcodeSearch"); //条码（包含但不限于：器械包实例条码、标识牌） - String barcodes = sqlWhereParamMap.get("barcodes"); //条码集合（用户启用多次扫描模式并且不是第一次扫描条码时才有值，此时要按照此条码集合查询） + + //过滤条件：条码 + //条码（包含但不限于：器械包实例条码、标识牌） + String barcodeSearch = sqlWhereParamMap.get("barcodeSearch"); + //条码集合（用户启用多次扫描模式并且不是第一次扫描条码时才有值，此时要按照此条码集合查询） + String barcodes = sqlWhereParamMap.get("barcodes"); if(StringUtils.isNotBlank(barcodeSearch)){ - BarcodeDevice barcodeDevice = barcodeManager - .getBarcodeByBarcode(barcodeSearch); - if(barcodeDevice == null - && StringUtils.isBlank(barcodes)) { //1、若无此条码 2、用户没启用多次扫描模式，或者是启用了而且是第一次扫描 同时满足1和2则两个条件直接返回 + //根据条码获取BarcodeDevice + BarcodeDevice barcodeDevice = barcodeManager.getBarcodeByBarcode(barcodeSearch); + //1、若无此条码 2、用户没启用多次扫描模式，或者是启用了而且是第一次扫描 + //同时满足1和2两个条件则直接返回 + if(barcodeDevice == null && StringUtils.isBlank(barcodes)) { Map map = new HashMap(); map.put("totalResults", 0); map.put("list", Arrays.asList()); map.put("selectSqlWhereCondition", ""); - String json = gridManager.converJsonString(0, Arrays.asList(), "", - TousseInstance.filterProperties); + String json = gridManager.converJsonString(0, Arrays.asList(), "",TousseInstance.filterProperties); return json; } - - if (barcodeDevice instanceof IDCardInstance) { //是标识牌的条码 + //若是标识牌的条码 + if (barcodeDevice instanceof IDCardInstance) { IDCardInstance idCardInstance = (IDCardInstance) barcodeDevice; - List tousseInstances = idCardInstance - .getTousseInstances(objectDao); + List tousseInstances = idCardInstance.getTousseInstances(objectDao); Collection barcodeCollection = CollectionUtils.collect( tousseInstances, new Transformer() { @Override public String transform(TousseInstance input) { return input.getBarcode(); } }); - sqlBuilder.append(" AND"); - sqlBuilder.append(SqlBuilder.build_IN_Statement("po.barcode", - SqlBuilder.IN, barcodeCollection)); + sqlBuilder.append(" AND "); + sqlBuilder.append(SqlBuilder.build_IN_Statement("po.barcode",SqlBuilder.IN, barcodeCollection)); } else { if (StringUtils.isNotBlank(barcodes)) { String[] barcodeArray = barcodes.split(";"); List barcodeList = Arrays.asList(barcodeArray); - sqlBuilder.append(" AND" + SqlBuilder.build_IN_Statement("po.barcode", - SqlBuilder.IN, barcodeList)); + sqlBuilder.append(" AND" + SqlBuilder.build_IN_Statement("po.barcode",SqlBuilder.IN, barcodeList)); } else { - sqlBuilder.append(String.format(" AND po.barcode = '%s'", - barcodeSearch)); + sqlBuilder.append(String.format(" AND po.barcode = '%s' ",barcodeSearch)); } } } - - String sterilizationStart = sqlWhereParamMap.get("sterilizationStart"); //灭菌开始时间 + + //过滤条件：灭菌 + //灭菌炉名称 + String sterilizerName = sqlWhereParamMap.get("sterilizerName"); + if (StringUtils.isNotBlank(sterilizerName)) { + sqlBuilder.append(String.format(" AND po.sterilizerName = '%s' " ,sterilizerName)); + }else{ + //灭菌炉分组 + String sterilizerGroup = sqlWhereParamMap.get("sterilizerGroup"); + if(StringUtils.isNotBlank(sterilizerGroup)){ + List sterilizerList = objectDao.findBySql(Sterilizer.class.getSimpleName(), + String.format("where po.ownGroup = '%s' ", sterilizerGroup)); + List sterilizers = new ArrayList(); + for(Sterilizer sterilizer : sterilizerList){ + sterilizers.add(sterilizer.getName()); + } + sqlBuilder.append(String.format(" AND (%s) ", + SqlUtils.getStringFieldInLargeCollectionsPredicate("po.sterilizerName", sterilizers))); + } + } + //炉次 + String frequency = sqlWhereParamMap.get("frequency"); + if (StringUtils.isNotBlank(frequency)) { + sqlBuilder.append(String.format(" AND po.sterileFrequency = '%s'" ,frequency)); + } + //灭菌开始时间 + String sterilizationStart = sqlWhereParamMap.get("sterilizationStart"); if (StringUtils.isNotBlank(sterilizationStart)) { sqlBuilder.append(String.format( " AND po.sterileStartTime >= '%s' ",parseStartTime(sterilizationStart,false))); - //注释掉这种格式（convert函数太耗时）and CONVERT(datetime, tousseinst0_.sterileStartTime, 120)>=convert(datetime, '2017-12-16 00:00:00', 120) - /*dateQueryAdapter.stringFieldToDate("po.sterileEndTime"), + //注释掉这种格式（convert函数太耗时）and CONVERT(datetime, tousseinst0_.sterileStartTime, 120)>=convert(datetime, '2017-12-16 00:00:00', 120) + /*dateQueryAdapter.stringFieldToDate("po.sterileEndTime"), dateQueryAdapter.dateAdapter(sterilizationDate + " 00:00:00")*/ } - - String sterilizationEnd = sqlWhereParamMap.get("sterilizationEnd"); //灭菌结束日期 + //灭菌结束时间 + String sterilizationEnd = sqlWhereParamMap.get("sterilizationEnd"); if (StringUtils.isNotBlank(sterilizationEnd)) { sqlBuilder.append(String.format( " AND po.sterileEndTime < '%s' ",parseEndTime(sterilizationEnd,false))); - //注释掉这种格式（convert函数太耗时）and CONVERT(datetime, tousseinst0_.sterileEndTime, 120)<=convert(datetime, '2017-12-16 23:59:59', 120) - /*dateQueryAdapter.stringFieldToDate("po.sterileEndTime"), + //注释掉这种格式（convert函数太耗时）and CONVERT(datetime, tousseinst0_.sterileEndTime, 120)<=convert(datetime, '2017-12-16 23:59:59', 120) + /*dateQueryAdapter.stringFieldToDate("po.sterileEndTime"), dateQueryAdapter.dateAdapter(sterilizationEndDate + " 23:59:59")*/ } //如果要根据灭菌时间来筛选，首先必须是已经有灭菌记录的（数据库中存在有灭菌开始时间但是没有灭菌结束时间和灭菌单的记录） if(StringUtils.isNotBlank(sterilizationStart) || StringUtils.isNotBlank(sterilizationEnd)){ sqlBuilder.append(" AND po.sterilizationRecord_id is not null"); } - - String sterilizerName = sqlWhereParamMap.get("sterilizerName"); //灭菌炉 - if (StringUtils.isNotBlank(sterilizerName)) { - sqlBuilder.append(String.format(" AND po.sterilizerName = '%s'" ,sterilizerName)); - }else{ - String sterilizerGroup = sqlWhereParamMap.get("sterilizerGroup"); //灭菌炉分组 - if(StringUtils.isNotBlank(sterilizerGroup)){ - List list = objectDao.findBySql(Sterilizer.class.getSimpleName(), String.format("where po.ownGroup = '%s' ", sterilizerGroup)); - List sterilizers = new ArrayList(); - for(Sterilizer sterilizer : list){ - sterilizers.add(sterilizer.getName()); - } - sqlBuilder.append(String.format(" AND (%s) ", - SqlUtils.getStringFieldInLargeCollectionsPredicate("po.sterilizerName", sterilizers))); - } + //灭菌交接开始时间 + String sterilizationTransitionStart = sqlWhereParamMap.get("sterilizationTransitionStart"); + if(StringUtils.isNotBlank(sterilizationTransitionStart)){ + sqlBuilder.append(String.format(" AND po.transitionTime >= %s ",parseStartTime(sterilizationTransitionStart,true))); } - - String operationStart = sqlWhereParamMap.get("operationStart"); //装配开始时间 + //灭菌交接结束时间 + String sterilizationTransitionEnd = sqlWhereParamMap.get("sterilizationTransitionEnd"); + if(StringUtils.isNotBlank(sterilizationTransitionEnd)){ + sqlBuilder.append(String.format(" AND po.transitionTime < %s ",parseEndTime(sterilizationTransitionEnd,true))); + } + + //过滤条件：装配 + //装配开始时间 + String operationStart = sqlWhereParamMap.get("operationStart"); if(StringUtils.isNotBlank(operationStart)){ sqlBuilder.append(String.format(" AND po.operationTime >= %s ",parseStartTime(operationStart,true))); } - String operationEnd = sqlWhereParamMap.get("operationEnd"); //装配结束时间 + //装配结束时间 + String operationEnd = sqlWhereParamMap.get("operationEnd"); if(StringUtils.isNotBlank(operationEnd)){ sqlBuilder.append(String.format(" AND po.operationTime < %s ",parseEndTime(operationEnd,true))); } - String invoiceStart = sqlWhereParamMap.get("invoiceStart"); //发货开始时间 + //装配任务组 + String taskGroup = sqlWhereParamMap.get("taskGroup"); + if(StringUtils.isNotBlank(taskGroup)){ + String[] groups = taskGroup.split(", "); + if(!"全部".equals(groups[0])){ + if(groups.length == 1){ + sqlBuilder.append(String.format(" AND ( po.taskGroup = '%s' ) ",groups[0])); + }else{ + sqlBuilder.append(String.format(" AND (%s) ", + SqlUtils.getStringFieldInLargeCollectionsPredicate("po.taskGroup", Arrays.asList(groups)))); + } + } + } + + //过滤条件：发货 + //发货开始时间 + String invoiceStart = sqlWhereParamMap.get("invoiceStart"); if(StringUtils.isNotBlank(invoiceStart)){ sqlBuilder.append(String.format(" AND po.invoiceSendTime >= %s ",parseStartTime(invoiceStart,true))); } - String invoiceEnd = sqlWhereParamMap.get("invoiceEnd"); //发货结束时间 + //发货结束时间 + String invoiceEnd = sqlWhereParamMap.get("invoiceEnd"); if(StringUtils.isNotBlank(invoiceEnd)){ sqlBuilder.append(String.format(" AND po.invoiceSendTime < %s ",parseEndTime(invoiceEnd,true))); } - - //undo - String sterilizationTransitionStart = sqlWhereParamMap.get("sterilizationTransitionStart"); //灭菌交接开始时间 - if(StringUtils.isNotBlank(sterilizationTransitionStart)){ - sqlBuilder.append(String.format(" AND po.transitionTime >= %s ",parseStartTime(sterilizationTransitionStart,true))); - } - String sterilizationTransitionEnd = sqlWhereParamMap.get("sterilizationTransitionEnd"); //灭菌交接结束时间 - if(StringUtils.isNotBlank(sterilizationTransitionEnd)){ - sqlBuilder.append(String.format(" AND po.transitionTime < %s ",parseEndTime(sterilizationTransitionEnd,true))); - } - - String frequency = sqlWhereParamMap.get("frequency"); //炉次 - if (StringUtils.isNotBlank(frequency)) { - sqlBuilder.append(String.format(" AND po.sterileFrequency = '%s'" ,frequency)); - } - - String patientName = sqlWhereParamMap.get("patientName"); //病人姓名 - String treatmentNum = sqlWhereParamMap.get("treatmentNum"); //诊疗号 - String hospitalNum = sqlWhereParamMap.get("hospitalNum"); //住院号 + + //过滤条件：病人信息 + String patientName = sqlWhereParamMap.get("patientName"); //病人姓名 + String treatmentNum = sqlWhereParamMap.get("treatmentNum"); //诊疗号 + String hospitalNum = sqlWhereParamMap.get("hospitalNum"); //住院号 String patientNameSql = ""; String treatmentNumSql = ""; String hospitalNumSql = ""; if (StringUtils.isNotBlank(patientName)) { - patientNameSql = " AND patientName = '"+patientName+"'"; - } + patientNameSql = " AND patientName = '"+patientName+"'"; + } if (StringUtils.isNotBlank(treatmentNum)) { - treatmentNumSql = " AND treatmentNum = '"+treatmentNum+"'"; - } + treatmentNumSql = " AND treatmentNum = '"+treatmentNum+"'"; + } if (StringUtils.isNotBlank(treatmentNum)) { - hospitalNum = " AND hospitalNum = '"+hospitalNum+"'"; - } + hospitalNum = " AND hospitalNum = '"+hospitalNum+"'"; + } if(StringUtils.isNotBlank(patientNameSql)|| StringUtils.isNotBlank(treatmentNumSql) || StringUtils.isNotBlank(hospitalNumSql)){ - sqlBuilder.append(String.format(" AND po.useRecord_id in (select id from UseRecord where 1=1 %s %s %s ) " ,patientNameSql,treatmentNumSql,hospitalNumSql)); + sqlBuilder.append(String.format(" AND po.useRecord_id in (select id from UseRecord where 1=1 %s %s %s ) " ,patientNameSql,treatmentNumSql,hospitalNumSql)); } - String tousseGroupName = sqlWhereParamMap.get("tousseGroupName"); //器械包分组 - if (StringUtils.isNotBlank(tousseGroupName) - && tousseGroupName.indexOf("全部") == -1) { //没选或者选择全部就不过滤 + //过滤条件：器械包 + //器械包分组 + String tousseGroupName = sqlWhereParamMap.get("tousseGroupName"); + //没选或者选择全部就不过滤 + if (StringUtils.isNotBlank(tousseGroupName)&& tousseGroupName.indexOf("全部") == -1) { String[] tousseGroupNameArray = tousseGroupName.split(","); - StringBuilder tempBuilder = new StringBuilder(); for (String temp : tousseGroupNameArray) { tempBuilder.append(String.format("po.tousseDefinition.tousseGroupName = '%s' or " ,temp.trim())); } - int length = tempBuilder.length(); tempBuilder.delete(length - 4, length); sqlBuilder.append(String.format(" AND (%s) " ,tempBuilder)); } - + + //器械包名称（根据查询模式设置不同） //通过在器械包下拉框选项中选中的名称(采用精确匹配) String tousseName = sqlWhereParamMap.get("tousseName"); //通过在器械包下拉里输入但未从下拉选项选中的物品名称(采用模糊匹配) String tousseNameFuzzy = sqlWhereParamMap.get("tousseNameFuzzy"); if (StringUtils.isNotBlank(tousseName)) { - sqlBuilder.append(" AND po.tousseDefinition.name = '" + tousseName - + "'"); + sqlBuilder.append(" AND po.tousseDefinition.name = '" + tousseName + "'"); }else if (StringUtils.isNotBlank(tousseNameFuzzy)) { - sqlBuilder.append(" AND po.tousseDefinition.name like '%" + tousseNameFuzzy - + "%'"); + sqlBuilder.append(" AND po.tousseDefinition.name like '%" + tousseNameFuzzy + "%'"); } - - String taskGroup = sqlWhereParamMap.get("taskGroup"); //装配任务组 - if(StringUtils.isNotBlank(taskGroup)){ - String[] groups = taskGroup.split(", "); - if(!"全部".equals(groups[0])){ - if(groups.length == 1){ - sqlBuilder.append(String.format(" AND ( po.taskGroup = '%s' ) ",groups[0])); - }else{ - sqlBuilder.append(String.format(" AND (%s) ", - SqlUtils.getStringFieldInLargeCollectionsPredicate("po.taskGroup", Arrays.asList(groups)))); - } - } - } - - String tousseStatus = sqlWhereParamMap.get("tousseStatus"); //器械包状态 + //器械包状态 + String tousseStatus = sqlWhereParamMap.get("tousseStatus"); if (StringUtils.isNotBlank(tousseStatus)){ String[] statuses = tousseStatus.split(", "); if(!"全部".equals(statuses[0])){ if(statuses.length == 1){ sqlBuilder.append(String.format(" AND (po.status = '%s') ",statuses[0])); }else{ sqlBuilder.append(String.format(" AND (%s) ", - SqlUtils.getStringFieldInLargeCollectionsPredicate("po.status", Arrays.asList(statuses)))); + SqlUtils.getStringFieldInLargeCollectionsPredicate("po.status", Arrays.asList(statuses)))); } } } - - String department = sqlWhereParamMap.get("department"); //科室 + //科室 + String department = sqlWhereParamMap.get("department"); if (StringUtils.isNotBlank(department)){ sqlBuilder.append(String.format(" AND po.departCoding = '%s' ",department)); } - - /////////////////////////////////////////////// + //过滤条件： selectall为true则为查看所有科室器械包实体信息 LoginUserData userData = AcegiHelper.getLoginUser(); - String currentOrgUnitCode = userData - .getCurrentOrgUnitCode(); - // true则为查看所有科室器械包实体信息 - boolean isSelectAll = StringUtils.isNotBlank(sqlWhereParamMap - .get("selectall")); + String currentOrgUnitCode = userData.getCurrentOrgUnitCode(); + boolean isSelectAll = StringUtils.isNotBlank(sqlWhereParamMap.get("selectall")); if (!isSelectAll) { if(StringUtils.isNotBlank(currentOrgUnitCode)){ if(supplyRoomConfigManager.isFirstSupplyRoomOrgUnit(currentOrgUnitCode)){ // 科室为一级供应室，不限定装配科室 }else{ - String warehousePredicate = "select id from " + WareHouse.class.getSimpleName() - + " where orgUnitCode='" + currentOrgUnitCode + "'"; + String warehousePredicate = String.format("select id from %s where orgUnitCode = '%s' ", + WareHouse.class.getSimpleName(),currentOrgUnitCode); sqlBuilder.append(String.format(" AND (po.orgUnitCoding = '%s' OR po.location='%s' OR po.wareHouseId in (%s))", - AcegiHelper.getLoginUser() - .getOrgUnitCodingFromSupplyRoomConfig(),currentOrgUnitCode,warehousePredicate)); + AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig(),currentOrgUnitCode,warehousePredicate)); } }else{ sqlBuilder.append(String.format(" AND 1=0 ")); } } + //不显示:器械包不追溯且是固定条码 + sqlBuilder.append(" AND (po.unTraceableTousse = 0 or po.tousseFixedBarcode = 0) "); + + //是否显示:聚合包里面的包实例 + String isShowComboTousseInstance = sqlWhereParamMap.get("isShowComboTousseInstance"); + if(!("true".equals(isShowComboTousseInstance))){ + //不显示聚合包里面的包实例 + sqlBuilder.append(" AND po.comboTousseInstanceId is null "); + } + + /*由于不追溯的器械包都会生成一个固定条码的包实例,这些包实例的operationTime都是null, + 器械包信息页面oracle数据库按operationTime降排时默认null都排到最前面了,所以增加此过滤条件*/ + sqlBuilder.append(" AND operationTime is not null "); + + //对应器械包干预审核时间页面，不显示审核时间为空的数据项 + String reviewTime = sqlWhereParamMap.get("isReview"); + if(StringUtils.isNotBlank(reviewTime)){ + sqlBuilder.append(" AND po.reviewTime is not null "); + } + //不再需要此条件了,因为不管是一级供应室还是二级供应室都不按包定义的处理科室条件查询 + /*if (currentOrgUnitCode != null) { + if (!currentOrgUnitCode.equals(unitCodeOfFirstSupplyRoom)) {// 如果当前登录用户是一级供应室的人 + sqlBuilder.append(String.format(" AND po.tousseDefinition.handlerDepartCode='%s'", currentOrgUnitCode)); + } + }*/ + //2017.12.23 如果是双排序，对查询时间影响很大，取消id排序 +// if(StringUtils.isNotBlank(orderStr)){ +// orderStr += ", id desc "; +// } int start = 0; int pageSize = 20; String orderStr = ""; @@ -483,61 +518,30 @@ e.printStackTrace(); } } - // 处理GridSearch的参数 searchSql = gridManager.getSearchFieldSql(parameterMap); // 处理GridFilter的参数 filterSql = gridManager.getFilterFieldSql(parameterMap); } // 合并用户自定义的sql - if (StringUtils.isNotBlank(filterSqlStr)) { sqlBuilder.append(" AND "); sqlBuilder.append(filterSqlStr); } - if (StringUtils.isNotBlank(searchSql)) { sqlBuilder.append(" AND "); sqlBuilder.append(searchSql); } - if (StringUtils.isNotBlank(filterSql)) { sqlBuilder.append(" AND "); sqlBuilder.append(filterSql); } - - //不再需要此条件了,因为不管是一级供应室还是二级供应室都不按包定义的处理科室条件查询 - /*if (currentOrgUnitCode != null) { - if (!currentOrgUnitCode.equals(unitCodeOfFirstSupplyRoom)) {// 如果当前登录用户是一级供应室的人 - sqlBuilder.append(String.format(" AND po.tousseDefinition.handlerDepartCode='%s'", currentOrgUnitCode)); - } - }*/ - // 器械包不追溯且是固定条码 不显示 - sqlBuilder.append(" AND (po.unTraceableTousse = 0 or po.tousseFixedBarcode = 0) "); - - - sqlBuilder.append(" AND po.comboTousseInstanceId is null "); //聚合包里面的包实例 不显示 - - String reviewTime = sqlWhereParamMap.get("isReview"); - //对应器械包干预审核时间页面，不显示审核时间为空的数据项 - if(StringUtils.isNotBlank(reviewTime)){ - sqlBuilder.append(" AND po.reviewTime is not null "); - } String sql = sqlBuilder.toString(); - - //2017.12.23 如果是双排序，对查询时间影响很大，取消id排序 -// if(StringUtils.isNotBlank(orderStr)){ -// orderStr += ", id desc "; -// } - - int totalResults = objectDao.countObjectBySql( - TousseInstance.class.getSimpleName(), sql); -// int totalResults = 10000; - List list = objectDao.findBySql( - TousseInstance.class.getSimpleName(), sql, start, - pageSize, orderStr); + //开始查询 + int totalResults = objectDao.countObjectBySql(TousseInstance.class.getSimpleName(), sql); + List list = objectDao.findBySql(TousseInstance.class.getSimpleName(), sql, start,pageSize, orderStr); setIdNumber(list); Map map = new HashMap(); map.put("totalResults", totalResults); @@ -602,9 +606,7 @@ } } - - String json = gridManager.converJsonString(totalResults, list, sql, - TousseInstance.filterProperties); + String json = gridManager.converJsonString(totalResults, list, sql,TousseInstance.filterProperties); return json; } Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp =================================================================== diff -u -r25383 -r25962 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp (.../tousseInstanceView.jsp) (revision 25383) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp (.../tousseInstanceView.jsp) (revision 25962) @@ -23,7 +23,9 @@ selectall = true; - + + + var SSTS_SystemWarning_TousseGoods_delete = true; SSTS_SystemWarning_TousseGoods_delete = false; @@ -108,6 +110,8 @@
+ +